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

xace: typesafe hook function for XACE_RECEIVE_ACCESS 

The generic XaceHook() call isn't typesafe (und unnecessarily slow).
Better add an explicit function, just like we already have for others.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1556>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-05-17 08:55:58 +02:00 committed by Marge Bot
parent 67e468c8bd
commit 3dfe00d5e0
4 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Xext/xace.c
View File

@ -86,13 +86,20 @@ int XaceHookSendAccess(ClientPtr client, DeviceIntPtr dev, WindowPtr win,
return rec.status; return rec.status;
} }
int XaceHookReceiveAccess(ClientPtr client, WindowPtr win,
xEventPtr ev, int count)
{
XaceReceiveAccessRec rec = { client, win, ev, count, Success };
CallCallbacks(&XaceHooks[XACE_RECEIVE_ACCESS], &rec);
return rec.status;
}
/* Entry point for hook functions. Called by Xserver. /* Entry point for hook functions. Called by Xserver.
*/ */
int int
XaceHook(int hook, ...) XaceHook(int hook, ...)
{ {
union { union {
XaceReceiveAccessRec recv;
XaceClientAccessRec client; XaceClientAccessRec client;
XaceExtAccessRec ext; XaceExtAccessRec ext;
XaceServerAccessRec server; XaceServerAccessRec server;
@ -114,16 +121,6 @@ XaceHook(int hook, ...)
* sets calldata directly to a single argument (with no return result) * sets calldata directly to a single argument (with no return result)
*/ */
switch (hook) { switch (hook) {
case XACE_RECEIVE_ACCESS:
u.recv.client = va_arg(ap, ClientPtr);
u.recv.pWin = va_arg(ap, WindowPtr);
u.recv.events = va_arg(ap, xEventPtr);
u.recv.count = va_arg(ap, int);
u.recv.status = Success; /* default allow */
prv = &u.recv.status;
break;
case XACE_CLIENT_ACCESS: case XACE_CLIENT_ACCESS:
u.client.client = va_arg(ap, ClientPtr); u.client.client = va_arg(ap, ClientPtr);
u.client.target = va_arg(ap, ClientPtr); u.client.target = va_arg(ap, ClientPtr);

1
Xext/xace.h
View File

@ -86,6 +86,7 @@ int XaceHookDeviceAccess(ClientPtr client, DeviceIntPtr dev, Mask access_mode);
int XaceHookSendAccess(ClientPtr client, DeviceIntPtr dev, WindowPtr win, int XaceHookSendAccess(ClientPtr client, DeviceIntPtr dev, WindowPtr win,
xEventPtr ev, int count); xEventPtr ev, int count);
int XaceHookReceiveAccess(ClientPtr client, WindowPtr win, xEventPtr ev, int count);
/* Register a callback for a given hook. /* Register a callback for a given hook.
*/ */

4
Xi/exevents.c
View File

@ -1094,7 +1094,7 @@ DeliverOneTouchEvent(ClientPtr client, DeviceIntPtr dev, TouchPointInfoPtr ti,
FixUpEventFromWindow(&ti->sprite, xi2, win, child, FALSE); FixUpEventFromWindow(&ti->sprite, xi2, win, child, FALSE);
filter = GetEventFilter(dev, xi2); filter = GetEventFilter(dev, xi2);
if (XaceHook(XACE_RECEIVE_ACCESS, client, win, xi2, 1) != Success) if (XaceHookReceiveAccess(client, win, xi2, 1) != Success)
return FALSE; return FALSE;
err = TryClientEvents(client, dev, xi2, 1, filter, filter, NullGrab); err = TryClientEvents(client, dev, xi2, 1, filter, filter, NullGrab);
free(xi2); free(xi2);
@ -2240,7 +2240,7 @@ DeliverOneGestureEvent(ClientPtr client, DeviceIntPtr dev, GestureInfoPtr gi,
FixUpEventFromWindow(&gi->sprite, xi2, win, child, FALSE); FixUpEventFromWindow(&gi->sprite, xi2, win, child, FALSE);
filter = GetEventFilter(dev, xi2); filter = GetEventFilter(dev, xi2);
if (XaceHook(XACE_RECEIVE_ACCESS, client, win, xi2, 1) != Success) if (XaceHookReceiveAccess(client, win, xi2, 1) != Success)
return FALSE; return FALSE;
err = TryClientEvents(client, dev, xi2, 1, filter, filter, NullGrab); err = TryClientEvents(client, dev, xi2, 1, filter, filter, NullGrab);
free(xi2); free(xi2);

11
dix/events.c
View File

@ -2179,7 +2179,7 @@ DeliverToWindowOwner(DeviceIntPtr dev, WindowPtr win,
if (IsInterferingGrab(wClient(win), dev, events)) if (IsInterferingGrab(wClient(win), dev, events))
return EVENT_SKIP; return EVENT_SKIP;
if (!XaceHook(XACE_RECEIVE_ACCESS, wClient(win), win, events, count)) { if (!XaceHookReceiveAccess(wClient(win), win, events, count)) {
int attempt = TryClientEvents(wClient(win), dev, events, int attempt = TryClientEvents(wClient(win), dev, events,
count, win->eventMask, count, win->eventMask,
filter, grab); filter, grab);
@ -2257,7 +2257,7 @@ DeliverEventToInputClients(DeviceIntPtr dev, InputClients * inputclients,
mask = GetEventMask(dev, events, inputclients); mask = GetEventMask(dev, events, inputclients);
if (XaceHook(XACE_RECEIVE_ACCESS, client, win, events, count)) if (XaceHookReceiveAccess(client, win, events, count))
/* do nothing */ ; /* do nothing */ ;
else if ((attempt = TryClientEvents(client, dev, else if ((attempt = TryClientEvents(client, dev,
events, count, events, count,
@ -2536,7 +2536,7 @@ MaybeDeliverEventsToClient(WindowPtr pWin, xEvent *pEvents,
return XineramaTryClientEventsResult(wClient(pWin), NullGrab, return XineramaTryClientEventsResult(wClient(pWin), NullGrab,
pWin->eventMask, filter); pWin->eventMask, filter);
#endif #endif
if (XaceHook(XACE_RECEIVE_ACCESS, wClient(pWin), pWin, pEvents, count)) if (XaceHookReceiveAccess(wClient(pWin), pWin, pEvents, count))
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, count,
pWin->eventMask, filter, NullGrab); pWin->eventMask, filter, NullGrab);
@ -2550,7 +2550,7 @@ MaybeDeliverEventsToClient(WindowPtr pWin, xEvent *pEvents,
return XineramaTryClientEventsResult(rClient(other), NullGrab, return XineramaTryClientEventsResult(rClient(other), NullGrab,
other->mask, filter); other->mask, filter);
#endif #endif
if (XaceHook(XACE_RECEIVE_ACCESS, rClient(other), pWin, pEvents, if (XaceHookReceiveAccess(rClient(other), pWin, pEvents,
count)) 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, count,
@ -4303,8 +4303,7 @@ DeliverOneGrabbedEvent(InternalEvent *event, DeviceIntPtr dev,
if (rc == Success) { if (rc == Success) {
FixUpEventFromWindow(pSprite, xE, grab->window, None, TRUE); FixUpEventFromWindow(pSprite, xE, grab->window, None, TRUE);
if (XaceHookSendAccess(0, dev, grab->window, xE, count) || if (XaceHookSendAccess(0, dev, grab->window, xE, count) ||
XaceHook(XACE_RECEIVE_ACCESS, rClient(grab), XaceHookReceiveAccess(rClient(grab), grab->window, xE, count))
grab->window, xE, count))
deliveries = 1; /* don't send, but pretend we did */ deliveries = 1; /* don't send, but pretend we did */
else if (level != CORE || !IsInterferingGrab(rClient(grab), dev, xE)) { else if (level != CORE || !IsInterferingGrab(rClient(grab), dev, xE)) {
deliveries = TryClientEvents(rClient(grab), dev, deliveries = TryClientEvents(rClient(grab), dev,