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

dix: remove now obsolete mskidx parameter from DeliverEventsToWindow. 

mskidx would always be dev->id anyway, so if we're already passing in the
device, mskidx is superfluous.
This commit is contained in:
Peter Hutterer 2009-03-18 10:21:59 +10:00
parent f5409aa026
commit 15a969c0fc
3 changed files with 29 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Xi/exevents.c
View File

@ -936,8 +936,7 @@ ProcessRawEvent(RawDeviceEvent *ev, DeviceIntPtr device)
for (i = 0; i < screenInfo.numScreens; i++) for (i = 0; i < screenInfo.numScreens; i++)
DeliverEventsToWindow(device, WindowTable[i], xi, 1, DeliverEventsToWindow(device, WindowTable[i], xi, 1,
GetEventFilter(device, xi), NULL, GetEventFilter(device, xi), NULL);
device->id);
xfree(xi); xfree(xi);
} }
} }
@ -1241,8 +1240,7 @@ DeviceFocusEvent(DeviceIntPtr dev, int type, int mode, int detail,
FixUpEventFromWindow(dev, (xEvent*)xi2event, pWin, None, FALSE); FixUpEventFromWindow(dev, (xEvent*)xi2event, pWin, None, FALSE);
DeliverEventsToWindow(dev, pWin, (xEvent*)xi2event, 1, DeliverEventsToWindow(dev, pWin, (xEvent*)xi2event, 1,
GetEventFilter(dev, (xEvent*)xi2event), NullGrab, GetEventFilter(dev, (xEvent*)xi2event), NullGrab);
dev->id);
xfree(xi2event); xfree(xi2event);
@ -1255,7 +1253,7 @@ DeviceFocusEvent(DeviceIntPtr dev, int type, int mode, int detail,
event.time = currentTime.milliseconds; event.time = currentTime.milliseconds;
DeliverEventsToWindow(dev, pWin, (xEvent *) & event, 1, DeliverEventsToWindow(dev, pWin, (xEvent *) & event, 1,
DeviceFocusChangeMask, NullGrab, dev->id); DeviceFocusChangeMask, NullGrab);
if ((type == DeviceFocusIn) && if ((type == DeviceFocusIn) &&
(wOtherInputMasks(pWin)) && (wOtherInputMasks(pWin)) &&
@ -1352,7 +1350,7 @@ DeviceFocusEvent(DeviceIntPtr dev, int type, int mode, int detail,
} }
DeliverEventsToWindow(dev, pWin, (xEvent *) sev, evcount, DeliverEventsToWindow(dev, pWin, (xEvent *) sev, evcount,
DeviceStateNotifyMask, NullGrab, dev->id); DeviceStateNotifyMask, NullGrab);
xfree(sev); xfree(sev);
} }
} }
@ -1697,7 +1695,7 @@ SendEvent(ClientPtr client, DeviceIntPtr d, Window dest, Bool propagate,
ev->u.u.type |= 0x80; ev->u.u.type |= 0x80;
if (propagate) { if (propagate) {
for (; pWin; pWin = pWin->parent) { for (; pWin; pWin = pWin->parent) {
if (DeliverEventsToWindow(d, pWin, ev, count, mask, NullGrab, d->id)) if (DeliverEventsToWindow(d, pWin, ev, count, mask, NullGrab))
return Success; return Success;
if (pWin == effectiveFocus) if (pWin == effectiveFocus)
return Success; return Success;
@ -1707,7 +1705,7 @@ SendEvent(ClientPtr client, DeviceIntPtr d, Window dest, Bool propagate,
break; break;
} }
} else if (!XaceHook(XACE_SEND_ACCESS, client, NULL, pWin, ev, count)) } else if (!XaceHook(XACE_SEND_ACCESS, client, NULL, pWin, ev, count))
DeliverEventsToWindow(d, pWin, ev, count, mask, NullGrab, d->id); DeliverEventsToWindow(d, pWin, ev, count, mask, NullGrab);
return Success; return Success;
} }
@ -2009,7 +2007,7 @@ FindInterestedChildren(DeviceIntPtr dev, WindowPtr p1, Mask mask,
while (p1) { while (p1) {
p2 = p1->firstChild; p2 = p1->firstChild;
DeliverEventsToWindow(dev, p1, ev, count, mask, NullGrab, dev->id); DeliverEventsToWindow(dev, p1, ev, count, mask, NullGrab);
FindInterestedChildren(dev, p2, mask, ev, count); FindInterestedChildren(dev, p2, mask, ev, count);
p1 = p1->nextSib; p1 = p1->nextSib;
} }
@ -2031,7 +2029,7 @@ SendEventToAllWindows(DeviceIntPtr dev, Mask mask, xEvent * ev, int count)
pWin = WindowTable[i]; pWin = WindowTable[i];
if (!pWin) if (!pWin)
continue; continue;
DeliverEventsToWindow(dev, pWin, ev, count, mask, NullGrab, dev->id); DeliverEventsToWindow(dev, pWin, ev, count, mask, NullGrab);
p1 = pWin->firstChild; p1 = pWin->firstChild;
FindInterestedChildren(dev, p1, mask, ev, count); FindInterestedChildren(dev, p1, mask, ev, count);
} }

42
dix/events.c
View File

@ -1945,13 +1945,12 @@ TryClientEvents (ClientPtr client, DeviceIntPtr dev, xEvent *pEvents,
* @param count Number of elements in pEvents. * @param count Number of elements in pEvents.
* @param filter Mask based on event type. * @param filter Mask based on event type.
* @param grab Possible grab on the device that caused the event. * @param grab Possible grab on the device that caused the event.
* @param mskidx Mask index, depending on device that caused event.
* *
* @return Number of events delivered to various clients. * @return Number of events delivered to various clients.
*/ */
int int
DeliverEventsToWindow(DeviceIntPtr pDev, WindowPtr pWin, xEvent DeliverEventsToWindow(DeviceIntPtr pDev, WindowPtr pWin, xEvent
*pEvents, int count, Mask filter, GrabPtr grab, int mskidx) *pEvents, int count, Mask filter, GrabPtr grab)
{ {
int deliveries = 0, nondeliveries = 0; int deliveries = 0, nondeliveries = 0;
int attempt; int attempt;
@ -2005,7 +2004,7 @@ DeliverEventsToWindow(DeviceIntPtr pDev, WindowPtr pWin, xEvent
OtherInputMasks *inputMasks = wOtherInputMasks(pWin); OtherInputMasks *inputMasks = wOtherInputMasks(pWin);
/* Has any client selected for the event? */ /* Has any client selected for the event? */
if (!inputMasks || if (!inputMasks ||
!(inputMasks->inputEvents[mskidx] & filter)) !(inputMasks->inputEvents[pDev->id] & filter))
return 0; return 0;
other = inputMasks->inputClients; other = inputMasks->inputClients;
@ -2403,7 +2402,7 @@ DeliverDeviceEvents(WindowPtr pWin, InternalEvent *event, GrabPtr grab,
filter = GetEventFilter(dev, xi2); filter = GetEventFilter(dev, xi2);
FixUpEventFromWindow(dev, xi2, pWin, child, FALSE); FixUpEventFromWindow(dev, xi2, pWin, child, FALSE);
deliveries = DeliverEventsToWindow(dev, pWin, xi2, 1, deliveries = DeliverEventsToWindow(dev, pWin, xi2, 1,
filter, grab, dev->id); filter, grab);
xfree(xi2); xfree(xi2);
if (deliveries > 0) if (deliveries > 0)
goto unwind; goto unwind;
@ -2415,7 +2414,7 @@ DeliverDeviceEvents(WindowPtr pWin, InternalEvent *event, GrabPtr grab,
filter = GetEventFilter(dev, xE); filter = GetEventFilter(dev, xE);
FixUpEventFromWindow(dev, xE, pWin, child, FALSE); FixUpEventFromWindow(dev, xE, pWin, child, FALSE);
deliveries = DeliverEventsToWindow(dev, pWin, xE, count, deliveries = DeliverEventsToWindow(dev, pWin, xE, count,
filter, grab, dev->id); filter, grab);
if (deliveries > 0) if (deliveries > 0)
goto unwind; goto unwind;
} }
@ -2435,7 +2434,7 @@ DeliverDeviceEvents(WindowPtr pWin, InternalEvent *event, GrabPtr grab,
filter = GetEventFilter(dev, &core); filter = GetEventFilter(dev, &core);
FixUpEventFromWindow(dev, &core, pWin, child, FALSE); FixUpEventFromWindow(dev, &core, pWin, child, FALSE);
deliveries = DeliverEventsToWindow(dev, pWin, &core, 1, deliveries = DeliverEventsToWindow(dev, pWin, &core, 1,
filter, grab, dev->id); filter, grab);
if (deliveries > 0) if (deliveries > 0)
goto unwind; goto unwind;
} }
@ -2495,21 +2494,20 @@ DeliverEvents(WindowPtr pWin, xEvent *xE, int count,
if ((filter & SubstructureNotifyMask) && (xE->u.u.type != CreateNotify)) if ((filter & SubstructureNotifyMask) && (xE->u.u.type != CreateNotify))
xE->u.destroyNotify.event = pWin->drawable.id; xE->u.destroyNotify.event = pWin->drawable.id;
if (filter != StructureAndSubMask) if (filter != StructureAndSubMask)
return DeliverEventsToWindow(&dummy, pWin, xE, count, filter, NullGrab, dummy.id); return DeliverEventsToWindow(&dummy, pWin, xE, count, filter, NullGrab);
deliveries = DeliverEventsToWindow(&dummy, pWin, xE, count, StructureNotifyMask, deliveries = DeliverEventsToWindow(&dummy, pWin, xE, count,
NullGrab, dummy.id); StructureNotifyMask, NullGrab);
if (pWin->parent) if (pWin->parent)
{ {
xE->u.destroyNotify.event = pWin->parent->drawable.id; xE->u.destroyNotify.event = pWin->parent->drawable.id;
deliveries += DeliverEventsToWindow(&dummy, pWin->parent, xE, count, deliveries += DeliverEventsToWindow(&dummy, pWin->parent, xE, count,
SubstructureNotifyMask, NullGrab, SubstructureNotifyMask, NullGrab);
dummy.id);
if (xE->u.u.type == ReparentNotify) if (xE->u.u.type == ReparentNotify)
{ {
xE->u.destroyNotify.event = otherParent->drawable.id; xE->u.destroyNotify.event = otherParent->drawable.id;
deliveries += DeliverEventsToWindow(&dummy, deliveries += DeliverEventsToWindow(&dummy,
otherParent, xE, count, SubstructureNotifyMask, otherParent, xE, count, SubstructureNotifyMask,
NullGrab, dummy.id); NullGrab);
} }
} }
return deliveries; return deliveries;
@ -3559,7 +3557,7 @@ DeliverFocusedEvent(DeviceIntPtr keybd, InternalEvent *event, WindowPtr window)
/* just deliver it to the focus window */ /* just deliver it to the focus window */
FixUpEventFromWindow(ptr, xi2, focus, None, FALSE); FixUpEventFromWindow(ptr, xi2, focus, None, FALSE);
deliveries = DeliverEventsToWindow(keybd, focus, xi2, 1, deliveries = DeliverEventsToWindow(keybd, focus, xi2, 1,
filter, NullGrab, keybd->id); filter, NullGrab);
if (deliveries > 0) if (deliveries > 0)
goto unwind; goto unwind;
} }
@ -3568,7 +3566,7 @@ DeliverFocusedEvent(DeviceIntPtr keybd, InternalEvent *event, WindowPtr window)
FixUpEventFromWindow(ptr, xE, focus, None, FALSE); FixUpEventFromWindow(ptr, xE, focus, None, FALSE);
deliveries = DeliverEventsToWindow(keybd, focus, xE, count, deliveries = DeliverEventsToWindow(keybd, focus, xE, count,
GetEventFilter(keybd, xE), GetEventFilter(keybd, xE),
NullGrab, keybd->id); NullGrab);
if (deliveries > 0) if (deliveries > 0)
goto unwind; goto unwind;
@ -3586,7 +3584,7 @@ DeliverFocusedEvent(DeviceIntPtr keybd, InternalEvent *event, WindowPtr window)
FixUpEventFromWindow(keybd, &core, focus, None, FALSE); FixUpEventFromWindow(keybd, &core, focus, None, FALSE);
deliveries = DeliverEventsToWindow(keybd, focus, &core, 1, deliveries = DeliverEventsToWindow(keybd, focus, &core, 1,
GetEventFilter(keybd, &core), GetEventFilter(keybd, &core),
NullGrab, keybd->id); NullGrab);
} }
unwind: unwind:
@ -4105,7 +4103,7 @@ CoreEnterLeaveEvent(
else else
DeliverEventsToWindow(mouse, pWin, &event, 1, DeliverEventsToWindow(mouse, pWin, &event, 1,
GetEventFilter(mouse, &event), GetEventFilter(mouse, &event),
NullGrab, mouse->id); NullGrab);
} }
if ((type == EnterNotify) && (mask & KeymapStateMask)) if ((type == EnterNotify) && (mask & KeymapStateMask))
@ -4124,7 +4122,7 @@ CoreEnterLeaveEvent(
mask, KeymapStateMask, grab); mask, KeymapStateMask, grab);
else else
DeliverEventsToWindow(mouse, pWin, (xEvent *)&ke, 1, DeliverEventsToWindow(mouse, pWin, (xEvent *)&ke, 1,
KeymapStateMask, NullGrab, mouse->id); KeymapStateMask, NullGrab);
} }
} }
@ -4192,7 +4190,7 @@ DeviceEnterLeaveEvent(
filter, grab); filter, grab);
else else
DeliverEventsToWindow(mouse, pWin, (xEvent*)event, 1, filter, DeliverEventsToWindow(mouse, pWin, (xEvent*)event, 1, filter,
NullGrab, mouse->id); NullGrab);
xfree(event); xfree(event);
} }
@ -4208,7 +4206,7 @@ CoreFocusEvent(DeviceIntPtr dev, int type, int mode, int detail, WindowPtr pWin)
event.u.focus.window = pWin->drawable.id; event.u.focus.window = pWin->drawable.id;
DeliverEventsToWindow(dev, pWin, &event, 1, DeliverEventsToWindow(dev, pWin, &event, 1,
GetEventFilter(dev, &event), NullGrab, dev->id); GetEventFilter(dev, &event), NullGrab);
if ((type == FocusIn) && if ((type == FocusIn) &&
((pWin->eventMask | wOtherEventMasks(pWin)) & KeymapStateMask)) ((pWin->eventMask | wOtherEventMasks(pWin)) & KeymapStateMask))
{ {
@ -4221,7 +4219,7 @@ CoreFocusEvent(DeviceIntPtr dev, int type, int mode, int detail, WindowPtr pWin)
ke.type = KeymapNotify; ke.type = KeymapNotify;
DeliverEventsToWindow(dev, pWin, (xEvent *)&ke, 1, DeliverEventsToWindow(dev, pWin, (xEvent *)&ke, 1,
KeymapStateMask, NullGrab, dev->id); KeymapStateMask, NullGrab);
} }
} }
@ -4962,7 +4960,7 @@ ProcSendEvent(ClientPtr client)
&stuff->event, 1)) &stuff->event, 1))
return Success; return Success;
if (DeliverEventsToWindow(dev, pWin, if (DeliverEventsToWindow(dev, pWin,
&stuff->event, 1, stuff->eventMask, NullGrab, dev->id)) &stuff->event, 1, stuff->eventMask, NullGrab))
return Success; return Success;
if (pWin == effectiveFocus) if (pWin == effectiveFocus)
return Success; return Success;
@ -4973,7 +4971,7 @@ ProcSendEvent(ClientPtr client)
} }
else if (!XaceHook(XACE_SEND_ACCESS, client, NULL, pWin, &stuff->event, 1)) else if (!XaceHook(XACE_SEND_ACCESS, client, NULL, pWin, &stuff->event, 1))
DeliverEventsToWindow(dev, pWin, &stuff->event, DeliverEventsToWindow(dev, pWin, &stuff->event,
1, stuff->eventMask, NullGrab, dev->id); 1, stuff->eventMask, NullGrab);
return Success; return Success;
} }

3
include/dix.h
View File

@ -365,8 +365,7 @@ extern _X_EXPORT int DeliverEventsToWindow(
xEventPtr /* pEvents */, xEventPtr /* pEvents */,
int /* count */, int /* count */,
Mask /* filter */, Mask /* filter */,
GrabPtr /* grab */, GrabPtr /* grab */);
int /* mskidx */);
extern _X_EXPORT int DeliverDeviceEvents( extern _X_EXPORT int DeliverDeviceEvents(
WindowPtr /* pWin */, WindowPtr /* pWin */,