diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-03-04 08:39:14 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-04 08:39:14 -0500 |
| commit | 3a291b189bfc7816f32a5773feea0103d5c79b91 (patch) | |
| tree | 64b4f415feb9642f5637316fbeaaa2610fe85bb1 /include | |
| parent | 0713cb043ff2fef8e431e660370a3ccb82a912d2 (diff) | |
| parent | 2910972b25a211ecd07c605d4bf93897ef5f715a (diff) | |
Merge pull request #699 from martinetd/xcb_errors
Print xcb errors
Diffstat (limited to 'include')
| -rw-r--r-- | include/wlr/xwayland.h | 4 | ||||
| -rw-r--r-- | include/xwayland/xwm.h (renamed from include/wlr/xwm.h) | 16 |
2 files changed, 13 insertions, 7 deletions
diff --git a/include/wlr/xwayland.h b/include/wlr/xwayland.h index 0d4b91ed..f34860aa 100644 --- a/include/wlr/xwayland.h +++ b/include/wlr/xwayland.h @@ -8,10 +8,6 @@ #include <wlr/types/wlr_seat.h> #include <xcb/xcb.h> -#ifdef WLR_HAS_XCB_ICCCM - #include <xcb/xcb_icccm.h> -#endif - struct wlr_xwm; struct wlr_xwayland_cursor; diff --git a/include/wlr/xwm.h b/include/xwayland/xwm.h index 7d518f7e..4b15cc84 100644 --- a/include/wlr/xwm.h +++ b/include/xwayland/xwm.h @@ -1,10 +1,17 @@ -#ifndef WLR_XWM_H -#define WLR_XWM_H +#ifndef XWAYLAND_XWM_H +#define XWAYLAND_XWM_H #include <wayland-server-core.h> #include <wlr/xwayland.h> #include <xcb/render.h> +#ifdef WLR_HAS_XCB_ICCCM + #include <xcb/xcb_icccm.h> +#endif +#ifdef WLR_HAS_XCB_ERRORS + #include <xcb/xcb_errors.h> +#endif + enum atom_name { WL_SURFACE_ID, WM_DELETE_WINDOW, @@ -98,6 +105,9 @@ struct wlr_xwm { struct wl_list unpaired_surfaces; // wlr_xwayland_surface::unpaired_link const xcb_query_extension_reply_t *xfixes; +#ifdef WLR_HAS_XCB_ERRORS + xcb_errors_context_t *errors_context; +#endif struct wl_listener compositor_new_surface; struct wl_listener compositor_destroy; @@ -119,7 +129,7 @@ void xwm_selection_finish(struct wlr_xwm *xwm); void xwm_set_seat(struct wlr_xwm *xwm, struct wlr_seat *seat); -bool wlr_xwm_atoms_contains(struct wlr_xwm *xwm, xcb_atom_t *atoms, +bool xwm_atoms_contains(struct wlr_xwm *xwm, xcb_atom_t *atoms, size_t num_atoms, enum atom_name needle); #endif |