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

DIX/Xi: Pass correct client to CheckDeviceGrabAndHintWindow()

Browse source 
If we have a client which has registered for a DeviceButton grab
be sure to pass this to CheckDeviceGrabAndHintWindow(). Since the
order of clients is arbitrary there is no guarantee that the last
client in the list is the one that belongs to this class.

Signed-off-by: Egbert Eich <eich@freedesktop.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 05ea6307fa)
This commit is contained in:
Egbert Eich 2013-08-16 19:52:16 +02:00 • committed by Peter Hutterer
parent cc7084af0d
commit 551dbf744b
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
dix/events.c
View file

@ -2102,6 +2102,7 @@ DeliverEventToInputClients(DeviceIntPtr dev, InputClients * inputclients,
{
int attempt;
enum EventDeliveryState rc = EVENT_NOT_DELIVERED;
Bool have_device_button_grab_class_client = FALSE;
for (; inputclients; inputclients = inputclients->next) {
Mask mask;
@ -2121,13 +2122,21 @@ DeliverEventToInputClients(DeviceIntPtr dev, InputClients * inputclients,
events, count,
mask, filter, grab))) {
if (attempt > 0) {
rc = EVENT_DELIVERED;
*client_return = client;
*mask_return = mask;
/* Success overrides non-success, so if we've been
* successful on one client, return that */
}
else if (rc == EVENT_NOT_DELIVERED)
/*
* The order of clients is arbitrary therefore if one
* client belongs to DeviceButtonGrabClass make sure to
* catch it.
*/
if (!have_device_button_grab_class_client) {
rc = EVENT_DELIVERED;
*client_return = client;
*mask_return = mask;
/* Success overrides non-success, so if we've been
* successful on one client, return that */
if (mask & DeviceButtonGrabMask)
have_device_button_grab_class_client = TRUE;
}
} else if (rc == EVENT_NOT_DELIVERED)
rc = EVENT_REJECTED;
}
}