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

Don't print a failure message when XACE denies an input event delivery. 

A denial is normal and the behavior should be to drop the event.
Having the log message creates excessive log spam.

Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
Reviewed-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Eamon Walsh 2009-10-21 21:59:01 -04:00
parent e687e11b12
commit 0c4b75a089
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
dix/events.c
View File

@ -2485,15 +2485,15 @@ DeliverDeviceEvents(WindowPtr pWin, InternalEvent *event, GrabPtr grab,
if (mask & XI_MASK) if (mask & XI_MASK)
{ {
rc = EventToXI(event, &xE, &count); rc = EventToXI(event, &xE, &count);
if (rc == Success && if (rc == Success) {
XaceHook(XACE_SEND_ACCESS, NULL, dev, pWin, xE, count) == Success) if (XaceHook(XACE_SEND_ACCESS, NULL, dev, pWin, xE, count) == Success) {
{ 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);
filter, grab); if (deliveries > 0)
if (deliveries > 0) goto unwind;
goto unwind; }
} else if (rc != BadMatch) } else if (rc != BadMatch)
ErrorF("[dix] %s: XI conversion failed in DDE (%d, %d). Skipping delivery.\n", ErrorF("[dix] %s: XI conversion failed in DDE (%d, %d). Skipping delivery.\n",
dev->name, event->any.type, rc); dev->name, event->any.type, rc);
@ -2503,15 +2503,15 @@ DeliverDeviceEvents(WindowPtr pWin, InternalEvent *event, GrabPtr grab,
if ((mask & CORE_MASK) && IsMaster(dev) && dev->coreEvents) if ((mask & CORE_MASK) && IsMaster(dev) && dev->coreEvents)
{ {
rc = EventToCore(event, &core); rc = EventToCore(event, &core);
if (rc == Success && if (rc == Success) {
XaceHook(XACE_SEND_ACCESS, NULL, dev, pWin, &core, 1) == Success) if (XaceHook(XACE_SEND_ACCESS, NULL, dev, pWin, &core, 1) == Success) {
{ 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);
filter, grab); if (deliveries > 0)
if (deliveries > 0) goto unwind;
goto unwind; }
} else if (rc != BadMatch) } else if (rc != BadMatch)
ErrorF("[dix] %s: Core conversion failed in DDE (%d, %d).\n", ErrorF("[dix] %s: Core conversion failed in DDE (%d, %d).\n",
dev->name, event->any.type, rc); dev->name, event->any.type, rc);
@ -3791,13 +3791,13 @@ DeliverFocusedEvent(DeviceIntPtr keybd, InternalEvent *event, WindowPtr window)
if (sendCore) if (sendCore)
{ {
rc = EventToCore(event, &core); rc = EventToCore(event, &core);
if (rc == Success && if (rc == Success) {
XaceHook(XACE_SEND_ACCESS, NULL, keybd, focus, &core, 1) == Success) if (XaceHook(XACE_SEND_ACCESS, NULL, keybd, focus, &core, 1) == Success) {
{ 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);
NullGrab); }
} else if (rc != BadMatch) } else if (rc != BadMatch)
ErrorF("[dix] %s: core conversion failed DFE (%d, %d). Skipping delivery.\n", ErrorF("[dix] %s: core conversion failed DFE (%d, %d). Skipping delivery.\n",
keybd->name, event->any.type, rc); keybd->name, event->any.type, rc);