From cc338e26ff0bef408498c19e14fa608e76412ea3 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Queru Date: Wed, 1 Sep 2010 06:16:36 -0700 Subject: [PATCH] Revert "Fixed problem with keymap files copied to target" This reverts commit 1fc95cae8ec2ccfe134ff279ed9082311ad0d877. --- emulator/keymaps/Android.mk | 12 ++++++ emulator/keymaps/qwerty.kcm | 64 +++++++++++++++++++++++++++++++ emulator/keymaps/qwerty.kl | 91 ++++++++++++++++++++++++++++++++++++++++++++ emulator/keymaps/qwerty2.kcm | 81 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 248 insertions(+) create mode 100644 emulator/keymaps/qwerty.kcm create mode 100644 emulator/keymaps/qwerty.kl create mode 100644 emulator/keymaps/qwerty2.kcm diff --git a/emulator/keymaps/Android.mk b/emulator/keymaps/Android.mk index d6d330dbc..81ac53000 100644 --- a/emulator/keymaps/Android.mk +++ b/emulator/keymaps/Android.mk @@ -1,4 +1,16 @@ LOCAL_PATH:= $(call my-dir) +include $(CLEAR_VARS) +LOCAL_SRC_FILES := qwerty.kcm +include $(BUILD_KEY_CHAR_MAP) + +include $(CLEAR_VARS) +LOCAL_SRC_FILES := qwerty2.kcm +include $(BUILD_KEY_CHAR_MAP) + +file := $(TARGET_OUT_KEYLAYOUT)/qwerty.kl +ALL_PREBUILT += $(file) +$(file): $(LOCAL_PATH)/qwerty.kl | $(ACP) + $(transform-prebuilt-to-target) file := $(TARGET_OUT_KEYLAYOUT)/AVRCP.kl ALL_PREBUILT += $(file) diff --git a/emulator/keymaps/qwerty.kcm b/emulator/keymaps/qwerty.kcm new file mode 100644 index 000000000..80563642e --- /dev/null +++ b/emulator/keymaps/qwerty.kcm @@ -0,0 +1,64 @@ +[type=QWERTY] + +# keycode display number base caps fn caps_fn + +A 'A' '2' 'a' 'A' '#' 0x00 +B 'B' '2' 'b' 'B' '<' 0x00 +C 'C' '2' 'c' 'C' '9' 0x00E7 +D 'D' '3' 'd' 'D' '5' 0x00 +E 'E' '3' 'e' 'E' '2' 0x0301 +F 'F' '3' 'f' 'F' '6' 0x00A5 +G 'G' '4' 'g' 'G' '-' '_' +H 'H' '4' 'h' 'H' '[' '{' +I 'I' '4' 'i' 'I' '$' 0x0302 +J 'J' '5' 'j' 'J' ']' '}' +K 'K' '5' 'k' 'K' '"' '~' +L 'L' '5' 'l' 'L' ''' '`' +M 'M' '6' 'm' 'M' '!' 0x00 +N 'N' '6' 'n' 'N' '>' 0x0303 +O 'O' '6' 'o' 'O' '(' 0x00 +P 'P' '7' 'p' 'P' ')' 0x00 +Q 'Q' '7' 'q' 'Q' '*' 0x0300 +R 'R' '7' 'r' 'R' '3' 0x20AC +S 'S' '7' 's' 'S' '4' 0x00DF +T 'T' '8' 't' 'T' '+' 0x00A3 +U 'U' '8' 'u' 'U' '&' 0x0308 +V 'V' '8' 'v' 'V' '=' '^' +W 'W' '9' 'w' 'W' '1' 0x00 +X 'X' '9' 'x' 'X' '8' 0xEF00 +Y 'Y' '9' 'y' 'Y' '%' 0x00A1 +Z 'Z' '9' 'z' 'Z' '7' 0x00 + +# on pc keyboards +COMMA ',' ',' ',' ';' ';' '|' +PERIOD '.' '.' '.' ':' ':' 0x2026 +AT '@' '0' '@' '0' '0' 0x2022 +SLASH '/' '/' '/' '?' '?' '\' + +SPACE 0x20 0x20 0x20 0x20 0xEF01 0xEF01 +ENTER 0xa 0xa 0xa 0xa 0xa 0xa + +TAB 0x9 0x9 0x9 0x9 0x9 0x9 +0 '0' '0' '0' ')' ')' ')' +1 '1' '1' '1' '!' '!' '!' +2 '2' '2' '2' '@' '@' '@' +3 '3' '3' '3' '#' '#' '#' +4 '4' '4' '4' '$' '$' '$' +5 '5' '5' '5' '%' '%' '%' +6 '6' '6' '6' '^' '^' '^' +7 '7' '7' '7' '&' '&' '&' +8 '8' '8' '8' '*' '*' '*' +9 '9' '9' '9' '(' '(' '(' + +GRAVE '`' '`' '`' '~' '`' '~' +MINUS '-' '-' '-' '_' '-' '_' +EQUALS '=' '=' '=' '+' '=' '+' +LEFT_BRACKET '[' '[' '[' '{' '[' '{' +RIGHT_BRACKET ']' ']' ']' '}' ']' '}' +BACKSLASH '\' '\' '\' '|' '\' '|' +SEMICOLON ';' ';' ';' ':' ';' ':' +APOSTROPHE ''' ''' ''' '"' ''' '"' +STAR '*' '*' '*' '*' '*' '*' +POUND '#' '#' '#' '#' '#' '#' +PLUS '+' '+' '+' '+' '+' '+' + diff --git a/emulator/keymaps/qwerty.kl b/emulator/keymaps/qwerty.kl new file mode 100644 index 000000000..692a4acc3 --- /dev/null +++ b/emulator/keymaps/qwerty.kl @@ -0,0 +1,91 @@ +key 399 GRAVE +key 2 1 +key 3 2 +key 4 3 +key 5 4 +key 6 5 +key 7 6 +key 8 7 +key 9 8 +key 10 9 +key 11 0 +key 158 BACK WAKE_DROPPED +key 230 SOFT_RIGHT WAKE +key 60 SOFT_RIGHT WAKE +key 107 ENDCALL WAKE_DROPPED +key 62 ENDCALL WAKE_DROPPED +key 229 MENU WAKE_DROPPED +key 139 MENU WAKE_DROPPED +key 59 MENU WAKE_DROPPED +key 127 SEARCH WAKE_DROPPED +key 217 SEARCH WAKE_DROPPED +key 228 POUND +key 227 STAR +key 231 CALL WAKE_DROPPED +key 61 CALL WAKE_DROPPED +key 232 DPAD_CENTER WAKE_DROPPED +key 108 DPAD_DOWN WAKE_DROPPED +key 103 DPAD_UP WAKE_DROPPED +key 102 HOME WAKE +key 105 DPAD_LEFT WAKE_DROPPED +key 106 DPAD_RIGHT WAKE_DROPPED +key 115 VOLUME_UP +key 114 VOLUME_DOWN +key 116 POWER WAKE +key 212 CAMERA + +key 16 Q +key 17 W +key 18 E +key 19 R +key 20 T +key 21 Y +key 22 U +key 23 I +key 24 O +key 25 P +key 26 LEFT_BRACKET +key 27 RIGHT_BRACKET +key 43 BACKSLASH + +key 30 A +key 31 S +key 32 D +key 33 F +key 34 G +key 35 H +key 36 J +key 37 K +key 38 L +key 39 SEMICOLON +key 40 APOSTROPHE +key 14 DEL + +key 44 Z +key 45 X +key 46 C +key 47 V +key 48 B +key 49 N +key 50 M +key 51 COMMA +key 52 PERIOD +key 53 SLASH +key 28 ENTER + +key 56 ALT_LEFT +key 100 ALT_RIGHT +key 42 SHIFT_LEFT +key 54 SHIFT_RIGHT +key 15 TAB +key 57 SPACE +key 150 EXPLORER +key 155 ENVELOPE + +key 12 MINUS +key 13 EQUALS +key 215 AT + +# On an AT keyboard: ESC, F10 +key 1 BACK WAKE_DROPPED +key 68 MENU WAKE_DROPPED diff --git a/emulator/keymaps/qwerty2.kcm b/emulator/keymaps/qwerty2.kcm new file mode 100644 index 000000000..1487fb70c --- /dev/null +++ b/emulator/keymaps/qwerty2.kcm @@ -0,0 +1,81 @@ +[type=QWERTY] + +# this keymap is to be used in the emulator only. note +# that I have liberally modified certain key strokes to +# make it more usable in this context. the main differences +# with the reference keyboard image are: +# +# - cap-2 produces '@', and not '"', without that, typing +# email addresses becomes a major pain with a qwerty +# keyboard. note that you can type '"' with fn-E anyway. +# +# - cap-COMMA and cap-PERIOD return '<' and '>', instead +# of nothing. +# +# + +# keycode display number base caps fn caps_fn + +A 'A' '2' 'a' 'A' 'a' 'A' +B 'B' '2' 'b' 'B' 'b' 'B' +C 'C' '2' 'c' 'C' 0x00e7 0x00E7 +D 'D' '3' 'd' 'D' ''' ''' +E 'E' '3' 'e' 'E' '"' 0x0301 +F 'F' '3' 'f' 'F' '[' '[' +G 'G' '4' 'g' 'G' ']' ']' +H 'H' '4' 'h' 'H' '<' '<' +I 'I' '4' 'i' 'I' '-' 0x0302 +J 'J' '5' 'j' 'J' '>' '>' +K 'K' '5' 'k' 'K' ';' '~' +L 'L' '5' 'l' 'L' ':' '`' +M 'M' '6' 'm' 'M' '%' 0x00 +N 'N' '6' 'n' 'N' 0x00 0x0303 +O 'O' '6' 'o' 'O' '+' '+' +P 'P' '7' 'p' 'P' '=' 0x00A5 +Q 'Q' '7' 'q' 'Q' '|' 0x0300 +R 'R' '7' 'r' 'R' '`' 0x20AC +S 'S' '7' 's' 'S' '\' 0x00DF +T 'T' '8' 't' 'T' '{' 0x00A3 +U 'U' '8' 'u' 'U' '_' 0x0308 +V 'V' '8' 'v' 'V' 'v' 'V' +W 'W' '9' 'w' 'W' '~' '~' +X 'X' '9' 'x' 'X' 'x' 0xEF00 +Y 'Y' '9' 'y' 'Y' '}' 0x00A1 +Z 'Z' '9' 'z' 'Z' 'z' 'Z' + +COMMA ',' ',' ',' '<' ',' ',' +PERIOD '.' '.' '.' '>' '.' 0x2026 +AT '@' '@' '@' '@' '@' 0x2022 +SLASH '/' '/' '/' '?' '?' '?' + +SPACE 0x20 0x20 0x20 0x20 0xEF01 0xEF01 +ENTER 0xa 0xa 0xa 0xa 0xa 0xa + +0 '0' '0' '0' ')' ')' ')' +1 '1' '1' '1' '!' '!' '!' +2 '2' '2' '2' '@' '@' '@' +3 '3' '3' '3' '#' '#' '#' +4 '4' '4' '4' '$' '$' '$' +5 '5' '5' '5' '%' '%' '%' +6 '6' '6' '6' '^' '^' '^' +7 '7' '7' '7' '&' '&' '&' +8 '8' '8' '8' '*' '*' '*' +9 '9' '9' '9' '(' '(' '(' + +# the rest is for a qwerty keyboard +# +TAB 0x9 0x9 0x9 0x9 0x9 0x9 +GRAVE '`' '`' '`' '~' '`' '~' +MINUS '-' '-' '-' '_' '-' '_' +EQUALS '=' '=' '=' '+' '=' '+' +LEFT_BRACKET '[' '[' '[' '{' '[' '{' +RIGHT_BRACKET ']' ']' ']' '}' ']' '}' +BACKSLASH '\' '\' '\' '|' '\' '|' +SEMICOLON ';' ';' ';' ':' ';' ':' +APOSTROPHE ''' ''' ''' '"' ''' '"' +STAR '*' '*' '*' '*' '*' '*' +POUND '#' '#' '#' '#' '#' '#' +PLUS '+' '+' '+' '+' '+' '+' + + + -- 2.11.0