1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
|
diff -ur xorg-server-1.10.1.901//hw/xfree86/common/xf86Xinput.c git/xorg-server-1.10.1.901//hw/xfree86/common/xf86Xinput.c
--- xorg-server-1.10.1.901//hw/xfree86/common/xf86Xinput.c 2011-04-28 09:25:00.000000000 +0200
+++ git/xorg-server-1.10.1.901//hw/xfree86/common/xf86Xinput.c 2011-05-19 00:31:01.178439874 +0200
@@ -99,6 +99,8 @@
return; \
}
+#define RR_Rotate_All (RR_Rotate_0|RR_Rotate_90|RR_Rotate_180|RR_Rotate_270)
+
EventListPtr xf86Events = NULL;
static int
@@ -1408,4 +1410,73 @@
EnableDevice(dev, TRUE);
}
+/* Taken from evdev-properties.h. */
+#define EVDEV_PROP_SWAP_AXES "Evdev Axes Swap"
+#define EVDEV_PROP_INVERT_AXES "Evdev Axis Inversion"
+
+/* This is a hack until we get device -> CRTC association. */
+void
+xf86InputRotationNotify(Rotation rotation)
+{
+ DeviceIntPtr dev;
+ //LocalDevicePtr local;
+ int ret;
+ int swap_axes = 0;
+ CARD8 invert[2] = { 0, 0 };
+ static Atom prop_swap = 0, prop_invert = 0;
+ static int atom_generation = -1;
+
+ if (atom_generation != serverGeneration) {
+ prop_swap = 0;
+ prop_invert = 0;
+ }
+
+ switch (rotation & RR_Rotate_All) {
+ case RR_Rotate_0:
+ swap_axes = 1;
+ invert[0] = 0;
+ invert[1] = 0;
+ break;
+ case RR_Rotate_90:
+ swap_axes = 0;
+ invert[0] = 0;
+ invert[1] = 1;
+ break;
+ case RR_Rotate_180:
+ swap_axes = 1;
+ invert[0] = 1;
+ invert[1] = 1;
+ break;
+ case RR_Rotate_270:
+ swap_axes = 0;
+ invert[0] = 1;
+ invert[1] = 0;
+ break;
+ }
+
+ if (!prop_swap)
+ prop_swap = MakeAtom(EVDEV_PROP_SWAP_AXES,
+ strlen(EVDEV_PROP_SWAP_AXES), TRUE);
+ if (!prop_invert)
+ prop_invert = MakeAtom(EVDEV_PROP_INVERT_AXES,
+ strlen(EVDEV_PROP_INVERT_AXES), TRUE);
+
+ for (dev = inputInfo.devices; dev; dev = dev->next) {
+ //local = dev->public.devicePrivate;
+ ret = XIChangeDeviceProperty(dev, prop_swap, XA_INTEGER, 8,
+ PropModeReplace, 1, &swap_axes, FALSE);
+ if (ret != Success) {
+ xf86Msg(X_ERROR, "Changing swap_xy property failed!\n");
+ continue;
+ }
+ ret = XIChangeDeviceProperty(dev, prop_invert, XA_INTEGER, 8,
+ PropModeReplace, 2, invert, FALSE);
+ if (ret != Success) {
+ xf86Msg(X_ERROR, "Changing invert property failed!\n");
+ continue;
+ }
+ }
+}
+
+
/* end of xf86Xinput.c */
diff -ur xorg-server-1.10.1.901//hw/xfree86/modes/xf86Crtc.c git/xorg-server-1.10.1.901//hw/xfree86/modes/xf86Crtc.c
--- xorg-server-1.10.1.901//hw/xfree86/modes/xf86Crtc.c 2011-04-28 09:25:00.000000000 +0200
+++ git/xorg-server-1.10.1.901//hw/xfree86/modes/xf86Crtc.c 2011-05-19 00:23:16.244383998 +0200
@@ -389,6 +389,12 @@
if (didLock)
crtc->funcs->unlock (crtc);
+ /*
+ * Rotate Touchscreen
+ */
+ xf86InputRotationNotify(crtc->rotation);
+
+
return ret;
}
|
