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

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"
44	fi	44	fi
45		45
		46	# kdrive 1.4 onwards needs -mouse args
		47	if [ -n "$TSLIB_TSDEVICE" ]; then
		48	ARGS="$ARGS -mouse tslib"
		49	fi
		50
46	# start off server in conventional location.	51	# start off server in conventional location.
47	case `module_id` in	52	case `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
		4	xmodmap - </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 @@
		1	keycode 8 =
		2	keycode 9 = Escape
		3	keycode 10 = 1 exclam
		4	keycode 11 = 2 at
		5	keycode 12 = 3 numbersign
		6	keycode 13 = 4 dollar
		7	keycode 14 = 5 percent
		8	keycode 15 = 6 asciicircum
		9	keycode 16 = 7 ampersand braceleft
		10	keycode 17 = 8 asterisk bracketleft
		11	keycode 18 = 9 parenleft bracketright
		12	keycode 19 = 0 parenright braceright
		13	keycode 20 = minus underscore backslash
		14	keycode 21 = equal plus
		15	keycode 22 = BackSpace
		16	keycode 23 = Tab
		17	keycode 24 = q Q q
		18	keycode 25 = w W w
		19	keycode 26 = e E
		20	keycode 27 = r R r
		21	keycode 28 = t T t
		22	keycode 29 = y Y y
		23	keycode 30 = u U u
		24	keycode 31 = i I i
		25	keycode 32 = o O o
		26	keycode 33 = p P p
		27	keycode 34 = bracketleft braceleft
		28	keycode 35 = bracketright braceright asciitilde
		29	keycode 36 = Return
		30	keycode 37 = Control_L
		31	keycode 38 = a A
		32	keycode 39 = s S s
		33	keycode 40 = d D
		34	keycode 41 = f F
		35	keycode 42 = g G g
		36	keycode 43 = h H h
		37	keycode 44 = j J j
		38	keycode 45 = k K k
		39	keycode 46 = l L l
		40	keycode 47 = semicolon colon
		41	keycode 48 = apostrophe quotedbl
		42	keycode 49 = grave asciitilde
		43	keycode 50 = Shift_L
		44	keycode 51 = backslash bar
		45	keycode 52 = z Z z
		46	keycode 53 = x X x
		47	keycode 54 = c C
		48	keycode 55 = v V v
		49	keycode 56 = b B
		50	keycode 57 = n N n
		51	keycode 58 = m M m
		52	keycode 59 = comma less
		53	keycode 60 = period greater
		54	keycode 61 = slash question
		55	keycode 62 = Shift_R
		56	keycode 63 = KP_Multiply
		57	keycode 64 = Alt_L
		58	keycode 65 = space
		59	keycode 66 = Caps_Lock
		60	keycode 67 = F1 F11
		61	keycode 68 = F2 F12
		62	keycode 69 = F3 F13
		63	keycode 70 = F4 F14
		64	keycode 71 = F5 F15
		65	keycode 72 = F6 F16
		66	keycode 73 = F7 F17
		67	keycode 74 = F8 F18
		68	keycode 75 = F9 F19
		69	keycode 76 = F10 F20
		70	keycode 77 = Num_Lock
		71	keycode 78 = Scroll_Lock
		72	keycode 79 = KP_7
		73	keycode 80 = KP_8
		74	keycode 81 = KP_9
		75	keycode 82 = KP_Subtract
		76	keycode 83 = KP_4
		77	keycode 84 = KP_5
		78	keycode 85 = KP_6
		79	keycode 86 = KP_Add
		80	keycode 87 = KP_1
		81	keycode 88 = KP_2
		82	keycode 89 = KP_3
		83	keycode 90 = KP_0
		84	keycode 91 = KP_Decimal
		85	keycode 92 =
		86	keycode 93 =
		87	keycode 94 = less greater bar
		88	keycode 95 = F11
		89	keycode 96 = F12
		90	keycode 97 =
		91	keycode 98 =
		92	keycode 99 =
		93	keycode 100 =
		94	keycode 101 =
		95	keycode 102 =
		96	keycode 103 =
		97	keycode 104 = KP_Enter
		98	keycode 105 = Control_R
		99	keycode 106 = KP_Divide
		100	keycode 107 =
		101	keycode 108 = Mode_switch
		102	keycode 109 = Break
		103	keycode 110 = Home
		104	keycode 111 = Up
		105	keycode 112 = Prior
		106	keycode 113 = Left
		107	keycode 114 = Right
		108	keycode 115 = End
		109	keycode 116 = Down
		110	keycode 117 = Next
		111	keycode 118 = Insert
		112	keycode 119 = Delete
		113	keycode 120 = Menu
		114	keycode 121 = F13
		115	keycode 122 = F14
		116	keycode 123 = Help
		117	keycode 124 = Execute
		118	keycode 125 = F17
		119	keycode 126 = KP_Subtract
		120	keycode 127 = Pause
		121	keycode 128 =
		122	keycode 129 =
		123	keycode 130 =
		124	keycode 131 =
		125	keycode 132 =
		126	keycode 133 =
		127	keycode 134 =
		128	keycode 135 =
		129	keycode 136 =
		130	keycode 137 =
		131	keycode 138 =
		132	keycode 139 =
		133	keycode 140 =
		134	keycode 141 =
		135	keycode 142 =
		136	keycode 143 =
		137	keycode 144 =
		138	keycode 145 =
		139	keycode 146 =
		140	keycode 147 =
		141	keycode 148 =
		142	keycode 149 =
		143	keycode 150 =
		144	keycode 151 =
		145	keycode 152 =
		146	keycode 153 =
		147	keycode 154 =
		148	keycode 155 =
		149	keycode 156 =
		150	keycode 157 =
		151	keycode 158 =
		152	keycode 159 =
		153	keycode 160 =
		154	keycode 161 =
		155	keycode 162 =
		156	keycode 163 =
		157	keycode 164 =
		158	keycode 165 =
		159	keycode 166 =
		160	keycode 167 =
		161	keycode 168 =
		162	keycode 169 =
		163	keycode 170 =
		164	keycode 171 =
		165	keycode 172 =
		166	keycode 173 =
		167	keycode 174 =
		168	keycode 175 =
		169	keycode 176 =
		170	keycode 177 =
		171	keycode 178 =
		172	keycode 179 =
		173	keycode 180 =
		174	keycode 181 =
		175	keycode 182 =
		176	keycode 183 =
		177	keycode 184 =
		178	keycode 185 =
		179	keycode 186 =
		180	keycode 187 =
		181	keycode 188 =
		182	keycode 189 =
		183	keycode 190 =
		184	keycode 191 =
		185	keycode 192 =
		186	keycode 193 =
		187	keycode 194 =
		188	keycode 195 =
		189	keycode 196 =
		190	keycode 197 =
		191	keycode 198 =
		192	keycode 199 =
		193	keycode 200 =
		194	keycode 201 =
		195	keycode 202 =
		196	keycode 203 =
		197	keycode 204 =
		198	keycode 205 =
		199	keycode 206 =
		200	keycode 207 =
		201	keycode 208 =
		202	keycode 209 =
		203	keycode 210 =
		204	keycode 211 =
		205	keycode 212 =
		206	keycode 213 =
		207	keycode 214 =
		208	keycode 215 =
		209	keycode 216 =
		210	keycode 217 =
		211	keycode 218 =
		212	keycode 219 =
		213	keycode 220 =
		214	keycode 221 =
		215	keycode 222 =
		216	keycode 223 =
		217	keycode 224 =
		218	keycode 225 =
		219	keycode 226 =
		220	keycode 227 =
		221	keycode 228 =
		222	keycode 229 =
		223	keycode 230 =
		224	keycode 231 =
		225	keycode 232 =
		226	keycode 233 =
		227	keycode 234 =
		228	keycode 235 =
		229	keycode 236 =
		230	keycode 237 =
		231	keycode 238 =
		232	keycode 239 =
		233	keycode 240 =
		234	keycode 241 =
		235	keycode 242 =
		236	keycode 243 =
		237	keycode 244 =
		238	keycode 245 =
		239	keycode 246 =
		240	keycode 247 =
		241	keycode 248 =
		242	keycode 249 =
		243	keycode 250 =
		244	keycode 251 =
		245	keycode 252 =
		246	keycode 253 =
		247	keycode 254 =
		248
		249	add shift = Shift_L
		250	add shift = Shift_R
		251	add shift = Menu
		252	add lock = Caps_Lock
		253	add control = Control_L
		254	add control = Control_R
		255	add mod1 = Alt_L
		256	add mod2 = Num_Lock
		257	!mod3
		258	add 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"
2	LICENSE = "GPL"	2	LICENSE = "GPL"
3	SECTION = "x11"	3	SECTION = "x11"
4	RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit formfactor"	4	RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit formfactor"
5	PR = "r25"	5	PR = "r26"
6		6
7	SRC_URI = "file://etc"	7	SRC_URI = "file://etc"
8	S = ${WORKDIR}	8	S = ${WORKDIR}