[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 6719a3ccab: Correctly set up XI key input mask on X Toolkit build
From: |
Po Lu |
Subject: |
master 6719a3ccab: Correctly set up XI key input mask on X Toolkit builds |
Date: |
Tue, 4 Jan 2022 20:41:10 -0500 (EST) |
branch: master
commit 6719a3ccabec33e010aa4a42be2ee07e4e219b3c
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>
Correctly set up XI key input mask on X Toolkit builds
* src/xfns.c (setup_xi_event_mask): Also set the key event mask
on the outer window, which might also have the input focus.
(x_window) [USE_X_TOOLKIT]: Set up XI event mask a bit later.
---
src/xfns.c | 28 +++++++++++++++++-----------
1 file changed, 17 insertions(+), 11 deletions(-)
diff --git a/src/xfns.c b/src/xfns.c
index d1b0b72b7f..b94fe17922 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -2934,15 +2934,11 @@ setup_xi_event_mask (struct frame *f)
XISetMask (m, XI_ButtonPress);
XISetMask (m, XI_ButtonRelease);
- XISetMask (m, XI_KeyPress);
- XISetMask (m, XI_KeyRelease);
XISetMask (m, XI_Motion);
XISetMask (m, XI_Enter);
XISetMask (m, XI_Leave);
-#if 0
- XISetMask (m, XI_FocusIn);
- XISetMask (m, XI_FocusOut);
-#endif
+ XISetMask (m, XI_KeyPress);
+ XISetMask (m, XI_KeyRelease);
XISelectEvents (FRAME_X_DISPLAY (f),
FRAME_X_WINDOW (f),
&mask, 1);
@@ -2950,6 +2946,16 @@ setup_xi_event_mask (struct frame *f)
memset (m, 0, l);
#endif /* !USE_GTK */
+#ifdef USE_X_TOOLKIT
+ XISetMask (m, XI_KeyPress);
+ XISetMask (m, XI_KeyRelease);
+
+ XISelectEvents (FRAME_X_DISPLAY (f),
+ FRAME_OUTER_WINDOW (f),
+ &mask, 1);
+ memset (m, 0, l);
+#endif
+
mask.deviceid = XIAllDevices;
XISetMask (m, XI_PropertyEvent);
@@ -3140,11 +3146,6 @@ x_window (struct frame *f, long window_prompting)
class_hints.res_class = SSDATA (Vx_resource_class);
XSetClassHint (FRAME_X_DISPLAY (f), XtWindow (shell_widget), &class_hints);
-#ifdef HAVE_XINPUT2
- if (FRAME_DISPLAY_INFO (f)->supports_xi2)
- setup_xi_event_mask (f);
-#endif
-
#ifdef HAVE_X_I18N
FRAME_XIC (f) = NULL;
if (use_xim)
@@ -3232,6 +3233,11 @@ x_window (struct frame *f, long window_prompting)
/* This is a no-op, except under Motif. Make sure main areas are
set to something reasonable, in case we get an error later. */
lw_set_main_areas (pane_widget, 0, frame_widget);
+
+#ifdef HAVE_XINPUT2
+ if (FRAME_DISPLAY_INFO (f)->supports_xi2)
+ setup_xi_event_mask (f);
+#endif
}
#else /* not USE_X_TOOLKIT */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 6719a3ccab: Correctly set up XI key input mask on X Toolkit builds,
Po Lu <=