Use GetMaster instead of direct u.master access in core procs
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Acked-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
parent
3cc5e44224
commit
ff109bf844
|
@ -2018,8 +2018,9 @@ ProcChangeKeyboardControl (ClientPtr client)
|
|||
keyboard = PickKeyboard(client);
|
||||
|
||||
for (pDev = inputInfo.devices; pDev; pDev = pDev->next) {
|
||||
if ((pDev == keyboard || (!IsMaster(pDev) && pDev->u.master == keyboard)) &&
|
||||
pDev->kbdfeed && pDev->kbdfeed->CtrlProc) {
|
||||
if ((pDev == keyboard ||
|
||||
(!IsMaster(pDev) && GetMaster(pDev, MASTER_KEYBOARD) == keyboard))
|
||||
&& pDev->kbdfeed && pDev->kbdfeed->CtrlProc) {
|
||||
ret = XaceHook(XACE_DEVICE_ACCESS, client, pDev, DixManageAccess);
|
||||
if (ret != Success)
|
||||
return ret;
|
||||
|
@ -2027,8 +2028,9 @@ ProcChangeKeyboardControl (ClientPtr client)
|
|||
}
|
||||
|
||||
for (pDev = inputInfo.devices; pDev; pDev = pDev->next) {
|
||||
if ((pDev == keyboard || (!IsMaster(pDev) && pDev->u.master == keyboard)) &&
|
||||
pDev->kbdfeed && pDev->kbdfeed->CtrlProc) {
|
||||
if ((pDev == keyboard ||
|
||||
(!IsMaster(pDev) && GetMaster(pDev, MASTER_KEYBOARD) == keyboard))
|
||||
&& pDev->kbdfeed && pDev->kbdfeed->CtrlProc) {
|
||||
ret = DoChangeKeyboardControl(client, pDev, vlist, vmask);
|
||||
if (ret != Success)
|
||||
error = ret;
|
||||
|
@ -2088,7 +2090,8 @@ ProcBell(ClientPtr client)
|
|||
newpercent = base - newpercent + stuff->percent;
|
||||
|
||||
for (dev = inputInfo.devices; dev; dev = dev->next) {
|
||||
if ((dev == keybd || (!IsMaster(dev) && dev->u.master == keybd)) &&
|
||||
if ((dev == keybd ||
|
||||
(!IsMaster(dev) && GetMaster(dev, MASTER_KEYBOARD) == keybd)) &&
|
||||
dev->kbdfeed && dev->kbdfeed->BellProc) {
|
||||
|
||||
rc = XaceHook(XACE_DEVICE_ACCESS, client, dev, DixBellAccess);
|
||||
|
@ -2157,7 +2160,8 @@ ProcChangePointerControl(ClientPtr client)
|
|||
}
|
||||
|
||||
for (dev = inputInfo.devices; dev; dev = dev->next) {
|
||||
if ((dev == mouse || (!IsMaster(dev) && dev->u.master == mouse)) &&
|
||||
if ((dev == mouse ||
|
||||
(!IsMaster(dev) && GetMaster(dev, MASTER_POINTER) == mouse)) &&
|
||||
dev->ptrfeed) {
|
||||
rc = XaceHook(XACE_DEVICE_ACCESS, client, dev, DixManageAccess);
|
||||
if (rc != Success)
|
||||
|
@ -2166,7 +2170,8 @@ ProcChangePointerControl(ClientPtr client)
|
|||
}
|
||||
|
||||
for (dev = inputInfo.devices; dev; dev = dev->next) {
|
||||
if ((dev == mouse || (!IsMaster(dev) && dev->u.master == mouse)) &&
|
||||
if ((dev == mouse ||
|
||||
(!IsMaster(dev) && GetMaster(dev, MASTER_POINTER) == mouse)) &&
|
||||
dev->ptrfeed) {
|
||||
dev->ptrfeed->ctrl = ctrl;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user