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

Fix some issues with input methods that depend on button state

Browse source 
* src/xterm.c (handle_one_xevent): Translate button state before
filtering events.
This commit is contained in:
Po Lu 2022-03-12 13:02:28 +08:00
parent d0ff20f2e6
commit b5ac604b15
1 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/xterm.c
View file

@ -12771,6 +12771,19 @@ handle_one_xevent (struct x_display_info *dpyinfo,
xkey.time = xev->time;
xkey.state = ((xev->mods.effective & ~(1 << 13 | 1 << 14))
| (xev->group.effective << 13));
/* Some input methods react differently depending on the
buttons that are pressed. */
if (xev->buttons.mask_len)
{
if (XIMaskIsSet (xev->buttons.mask, 1))
xkey.state |= Button1Mask;
if (XIMaskIsSet (xev->buttons.mask, 2))
xkey.state |= Button2Mask;
if (XIMaskIsSet (xev->buttons.mask, 3))
xkey.state |= Button3Mask;
}
xkey.keycode = xev->detail;
xkey.same_screen = True;
@ -13126,6 +13139,19 @@ handle_one_xevent (struct x_display_info *dpyinfo,
xkey.time = xev->time;
xkey.state = ((xev->mods.effective & ~(1 << 13 | 1 << 14))
| (xev->group.effective << 13));
/* Some input methods react differently depending on the
buttons that are pressed. */
if (xev->buttons.mask_len)
{
if (XIMaskIsSet (xev->buttons.mask, 1))
xkey.state |= Button1Mask;
if (XIMaskIsSet (xev->buttons.mask, 2))
xkey.state |= Button2Mask;
if (XIMaskIsSet (xev->buttons.mask, 3))
xkey.state |= Button3Mask;
}
xkey.keycode = xev->detail;
xkey.same_screen = True;