dix: Don't send touch end to clients that do async grab without touches
GTK3 menu widget creates a selection for touch and other events and after receiving touch events creates an async grab that excludes touch events. Unfortunately it relies on X server not sending the touch end event in order to function properly. Sending touch end event will cause it to think that the initiating touch ended and when it actually ends, the ButtonRelease event will make it think that the menu should be closed. As a result, the menu will be open only for the duration of the touch making it useless. This commit revertsf682e0563f
. Fixes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1255 Signed-off-by: Povilas Kanapickas <povilas@radix.lt> (cherry picked from commit43e934a19f
)
This commit is contained in:
parent
b713e717c3
commit
9d05ee10c2
15
dix/events.c
15
dix/events.c
|
@ -1505,16 +1505,13 @@ UpdateTouchesForGrab(DeviceIntPtr mouse)
|
|||
CLIENT_BITS(listener->listener) == grab->resource) {
|
||||
if (grab->grabtype == CORE || grab->grabtype == XI ||
|
||||
!xi2mask_isset(grab->xi2mask, mouse, XI_TouchBegin)) {
|
||||
/* Note that the grab will override any current listeners and if these listeners
|
||||
already received touch events then this is the place to send touch end event
|
||||
to complete the touch sequence.
|
||||
|
||||
if (listener->type == TOUCH_LISTENER_REGULAR &&
|
||||
listener->state != TOUCH_LISTENER_AWAITING_BEGIN &&
|
||||
listener->state != TOUCH_LISTENER_HAS_END) {
|
||||
/* if the listener already got any events relating to the touch, we must send
|
||||
a touch end because the grab overrides the previous listener and won't
|
||||
itself send any touch events.
|
||||
*/
|
||||
TouchEmitTouchEnd(mouse, ti, 0, listener->listener);
|
||||
}
|
||||
Unfortunately GTK3 menu widget implementation relies on not getting touch end
|
||||
event, so we can't fix the current behavior.
|
||||
*/
|
||||
listener->type = TOUCH_LISTENER_POINTER_GRAB;
|
||||
} else {
|
||||
listener->type = TOUCH_LISTENER_GRAB;
|
||||
|
|
Loading…
Reference in New Issue