And let it return a boolean value, that's all the callers need anyway.
Signed-off-by: Peter Hutterer <[email protected]>
---
Changes to v1:
- updated comment
dix/events.c | 13 +++++++------
include/input.h | 2 +-
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/dix/events.c b/dix/events.c
index 5e0dc5f..35b446b 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -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
-GetWindowXI2Mask(DeviceIntPtr dev, WindowPtr win, xEvent* ev)
+Bool
+WindowXI2MaskIsset(DeviceIntPtr dev, WindowPtr win, xEvent* ev)
{
OtherInputMasks *inputMasks = wOtherInputMasks(win);
int filter;
@@ -484,7 +485,7 @@ GetWindowXI2Mask(DeviceIntPtr dev, WindowPtr win, xEvent*
ev)
evtype = ((xGenericEvent*)ev)->evtype;
filter = GetEventFilter(dev, ev);
- return (GetXI2MaskByte(inputMasks->xi2mask, dev, evtype) & filter);
+ return !!(GetXI2MaskByte(inputMasks->xi2mask, dev, evtype) & filter);
}
Mask
@@ -2075,7 +2076,7 @@ GetClientsForDelivery(DeviceIntPtr dev, WindowPtr win,
{
OtherInputMasks *inputMasks = wOtherInputMasks(win);
/* Has any client selected for the event? */
- if (!GetWindowXI2Mask(dev, win, events))
+ if (!WindowXI2MaskIsset(dev, win, events))
goto out;
*clients = inputMasks->inputClients;
} else {
@@ -4632,7 +4633,7 @@ DeviceEnterLeaveEvent(
TryClientEvents(rClient(grab), mouse, (xEvent*)event, 1, mask,
filter, grab);
} else {
- if (!GetWindowXI2Mask(mouse, pWin, (xEvent*)event))
+ if (!WindowXI2MaskIsset(mouse, pWin, (xEvent*)event))
goto out;
DeliverEventsToWindow(mouse, pWin, (xEvent*)event, 1, filter,
NullGrab);
diff --git a/include/input.h b/include/input.h
index 9ef726f..3c6f6af 100644
--- a/include/input.h
+++ b/include/input.h
@@ -535,7 +535,7 @@ extern _X_EXPORT void FreeInputAttributes(InputAttributes
*attrs);
/* misc event helpers */
extern Mask GetEventMask(DeviceIntPtr dev, xEvent* ev, InputClientsPtr
clients);
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,
xEvent *xE,
WindowPtr pWin,
--
1.7.7
_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
