summaryrefslogtreecommitdiff
path: root/dix
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@redhat.com>2008-11-05 12:52:03 +1030
committerPeter Hutterer <peter.hutterer@redhat.com>2008-11-11 14:52:54 +1000
commitdde09076c5c0c36a4a9321cd23a2c7922c4c755b (patch)
treecbb3a356a7e8aaa538a15b34a71bba3e6805f782 /dix
parentfc3e8bfb82323477b54181c6d546c90f53f1ebd8 (diff)
dix: remove superfluous variable devgrab
grab == devgrab anyway, this is a leftover from the time when we had two different grabs per device (core and XI grab). Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
Diffstat (limited to 'dix')
-rw-r--r--dix/events.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/dix/events.c b/dix/events.c
index 7ec5355c1..9cdf49fb0 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -4214,7 +4214,6 @@ EnterLeaveEvent(
WindowPtr focus;
DeviceIntPtr keybd;
GrabPtr grab = mouse->deviceGrab.grab;
- GrabPtr devgrab = mouse->deviceGrab.grab;
Mask mask;
int inWindow; /* zero if no sprites are in window */
Bool sendevent = FALSE;
@@ -4336,11 +4335,11 @@ EnterLeaveEvent(
(filters[mouse->id][devEnterLeave->type] &
inputMasks->deliverableEvents[mskidx]))
{
- if (devgrab)
- (void)TryClientEvents(rClient(devgrab), mouse,
+ if (grab)
+ (void)TryClientEvents(rClient(grab), mouse,
(xEvent*)devEnterLeave, 1,
mask, filters[mouse->id][devEnterLeave->type],
- devgrab);
+ grab);
else
(void)DeliverEventsToWindow(mouse, pWin, (xEvent*)devEnterLeave,
1, filters[mouse->id][devEnterLeave->type],