frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dix: CheckPassiveGrabsOnWindow moved to internal events. 

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2009-02-02 16:06:15 +10:00
parent 1c38abd4b1
commit 155986a93d
1 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
dix/events.c
View File

@ -3185,10 +3185,6 @@ CheckPassiveGrabsOnWindow(
#define XI_MATCH 0x2 #define XI_MATCH 0x2
int match = 0; int match = 0;
/* FIXME: temporary solution only. */
static int count;
static xEvent xE[1000]; /* enough bytes for the events we have atm */
if (!grab) if (!grab)
return FALSE; return FALSE;
/* Fill out the grab details, but leave the type for later before /* Fill out the grab details, but leave the type for later before
@ -3231,6 +3227,10 @@ CheckPassiveGrabsOnWindow(
(grab->confineTo->realized && (grab->confineTo->realized &&
BorderSizeNotEmpty(device, grab->confineTo)))) BorderSizeNotEmpty(device, grab->confineTo))))
{ {
int rc, count = 0;
xEvent *xE = NULL;
xEvent core;
event->corestate &= 0x1f00; event->corestate &= 0x1f00;
event->corestate |= tempGrab.modifiersDetail.exact & (~0x1f00); event->corestate |= tempGrab.modifiersDetail.exact & (~0x1f00);
grabinfo = &device->deviceGrab; grabinfo = &device->deviceGrab;
@ -3276,10 +3276,28 @@ CheckPassiveGrabsOnWindow(
} }
/* FIXME: temporary only */
count = ConvertBackToXI((InternalEvent*)event, xE);
if (match & CORE_MATCH) if (match & CORE_MATCH)
xE->u.u.type = GetCoreType(event); {
rc = EventToCore((InternalEvent*)event, &core);
if (rc != Success && rc != BadMatch)
{
ErrorF("[dix] %s: core conversion failed in CPGFW "
"(%d, %d).\n", device->name, event->type, rc);
continue;
}
xE = &core;
count = 1;
} else
{
rc = EventToXI((InternalEvent*)event, &xE, &count);
if (rc != Success)
{
ErrorF("[dix] %s: XI conversion failed in CPGFW "
"(%d, %d).\n", device->name, event->type, rc);
continue;
}
}
(*grabinfo->ActivateGrab)(device, grab, currentTime, TRUE); (*grabinfo->ActivateGrab)(device, grab, currentTime, TRUE);
@ -3296,6 +3314,9 @@ CheckPassiveGrabsOnWindow(
*grabinfo->sync.event = *event; *grabinfo->sync.event = *event;
grabinfo->sync.state = FROZEN_WITH_EVENT; grabinfo->sync.state = FROZEN_WITH_EVENT;
} }
if (match & XI_MATCH)
xfree(xE); /* on core match xE == &core */
return TRUE; return TRUE;
} }
} }