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

(!2007) dix: MaybeDeliverEventToClient() drop count parameter 

It's always called with just a single event, so no need for the count
parameter. Also renaming it in order to better fit it's new semantics.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2025-05-22 14:29:07 +02:00
parent 5c185a0e45
commit 0856fcf75d
3 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dix/dix_priv.h
View File

@ -263,20 +263,18 @@ void MakePredeclaredAtoms(void);
void SetCriticalEvent(int event); void SetCriticalEvent(int event);
/** /**
* @brief try to deliver events to interested parties. * @brief try to deliver (single) event to interested parties.
* *
* @param pWindow target window * @param pWindow target window
* @param pEvents array of events to be delivered * @param pEvent event to be delivered
* @param nEvents number of elements in *pEvents
* @param filter filter mask based on event type * @param filter filter mask based on event type
* @param skipClient don't deliver to this client (if not NULL) * @param skipClient don't deliver to this client (if not NULL)
* @return 0 when skipped (skipClient), 1 when delivered, 2 when nobody's interested * @return 0 when skipped (skipClient), 1 when delivered, 2 when nobody's interested
*/ */
int MaybeDeliverEventsToClient(WindowPtr pWindow, int MaybeDeliverEventToClient(WindowPtr pWindow,
xEvent *pEvents, xEvent *pEvent,
size_t nEvents, Mask filter,
Mask filter, ClientPtr skipClient)
ClientPtr skipClient)
_X_ATTRIBUTE_NONNULL_ARG(1,2); _X_ATTRIBUTE_NONNULL_ARG(1,2);
#endif /* _XSERVER_DIX_PRIV_H */ #endif /* _XSERVER_DIX_PRIV_H */

13
dix/events.c
View File

@ -2546,8 +2546,8 @@ XineramaTryClientEventsResult(ClientPtr client,
* @param dontClient Don't deliver to the dontClient. * @param dontClient Don't deliver to the dontClient.
*/ */
int int
MaybeDeliverEventsToClient(WindowPtr pWin, xEvent *pEvents, MaybeDeliverEventToClient(WindowPtr pWin, xEvent *pEvents,
size_t count, Mask filter, ClientPtr dontClient) Mask filter, ClientPtr dontClient)
{ {
OtherClients *other; OtherClients *other;
@ -2559,9 +2559,9 @@ MaybeDeliverEventsToClient(WindowPtr pWin, xEvent *pEvents,
return XineramaTryClientEventsResult(wClient(pWin), NullGrab, return XineramaTryClientEventsResult(wClient(pWin), NullGrab,
pWin->eventMask, filter); pWin->eventMask, filter);
#endif /* XINERAMA */ #endif /* XINERAMA */
if (XaceHookReceiveAccess(wClient(pWin), pWin, pEvents, count)) if (XaceHookReceiveAccess(wClient(pWin), pWin, pEvents, 1))
return 1; /* don't send, but pretend we did */ return 1; /* don't send, but pretend we did */
return TryClientEvents(wClient(pWin), NULL, pEvents, count, return TryClientEvents(wClient(pWin), NULL, pEvents, 1,
pWin->eventMask, filter, NullGrab); pWin->eventMask, filter, NullGrab);
} }
for (other = wOtherClients(pWin); other; other = other->next) { for (other = wOtherClients(pWin); other; other = other->next) {
@ -2573,10 +2573,9 @@ MaybeDeliverEventsToClient(WindowPtr pWin, xEvent *pEvents,
return XineramaTryClientEventsResult(rClient(other), NullGrab, return XineramaTryClientEventsResult(rClient(other), NullGrab,
other->mask, filter); other->mask, filter);
#endif /* XINERAMA */ #endif /* XINERAMA */
if (XaceHookReceiveAccess(rClient(other), pWin, pEvents, if (XaceHookReceiveAccess(rClient(other), pWin, pEvents, 1))
count))
return 1; /* don't send, but pretend we did */ return 1; /* don't send, but pretend we did */
return TryClientEvents(rClient(other), NULL, pEvents, count, return TryClientEvents(rClient(other), NULL, pEvents, 1,
other->mask, filter, NullGrab); other->mask, filter, NullGrab);
} }
} }

18
dix/window.c
View File

@ -2309,8 +2309,8 @@ ConfigureWindow(WindowPtr pWin, Mask mask, XID *vlist, ClientPtr client)
event.u.configureRequest.y += screenInfo.screens[0]->y; event.u.configureRequest.y += screenInfo.screens[0]->y;
} }
#endif /* XINERAMA */ #endif /* XINERAMA */
if (MaybeDeliverEventsToClient(pParent, &event, 1, if (MaybeDeliverEventToClient(pParent, &event,
SubstructureRedirectMask, client) == 1) SubstructureRedirectMask, client) == 1)
return Success; return Success;
} }
if (action == RESIZE_WIN) { if (action == RESIZE_WIN) {
@ -2325,8 +2325,8 @@ ConfigureWindow(WindowPtr pWin, Mask mask, XID *vlist, ClientPtr client)
.u.resizeRequest.height = h .u.resizeRequest.height = h
}; };
eventT.u.u.type = ResizeRequest; eventT.u.u.type = ResizeRequest;
if (MaybeDeliverEventsToClient(pWin, &eventT, 1, if (MaybeDeliverEventToClient(pWin, &eventT,
ResizeRedirectMask, client) == 1) { ResizeRedirectMask, client) == 1) {
/* if event is delivered, leave the actual size alone. */ /* if event is delivered, leave the actual size alone. */
w = pWin->drawable.width; w = pWin->drawable.width;
h = pWin->drawable.height; h = pWin->drawable.height;
@ -2474,8 +2474,8 @@ CirculateWindow(WindowPtr pParent, int direction, ClientPtr client)
if (RedirectSend(pParent)) { if (RedirectSend(pParent)) {
event.u.u.type = CirculateRequest; event.u.u.type = CirculateRequest;
if (MaybeDeliverEventsToClient(pParent, &event, 1, if (MaybeDeliverEventToClient(pParent, &event,
SubstructureRedirectMask, client) == 1) SubstructureRedirectMask, client) == 1)
return Success; return Success;
} }
@ -2631,9 +2631,9 @@ MaybeDeliverMapRequest(WindowPtr pWin, WindowPtr pParent, ClientPtr client)
}; };
event.u.u.type = MapRequest; event.u.u.type = MapRequest;
return MaybeDeliverEventsToClient(pParent, &event, 1, return MaybeDeliverEventToClient(pParent, &event,
SubstructureRedirectMask, SubstructureRedirectMask,
client) == 1; client) == 1;
} }
static void static void