xwm: Define SEND_EVENT_MASK and EVENT_TYPE macros to clarify xcb event type checks
diff --git a/src/xwayland/window-manager.c b/src/xwayland/window-manager.c
index 5d003a9..e656eda 100644
--- a/src/xwayland/window-manager.c
+++ b/src/xwayland/window-manager.c
@@ -89,6 +89,9 @@
#define _NET_WM_MOVERESIZE_MOVE_KEYBOARD 10 /* move via keyboard */
#define _NET_WM_MOVERESIZE_CANCEL 11 /* cancel operation */
+#define SEND_EVENT_MASK (0x80)
+#define EVENT_TYPE(event) ((event)->response_type & ~SEND_EVENT_MASK)
+
struct weston_wm_window {
struct weston_wm *wm;
xcb_window_t id;
@@ -748,7 +751,7 @@
if (our_resource(wm, unmap_notify->window))
return;
- if (unmap_notify->response_type & 0x80)
+ if (unmap_notify->response_type & SEND_EVENT_MASK)
/* We just ignore the ICCCM 4.1.4 synthetic unmap notify
* as it may come in after we've destroyed the window. */
return;
@@ -1333,7 +1336,7 @@
continue;
}
- switch (event->response_type & ~0x80) {
+ switch (EVENT_TYPE(event)) {
case XCB_BUTTON_PRESS:
case XCB_BUTTON_RELEASE:
weston_wm_handle_button(wm, event);