Commit 5419e57736345132b2ec5c6fcbf2d01cc3ed858b

Simon Ser 2021-07-12T11:05:50

tools/interactive-x11: use keysym to look for Esc Don't assume that keycode 9 means Escape. Instead, use the keymap to check for Esc. Logic copied from the Wayland version. Signed-off-by: Simon Ser <contact@emersion.fr>

1
2
3
4
5
6
7
8
9
10
11
12
13
diff --git a/tools/interactive-x11.c b/tools/interactive-x11.c
index c7ca9aa..eea22fa 100644
--- a/tools/interactive-x11.c
+++ b/tools/interactive-x11.c
@@ -246,7 +246,7 @@ process_event(xcb_generic_event_t *gevent, struct keyboard *kbd)
                                   XKB_CONSUMED_MODE_XKB);
 
         /* Exit on ESC. */
-        if (keycode == 9)
+        if (xkb_state_key_get_one_sym(kbd->state, keycode) == XKB_KEY_Escape)
             terminate = true;
         break;
     }