andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Revert "dix: use the event mask of the grab for TryClientEvents.""

Browse Source 
Preparing to merge Peter's branch.

This reverts commit 018c878e94.
This commit is contained in:
Keith Packard 2010-07-01 23:45:50 -04:00
parent 48cac27870
commit 9fb0785449
1 changed files with 50 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
dix/events.c
View File

@ -3420,6 +3420,7 @@ CheckPassiveGrabsOnWindow(
{
DeviceIntPtr gdev;
XkbSrvInfoPtr xkbi = NULL;
Mask mask = 0;
gdev= grab->modifierDevice;
if (grab->grabtype == GRABTYPE_CORE)
@ -3534,6 +3535,9 @@ CheckPassiveGrabsOnWindow(
}
xE = &core;
count = 1;
mask = grab->eventMask;
if (grab->ownerEvents)
mask |= pWin->eventMask;
} else if (match & XI2_MATCH)
{
rc = EventToXI2((InternalEvent*)event, &xE);
@ -3545,6 +3549,34 @@ CheckPassiveGrabsOnWindow(
continue;
}
count = 1;
/* FIXME: EventToXI2 returns NULL for enter events, so
* dereferencing the event is bad. Internal event types are
* aligned with core events, so the else clause is valid.
* long-term we should use internal events for enter/focus
* as well */
if (xE)
mask = grab->xi2mask[device->id][((xGenericEvent*)xE)->evtype/8];
else if (event->type == XI_Enter || event->type == XI_FocusIn)
mask = grab->xi2mask[device->id][event->type/8];
if (grab->ownerEvents && wOtherInputMasks(grab->window))
{
InputClientsPtr icp =
wOtherInputMasks(grab->window)->inputClients;
while(icp)
{
if (rClient(icp) == rClient(grab))
{
int evtype = (xE) ? ((xGenericEvent*)xE)->evtype : event->type;
mask |= icp->xi2mask[device->id][evtype/8];
break;
}
icp = icp->next;
}
}
} else
{
rc = EventToXI((InternalEvent*)event, &xE, &count);
@ -3555,6 +3587,23 @@ CheckPassiveGrabsOnWindow(
"(%d, %d).\n", device->name, event->type, rc);
continue;
}
mask = grab->eventMask;
if (grab->ownerEvents && wOtherInputMasks(grab->window))
{
InputClientsPtr icp =
wOtherInputMasks(grab->window)->inputClients;
while(icp)
{
if (rClient(icp) == rClient(grab))
{
mask |= icp->mask[device->id];
break;
}
icp = icp->next;
}
}
}
(*grabinfo->ActivateGrab)(device, grab, currentTime, TRUE);
@ -3563,8 +3612,7 @@ CheckPassiveGrabsOnWindow(
{
FixUpEventFromWindow(device, xE, grab->window, None, TRUE);
TryClientEvents(rClient(grab), device, xE, count,
GetEventFilter(device, xE),
TryClientEvents(rClient(grab), device, xE, count, mask,
GetEventFilter(device, xE), grab);
}