summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/kdrive-use-evdev.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/kdrive-use-evdev.patch')
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/kdrive-use-evdev.patch58
1 files changed, 0 insertions, 58 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/kdrive-use-evdev.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/kdrive-use-evdev.patch
deleted file mode 100644
index 8a480dc9d9..0000000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/kdrive-use-evdev.patch
+++ /dev/null
@@ -1,58 +0,0 @@
1Upstream-Status: Pending
2
3Signed-off-by: Yu Ke <ke.yu@intel.com>
4
5--- xserver/hw/kdrive/fbdev/fbinit.c~ 2006-01-31 17:09:33.000000000 +0100
6+++ xserver/hw/kdrive/fbdev/fbinit.c 2006-01-31 17:11:55.000000000 +0100
7@@ -28,6 +28,8 @@
8 #endif
9 #include <fbdev.h>
10
11+extern int use_evdev;
12+
13 void
14 InitCard (char *name)
15 {
16@@ -45,7 +47,10 @@
17 void
18 InitInput (int argc, char **argv)
19 {
20- KdInitInput (&LinuxMouseFuncs, &LinuxKeyboardFuncs);
21+ if (use_evdev)
22+ KdInitInput (&LinuxEvdevMouseFuncs, &LinuxEvdevKeyboardFuncs);
23+ else
24+ KdInitInput (&LinuxMouseFuncs, &LinuxKeyboardFuncs);
25 #ifdef TOUCHSCREEN
26 KdAddMouseDriver (&TsFuncs);
27 #endif
28--- xserver/hw/kdrive/src/kdrive.c.orig 2006-01-31 17:13:28.000000000 +0100
29+++ xserver/hw/kdrive/src/kdrive.c 2006-01-31 17:15:28.000000000 +0100
30@@ -44,6 +44,8 @@
31 #include "dpmsproc.h"
32 #endif
33
34+int use_evdev = 0;
35+
36 typedef struct _kdDepths {
37 CARD8 depth;
38 CARD8 bpp;
39@@ -687,6 +689,7 @@
40 ErrorF("-videoTest Start the server, pause momentarily and exit\n");
41 ErrorF("-origin X,Y Locates the next screen in the the virtual screen (Xinerama)\n");
42 ErrorF("-mouse path[,n] Filename of mouse device, n is number of buttons\n");
43+ ErrorF("-use-evdev Use Linux evdev input\n");
44 ErrorF("-switchCmd Command to execute on vt switch\n");
45 ErrorF("-nozap Don't terminate server on Ctrl+Alt+Backspace\n");
46 ErrorF("vtxx Use virtual terminal xx instead of the next available\n");
47@@ -796,6 +799,11 @@
48 UseMsg ();
49 return 2;
50 }
51+ if (!strcmp (argv[i], "-use-evdev"))
52+ {
53+ use_evdev = 1;
54+ return 1;
55+ }
56 if (!strcmp (argv[i], "-keyboard"))
57 {
58 if ((i+1) < argc)