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

Fix crash when the keymap changes

Browse source 
* src/xterm.c (handle_one_xevent): Call
XkbRefreshKeyboardMapping first before trying to update the map.
This commit is contained in:
Po Lu 2022-08-20 10:32:09 +08:00
parent 9a7b3673e0
commit b2f9c4c6d4
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/xterm.c
View file

@ -23027,6 +23027,8 @@ handle_one_xevent (struct x_display_info *dpyinfo,
if (xkbevent->any.xkb_type == XkbNewKeyboardNotify
|| xkbevent->any.xkb_type == XkbMapNotify)
{
XkbRefreshKeyboardMapping (&xkbevent->map);
if (dpyinfo->xkb_desc)
{
if (XkbGetUpdatedMap (dpyinfo->display,
@ -23035,11 +23037,9 @@ handle_one_xevent (struct x_display_info *dpyinfo,
| XkbModifierMapMask
| XkbVirtualModsMask),
dpyinfo->xkb_desc) == Success)
{
XkbGetNames (dpyinfo->display,
XkbGroupNamesMask | XkbVirtualModNamesMask,
dpyinfo->xkb_desc);
}
XkbGetNames (dpyinfo->display,
XkbGroupNamesMask | XkbVirtualModNamesMask,
dpyinfo->xkb_desc);
else
{
XkbFreeKeyboard (dpyinfo->xkb_desc, XkbAllComponentsMask, True);
@ -23061,7 +23061,6 @@ handle_one_xevent (struct x_display_info *dpyinfo,
dpyinfo->xkb_desc);
}
XkbRefreshKeyboardMapping (&xkbevent->map);
x_find_modifier_meanings (dpyinfo);
}
else if (x_dnd_in_progress