summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2008-04-23 10:30:05 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2008-04-23 10:30:05 +0000
commitc7aafce36c9667b2ae1174a9f8e0302acc2f8851 (patch)
treed7daaca0be9d893b1edd48b370e847d0e11e9e97
parentb07a4adc0ca8dd17e9ed2999ed0780a67535acfe (diff)
downloadpoky-c7aafce36c9667b2ae1174a9f8e0302acc2f8851.tar.gz
xserver-kdrive-common: merged KDrive 1.4 support from OE
- KDrive 1.4 require "-mouse tslib" to use touchscreen - KDrive 1.4 does not provide internal keymap so we need to load it git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4319 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver5
-rw-r--r--meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/12keymap4
-rw-r--r--meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/default.xmodmap260
-rw-r--r--meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb2
4 files changed, 270 insertions, 1 deletions
diff --git a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver b/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver
index 8efb8661f4..742f4ee5f0 100644
--- a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver
+++ b/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver
@@ -43,6 +43,11 @@ if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/input/mice ] && [ "$XSERVER" != "Xorg"
43 ARGS="$ARGS -mouse /dev/input/mice" 43 ARGS="$ARGS -mouse /dev/input/mice"
44fi 44fi
45 45
46# kdrive 1.4 onwards needs -mouse args
47if [ -n "$TSLIB_TSDEVICE" ]; then
48 ARGS="$ARGS -mouse tslib"
49fi
50
46# start off server in conventional location. 51# start off server in conventional location.
47case `module_id` in 52case `module_id` in
48 "Generic OMAP1510/1610/1710") 53 "Generic OMAP1510/1610/1710")
diff --git a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/12keymap b/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/12keymap
new file mode 100644
index 0000000000..7a22f43276
--- /dev/null
+++ b/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/12keymap
@@ -0,0 +1,4 @@
1#!/bin/sh
2
3# since kdrive 1.4 there is no default keymap in server
4xmodmap - </etc/X11/default.xmodmap
diff --git a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/default.xmodmap b/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/default.xmodmap
new file mode 100644
index 0000000000..05a13fa3c8
--- /dev/null
+++ b/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/default.xmodmap
@@ -0,0 +1,260 @@
1keycode 8 =
2keycode 9 = Escape
3keycode 10 = 1 exclam
4keycode 11 = 2 at
5keycode 12 = 3 numbersign
6keycode 13 = 4 dollar
7keycode 14 = 5 percent
8keycode 15 = 6 asciicircum
9keycode 16 = 7 ampersand braceleft
10keycode 17 = 8 asterisk bracketleft
11keycode 18 = 9 parenleft bracketright
12keycode 19 = 0 parenright braceright
13keycode 20 = minus underscore backslash
14keycode 21 = equal plus
15keycode 22 = BackSpace
16keycode 23 = Tab
17keycode 24 = q Q q
18keycode 25 = w W w
19keycode 26 = e E
20keycode 27 = r R r
21keycode 28 = t T t
22keycode 29 = y Y y
23keycode 30 = u U u
24keycode 31 = i I i
25keycode 32 = o O o
26keycode 33 = p P p
27keycode 34 = bracketleft braceleft
28keycode 35 = bracketright braceright asciitilde
29keycode 36 = Return
30keycode 37 = Control_L
31keycode 38 = a A
32keycode 39 = s S s
33keycode 40 = d D
34keycode 41 = f F
35keycode 42 = g G g
36keycode 43 = h H h
37keycode 44 = j J j
38keycode 45 = k K k
39keycode 46 = l L l
40keycode 47 = semicolon colon
41keycode 48 = apostrophe quotedbl
42keycode 49 = grave asciitilde
43keycode 50 = Shift_L
44keycode 51 = backslash bar
45keycode 52 = z Z z
46keycode 53 = x X x
47keycode 54 = c C
48keycode 55 = v V v
49keycode 56 = b B
50keycode 57 = n N n
51keycode 58 = m M m
52keycode 59 = comma less
53keycode 60 = period greater
54keycode 61 = slash question
55keycode 62 = Shift_R
56keycode 63 = KP_Multiply
57keycode 64 = Alt_L
58keycode 65 = space
59keycode 66 = Caps_Lock
60keycode 67 = F1 F11
61keycode 68 = F2 F12
62keycode 69 = F3 F13
63keycode 70 = F4 F14
64keycode 71 = F5 F15
65keycode 72 = F6 F16
66keycode 73 = F7 F17
67keycode 74 = F8 F18
68keycode 75 = F9 F19
69keycode 76 = F10 F20
70keycode 77 = Num_Lock
71keycode 78 = Scroll_Lock
72keycode 79 = KP_7
73keycode 80 = KP_8
74keycode 81 = KP_9
75keycode 82 = KP_Subtract
76keycode 83 = KP_4
77keycode 84 = KP_5
78keycode 85 = KP_6
79keycode 86 = KP_Add
80keycode 87 = KP_1
81keycode 88 = KP_2
82keycode 89 = KP_3
83keycode 90 = KP_0
84keycode 91 = KP_Decimal
85keycode 92 =
86keycode 93 =
87keycode 94 = less greater bar
88keycode 95 = F11
89keycode 96 = F12
90keycode 97 =
91keycode 98 =
92keycode 99 =
93keycode 100 =
94keycode 101 =
95keycode 102 =
96keycode 103 =
97keycode 104 = KP_Enter
98keycode 105 = Control_R
99keycode 106 = KP_Divide
100keycode 107 =
101keycode 108 = Mode_switch
102keycode 109 = Break
103keycode 110 = Home
104keycode 111 = Up
105keycode 112 = Prior
106keycode 113 = Left
107keycode 114 = Right
108keycode 115 = End
109keycode 116 = Down
110keycode 117 = Next
111keycode 118 = Insert
112keycode 119 = Delete
113keycode 120 = Menu
114keycode 121 = F13
115keycode 122 = F14
116keycode 123 = Help
117keycode 124 = Execute
118keycode 125 = F17
119keycode 126 = KP_Subtract
120keycode 127 = Pause
121keycode 128 =
122keycode 129 =
123keycode 130 =
124keycode 131 =
125keycode 132 =
126keycode 133 =
127keycode 134 =
128keycode 135 =
129keycode 136 =
130keycode 137 =
131keycode 138 =
132keycode 139 =
133keycode 140 =
134keycode 141 =
135keycode 142 =
136keycode 143 =
137keycode 144 =
138keycode 145 =
139keycode 146 =
140keycode 147 =
141keycode 148 =
142keycode 149 =
143keycode 150 =
144keycode 151 =
145keycode 152 =
146keycode 153 =
147keycode 154 =
148keycode 155 =
149keycode 156 =
150keycode 157 =
151keycode 158 =
152keycode 159 =
153keycode 160 =
154keycode 161 =
155keycode 162 =
156keycode 163 =
157keycode 164 =
158keycode 165 =
159keycode 166 =
160keycode 167 =
161keycode 168 =
162keycode 169 =
163keycode 170 =
164keycode 171 =
165keycode 172 =
166keycode 173 =
167keycode 174 =
168keycode 175 =
169keycode 176 =
170keycode 177 =
171keycode 178 =
172keycode 179 =
173keycode 180 =
174keycode 181 =
175keycode 182 =
176keycode 183 =
177keycode 184 =
178keycode 185 =
179keycode 186 =
180keycode 187 =
181keycode 188 =
182keycode 189 =
183keycode 190 =
184keycode 191 =
185keycode 192 =
186keycode 193 =
187keycode 194 =
188keycode 195 =
189keycode 196 =
190keycode 197 =
191keycode 198 =
192keycode 199 =
193keycode 200 =
194keycode 201 =
195keycode 202 =
196keycode 203 =
197keycode 204 =
198keycode 205 =
199keycode 206 =
200keycode 207 =
201keycode 208 =
202keycode 209 =
203keycode 210 =
204keycode 211 =
205keycode 212 =
206keycode 213 =
207keycode 214 =
208keycode 215 =
209keycode 216 =
210keycode 217 =
211keycode 218 =
212keycode 219 =
213keycode 220 =
214keycode 221 =
215keycode 222 =
216keycode 223 =
217keycode 224 =
218keycode 225 =
219keycode 226 =
220keycode 227 =
221keycode 228 =
222keycode 229 =
223keycode 230 =
224keycode 231 =
225keycode 232 =
226keycode 233 =
227keycode 234 =
228keycode 235 =
229keycode 236 =
230keycode 237 =
231keycode 238 =
232keycode 239 =
233keycode 240 =
234keycode 241 =
235keycode 242 =
236keycode 243 =
237keycode 244 =
238keycode 245 =
239keycode 246 =
240keycode 247 =
241keycode 248 =
242keycode 249 =
243keycode 250 =
244keycode 251 =
245keycode 252 =
246keycode 253 =
247keycode 254 =
248
249add shift = Shift_L
250add shift = Shift_R
251add shift = Menu
252add lock = Caps_Lock
253add control = Control_L
254add control = Control_R
255add mod1 = Alt_L
256add mod2 = Num_Lock
257!mod3
258add mod4 = Mode_switch
259!mod5
260
diff --git a/meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb b/meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
index 5419842692..b7830dae91 100644
--- a/meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
+++ b/meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts"
2LICENSE = "GPL" 2LICENSE = "GPL"
3SECTION = "x11" 3SECTION = "x11"
4RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit formfactor" 4RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit formfactor"
5PR = "r25" 5PR = "r26"
6 6
7SRC_URI = "file://etc" 7SRC_URI = "file://etc"
8S = ${WORKDIR} 8S = ${WORKDIR}