xkb: Fix a check for MASTER_KEYBOARD
And copy into the master keyboard, not just the directly attached device. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Benjamin Tissoires <tissoire@cena.fr>
This commit is contained in:
parent
0ba526deeb
commit
2936635698
10
xkb/xkb.c
10
xkb/xkb.c
|
@ -5883,12 +5883,10 @@ ProcXkbGetKbdByName(ClientPtr client)
|
|||
nkn.changed|= XkbNKN_GeometryMask;
|
||||
XkbSendNewKeyboardNotify(dev,&nkn);
|
||||
|
||||
if (!IsMaster(dev) && !IsFloating(dev))
|
||||
{
|
||||
DeviceIntPtr master = dev->u.master;
|
||||
if (master->u.lastSlave == dev)
|
||||
{
|
||||
XkbCopyDeviceKeymap(dev->u.master, dev);
|
||||
if (!IsMaster(dev)) {
|
||||
DeviceIntPtr master = GetMaster(dev, MASTER_KEYBOARD);
|
||||
if (master && master->u.lastSlave == dev) {
|
||||
XkbCopyDeviceKeymap(master, dev);
|
||||
XkbSendNewKeyboardNotify(dev,&nkn);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user