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

Fix XI2 keysym translation

Browse source 
* src/xterm.c (handle_one_xevent): Handle XI_KeyPress events
that can't be translated into strings.
This commit is contained in:
Po Lu 2021-11-23 09:01:33 +08:00
parent 9ceb3070e3
commit 919cb31cf7
1 changed files with 20 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
src/xterm.c
View file

@ -10324,7 +10324,7 @@ handle_one_xevent (struct x_display_info *dpyinfo,
memset (&xkey, 0, sizeof xkey);
xkey.type = KeyPress;
xkey.serial = 0;
xkey.serial = xev->serial;
xkey.send_event = xev->send_event;
xkey.display = xev->display;
xkey.window = xev->event;
@ -10439,53 +10439,38 @@ handle_one_xevent (struct x_display_info *dpyinfo,
emacs_abort ();
}
else
{
#endif
{
#ifdef HAVE_XKB
int overflow = 0;
KeySym sym = keysym;
if (dpyinfo->xkb_desc)
{
if (!(nbytes = XkbTranslateKeySym (dpyinfo->display, &sym,
state & ~mods_rtrn, copy_bufptr,
copy_bufsiz, &overflow)))
goto XI_OTHER;
nbytes = XkbTranslateKeySym (dpyinfo->display, &sym,
state & ~mods_rtrn, copy_bufptr,
copy_bufsiz, &overflow);
if (overflow)
{
copy_bufptr = alloca ((copy_bufsiz += overflow)
* sizeof *copy_bufptr);
overflow = 0;
nbytes = XkbTranslateKeySym (dpyinfo->display, &sym,
state & ~mods_rtrn, copy_bufptr,
copy_bufsiz, &overflow);
if (overflow)
nbytes = 0;
}
}
else
#else
{
block_input ();
char *str = XKeysymToString (keysym);
if (!str)
{
unblock_input ();
goto XI_OTHER;
}
nbytes = strlen (str) + 1;
copy_bufptr = alloca (nbytes);
strcpy (copy_bufptr, str);
unblock_input ();
}
#endif
#ifdef HAVE_XKB
if (overflow)
{
overflow = 0;
copy_bufptr = alloca (copy_bufsiz + overflow);
keysym = sym;
if (!(nbytes = XkbTranslateKeySym (dpyinfo->display, &sym,
state & ~mods_rtrn, copy_bufptr,
copy_bufsiz + overflow, &overflow)))
goto XI_OTHER;
if (overflow)
goto XI_OTHER;
nbytes = XLookupString (&xkey, copy_bufptr,
copy_bufsiz, &keysym,
&compose_status);
}
#endif
#ifdef HAVE_X_I18N
}
#endif
/* First deal with keysyms which have defined
translations to characters. */