diff options
| author | Dominique Martinet <asmadeus@codewreck.org> | 2018-03-03 17:03:19 +0100 |
|---|---|---|
| committer | Dominique Martinet <asmadeus@codewreck.org> | 2018-03-03 17:03:21 +0100 |
| commit | 7d1870c6f1c1dd14fe9fe13885021970f0cbdbe8 (patch) | |
| tree | 913f3a92d12eac96d70a8ae44978cadf15d9919f /include | |
| parent | f4817916697c10f9361d0e78aa6d7979db5c850a (diff) | |
move xwm.h out of include/wlr
xwm.h was meant to be private, so move it to include/xwayland/xwm.h
We had an ifdef WLR_HAS_XCB_ICCCM in xwayland.h which was easy to move
to xwm, it is not safe to use the WLR_HAS_* in the public headers.
I checked a few of our current users and none rely on xwm.h being
public as expected (rootston, sway, hsroots)
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) | 7 |
2 files changed, 7 insertions, 4 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..0ed61d37 100644 --- a/include/wlr/xwm.h +++ b/include/xwayland/xwm.h @@ -5,6 +5,13 @@ #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, |