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

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>
This commit is contained in:
Peter Hutterer 2008-11-05 12:52:03 +10:30
parent fc3e8bfb82
commit dde09076c5
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dix/events.c
View File

@ -4214,7 +4214,6 @@ EnterLeaveEvent(
WindowPtr focus; WindowPtr focus;
DeviceIntPtr keybd; DeviceIntPtr keybd;
GrabPtr grab = mouse->deviceGrab.grab; GrabPtr grab = mouse->deviceGrab.grab;
GrabPtr devgrab = mouse->deviceGrab.grab;
Mask mask; Mask mask;
int inWindow; /* zero if no sprites are in window */ int inWindow; /* zero if no sprites are in window */
Bool sendevent = FALSE; Bool sendevent = FALSE;
@ -4336,11 +4335,11 @@ EnterLeaveEvent(
(filters[mouse->id][devEnterLeave->type] & (filters[mouse->id][devEnterLeave->type] &
inputMasks->deliverableEvents[mskidx])) inputMasks->deliverableEvents[mskidx]))
{ {
if (devgrab) if (grab)
(void)TryClientEvents(rClient(devgrab), mouse, (void)TryClientEvents(rClient(grab), mouse,
(xEvent*)devEnterLeave, 1, (xEvent*)devEnterLeave, 1,
mask, filters[mouse->id][devEnterLeave->type], mask, filters[mouse->id][devEnterLeave->type],
devgrab); grab);
else else
(void)DeliverEventsToWindow(mouse, pWin, (xEvent*)devEnterLeave, (void)DeliverEventsToWindow(mouse, pWin, (xEvent*)devEnterLeave,
1, filters[mouse->id][devEnterLeave->type], 1, filters[mouse->id][devEnterLeave->type],