tools/interactive-x11: use keysym to look for Esc
authorSimon Ser <contact@emersion.fr>
Mon, 12 Jul 2021 09:05:50 +0000 (11:05 +0200)
committerRan Benita <ran@unusedvar.com>
Mon, 12 Jul 2021 09:25:48 +0000 (12:25 +0300)
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>
tools/interactive-x11.c

index c7ca9aa..eea22fa 100644 (file)
@@ -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;
     }