keymaps: improve keypad slash support

Now that the keymaps can distinguish between the regular slash key
and the slash key on the numeric keypad, we can avoid localization
of the latter.

Change-Id: I20ead7d26a9baa82f5a522562524fd75d44efb42

diff --git a/drivers/tty/keymaps/abnt2.src b/drivers/tty/keymaps/abnt2.src
index b0d09b34535a3195a9423f7174ea505b8059d359..f5c7e792d2c0bf7f67e52a12b0e513f5839f6f24 100644 (file)
--- a/drivers/tty/keymaps/abnt2.src
+++ b/drivers/tty/keymaps/abnt2.src
@@ -79,7 +79,7 @@
    K(DOWN_ARROW)    = {        DOWN,   DOWN,   ADOWN,  ADOWN,  ADOWN,  CDOWN   },
    K(UP_ARROW)      = {        UP,     UP,     AUP,    AUP,    AUP,    CUP     },
    K(NUM_LOCK)      = {        NLOCK,  NLOCK,  NLOCK,  NLOCK,  NLOCK,  NLOCK   },
-   K(KP_SLASH)      = {        59,     59,     A(59),  A(58),  A(59),  C('@')  },
+   K(KP_SLASH)      = {        '/',    '/',    A('/'), A('/'), A('/'), C('@')  },
    K(KP_STAR)       = {        '*',    '*',    A('*'), A('*'), A('*'), C('@')  },
    K(KP_DASH)       = {        '-',    '-',    AMIN,   AMIN,   A('-'), CMIN    },
    K(KP_PLUS)       = {        '+',    '+',    APLUS,  APLUS,  A('+'), CPLUS   },

diff --git a/drivers/tty/keymaps/dvorak.src b/drivers/tty/keymaps/dvorak.src
index 4a9c3bc2af0124501b5bbafbcf7b99ca0a9eeeaf..659d5942ae0a4f8daeb837b0381e68e73645024e 100644 (file)
--- a/drivers/tty/keymaps/dvorak.src
+++ b/drivers/tty/keymaps/dvorak.src
@@ -82,7 +82,7 @@
    K(DOWN_ARROW)    = {        DOWN,   DOWN,   ADOWN,  ADOWN,  ADOWN,  CDOWN   },
    K(UP_ARROW)      = {        UP,     UP,     AUP,    AUP,    AUP,    CUP     },
    K(NUM_LOCK)      = {        NLOCK,  NLOCK,  NLOCK,  NLOCK,  NLOCK,  NLOCK   },
-   K(KP_SLASH)      = {        L('z'), L('z'), A('z'), A('z'), A('z'), C('Z')  },
+   K(KP_SLASH)      = {        '/',    '/',    A('/'), A('/'), A('/'), C('@')  },
    K(KP_STAR)       = {        '*',    '*',    A('*'), A('*'), A('*'), C('@')  },
    K(KP_DASH)       = {        '-',    '-',    AMIN,   AMIN,   A('-'), CMIN    },
    K(KP_PLUS)       = {        '+',    '+',    APLUS,  APLUS,  A('+'), CPLUS   },

diff --git a/drivers/tty/keymaps/french.src b/drivers/tty/keymaps/french.src
index d6a2afb5a14b9c9fc3136fa3c72d8bf180258df6..2cc6c776de80e48e82da7a95ab1f4ead9b5cf0e3 100644 (file)
--- a/drivers/tty/keymaps/french.src
+++ b/drivers/tty/keymaps/french.src
@@ -79,7 +79,7 @@
    K(DOWN_ARROW)    = {        DOWN,   DOWN,   ADOWN,  ADOWN,  ADOWN,  CDOWN   },
    K(UP_ARROW)      = {        UP,     UP,     AUP,    AUP,    AUP,    CUP     },
    K(NUM_LOCK)      = {        NLOCK,  NLOCK,  NLOCK,  NLOCK,  NLOCK,  NLOCK   },
-   K(KP_SLASH)      = {        '!',    '!',    A('!'), '!',    A('!'), C('@')  },
+   K(KP_SLASH)      = {        '/',    '/',    A('/'), A('/'), '/',    C('@')  },
    K(KP_STAR)       = {        '*',    '*',    A('*'), '*',    '*',    C('@')  },
    K(KP_DASH)       = {        '-',    '-',    AMIN,   AMIN,   '-',    CMIN    },
    K(KP_PLUS)       = {        '+',    '+',    APLUS,  APLUS,  '+',    CPLUS   },

diff --git a/drivers/tty/keymaps/german.src b/drivers/tty/keymaps/german.src
index a5239d1aaf5c5bae58f18bea25386c3d1dee6b95..93ddbf6bd2c5baf14e038cea95a573a62e471b10 100644 (file)
--- a/drivers/tty/keymaps/german.src
+++ b/drivers/tty/keymaps/german.src
@@ -79,7 +79,7 @@
    K(DOWN_ARROW)    = {        DOWN,   DOWN,   ADOWN,  ADOWN,  ADOWN,  CDOWN   },
    K(UP_ARROW)      = {        UP,     UP,     AUP,    AUP,    AUP,    CUP     },
    K(NUM_LOCK)      = {        NLOCK,  NLOCK,  NLOCK,  NLOCK,  NLOCK,  NLOCK   },
-   K(KP_SLASH)      = {        '-',    '-',    A('-'), '/',    A('-'), C('_')  },
+   K(KP_SLASH)      = {        '/',    '/',    A('/'), A('/'), '/',    C('@')  },
    K(KP_STAR)       = {        '*',    '*',    A('*'), '*',    '*',    C('@')  },
    K(KP_DASH)       = {        '-',    '-',    AMIN,   AMIN,   '-',    CMIN    },
    K(KP_PLUS)       = {        '+',    '+',    APLUS,  APLUS,  '+',    CPLUS   },

diff --git a/drivers/tty/keymaps/italian.src b/drivers/tty/keymaps/italian.src
index d7c9d4e808a396c281818c496745f897e016f08d..5d4d550e86b65530f1e30da8d793ac675dcbaaa5 100644 (file)
--- a/drivers/tty/keymaps/italian.src
+++ b/drivers/tty/keymaps/italian.src
@@ -81,7 +81,7 @@
    K(DOWN_ARROW)    = {        DOWN,   DOWN,   ADOWN,  ADOWN,  ADOWN,  CDOWN   },
    K(UP_ARROW)      = {        UP,     UP,     AUP,    AUP,    AUP,    CUP     },
    K(NUM_LOCK)      = {        NLOCK,  NLOCK,  NLOCK,  NLOCK,  NLOCK,  NLOCK   },
-   K(KP_SLASH)      = {        '-',    '-',    A('-'), '-',    A('-'), C('_')  },
+   K(KP_SLASH)      = {        '/',    '/',    A('/'), A('/'), '/',    C('@')  },
    K(KP_STAR)       = {        '*',    '*',    A('*'), '*',    '*',    C('M')  },
    K(KP_DASH)       = {        '-',    '-',    AMIN,   AMIN,   '-',    CMIN    },
    K(KP_PLUS)       = {        '+',    '+',    APLUS,  APLUS,  '+',    CPLUS   },

diff --git a/drivers/tty/keymaps/latin-america.src b/drivers/tty/keymaps/latin-america.src
index aecceba5c89a3038082b1e34f6ed2313ff74fac4..f208ca0156f1c6a8d3b2309b9d3e78ecec17af4a 100644 (file)
--- a/drivers/tty/keymaps/latin-america.src
+++ b/drivers/tty/keymaps/latin-america.src
@@ -93,7 +93,7 @@
    K(DOWN_ARROW)    = {        DOWN,   DOWN,   ADOWN,  ADOWN,  ADOWN,  CDOWN   },
    K(UP_ARROW)      = {        UP,     UP,     AUP,    AUP,    AUP,    CUP     },
    K(NUM_LOCK)      = {        NLOCK,  NLOCK,  NLOCK,  NLOCK,  NLOCK,  NLOCK   },
-   K(KP_SLASH)      = {        '-',    '-',    A('-'), A('-'), A('-'), C('@')  },
+   K(KP_SLASH)      = {        '/',    '/',    A('/'), A('/'), A('/'), C('@')  },
    K(KP_STAR)       = {        '*',    '*',    A('*'), A('*'), A('*'), C('@')  },
    K(KP_DASH)       = {        '-',    '-',    '-',    '-',    '-',    '-'     },
    K(KP_PLUS)       = {        '+',    '+',    '+',    '+',    '+',    '+'     },

diff --git a/drivers/tty/keymaps/norwegian.src b/drivers/tty/keymaps/norwegian.src
index a8d63cb2d9117f126cdf50c57f7dedb2b51b6a32..f81b09472135da78c5d794addee94639424245a8 100644 (file)
--- a/drivers/tty/keymaps/norwegian.src
+++ b/drivers/tty/keymaps/norwegian.src
@@ -82,7 +82,7 @@
    K(DOWN_ARROW)    = {        DOWN,   DOWN,   ADOWN,  ADOWN,  ADOWN,  CDOWN   },
    K(UP_ARROW)      = {        UP,     UP,     AUP,    AUP,    AUP,    CUP     },
    K(NUM_LOCK)      = {        NLOCK,  NLOCK,  NLOCK,  NLOCK,  NLOCK,  NLOCK   },
-   K(KP_SLASH)      = {        '-',    '-',    A('-'), '/',    A('-'), C('_')  },
+   K(KP_SLASH)      = {        '/',    '/',    A('/'), A('/'), '/',    C('/')  },
    K(KP_STAR)       = {        '*',    '*',    A('*'), '*',    '*',    C('@')  },
    K(KP_DASH)       = {        '-',    '-',    AMIN,   AMIN,   '-',    CMIN    },
    K(KP_PLUS)       = {        '+',    '+',    APLUS,  APLUS,  '+',    CPLUS   },

diff --git a/drivers/tty/keymaps/portuguese.src b/drivers/tty/keymaps/portuguese.src
index d48978b244cfd76d2aca3137d6ea923c5f671abf..c45bfc2618236e4c81add74ca4d8c162be0a029c 100644 (file)
--- a/drivers/tty/keymaps/portuguese.src
+++ b/drivers/tty/keymaps/portuguese.src
@@ -79,7 +79,7 @@
    K(DOWN_ARROW)    = {        DOWN,   DOWN,   ADOWN,  ADOWN,  ADOWN,  CDOWN   },
    K(UP_ARROW)      = {        UP,     UP,     AUP,    AUP,    AUP,    CUP     },
    K(NUM_LOCK)      = {        NLOCK,  NLOCK,  NLOCK,  NLOCK,  NLOCK,  NLOCK   },
-   K(KP_SLASH)      = {        '-',    '-',    '-'   , '-',    '-'   , C('@')  },
+   K(KP_SLASH)      = {        '/',    '/',    A('/'), A('/'), '/',    C('@')  },
    K(KP_STAR)       = {        '*',    '*',    A('*'), '*',    '*',    C('M')  },
    K(KP_DASH)       = {        '-',    '-',    AMIN,   AMIN,   '-',    CMIN    },
    K(KP_PLUS)       = {        '+',    '+',    APLUS,  APLUS,  '+',    CPLUS   },

diff --git a/drivers/tty/keymaps/russian-cp1251.src b/drivers/tty/keymaps/russian-cp1251.src
index 1a5a7735a670d5dfb13fea6ab1cdab59729df766..146557195e942bc8cce3a883358fbe33aead2b2f 100755 (executable)
--- a/drivers/tty/keymaps/russian-cp1251.src
+++ b/drivers/tty/keymaps/russian-cp1251.src
@@ -84,7 +84,7 @@
    K(DOWN_ARROW)    = {        DOWN,   DOWN,   ADOWN,  ADOWN,  ADOWN,  CDOWN   },
    K(UP_ARROW)      = {        UP,     UP,     AUP,    AUP,    AUP,    CUP     },
    K(NUM_LOCK)      = {        NLOCK,  NLOCK,  NLOCK,  NLOCK,  NLOCK,  NLOCK   },
-   K(KP_SLASH)      = {        '/',    '/',    A(46),  A('/'), A(46),  C('@')  },
+   K(KP_SLASH)      = {        '/',    '/',    A('/'), A('/'), A('/'), C('@')  },
    K(KP_STAR)       = {        '*',    '*',    A('*'), A('*'), A('*'), C('@')  },
    K(KP_DASH)       = {        '-',    '-',    AMIN,   AMIN,   A('-'), CMIN    },
    K(KP_PLUS)       = {        '+',    '+',    APLUS,  APLUS,  A('+'), CPLUS   },

diff --git a/drivers/tty/keymaps/russian-cp866.src b/drivers/tty/keymaps/russian-cp866.src
index 8032fa3c6d78f7bd29630dfb6d0c66e71d4431b0..fd5120c1ea720befa4e4f96fa018cafe3eee2804 100644 (file)
--- a/drivers/tty/keymaps/russian-cp866.src
+++ b/drivers/tty/keymaps/russian-cp866.src
@@ -83,7 +83,7 @@
    K(DOWN_ARROW)    = {        DOWN,   DOWN,   DOWN,   ADOWN,  DOWN,   CDOWN   },
    K(UP_ARROW)      = {        UP,     UP,     UP,     AUP,    UP,     CUP     },
    K(NUM_LOCK)      = {        NLOCK,  NLOCK,  NLOCK,  NLOCK,  NLOCK,  NLOCK   },
-   K(KP_SLASH)      = {        '/',    '/',    '.',    A('/'), '.',    C('@')  },
+   K(KP_SLASH)      = {        '/',    '/',    A('/'), A('/'), '/',    C('@')  },
    K(KP_STAR)       = {        '*',    '*',    '*',    A('*'), '*',    C('@')  },
    K(KP_DASH)       = {        '-',    '-',    '-',    AMIN,   '-',    CMIN    },
    K(KP_PLUS)       = {        '+',    '+',    '+',    APLUS,  '+',    CPLUS   },

diff --git a/drivers/tty/keymaps/russian.src b/drivers/tty/keymaps/russian.src
index 07fa345d7209f232b5b3fdb1cb165309cf973ec9..ed6922e6efcd070aadee0866618636489363bf19 100644 (file)
--- a/drivers/tty/keymaps/russian.src
+++ b/drivers/tty/keymaps/russian.src
@@ -83,7 +83,7 @@
    K(DOWN_ARROW)    = {        DOWN,   DOWN,   DOWN,   ADOWN,  DOWN,   CDOWN   },
    K(UP_ARROW)      = {        UP,     UP,     UP,     AUP,    UP,     CUP     },
    K(NUM_LOCK)      = {        NLOCK,  NLOCK,  NLOCK,  NLOCK,  NLOCK,  NLOCK   },
-   K(KP_SLASH)      = {        '/',    '/',    '.',    A('/'), '.',    C('@')  },
+   K(KP_SLASH)      = {        '/',    '/',    '/',    A('/'), '/',    C('@')  },
    K(KP_STAR)       = {        '*',    '*',    '*',    A('*'), '*',    C('@')  },
    K(KP_DASH)       = {        '-',    '-',    '-',    AMIN,   '-',    CMIN    },
    K(KP_PLUS)       = {        '+',    '+',    '+',    APLUS,  '+',    CPLUS   },

diff --git a/drivers/tty/keymaps/scandinavian.src b/drivers/tty/keymaps/scandinavian.src
index a1ad2eb8e0a494253134475e3c392fb5e3d0e7bc..868038245ea8d5fe2ff9f65804a3b082699ace26 100644 (file)
--- a/drivers/tty/keymaps/scandinavian.src
+++ b/drivers/tty/keymaps/scandinavian.src
@@ -82,7 +82,7 @@
    K(DOWN_ARROW)    = {        DOWN,   DOWN,   ADOWN,  ADOWN,  ADOWN,  CDOWN   },
    K(UP_ARROW)      = {        UP,     UP,     AUP,    AUP,    AUP,    CUP     },
    K(NUM_LOCK)      = {        NLOCK,  NLOCK,  NLOCK,  NLOCK,  NLOCK,  NLOCK   },
-   K(KP_SLASH)      = {        '-',    '-',    A('-'), '/',    A('-'), C('_')  },
+   K(KP_SLASH)      = {        '/',    '/',    A('/'), A('/'), '/',    C('@')  },
    K(KP_STAR)       = {        '*',    '*',    A('*'), '*',    '*',    C('@')  },
    K(KP_DASH)       = {        '-',    '-',    AMIN,   AMIN,   '-',    CMIN    },
    K(KP_PLUS)       = {        '+',    '+',    APLUS,  APLUS,  '+',    CPLUS   },

diff --git a/drivers/tty/keymaps/spanish.src b/drivers/tty/keymaps/spanish.src
index 0ba1b5a6c1046a033419dc1e41c00cc7971269ea..2ccacadebe521b7efd93ec0724e1033773279cee 100644 (file)
--- a/drivers/tty/keymaps/spanish.src
+++ b/drivers/tty/keymaps/spanish.src
@@ -80,7 +80,7 @@
    K(DOWN_ARROW)    = {        DOWN,   DOWN,   ADOWN,  ADOWN,  ADOWN,  CDOWN   },
    K(UP_ARROW)      = {        UP,     UP,     AUP,    AUP,    AUP,    CUP     },
    K(NUM_LOCK)      = {        NLOCK,  NLOCK,  NLOCK,  NLOCK,  NLOCK,  C('S')  },
-   K(KP_SLASH)      = {        '-',    '-',    A('-'), '-',    A('-'), C('_')  },
+   K(KP_SLASH)      = {        '/',    '/',    A('/'), A('/'), '/',    C('@')  },
    K(KP_STAR)       = {        '*',    '*',    A('*'), '*',    '*',    C('M')  },
    K(KP_DASH)       = {        '-',    '-',    AMIN,   AMIN,   '-',    CMIN    },
    K(KP_PLUS)       = {        '+',    '+',    APLUS,  APLUS,  '+',    CPLUS   },

diff --git a/drivers/tty/keymaps/ukraine-koi8-u.src b/drivers/tty/keymaps/ukraine-koi8-u.src
index e20c41cbf5f2610a4c95d59ff7ed2a3e7183a54a..9f03266dd4209e84548a74306577c41666ddbd24 100755 (executable)
--- a/drivers/tty/keymaps/ukraine-koi8-u.src
+++ b/drivers/tty/keymaps/ukraine-koi8-u.src
@@ -83,7 +83,7 @@
    K(DOWN_ARROW)    = {        DOWN,   DOWN,   DOWN,   ADOWN,  DOWN,   CDOWN   },
    K(UP_ARROW)      = {        UP,     UP,     UP,     AUP,    UP,     CUP     },
    K(NUM_LOCK)      = {        NLOCK,  NLOCK,  NLOCK,  NLOCK,  NLOCK,  NLOCK   },
-   K(KP_SLASH)      = {        '/',    '/',    '.',    A('/'), '.',    C('@')  },
+   K(KP_SLASH)      = {        '/',    '/',    '/',    A('/'), '/',    C('@')  },
    K(KP_STAR)       = {        '*',    '*',    '*',    A('*'), '*',    C('@')  },
    K(KP_DASH)       = {        '-',    '-',    '-',    AMIN,   '-',    CMIN    },
    K(KP_PLUS)       = {        '+',    '+',    '+',    APLUS,  '+',    CPLUS   },