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

Fix pinch gestures after toolkit menu

Browse source 
* src/xmenu.c (leave_toolkit_menu): Restore gesture event
mask.  (bug#65129)
This commit is contained in:
Po Lu 2023-08-10 08:40:48 +08:00
parent cc0a30a876
commit cdb0b28474
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/xmenu.c
View file

@ -1617,6 +1617,7 @@ popup_selection_callback (Widget widget, LWLIB_ID id, XtPointer client_data)
#ifdef HAVE_XINPUT2
static void
prepare_for_entry_into_toolkit_menu (struct frame *f)
{
@ -1680,6 +1681,19 @@ leave_toolkit_menu (void *data)
XISetMask (m, XI_Enter);
XISetMask (m, XI_Leave);
#ifdef HAVE_XINPUT2_4
/* Select for gesture events. Emacs selects for gesture events from
all master devices on non-GTK3 builds, so that event mask is also
clobbered by prepare_for_entry_into_toolkit_menu. (bug#65129) */
if (dpyinfo->xi2_version >= 4)
{
XISetMask (m, XI_GesturePinchBegin);
XISetMask (m, XI_GesturePinchUpdate);
XISetMask (m, XI_GesturePinchEnd);
}
#endif /* HAVE_XINPUT2_4 */
FOR_EACH_FRAME (tail, frame)
{
f = XFRAME (frame);
@ -1691,7 +1705,8 @@ leave_toolkit_menu (void *data)
&mask, 1);
}
}
#endif
#endif /* HAVE_XINPUT2 */
/* ID is the LWLIB ID of the dialog box. */