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

xace: try to pretend events were sent when a denial occurs. 

Probably need to redo the error return paths in these functions
at some point.
This commit is contained in:
Eamon Walsh 2007-10-23 13:35:30 -04:00 committed by Eamon Walsh
parent ce7f6fe126
commit 9e0a468af1
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dix/events.c
View File

@ -1754,7 +1754,7 @@ DeliverEventsToWindow(WindowPtr pWin, xEvent *pEvents, int count,
!((wOtherEventMasks(pWin)|pWin->eventMask) & filter)) !((wOtherEventMasks(pWin)|pWin->eventMask) & filter))
return 0; return 0;
if (XaceHook(XACE_RECEIVE_ACCESS, wClient(pWin), pWin, pEvents, count)) if (XaceHook(XACE_RECEIVE_ACCESS, wClient(pWin), pWin, pEvents, count))
nondeliveries--; /* do nothing */;
else if ( (attempt = TryClientEvents(wClient(pWin), pEvents, count, else if ( (attempt = TryClientEvents(wClient(pWin), pEvents, count,
pWin->eventMask, filter, grab)) ) pWin->eventMask, filter, grab)) )
{ {
@ -1785,7 +1785,7 @@ DeliverEventsToWindow(WindowPtr pWin, xEvent *pEvents, int count,
{ {
if (XaceHook(XACE_RECEIVE_ACCESS, rClient(other), pWin, pEvents, if (XaceHook(XACE_RECEIVE_ACCESS, rClient(other), pWin, pEvents,
count)) count))
nondeliveries--; /* do nothing */;
else if ( (attempt = TryClientEvents(rClient(other), pEvents, count, else if ( (attempt = TryClientEvents(rClient(other), pEvents, count,
other->mask[mskidx], filter, grab)) ) other->mask[mskidx], filter, grab)) )
{ {
@ -1884,7 +1884,7 @@ MaybeDeliverEventsToClient(WindowPtr pWin, xEvent *pEvents,
wClient(pWin), NullGrab, pWin->eventMask, filter); wClient(pWin), NullGrab, pWin->eventMask, filter);
#endif #endif
if (XaceHook(XACE_RECEIVE_ACCESS, wClient(pWin), pWin, pEvents, count)) if (XaceHook(XACE_RECEIVE_ACCESS, wClient(pWin), pWin, pEvents, count))
return 0; return 1; /* don't send, but pretend we did */
return TryClientEvents(wClient(pWin), pEvents, count, return TryClientEvents(wClient(pWin), pEvents, count,
pWin->eventMask, filter, NullGrab); pWin->eventMask, filter, NullGrab);
} }
@ -1901,7 +1901,7 @@ MaybeDeliverEventsToClient(WindowPtr pWin, xEvent *pEvents,
#endif #endif
if (XaceHook(XACE_RECEIVE_ACCESS, rClient(other), pWin, pEvents, if (XaceHook(XACE_RECEIVE_ACCESS, rClient(other), pWin, pEvents,
count)) count))
return 0; return 1; /* don't send, but pretend we did */
return TryClientEvents(rClient(other), pEvents, count, return TryClientEvents(rClient(other), pEvents, count,
other->mask, filter, NullGrab); other->mask, filter, NullGrab);
} }
@ -2896,9 +2896,9 @@ DeliverFocusedEvent(DeviceIntPtr keybd, xEvent *xE, WindowPtr window, int count)
if (DeliverDeviceEvents(window, xE, NullGrab, focus, keybd, count)) if (DeliverDeviceEvents(window, xE, NullGrab, focus, keybd, count))
return; return;
} }
/* just deliver it to the focus window */
if (XaceHook(XACE_SEND_ACCESS, NULL, keybd, focus, xE, count)) if (XaceHook(XACE_SEND_ACCESS, NULL, keybd, focus, xE, count))
return; return;
/* just deliver it to the focus window */
FixUpEventFromWindow(xE, focus, None, FALSE); FixUpEventFromWindow(xE, focus, None, FALSE);
if (xE->u.u.type & EXTENSION_EVENT_BASE) if (xE->u.u.type & EXTENSION_EVENT_BASE)
mskidx = keybd->id; mskidx = keybd->id;
@ -2947,9 +2947,11 @@ DeliverGrabbedEvent(xEvent *xE, DeviceIntPtr thisDev,
if (!deliveries) if (!deliveries)
{ {
FixUpEventFromWindow(xE, grab->window, None, TRUE); FixUpEventFromWindow(xE, grab->window, None, TRUE);
if (!XaceHook(XACE_SEND_ACCESS, 0, thisDev, grab->window, xE, count) && if (XaceHook(XACE_SEND_ACCESS, 0, thisDev, grab->window, xE, count) ||
!XaceHook(XACE_RECEIVE_ACCESS, rClient(grab), grab->window, xE, XaceHook(XACE_RECEIVE_ACCESS, rClient(grab), grab->window, xE,
count)) count))
deliveries = 1; /* don't send, but pretend we did */
else
deliveries = TryClientEvents(rClient(grab), xE, count, deliveries = TryClientEvents(rClient(grab), xE, count,
(Mask)grab->eventMask, (Mask)grab->eventMask,
filters[xE->u.u.type], grab); filters[xE->u.u.type], grab);