diff options
Diffstat (limited to 'xwayland')
| -rw-r--r-- | xwayland/meson.build | 2 | ||||
| -rw-r--r-- | xwayland/xwm.c | 18 |
2 files changed, 2 insertions, 18 deletions
diff --git a/xwayland/meson.build b/xwayland/meson.build index a4b51bf2..09a7c6c2 100644 --- a/xwayland/meson.build +++ b/xwayland/meson.build @@ -2,12 +2,12 @@ xwayland_libs = [] xwayland_required = [ 'xcb', 'xcb-composite', + 'xcb-icccm', 'xcb-render', 'xcb-xfixes', ] xwayland_optional = { 'xcb-errors': 'Required for printing X11 errors.', - 'xcb-icccm': 'Required for extended X11 window manager hints.', } msg = [] diff --git a/xwayland/xwm.c b/xwayland/xwm.c index 89459533..b8e686d7 100644 --- a/xwayland/xwm.c +++ b/xwayland/xwm.c @@ -14,6 +14,7 @@ #include <wlr/xwayland.h> #include <xcb/composite.h> #include <xcb/render.h> +#include <xcb/xcb_icccm.h> #include <xcb/xfixes.h> #include "util/signal.h" #include "xwayland/xwm.h" @@ -563,7 +564,6 @@ static void read_surface_protocols(struct wlr_xwm *xwm, xsurface->protocols_len = atoms_len; } -#if WLR_HAS_XCB_ICCCM static void read_surface_hints(struct wlr_xwm *xwm, struct wlr_xwayland_surface *xsurface, xcb_get_property_reply_t *reply) { @@ -593,15 +593,7 @@ static void read_surface_hints(struct wlr_xwm *xwm, wlr_signal_emit_safe(&xsurface->events.set_hints, xsurface); } -#else -static void read_surface_hints(struct wlr_xwm *xwm, - struct wlr_xwayland_surface *xsurface, - xcb_get_property_reply_t *reply) { - // Do nothing -} -#endif -#if WLR_HAS_XCB_ICCCM static void read_surface_normal_hints(struct wlr_xwm *xwm, struct wlr_xwayland_surface *xsurface, xcb_get_property_reply_t *reply) { @@ -642,14 +634,6 @@ static void read_surface_normal_hints(struct wlr_xwm *xwm, xsurface->size_hints->max_height = -1; } } -#else -static void read_surface_normal_hints(struct wlr_xwm *xwm, - struct wlr_xwayland_surface *xsurface, - xcb_get_property_reply_t *reply) { - // Do nothing -} -#endif - #define MWM_HINTS_FLAGS_FIELD 0 #define MWM_HINTS_DECORATIONS_FIELD 2 |