martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent crash handling keyboard input from non-frame windows

Browse Source 
* src/xterm.c (handle_one_xevent): Use `dpyinfo' to access xkb
desc.  (bug#55890)
This commit is contained in:
Po Lu
2022-06-11 09:19:05 +08:00
parent 7def8baa08
commit 46e6b8a1e4
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/xterm.c
View File

@@ -16858,9 +16858,9 @@ handle_one_xevent (struct x_display_info *dpyinfo,
memset (&compose_status, 0, sizeof (compose_status));
#ifdef HAVE_XKB
if (FRAME_DISPLAY_INFO (f)->xkb_desc)
if (dpyinfo->xkb_desc)
{
XkbDescRec *rec = FRAME_DISPLAY_INFO (f)->xkb_desc;
XkbDescRec *rec = dpyinfo->xkb_desc;
if (rec->map->modmap && rec->map->modmap[xkey.keycode])
goto done_keysym;
@@ -20109,9 +20109,9 @@ handle_one_xevent (struct x_display_info *dpyinfo,
state |= x_emacs_to_x_modifiers (dpyinfo, extra_keyboard_modifiers);
#ifdef HAVE_XKB
if (FRAME_DISPLAY_INFO (f)->xkb_desc)
if (dpyinfo->xkb_desc)
{
XkbDescRec *rec = FRAME_DISPLAY_INFO (f)->xkb_desc;
XkbDescRec *rec = dpyinfo->xkb_desc;
if (rec->map->modmap && rec->map->modmap[xev->detail])
goto xi_done_keysym;