summaryrefslogtreecommitdiff
path: root/Xi
diff options
context:
space:
mode:
authorRui Matos <tiagomatos@gmail.com>2014-03-07 14:32:27 -0800
committerPeter Hutterer <peter.hutterer@who-t.net>2014-03-12 16:43:23 +1000
commitd35a02a767017f13db4bd4742eef49293d5a30ea (patch)
treec536a946af3a7215066f1a8db110a260ad26fc6b /Xi
parent361f405d3c866bc4d22ef84975fe771691156336 (diff)
xkb: Repurpose XkbCopyDeviceKeymap to apply a given keymap to a device
This will also make it useful for cases when we have a new keymap to apply to a device but don't have a source device. Reviewed-by: Kristian Høgsberg <krh@bitplanet.net> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'Xi')
-rw-r--r--Xi/exevents.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Xi/exevents.c b/Xi/exevents.c
index e9f670ec5..9c207eb23 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -230,7 +230,7 @@ CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master)
mk->sourceid = device->id;
- if (!XkbCopyDeviceKeymap(master, device))
+ if (!XkbDeviceApplyKeymap(master, device->key->xkbInfo->desc))
FatalError("Couldn't pivot keymap from device to core!\n");
}