diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2010-07-22 10:28:14 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2010-09-01 15:26:49 +1000 |
| commit | fbf35e27f3005cf009f2dd1e112260bb294342c7 (patch) | |
| tree | 990d5480f361bb2904253db1794ab4f98ae98403 | |
| parent | 11ed32b62c8793ecc1c68e1e4ba91e2eb45eef3e (diff) | |
input: set XKB extension for all new devices, not just xfree86 ones.
Right now, Xephyr and others don't get to use XKB on the slave devices.
Which works given that no-one cares about SDs just yet but event processing
is different if the ProcessInputProc isn't wrapped properly.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
| -rw-r--r-- | dix/devices.c | 1 | ||||
| -rw-r--r-- | hw/xfree86/common/xf86Xinput.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/dix/devices.c b/dix/devices.c index 0f00f2409..6a934cf80 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -272,6 +272,7 @@ AddInputDevice(ClientPtr client, DeviceProc deviceProc, Bool autoStart) dev->deviceGrab.ActivateGrab = ActivateKeyboardGrab; dev->deviceGrab.DeactivateGrab = DeactivateKeyboardGrab; + XkbSetExtension(dev, ProcessKeyboardEvent); dev->coreEvents = TRUE; diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c index 9ede70fa6..c0b216ac4 100644 --- a/hw/xfree86/common/xf86Xinput.c +++ b/hw/xfree86/common/xf86Xinput.c @@ -333,8 +333,6 @@ xf86ActivateDevice(LocalDevicePtr local) dev->config_info = xf86SetStrOption(local->options, "config_info", NULL); - XkbSetExtension(dev, ProcessKeyboardEvent); - if (serverGeneration == 1) xf86Msg(X_INFO, "XINPUT: Adding extended input device \"%s\" (type: %s)\n", local->name, local->type_name); |