Commit 29366356 authored by Peter Hutterer's avatar Peter Hutterer

xkb: Fix a check for MASTER_KEYBOARD

And copy into the master keyboard, not just the directly attached device.
Signed-off-by: 's avatarPeter Hutterer <>
Reviewed-by: 's avatarDaniel Stone <>
Reviewed-by: 's avatarBenjamin Tissoires <>
parent 0ba526de
......@@ -5883,12 +5883,10 @@ ProcXkbGetKbdByName(ClientPtr client)
nkn.changed|= XkbNKN_GeometryMask;
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);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment