From fe43e9ca60e2d80d4945e379eb8ca4230bbb4fe3 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Mon, 12 Aug 2024 14:33:55 +0200 Subject: [PATCH] (!1654) Xnest: use XCB_EVENT_MASK_* defines Use xcb's defines instead of Xlib's ones. Signed-off-by: Enrico Weigelt, metux IT consult --- hw/xnest/Display.c | 2 +- hw/xnest/Keyboard.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/xnest/Display.c b/hw/xnest/Display.c index 652eb662f..7466848b1 100644 --- a/hw/xnest/Display.c +++ b/hw/xnest/Display.c @@ -138,7 +138,7 @@ xnestOpenDisplay(int argc, char *argv[]) xnestWhitePixel = WhitePixel(xnestDisplay, DefaultScreen(xnestDisplay)); if (xnestParentWindow != (Window) 0) - xnestEventMask = StructureNotifyMask; + xnestEventMask = XCB_EVENT_MASK_STRUCTURE_NOTIFY; else xnestEventMask = 0L; diff --git a/hw/xnest/Keyboard.h b/hw/xnest/Keyboard.h index dc5eaa2de..96150dd57 100644 --- a/hw/xnest/Keyboard.h +++ b/hw/xnest/Keyboard.h @@ -16,7 +16,8 @@ is" without express or implied warranty. #define XNESTKEYBOARD_H #define XNEST_KEYBOARD_EVENT_MASK \ - (KeyPressMask | KeyReleaseMask | FocusChangeMask | KeymapStateMask) + (XCB_EVENT_MASK_KEY_PRESS | XCB_EVENT_MASK_KEY_RELEASE | \ + XCB_EVENT_MASK_FOCUS_CHANGE | XCB_EVENT_MASK_KEYMAP_STATE) extern DeviceIntPtr xnestKeyboardDevice;