fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-05-08 14:58:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't release grabs unless all buttons are up

Browse source 
Previously, only buttons <= 5 would count here, but the core protocol
allows for 255 buttons.

http://lists.freedesktop.org/archives/xorg/2009-January/042092.html

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 717a961528)

Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Thomas Jaeger 2008-12-20 16:17:02 +01:00 • committed by Keith Packard
parent 191161a24a
commit b893dc59da
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Xi/exevents.c
View file

@ -1069,7 +1069,7 @@ ProcessOtherEvent(xEventPtr xE, DeviceIntPtr device, int count)
xE->u.u.detail = key; xE->u.u.detail = key;
return; return;
} }
if (!b->state && device->deviceGrab.fromPassiveGrab) if (!b->buttonsDown && device->deviceGrab.fromPassiveGrab)
deactivateDeviceGrab = TRUE; deactivateDeviceGrab = TRUE;
} }

2
dix/events.c
View file

@ -3848,7 +3848,7 @@ ProcessPointerEvent (xEvent *xE, DeviceIntPtr mouse, int count)
if (xE->u.u.detail == 0) if (xE->u.u.detail == 0)
return; return;
filters[mouse->id][Motion_Filter(butc)] = MotionNotify; filters[mouse->id][Motion_Filter(butc)] = MotionNotify;
if (!butc->state && mouse->deviceGrab.fromPassiveGrab) if (!butc->buttonsDown && mouse->deviceGrab.fromPassiveGrab)
deactivateGrab = TRUE; deactivateGrab = TRUE;
break; break;
default: default: