dix: fix dev/keybd variable mixup.
Reported-by: Eric Anhold <eric@anholt.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
parent
630a6e9d14
commit
011cee3103
|
@ -1925,14 +1925,14 @@ ProcBell(ClientPtr client)
|
||||||
else
|
else
|
||||||
newpercent = base - newpercent + stuff->percent;
|
newpercent = base - newpercent + stuff->percent;
|
||||||
|
|
||||||
for (keybd = inputInfo.devices; keybd; keybd = keybd->next) {
|
for (dev = inputInfo.devices; dev; dev = dev->next) {
|
||||||
if ((dev == keybd || (!dev->isMaster && dev->u.master == keybd)) &&
|
if ((dev == keybd || (!dev->isMaster && dev->u.master == keybd)) &&
|
||||||
keybd->kbdfeed && keybd->kbdfeed->BellProc) {
|
dev->kbdfeed && dev->kbdfeed->BellProc) {
|
||||||
|
|
||||||
rc = XaceHook(XACE_DEVICE_ACCESS, client, dev, DixBellAccess);
|
rc = XaceHook(XACE_DEVICE_ACCESS, client, dev, DixBellAccess);
|
||||||
if (rc != Success)
|
if (rc != Success)
|
||||||
return rc;
|
return rc;
|
||||||
XkbHandleBell(FALSE, FALSE, keybd, newpercent,
|
XkbHandleBell(FALSE, FALSE, dev, newpercent,
|
||||||
&dev->kbdfeed->ctrl, 0, None, NULL, client);
|
&dev->kbdfeed->ctrl, 0, None, NULL, client);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user