From d74f591ce46a057a2a26f86751b153059b5f48e1 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Thu, 22 May 2025 14:29:07 +0200 Subject: [PATCH] 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 --- dix/dix_priv.h | 14 ++++++-------- dix/events.c | 13 ++++++------- dix/window.c | 18 +++++++++--------- 3 files changed, 21 insertions(+), 24 deletions(-) diff --git a/dix/dix_priv.h b/dix/dix_priv.h index acf4f1b0e..9bf84599a 100644 --- a/dix/dix_priv.h +++ b/dix/dix_priv.h @@ -263,20 +263,18 @@ void MakePredeclaredAtoms(void); 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 pEvents array of events to be delivered - * @param nEvents number of elements in *pEvents + * @param pEvent event to be delivered * @param filter filter mask based on event type * @param skipClient don't deliver to this client (if not NULL) * @return 0 when skipped (skipClient), 1 when delivered, 2 when nobody's interested */ -int MaybeDeliverEventsToClient(WindowPtr pWindow, - xEvent *pEvents, - size_t nEvents, - Mask filter, - ClientPtr skipClient) +int MaybeDeliverEventToClient(WindowPtr pWindow, + xEvent *pEvent, + Mask filter, + ClientPtr skipClient) _X_ATTRIBUTE_NONNULL_ARG(1,2); #endif /* _XSERVER_DIX_PRIV_H */ diff --git a/dix/events.c b/dix/events.c index ec9eb4f5b..b4fd94a42 100644 --- a/dix/events.c +++ b/dix/events.c @@ -2546,8 +2546,8 @@ XineramaTryClientEventsResult(ClientPtr client, * @param dontClient Don't deliver to the dontClient. */ int -MaybeDeliverEventsToClient(WindowPtr pWin, xEvent *pEvents, - size_t count, Mask filter, ClientPtr dontClient) +MaybeDeliverEventToClient(WindowPtr pWin, xEvent *pEvents, + Mask filter, ClientPtr dontClient) { OtherClients *other; @@ -2559,9 +2559,9 @@ MaybeDeliverEventsToClient(WindowPtr pWin, xEvent *pEvents, return XineramaTryClientEventsResult(wClient(pWin), NullGrab, pWin->eventMask, filter); #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 TryClientEvents(wClient(pWin), NULL, pEvents, count, + return TryClientEvents(wClient(pWin), NULL, pEvents, 1, pWin->eventMask, filter, NullGrab); } for (other = wOtherClients(pWin); other; other = other->next) { @@ -2573,10 +2573,9 @@ MaybeDeliverEventsToClient(WindowPtr pWin, xEvent *pEvents, return XineramaTryClientEventsResult(rClient(other), NullGrab, other->mask, filter); #endif /* XINERAMA */ - if (XaceHookReceiveAccess(rClient(other), pWin, pEvents, - count)) + if (XaceHookReceiveAccess(rClient(other), pWin, pEvents, 1)) 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); } } diff --git a/dix/window.c b/dix/window.c index 672593512..447d19747 100644 --- a/dix/window.c +++ b/dix/window.c @@ -2309,8 +2309,8 @@ ConfigureWindow(WindowPtr pWin, Mask mask, XID *vlist, ClientPtr client) event.u.configureRequest.y += screenInfo.screens[0]->y; } #endif /* XINERAMA */ - if (MaybeDeliverEventsToClient(pParent, &event, 1, - SubstructureRedirectMask, client) == 1) + if (MaybeDeliverEventToClient(pParent, &event, + SubstructureRedirectMask, client) == 1) return Success; } if (action == RESIZE_WIN) { @@ -2325,8 +2325,8 @@ ConfigureWindow(WindowPtr pWin, Mask mask, XID *vlist, ClientPtr client) .u.resizeRequest.height = h }; eventT.u.u.type = ResizeRequest; - if (MaybeDeliverEventsToClient(pWin, &eventT, 1, - ResizeRedirectMask, client) == 1) { + if (MaybeDeliverEventToClient(pWin, &eventT, + ResizeRedirectMask, client) == 1) { /* if event is delivered, leave the actual size alone. */ w = pWin->drawable.width; h = pWin->drawable.height; @@ -2474,8 +2474,8 @@ CirculateWindow(WindowPtr pParent, int direction, ClientPtr client) if (RedirectSend(pParent)) { event.u.u.type = CirculateRequest; - if (MaybeDeliverEventsToClient(pParent, &event, 1, - SubstructureRedirectMask, client) == 1) + if (MaybeDeliverEventToClient(pParent, &event, + SubstructureRedirectMask, client) == 1) return Success; } @@ -2631,9 +2631,9 @@ MaybeDeliverMapRequest(WindowPtr pWin, WindowPtr pParent, ClientPtr client) }; event.u.u.type = MapRequest; - return MaybeDeliverEventsToClient(pParent, &event, 1, - SubstructureRedirectMask, - client) == 1; + return MaybeDeliverEventToClient(pParent, &event, + SubstructureRedirectMask, + client) == 1; } static void