[PATCH 10/19] input: set XKB extension for all new devices, not just xfree86 ones.

[Peter Hutterer]

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 at who-t.net>
---
 dix/devices.c                  |    1 +
 hw/xfree86/common/xf86Xinput.c |    2 --
 2 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/dix/devices.c b/dix/devices.c
index aea5778..5622d06 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 d45e3d1..1ee1e71 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -337,8 +337,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);
-- 
1.7.2