diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-02-12 14:29:23 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-02-16 13:28:18 +1000 |
| commit | b735a4b4951b607e614682836f24d5fd86c1f7fb (patch) | |
| tree | c6337ec8cac0d40ecabdb9b37d21e0ce650167b5 | |
| parent | 772e0f9159ca3ab8fb4e03ed6feee3cc93697724 (diff) | |
dix: Remove lastEventMask variable, substitute with a #define.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | dix/events.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/dix/events.c b/dix/events.c index ae566c539..4b367f736 100644 --- a/dix/events.c +++ b/dix/events.c @@ -183,7 +183,8 @@ typedef const char *string; #define AllModifiersMask ( \ ShiftMask | LockMask | ControlMask | Mod1Mask | Mod2Mask | \ Mod3Mask | Mod4Mask | Mod5Mask ) -#define AllEventMasks (lastEventMask|(lastEventMask-1)) +#define LastEventMask OwnerGrabButtonMask +#define AllEventMasks (LastEventMask|(LastEventMask-1)) /** * Used to indicate a implicit passive grab created by a ButtonPress event. @@ -338,8 +339,6 @@ static WindowPtr XYToWindow( */ extern int lastEvent; -static Mask lastEventMask; - extern int DeviceMotionNotify; #define CantBeFiltered NoEventMask @@ -4616,7 +4615,6 @@ InitEvents(void) inputInfo.off_devices = (DeviceIntPtr)NULL; inputInfo.keyboard = (DeviceIntPtr)NULL; inputInfo.pointer = (DeviceIntPtr)NULL; - lastEventMask = OwnerGrabButtonMask; /* The mask for pointer motion events may have changed in the last server * generation. See comment above definition of filters. */ filters[0][PointerMotionMask] = MotionNotify; |