procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix handling "C-S-u" and such when using XKB

Browse source 
* src/xterm.c (handle_one_xevent): Don't rely on XKB for
consumed modifiers.
This commit is contained in:
Po Lu 2022-06-28 09:42:40 +08:00
parent dea5c528bd
commit 9c268510cf
1 changed files with 0 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/xterm.c
View file

@ -17635,7 +17635,6 @@ handle_one_xevent (struct x_display_info *dpyinfo,
&consumed, &keysym))
goto done_keysym;
modifiers &= ~consumed;
overflow = 0;
nbytes = XkbTranslateKeySym (dpyinfo->display, &keysym,
@ -20791,10 +20790,6 @@ handle_one_xevent (struct x_display_info *dpyinfo,
}
#endif
#ifdef HAVE_XKB
mods_rtrn = 0;
#endif
x_display_set_last_user_time (dpyinfo, xev->time,
xev->send_event);
ignore_next_mouse_click_timeout = 0;
@ -21029,12 +21024,7 @@ handle_one_xevent (struct x_display_info *dpyinfo,
}
}
#ifndef HAVE_XKB
inev.ie.modifiers = x_x_to_emacs_modifiers (dpyinfo, state);
#else
inev.ie.modifiers = x_x_to_emacs_modifiers (dpyinfo,
state & ~mods_rtrn);
#endif
#ifdef XK_F1
if (x_dnd_in_progress && keysym == XK_F1)