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

dix: move grab matching code into a helper function 

No functional changes.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
This commit is contained in:
Peter Hutterer 2011-12-07 14:41:18 +10:00
parent d253a262c2
commit fb010c5436
1 changed files with 60 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
dix/events.c
View File

@ -3751,6 +3751,62 @@ CoreGrabInterferes(DeviceIntPtr device, GrabPtr grab)
return interfering; return interfering;
} }
enum MatchFlags {
NO_MATCH = 0x0,
CORE_MATCH = 0x1,
XI_MATCH = 0x2,
XI2_MATCH = 0x4,
};
/**
* Match the grab against the temporary grab on the given input level.
* Modifies the temporary grab pointer.
*
* @param grab The grab to match against
* @param tmp The temporary grab to use for matching
* @param level The input level we want to match on
* @param event_type Wire protocol event type
*
* @return The respective matched flag or 0 for no match
*/
static enum MatchFlags
MatchForType(const GrabPtr grab, GrabPtr tmp, enum InputLevel level, int event_type)
{
enum MatchFlags match;
BOOL ignore_device = FALSE;
int grabtype;
int evtype;
switch(level)
{
case XI2:
grabtype = GRABTYPE_XI2;
evtype = GetXI2Type(event_type);
BUG_WARN(!evtype);
match = XI2_MATCH;
break;
case XI:
grabtype = GRABTYPE_XI;
evtype = GetXIType(event_type);
match = XI_MATCH;
break;
case CORE:
grabtype = GRABTYPE_CORE;
evtype = GetCoreType(event_type);
match = CORE_MATCH;
ignore_device = TRUE;
break;
}
tmp->grabtype = grabtype;
tmp->type = evtype;
if (tmp->type && GrabMatchesSecond(tmp, grab, ignore_device))
return match;
return NO_MATCH;
}
/** /**
* Check an individual grab against an event to determine if a passive grab * Check an individual grab against an event to determine if a passive grab
* should be activated. * should be activated.
@ -3768,12 +3824,9 @@ static Bool
CheckPassiveGrab(DeviceIntPtr device, GrabPtr grab, InternalEvent *event, CheckPassiveGrab(DeviceIntPtr device, GrabPtr grab, InternalEvent *event,
Bool checkCore, GrabPtr tempGrab) Bool checkCore, GrabPtr tempGrab)
{ {
static const int CORE_MATCH = 0x1;
static const int XI_MATCH = 0x2;
static const int XI2_MATCH = 0x4;
DeviceIntPtr gdev; DeviceIntPtr gdev;
XkbSrvInfoPtr xkbi = NULL; XkbSrvInfoPtr xkbi = NULL;
int match = 0; enum MatchFlags match = 0;
gdev = grab->modifierDevice; gdev = grab->modifierDevice;
if (grab->grabtype == GRABTYPE_CORE) if (grab->grabtype == GRABTYPE_CORE)
@ -3795,27 +3848,13 @@ CheckPassiveGrab(DeviceIntPtr device, GrabPtr grab, InternalEvent *event,
tempGrab->modifiersDetail.exact = xkbi ? xkbi->state.grab_mods : 0; tempGrab->modifiersDetail.exact = xkbi ? xkbi->state.grab_mods : 0;
/* Check for XI2 and XI grabs first */ /* Check for XI2 and XI grabs first */
tempGrab->type = GetXI2Type(event->any.type); match = MatchForType(grab, tempGrab, XI2, GetXI2Type(event->any.type));
tempGrab->grabtype = GRABTYPE_XI2;
if (GrabMatchesSecond(tempGrab, grab, FALSE))
match = XI2_MATCH;
if (!match) if (!match)
{ match = MatchForType(grab, tempGrab, XI, GetXIType(event->any.type));
tempGrab->grabtype = GRABTYPE_XI;
if ((tempGrab->type = GetXIType(event->any.type)) &&
(GrabMatchesSecond(tempGrab, grab, FALSE)))
match = XI_MATCH;
}
/* Check for a core grab (ignore the device when comparing) */
if (!match && checkCore) if (!match && checkCore)
{ match = MatchForType(grab, tempGrab, CORE, GetCoreType(event->any.type));
tempGrab->grabtype = GRABTYPE_CORE;
if ((tempGrab->type = GetCoreType(event->any.type)) &&
(GrabMatchesSecond(tempGrab, grab, TRUE)))
match = CORE_MATCH;
}
if (!match || (grab->confineTo && if (!match || (grab->confineTo &&
(!grab->confineTo->realized || (!grab->confineTo->realized ||