xserver/dix devices.c,3.26,3.27

Committed by: airlied

Update of /cvs/xserver/xserver/dix
In directory gabe:/tmp/cvs-serv8685/dix

Modified Files:
        devices.c 
Log Message:
xkb changes from Xgl


Index: devices.c
===================================================================
RCS file: /cvs/xserver/xserver/dix/devices.c,v
retrieving revision 3.26
retrieving revision 3.27
diff -u -d -r3.26 -r3.27
--- devices.c   3 Jan 2006 08:32:49 -0000       3.26
+++ devices.c   3 Jan 2006 09:02:22 -0000       3.27
@@ -358,13 +358,10 @@
 {
     inputInfo.pointer = device;
 #ifdef XKB
-    if (noXkbExtension) {
-       device->public.processInputProc = CoreProcessPointerEvent;
-       device->public.realInputProc = CoreProcessPointerEvent;
-    } else {
-       device->public.processInputProc = ProcessPointerEvent;
-       device->public.realInputProc = ProcessPointerEvent;
-    }
+    device->public.processInputProc = CoreProcessPointerEvent;
+    device->public.realInputProc = CoreProcessPointerEvent;
+    if (!noXkbExtension)
+       XkbSetExtension(device,ProcessPointerEvent);
 #else
     device->public.processInputProc = ProcessPointerEvent;
     device->public.realInputProc = ProcessPointerEvent;
@@ -384,13 +381,10 @@
 {
     inputInfo.keyboard = device;
 #ifdef XKB
-    if (noXkbExtension) {
-       device->public.processInputProc = CoreProcessKeyboardEvent;
-       device->public.realInputProc = CoreProcessKeyboardEvent;
-    } else {
-       device->public.processInputProc = ProcessKeyboardEvent;
-       device->public.realInputProc = ProcessKeyboardEvent;
-    }
+    device->public.processInputProc = CoreProcessKeyboardEvent;
+    device->public.realInputProc = CoreProcessKeyboardEvent;
+    if (!noXkbExtension)
+       XkbSetExtension(device,ProcessKeyboardEvent);
 #else
     device->public.processInputProc = ProcessKeyboardEvent;
     device->public.realInputProc = ProcessKeyboardEvent;