summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPo Lu <luangruo@yahoo.com>2022-01-12 10:24:01 +0800
committerPo Lu <luangruo@yahoo.com>2022-01-12 10:24:01 +0800
commitf2fcea2716405aac9a3a6013b284b6b7be634725 (patch)
treee7343c079f86e1b68bf674495fb8108fe77db673
parentee025b7f0ce0ad8555deebc90607e99d645400df (diff)
downloademacs-f2fcea2716405aac9a3a6013b284b6b7be634725.tar.gz
Avoid unnecessary lookup of min and max keycodes when XKB is present
* src/xterm.c (x_emacs_to_x_modifiers): Avoid calling XDisplayKeycodes when that information is available in the xkb desc and is not needed anyway.
-rw-r--r--src/xterm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xterm.c b/src/xterm.c
index af0c5c0bfde..80cf80f7d8e 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -5386,8 +5386,6 @@ x_find_modifier_meanings (struct x_display_info *dpyinfo)
dpyinfo->super_mod_mask = 0;
dpyinfo->hyper_mod_mask = 0;
- XDisplayKeycodes (dpyinfo->display, &min_code, &max_code);
-
#ifdef HAVE_XKB
if (dpyinfo->xkb_desc)
{
@@ -5432,6 +5430,8 @@ x_find_modifier_meanings (struct x_display_info *dpyinfo)
}
#endif
+ XDisplayKeycodes (dpyinfo->display, &min_code, &max_code);
+
syms = XGetKeyboardMapping (dpyinfo->display,
min_code, max_code - min_code + 1,
&syms_per_code);