keymaps: refine keyboard layouts

* add missed Fn keys
* add Japanese layout
* use ISO 639-1 language codes

diff --git a/keymaps/de.kl b/keymaps/de.kl
index 8eb1a30..b52527b 100644 (file)
--- a/keymaps/de.kl
+++ b/keymaps/de.kl
@@ -1,4 +1,4 @@
-key 41   GRAVE
+key 41    GRAVE
 key 2     1
 key 3     2
 key 4     3
@@ -27,11 +27,14 @@ key 103   DPAD_UP           WAKE_DROPPED
 key 125   HOME              WAKE
 key 105   DPAD_LEFT         WAKE_DROPPED
 key 106   DPAD_RIGHT        WAKE_DROPPED
-key 115   VOLUME_UP
+key 113   VOLUME_MUTE
 key 114   VOLUME_DOWN
+key 115   VOLUME_UP
 key 116   POWER             WAKE
 key 211   FOCUS
 key 212   CAMERA
+key 238   WIFI
+key 142   SLEEP
 
 key 16    Q
 key 17    W

diff --git a/keymaps/spanish_latin.kcm b/keymaps/es_latin.kcm
similarity index 100%
rename from keymaps/spanish_latin.kcm
rename to keymaps/es_latin.kcm

diff --git a/keymaps/spanish_latin.kl b/keymaps/es_latin.kl
similarity index 96%
rename from keymaps/spanish_latin.kl
rename to keymaps/es_latin.kl
index 62aec28..c249e3f 100644 (file)
--- a/keymaps/spanish_latin.kl
+++ b/keymaps/es_latin.kl
@@ -1,4 +1,4 @@
-key 41   GRAVE
+key 41    GRAVE
 key 2     1
 key 3     2
 key 4     3
@@ -27,11 +27,14 @@ key 103   DPAD_UP           WAKE_DROPPED
 key 125   HOME              WAKE
 key 105   DPAD_LEFT         WAKE_DROPPED
 key 106   DPAD_RIGHT        WAKE_DROPPED
-key 115   VOLUME_UP
+key 113   VOLUME_MUTE
 key 114   VOLUME_DOWN
+key 115   VOLUME_UP
 key 116   POWER             WAKE
 key 211   FOCUS
 key 212   CAMERA
+key 238   WIFI
+key 142   SLEEP
 
 key 16    Q
 key 17    W

diff --git a/keymaps/fn.kl b/keymaps/fn.kl
index 62aec28..c249e3f 100644 (file)
--- a/keymaps/fn.kl
+++ b/keymaps/fn.kl
@@ -1,4 +1,4 @@
-key 41   GRAVE
+key 41    GRAVE
 key 2     1
 key 3     2
 key 4     3
@@ -27,11 +27,14 @@ key 103   DPAD_UP           WAKE_DROPPED
 key 125   HOME              WAKE
 key 105   DPAD_LEFT         WAKE_DROPPED
 key 106   DPAD_RIGHT        WAKE_DROPPED
-key 115   VOLUME_UP
+key 113   VOLUME_MUTE
 key 114   VOLUME_DOWN
+key 115   VOLUME_UP
 key 116   POWER             WAKE
 key 211   FOCUS
 key 212   CAMERA
+key 238   WIFI
+key 142   SLEEP
 
 key 16    Q
 key 17    W

diff --git a/keymaps/fr.kl b/keymaps/fr.kl
index 7315b47..9027969 100644 (file)
--- a/keymaps/fr.kl
+++ b/keymaps/fr.kl
@@ -1,4 +1,4 @@
-key 41   GRAVE
+key 41    GRAVE
 key 2     1
 key 3     2
 key 4     3
@@ -27,11 +27,14 @@ key 103   DPAD_UP           WAKE_DROPPED
 key 125   HOME              WAKE
 key 105   DPAD_LEFT         WAKE_DROPPED
 key 106   DPAD_RIGHT        WAKE_DROPPED
-key 115   VOLUME_UP
+key 113   VOLUME_MUTE
 key 114   VOLUME_DOWN
+key 115   VOLUME_UP
 key 116   POWER             WAKE
 key 211   FOCUS
 key 212   CAMERA
+key 238   WIFI
+key 142   SLEEP
 
 key 16    A
 key 17    Z

diff --git a/keymaps/jp.kcm b/keymaps/jp.kcm
new file mode 100644 (file)
index 0000000..a69c4b0
--- /dev/null
+++ b/keymaps/jp.kcm
@@ -0,0 +1,63 @@
+[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
+SLASH           '/'     '/'     '/'     '?'     '?'     '\'
+
+SPACE           0x20    0x20    0x20    0x20    0x9     0x9
+ENTER           0xa     0xa     0xa     0xa     0xa     0xa
+
+TAB             0x9     0x9     0x9     0x9     0x9     0x9
+0               '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          '^'     '^'     '^'     '~'     '^'     '+'
+AT              '@'     '@'     '@'     '`'     '@'     '@'
+LEFT_BRACKET    '['     '['     '['     '{'     '['     '{'
+RIGHT_BRACKET   ']'     ']'     ']'     '}'     ']'     '|'
+SEMICOLON       ';'     ';'     ';'     '+'     ';'     ':'
+STAR            ':'     ':'     ':'     '*'     ':'     ':'
+POUND           '#'     '#'     '#'     '#'     '#'     '#'
+BACKSLASH       '\'     '\'     '\'     '_'     '\'     '\'
+PLUS            '+'     '+'     '+'     '+'     '+'     '+'
+MORE_KEY        0xA5    0xA5    0xA5    '|'     0xA5    0xA5

diff --git a/keymaps/jp.kl b/keymaps/jp.kl
new file mode 100644 (file)
index 0000000..9584913
--- /dev/null
+++ b/keymaps/jp.kl
@@ -0,0 +1,102 @@
+key 41    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 1     BACK              WAKE_DROPPED
+key 230   SOFT_RIGHT        WAKE
+key 60    SOFT_RIGHT        WAKE
+key 107   ENDCALL           WAKE_DROPPED
+key 62    ENDCALL           WAKE_DROPPED
+key 64    ENDCALL           WAKE_DROPPED
+key 127   MENU         WAKE_DROPPED
+key 139   MENU         WAKE_DROPPED
+key 228   POUND
+key 227   STAR
+key 231   CALL              WAKE_DROPPED
+key 61    CALL              WAKE_DROPPED
+key 221   DPAD_CENTER       WAKE_DROPPED
+key 108   DPAD_DOWN         WAKE_DROPPED
+key 103   DPAD_UP           WAKE_DROPPED
+key 125   HOME              WAKE
+key 105   DPAD_LEFT         WAKE_DROPPED
+key 106   DPAD_RIGHT        WAKE_DROPPED
+
+key 113   VOLUME_MUTE
+key 114   VOLUME_DOWN
+key 115   VOLUME_UP
+key 116   POWER             WAKE
+key 211   FOCUS
+key 212   CAMERA
+key 238   WIFI
+key 142   SLEEP
+
+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    AT
+key 27    LEFT_BRACKET
+key 43    RIGHT_BRACKET
+
+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    STAR
+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 89    BACKSLASH
+key 28    ENTER
+
+key 56    ALT_LEFT
+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
+
+key 75    BACK              WAKE_DROPPED
+key 77    SOFT_RIGHT        WAKE
+key 96    ENTER
+key 100   ALT_RIGHT
+key 102   HOME              WAKE
+key 104   PAGE_UP
+key 109   PAGE_DOWN
+key 29    CTRL_LEFT
+key 97    CTRL_RIGHT
+key 58    CAPS_LOCK         CAPS_LOCK
+key 124   MORE_KEY

diff --git a/keymaps/qwerty.kl b/keymaps/qwerty.kl
index 64ee501..a150ab1 100644 (file)
--- a/keymaps/qwerty.kl
+++ b/keymaps/qwerty.kl
@@ -28,9 +28,9 @@ key 125   HOME              WAKE
 key 105   DPAD_LEFT         WAKE_DROPPED
 key 106   DPAD_RIGHT        WAKE_DROPPED
 
-key 115   VOLUME_UP
-key 114   VOLUME_DOWN
 key 113   VOLUME_MUTE
+key 114   VOLUME_DOWN
+key 115   VOLUME_UP
 key 116   POWER             WAKE
 key 211   FOCUS
 key 212   CAMERA
@@ -98,5 +98,3 @@ key 109   PAGE_DOWN
 key 29    CTRL_LEFT
 key 97    CTRL_RIGHT
 key 58    CAPS_LOCK         CAPS_LOCK
-
-

diff --git a/keymaps/ru.kl b/keymaps/ru.kl
index 62aec28..c249e3f 100644 (file)
--- a/keymaps/ru.kl
+++ b/keymaps/ru.kl
@@ -1,4 +1,4 @@
-key 41   GRAVE
+key 41    GRAVE
 key 2     1
 key 3     2
 key 4     3
@@ -27,11 +27,14 @@ key 103   DPAD_UP           WAKE_DROPPED
 key 125   HOME              WAKE
 key 105   DPAD_LEFT         WAKE_DROPPED
 key 106   DPAD_RIGHT        WAKE_DROPPED
-key 115   VOLUME_UP
+key 113   VOLUME_MUTE
 key 114   VOLUME_DOWN
+key 115   VOLUME_UP
 key 116   POWER             WAKE
 key 211   FOCUS
 key 212   CAMERA
+key 238   WIFI
+key 142   SLEEP
 
 key 16    Q
 key 17    W

diff --git a/keymaps/Ireland.kcm b/keymaps/uk.kcm
similarity index 100%
rename from keymaps/Ireland.kcm
rename to keymaps/uk.kcm

diff --git a/keymaps/Ireland.kl b/keymaps/uk.kl
similarity index 96%
rename from keymaps/Ireland.kl
rename to keymaps/uk.kl
index 8eb1a30..b52527b 100644 (file)
--- a/keymaps/Ireland.kl
+++ b/keymaps/uk.kl
@@ -1,4 +1,4 @@
-key 41   GRAVE
+key 41    GRAVE
 key 2     1
 key 3     2
 key 4     3
@@ -27,11 +27,14 @@ key 103   DPAD_UP           WAKE_DROPPED
 key 125   HOME              WAKE
 key 105   DPAD_LEFT         WAKE_DROPPED
 key 106   DPAD_RIGHT        WAKE_DROPPED
-key 115   VOLUME_UP
+key 113   VOLUME_MUTE
 key 114   VOLUME_DOWN
+key 115   VOLUME_UP
 key 116   POWER             WAKE
 key 211   FOCUS
 key 212   CAMERA
+key 238   WIFI
+key 142   SLEEP
 
 key 16    Q
 key 17    W