summaryrefslogtreecommitdiff
path: root/packages/xorg-xserver/xserver-kdrive/w100-new-input-world-order.patch
diff options
context:
space:
mode:
authorPaul Sokolovsky <pmiscml@gmail.com>2007-09-08 23:56:41 +0000
committerPaul Sokolovsky <pmiscml@gmail.com>2007-09-08 23:56:41 +0000
commit7d36e174f745ff0c1f3a1a1e3971668056981e13 (patch)
treed4cf434ee00c6597e77c7b64f5a5258946be0d6b /packages/xorg-xserver/xserver-kdrive/w100-new-input-world-order.patch
parent7959b33796e034c780e96bf27d38ef9b19c09116 (diff)
parent7a1b68206fc952bd82d18a6d8018b24fcffa868e (diff)
merge of '47b95f573cdb3823ddb5ef52097dc49bb575bca8'
and '62587daa7e0ad5129712e1e4666b16c8a1971428'
Diffstat (limited to 'packages/xorg-xserver/xserver-kdrive/w100-new-input-world-order.patch')
-rw-r--r--packages/xorg-xserver/xserver-kdrive/w100-new-input-world-order.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/packages/xorg-xserver/xserver-kdrive/w100-new-input-world-order.patch b/packages/xorg-xserver/xserver-kdrive/w100-new-input-world-order.patch
new file mode 100644
index 0000000000..239ae0bb67
--- /dev/null
+++ b/packages/xorg-xserver/xserver-kdrive/w100-new-input-world-order.patch
@@ -0,0 +1,28 @@
+Index: xorg-server-1.4/hw/kdrive/w100/ati_stub.c
+===================================================================
+--- xorg-server-1.4.orig/hw/kdrive/w100/ati_stub.c 2007-09-08 21:40:26.000000000 +0200
++++ xorg-server-1.4/hw/kdrive/w100/ati_stub.c 2007-09-08 22:04:27.000000000 +0200
+@@ -74,10 +74,20 @@
+ void
+ InitInput(int argc, char **argv)
+ {
+- KdInitInput(&LinuxMouseFuncs, &LinuxKeyboardFuncs);
+-#ifdef TOUCHSCREEN
+- KdAddMouseDriver(&TsFuncs);
++ KdKeyboardInfo *ki;
++
++ KdAddKeyboardDriver (&LinuxKeyboardDriver);
++ KdAddPointerDriver (&LinuxMouseDriver);
++ KdAddKeyboardDriver (&LinuxEvdevKeyboardDriver);
++ KdAddPointerDriver (&LinuxEvdevMouseDriver);
++#ifdef TSLIB
++ KdAddPointerDriver (&TsDriver);
+ #endif
++
++ ki = KdParseKeyboard ("keyboard");
++ KdAddKeyboard(ki);
++
++ KdInitInput ();
+ }
+
+ void