Spanish keymap with tilde

and several small changes in keymaps, like cleaner
support for extended keypresses (those preceded with E0)

diff --git a/drivers/tty/keymaps/spanish.src b/drivers/tty/keymaps/spanish.src
index 2404e40dabf8c754433599ee2bf08da8e17ef8c0..ed66aa53799bfc823411139a3ab51cd10d809a82 100644 (file)
--- a/drivers/tty/keymaps/spanish.src
+++ b/drivers/tty/keymaps/spanish.src
@@ -10,14 +10,14 @@
 /* 02 - '1'    */      '1',    '!',    A('1'), '|',    '!',    C('A'),
 /* 03 - '2'    */      '2',    '"',    A('2'), '@',    '"',    C('@'),
 /* 04 - '3'    */      '3',    0372,   A('3'), '#',    0372,   C('C'),
-/* 05 - '4'    */      '4',    '$',    A('4'), '4',    '$',    C('D'),
-/* 06 - '5'    */      '5',    '%',    A('5'), '5',    '%',    C('E'),
-/* 07 - '6'    */      '6',    '&',    A('6'), 0252,   '&',    C('F'),
+/* 05 - '4'    */      '4',    '$',    A('4'), '~',    '$',    C('D'),
+/* 06 - '5'    */      '5',    '%',    A('5'), 0317,   '%',    C('E'),
+/* 07 - '6'    */      '6',    '&',    A('6'), 0252,   '&',    C('^'),
 /* 08 - '7'    */      '7',    '/',    A('7'), '{',    '/',    C('G'),
 /* 09 - '8'    */      '8',    '(',    A('8'), '(',    '(',    C('H'),
 /* 10 - '9'    */      '9',    ')',    A('9'), ')',    ')',    C('I'),
-/* 11 - '0'    */      '0',    '=',    A('0'), '=',    '=',    C('@'),
-/* 12 - '-'    */      '\'',   '?',    A('\''),'?',    '?',    C('_'),
+/* 11 - '0'    */      '0',    '=',    A('0'), '=',    '=',    C('_'),
+/* 12 - '-'    */      '\'',   '?',    A('\''),'?',    '?',    C('^'),
 /* 13 - '='    */      0255,   0250,   A(0255),0250,   0250,   C('@'),
 /* 14 - BS     */      C('H'), C('H'), CA('H'),C('H'), C('H'), 0177,   
 /* 15 - TAB    */      C('I'), C('I'), CA('I'),C('I'), C('I'), C('I'),
@@ -45,10 +45,10 @@
 /* 37 - 'k'    */      L('k'), 'K',    A('k'), 'k',    'K',    C('K'),
 /* 38 - 'l'    */      L('l'), 'L',    A('l'), 'l',    'L',    C('L'),
 /* 39 - ';'    */      L(0244),0245,   A(0244),0244,   0245,   C('@'),
-/* 40 - '\''   */      '\'',   '"',    A('\''),'{',    '"',    C('@'),
-/* 41 - '`'    */      0247,   0246,   A(0247),'\\',   0246,   C('@'),
+/* 40 - '\''   */      '\'',   '"',    A('\''),'{',    '"',    C('['),
+/* 41 - '`'    */      0247,   0246,   A(0247),'\\',   0246,   C('\\'),
 /* 42 - l. SHIFT*/     SHIFT,  SHIFT,  SHIFT,  SHIFT,  SHIFT,  SHIFT,
-/* 43 - '\\'   */      L(0207),0200,   A(0207),'}',    0200,   C('@'),
+/* 43 - '\\'   */      L(0207),0200,   A(0207),'}',    0200,   C(']'),
 /* 44 - 'z'    */      L('z'), 'Z',    A('z'), 'z',    'Z',    C('Z'),
 /* 45 - 'x'    */      L('x'), 'X',    A('x'), 'x',    'X',    C('X'),
 /* 46 - 'c'    */      L('c'), 'C',    A('c'), 'c',    'C',    C('C'),
@@ -58,7 +58,7 @@
 /* 50 - 'm'    */      L('m'), 'M',    A('m'), 'm',    'M',    C('M'),
 /* 51 - ','    */      ',',    ';',    A(','), ',',    ';',    C('@'),
 /* 52 - '.'    */      '.',    ':',    A('.'), '.',    ':',    C('@'),
-/* 53 - '/'    */      '-',    '_',    A('-'), '-',    '_',    C('@'),
+/* 53 - '/'    */      '-',    '_',    A('-'), '-',    '_',    C('_'),
 /* 54 - r. SHIFT*/     SHIFT,  SHIFT,  SHIFT,  SHIFT,  SHIFT,  SHIFT,
 /* 55 - '*'    */      '*',    '*',    A('*'), '*',    '*',    C('M'),
 /* 56 - ALT    */      ALT,    ALT,    ALT,    ALT,    ALT,    ALT,
@@ -74,8 +74,8 @@
 /* 66 - F8     */      F8,     SF8,    AF8,    AF8,    ASF8,   CF8,
 /* 67 - F9     */      F9,     SF9,    AF9,    AF9,    ASF9,   CF9,
 /* 68 - F10    */      F10,    SF10,   AF10,   AF10,   ASF10,  CF10,
-/* 69 - NumLock        */      NLOCK,  NLOCK,  NLOCK,  NLOCK,  NLOCK,  NLOCK,
-/* 70 - ScrLock */     SLOCK,  SLOCK,  SLOCK,  SLOCK,  SLOCK,  SLOCK,
+/* 69 - NumLock        */      NLOCK,  NLOCK,  NLOCK,  NLOCK,  NLOCK,  C('S'),
+/* 70 - ScrLock */     SLOCK,  SLOCK,  SLOCK,  SLOCK,  SLOCK,  C('C'),
 /* 71 - Home   */      HOME,   '7',    AHOME,  AHOME,  '7',    CHOME,  
 /* 72 - CurUp  */      UP,     '8',    AUP,    AUP,    '8',    CUP,
 /* 73 - PgUp   */      PGUP,   '9',    APGUP,  APGUP,  '9',    CPGUP,
@@ -89,9 +89,9 @@
 /* 81 - PgDown */      PGDN,   '3',    APGDN,  APGDN,  '3',    CPGDN,
 /* 82 - Insert */      INSRT,  '0',    AINSRT, AINSRT, '0',    CINSRT,
 /* 83 - Delete */      0177,   '.',    A(0177),0177,   '.',    0177,
-/* 84 - Enter  */      C('M'), C('M'), CA('M'),C('M'), C('M'), C('J'),
+/* 84 - Enter? SysRq?*/        C('M'), C('M'), CA('M'),C('M'), C('M'), C('J'),
 /* 85 - ???    */      0,      0,      0,      0,      0,      0,
-/* 86 - ???    */      '<',    '>',    A('<'), '<',    '>',    C('@'),
+/* 86 - ???    */      '<',    '>',    A('<'), '<',    '>',    C('\\'),
 /* 87 - F11    */      F11,    SF11,   AF11,   AF11,   ASF11,  CF11,
 /* 88 - F12    */      F12,    SF12,   AF12,   AF12,   ASF12,  CF12,
 /* 89 - ???    */      0,      0,      0,      0,      0,      0,

diff --git a/drivers/tty/keymaps/us-std-esc.src b/drivers/tty/keymaps/us-std-esc.src
index f8b63685ef07af636501de368a57705477dafa67..c83a7fb6da9e37bb6d69ec3ee73e7df1419e2f40 100644 (file)
--- a/drivers/tty/keymaps/us-std-esc.src
+++ b/drivers/tty/keymaps/us-std-esc.src
@@ -71,8 +71,8 @@
 /* 66 - F8     */      F8,     SF8,    AF8,    AF8,    ASF8,   CF8,
 /* 67 - F9     */      F9,     SF9,    AF9,    AF9,    ASF9,   CF9,
 /* 68 - F10    */      F10,    SF10,   AF10,   AF10,   ASF10,  CF10,
-/* 69 - NumLock        */      0,      0,      0,      0,      0,      0,
-/* 70 - ScrLock */     0,      0,      0,      0,      0,      0,
+/* 69 - NumLock        */      0,      0,      0,      0,      0,      C('S'),
+/* 70 - ScrLock */     0,      0,      0,      0,      0,      C('C'),
 /* 71 - Home   */      HOME,   '7',    AHOME,  AHOME,  A('7'), CHOME,  
 /* 72 - CurUp  */      UP,     '8',    AUP,    AUP,    A('8'), CUP,
 /* 73 - PgUp   */      PGUP,   '9',    APGUP,  APGUP,  A('9'), CPGUP,
@@ -93,24 +93,24 @@
 /* 88 - F12    */      F12,    SF12,   AF12,   AF12,   ASF12,  CF12,
 /* 89 - ???    */      0,      0,      0,      0,      0,      0,
 /* 90 - ???    */      0,      0,      0,      0,      0,      0,
-/* 91 - ???    */      0,      0,      0,      0,      0,      0,
-/* 92 - ???    */      0,      0,      0,      0,      0,      0,
-/* 93 - ???    */      0,      0,      0,      0,      0,      0,
-/* 94 - ???    */      0,      0,      0,      0,      0,      0,
-/* 95 - ???    */      0,      0,      0,      0,      0,      0,
+/* 91 - LGUI   */      LEFT,   '<',    ALEFT,  ALEFT,  A('<'), CLEFT,
+/* 92 - RGUI   */      RIGHT,  '>',    ARIGHT, ARIGHT, A('>'), ARIGHT,
+/* 93 - MENU   */      C('M'), C('M'), CA('M'),CA('M'),CA('M'),C('J'),
+/* 94 - Power  */      0,      0,      0,      0,      0,      0,
+/* 95 - Sleep  */      0,      0,      0,      0,      0,      0,
 /* 96 - EXT_KEY        */      EXTKEY, EXTKEY, EXTKEY, EXTKEY, EXTKEY, EXTKEY,
 /* 97 - ???    */      0,      0,      0,      0,      0,      0,
 /* 98 - ???    */      0,      0,      0,      0,      0,      0,
-/* 99 - ???    */      0,      0,      0,      0,      0,      0,
+/* 99 - Make   */      0,      0,      0,      0,      0,      0,
 /*100 - ???    */      0,      0,      0,      0,      0,      0,
-/*101 - ???    */      0,      0,      0,      0,      0,      0,
-/*102 - ???    */      0,      0,      0,      0,      0,      0,
+/*101 - SRCH   */      0,      0,      0,      0,      0,      0,
+/*102 - FAV    */      0,      0,      0,      0,      0,      0,
 /*103 - ???    */      0,      0,      0,      0,      0,      0,
-/*104 - ???    */      0,      0,      0,      0,      0,      0,
-/*105 - ???    */      0,      0,      0,      0,      0,      0,
-/*106 - ???    */      0,      0,      0,      0,      0,      0,
-/*107 - ???    */      0,      0,      0,      0,      0,      0,
-/*108 - ???    */      0,      0,      0,      0,      0,      0,
+/*104 - STOP   */      0,      0,      0,      0,      0,      0,
+/*105 - FWD    */      0,      0,      0,      0,      0,      0,
+/*106 - BACK   */      0,      0,      0,      0,      0,      0,
+/*107 - MyComp */      0,      0,      0,      0,      0,      0,
+/*108 - MAIL   */      0,      0,      0,      0,      0,      0,
 /*109 - ???    */      0,      0,      0,      0,      0,      0,
 /*110 - ???    */      0,      0,      0,      0,      0,      0,
 /*111 - ???    */      0,      0,      0,      0,      0,      0,