From bcb9dcfda3f9638816c58c743b57f15a0fa8dfef Mon Sep 17 00:00:00 2001 From: David-John Willis Date: Tue, 22 Feb 2011 12:27:16 +0000 Subject: [PATCH] MERGE: Rebase keymaps. --- .../omap3-pandora/keymap-extension-2.6.map | 241 +++++------------- recipes/keymaps/keymaps_1.0.bb | 2 +- 2 files changed, 59 insertions(+), 184 deletions(-) diff --git a/recipes/keymaps/files/omap3-pandora/keymap-extension-2.6.map b/recipes/keymaps/files/omap3-pandora/keymap-extension-2.6.map index 05e0b7b0cf..9c8c42c336 100644 --- a/recipes/keymaps/files/omap3-pandora/keymap-extension-2.6.map +++ b/recipes/keymaps/files/omap3-pandora/keymap-extension-2.6.map @@ -1,192 +1,67 @@ -keymaps 0-2,4,8,12 - -# Notes: -# FN is setup as AltGr. -# AltGr locking not yet working. - -# Default Shift AltGr Control Alt Ctrl+Alt - -# DPad/Buttons in keyboard mode (On Input2). - -# DPad - URDL -keycode 103 = Up Up Prior -keycode 106 = Right Right Incr_Console -keycode 108 = Down Down Next -keycode 105 = Left Left Decr_Console - -# Buttons - URDL -#keycode 307 = -#keycode 304 = -#keycode 305 = -#keycode 308 = - -# Left Trigger -#keycode 310 = - -# Right Trigger -#keycode 311 = +# 1, 2, 4, 8 +# Shift, AltGr, Control, Alt +keymaps 0,1 # Special keys. -keycode 29 = Control -keycode 56 = Alt -keycode 464 = AltGr AltGr AltGr_Lock - -keycode 14 = BackSpace Delete Insert - -keycode 28 = Return Return Return Return Return Return -keycode 40 = apostrophe quotedbl tilde -keycode 42 = Shift VoidSymbol Caps_Lock - -keycode 51 = comma less semicolon -keycode 52 = period greater colon - -keycode 53 = slash question Num_Lock +keycode 29 = Control +keycode 56 = Alt +#keycode 464 = AltGr -keycode 57 = space bar Tab +# Default Shift +keycode 51 = comma less +keycode 52 = period greater # Number Bar -keycode 2 = one VoidSymbol F1 -keycode 3 = two VoidSymbol F2 -keycode 4 = three VoidSymbol F3 -keycode 5 = four asciitilde F4 -keycode 6 = five VoidSymbol F5 -keycode 7 = six VoidSymbol F6 -keycode 8 = seven ampersand F7 -keycode 9 = eight asterisk F8 -keycode 10 = nine VoidSymbol F9 -keycode 11 = zero VoidSymbol F10 - - -# QWERTY Keypad +keycode 2 = one section +keycode 3 = two braceleft +keycode 4 = three braceright +keycode 5 = four asciitilde +keycode 6 = five percent +keycode 7 = six asciicircum +keycode 8 = seven ampersand +keycode 9 = eight asterisk +keycode 10 = nine bracketleft +keycode 11 = zero bracketright +keycode 14 = BackSpace Delete + +# Fn stuff + +# F13 - Fn-J +keycode 183 = apostrophe +# F14 - Fn-B +keycode 184 = bar +# F15 - Fn-Y +keycode 185 = underscore +# F16 - Fn-V +keycode 186 = numbersign +# F17 - Fn-T +keycode 187 = exclam +# F18 - Fn-K +keycode 188 = sterling +# F19 - Fn-S +keycode 189 = quotedbl +# F20 - Fn-W +keycode 190 = at +# F21 - Fn-. +keycode 191 = colon +# F22 - Fn-N +keycode 192 = dollar +# F23 - Fn-M +keycode 193 = currency +# Fn-L +keycode 124 = yen +# Fn-X +keycode 214 = question +# Fn-E +keycode 26 = parenleft +# Fn-R +keycode 27 = parenright -keycode 16 = +q +Q Escape Control_q Meta_q -keycode 17 = +w +W at Control_w Meta_w -keycode 18 = +e +E three Control_e Meta_e -keycode 19 = +r +R four Control_r Meta_r -keycode 20 = +t +T five Control_t Meta_t -keycode 21 = +y +Y six Control_y Meta_y -keycode 22 = +u +U seven Control_u Meta_u -keycode 23 = +i +I eight Control_i Meta_i -keycode 24 = +o +O F11 Control_o Meta_o -keycode 25 = +p +P F12 Control_p Meta_p - -keycode 30 = +a +A exclam Control_a Meta_a -keycode 31 = +s +S quotedbl Control_s Meta_s -keycode 32 = +d +D numbersign Control_d Meta_d -keycode 33 = +f +F plus Control_f Meta_f -keycode 34 = +g +G equals Control_g Meta_g -keycode 35 = +h +H underscore Control_h Meta_h -keycode 36 = +j +J ampersand Control_j Meta_j -keycode 37 = +k +K sterling Control_k Meta_k -keycode 38 = +l +L yen Control_l Meta_l - -keycode 44 = +z +Z VoidSymbol Control_z Meta_z -keycode 45 = +x +X question Control_x Meta_x -keycode 46 = +c +C Control_c Control_c Meta_c -keycode 47 = +v +V Control_v Control_v Meta_v -keycode 48 = +b +B minus Control_b Meta_b -keycode 49 = +n +N dollar Control_n Meta_n -keycode 50 = +m +M equal Control_m Meta_m - - -string F1 = "\033[[A" -string F2 = "\033[[B" -string F3 = "\033[[C" -string F4 = "\033[[D" -string F5 = "\033[[E" -string F6 = "\033[17~" -string F7 = "\033[18~" -string F8 = "\033[19~" -string F9 = "\033[20~" -string F10 = "\033[21~" -string F11 = "\033[23~" -string F12 = "\033[24~" -string F13 = "\033[25~" -string F14 = "\033[26~" -string F15 = "\033[28~" -string F16 = "\033[29~" -string F17 = "\033[31~" -string F18 = "\033[32~" -string F19 = "\033[33~" -string F20 = "\033[34~" -string F33 = "\033[49~" -string Find = "\033[1~" -string Insert = "\033[2~" -string Remove = "\033[3~" -string Select = "\033[4~" -string Prior = "\033[5~" -string Next = "\033[6~" -string Macro = "\033[M" -string Pause = "\033[P" - -compose '`' 'A' to 'À' -compose '`' 'a' to 'à' -compose '\'' 'A' to 'Á' -compose '\'' 'a' to 'á' -compose '^' 'A' to 'Â' -compose '^' 'a' to 'â' -compose '~' 'A' to 'Ã' -compose '~' 'a' to 'ã' -compose '"' 'A' to 'Ä' -compose '"' 'a' to 'ä' -compose 'O' 'A' to 'Å' -compose 'o' 'a' to 'å' -compose '0' 'A' to 'Å' -compose '0' 'a' to 'å' -compose 'A' 'A' to 'Å' -compose 'a' 'a' to 'å' -compose 'A' 'E' to 'Æ' -compose 'a' 'e' to 'æ' -compose ',' 'C' to 'Ç' -compose ',' 'c' to 'ç' -compose '`' 'E' to 'È' -compose '`' 'e' to 'è' -compose '\'' 'E' to 'É' -compose '\'' 'e' to 'é' -compose '^' 'E' to 'Ê' -compose '^' 'e' to 'ê' -compose '"' 'E' to 'Ë' -compose '"' 'e' to 'ë' -compose '`' 'I' to 'Ì' -compose '`' 'i' to 'ì' -compose '\'' 'I' to 'Í' -compose '\'' 'i' to 'í' -compose '^' 'I' to 'Î' -compose '^' 'i' to 'î' -compose '"' 'I' to 'Ï' -compose '"' 'i' to 'ï' -compose '-' 'D' to 'Ð' -compose '-' 'd' to 'ð' -compose '~' 'N' to 'Ñ' -compose '~' 'n' to 'ñ' -compose '`' 'O' to 'Ò' -compose '`' 'o' to 'ò' -compose '\'' 'O' to 'Ó' -compose '\'' 'o' to 'ó' -compose '^' 'O' to 'Ô' -compose '^' 'o' to 'ô' -compose '~' 'O' to 'Õ' -compose '~' 'o' to 'õ' -compose '"' 'O' to 'Ö' -compose '"' 'o' to 'ö' -compose '/' 'O' to 'Ø' -compose '/' 'o' to 'ø' -compose '`' 'U' to 'Ù' -compose '`' 'u' to 'ù' -compose '\'' 'U' to 'Ú' -compose '\'' 'u' to 'ú' -compose '^' 'U' to 'Û' -compose '^' 'u' to 'û' -compose '"' 'U' to 'Ü' -compose '"' 'u' to 'ü' -compose '\'' 'Y' to 'Ý' -compose '\'' 'y' to 'ý' -compose 'T' 'H' to 'Þ' -compose 't' 'h' to 'þ' -compose 's' 's' to 'ß' -compose '"' 'y' to 'ÿ' -compose 's' 'z' to 'ß' -compose 'i' 'j' to 'ÿ' +# DPad - URDL +#Control Alt keycode 103 = Prior +#Control Alt keycode 106 = Incr_Console +#Control Alt keycode 108 = Next +#Control Alt keycode 105 = Decr_Console diff --git a/recipes/keymaps/keymaps_1.0.bb b/recipes/keymaps/keymaps_1.0.bb index c17ee375f2..066bec57b7 100644 --- a/recipes/keymaps/keymaps_1.0.bb +++ b/recipes/keymaps/keymaps_1.0.bb @@ -3,7 +3,7 @@ SECTION = "base" RDEPENDS_${PN} = "console-tools" LICENSE = "GPL" PACKAGE_ARCH = "${MACHINE}" -PR = "r26" +PR = "r27" inherit update-rc.d -- 2.39.5