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

dix: rename GetWindowXI2Mask to WindowXI2MaskIsset 

And let it return a boolean value, that's all the callers need anyway.

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-11-03 14:54:06 +10:00
parent bedb8fd90d
commit b371795f01
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dix/events.c
View File

@ -469,10 +469,11 @@ GetXI2MaskByte(unsigned char xi2mask[][XI2MASKSIZE], DeviceIntPtr dev, int event
/** /**
* Return the windows complete XI2 mask for the given XI2 event type. * @return TRUE if the mask is set for this event from this device on the
* window, or FALSE otherwise.
*/ */
Mask Bool
GetWindowXI2Mask(DeviceIntPtr dev, WindowPtr win, xEvent* ev) WindowXI2MaskIsset(DeviceIntPtr dev, WindowPtr win, xEvent* ev)
{ {
OtherInputMasks *inputMasks = wOtherInputMasks(win); OtherInputMasks *inputMasks = wOtherInputMasks(win);
int filter; int filter;
@ -484,7 +485,7 @@ GetWindowXI2Mask(DeviceIntPtr dev, WindowPtr win, xEvent* ev)
evtype = ((xGenericEvent*)ev)->evtype; evtype = ((xGenericEvent*)ev)->evtype;
filter = GetEventFilter(dev, ev); filter = GetEventFilter(dev, ev);
return (GetXI2MaskByte(inputMasks->xi2mask, dev, evtype) & filter); return !!(GetXI2MaskByte(inputMasks->xi2mask, dev, evtype) & filter);
} }
Mask Mask
@ -2075,7 +2076,7 @@ GetClientsForDelivery(DeviceIntPtr dev, WindowPtr win,
{ {
OtherInputMasks *inputMasks = wOtherInputMasks(win); OtherInputMasks *inputMasks = wOtherInputMasks(win);
/* Has any client selected for the event? */ /* Has any client selected for the event? */
if (!GetWindowXI2Mask(dev, win, events)) if (!WindowXI2MaskIsset(dev, win, events))
goto out; goto out;
*clients = inputMasks->inputClients; *clients = inputMasks->inputClients;
} else { } else {
@ -4632,7 +4633,7 @@ DeviceEnterLeaveEvent(
TryClientEvents(rClient(grab), mouse, (xEvent*)event, 1, mask, TryClientEvents(rClient(grab), mouse, (xEvent*)event, 1, mask,
filter, grab); filter, grab);
} else { } else {
if (!GetWindowXI2Mask(mouse, pWin, (xEvent*)event)) if (!WindowXI2MaskIsset(mouse, pWin, (xEvent*)event))
goto out; goto out;
DeliverEventsToWindow(mouse, pWin, (xEvent*)event, 1, filter, DeliverEventsToWindow(mouse, pWin, (xEvent*)event, 1, filter,
NullGrab); NullGrab);

2
include/input.h
View File

@ -535,7 +535,7 @@ extern _X_EXPORT void FreeInputAttributes(InputAttributes *attrs);
/* misc event helpers */ /* misc event helpers */
extern Mask GetEventMask(DeviceIntPtr dev, xEvent* ev, InputClientsPtr clients); extern Mask GetEventMask(DeviceIntPtr dev, xEvent* ev, InputClientsPtr clients);
extern Mask GetEventFilter(DeviceIntPtr dev, xEvent *event); extern Mask GetEventFilter(DeviceIntPtr dev, xEvent *event);
extern Mask GetWindowXI2Mask(DeviceIntPtr dev, WindowPtr win, xEvent* ev); extern Bool WindowXI2MaskIsset(DeviceIntPtr dev, WindowPtr win, xEvent* ev);
void FixUpEventFromWindow(SpritePtr pSprite, void FixUpEventFromWindow(SpritePtr pSprite,
xEvent *xE, xEvent *xE,
WindowPtr pWin, WindowPtr pWin,