From e2cb8515661b1f7826981931d82dee6e05529f04 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed, 26 Sep 2007 18:01:17 +0930
Subject: [PATCH] xfree86: pass in the XKB event processing proc instead of the
 XI one.

We need to pass ProcessPointerEvent or ProcessKeyboardEvent to
XkbSetExtension, otherwise we lose the xkb layer.
---
 hw/xfree86/common/xf86Xinput.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index 31c300811..a43230e14 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -205,7 +205,7 @@ xf86ActivateDevice(LocalDevicePtr local)
 
         RegisterOtherDevice(dev);
         if (!noXkbExtension)
-            XkbSetExtension(dev, ProcessOtherEvent);
+            XkbSetExtension(dev, (DeviceIsPointerType(dev)) ? ProcessPointerEvent : ProcessKeyboardEvent);
 
         if (serverGeneration == 1) 
             xf86Msg(X_INFO, "XINPUT: Adding extended input device \"%s\" (type: %s)\n",