From cc598311794f1c24306e411db472b6fe3e36fb39 Mon Sep 17 00:00:00 2001 From: David van Moolenbroek Date: Wed, 2 Oct 2013 13:37:49 +0200 Subject: [PATCH] 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 --- drivers/tty/keymaps/abnt2.src | 2 +- drivers/tty/keymaps/dvorak.src | 2 +- drivers/tty/keymaps/french.src | 2 +- drivers/tty/keymaps/german.src | 2 +- drivers/tty/keymaps/italian.src | 2 +- drivers/tty/keymaps/latin-america.src | 2 +- drivers/tty/keymaps/norwegian.src | 2 +- drivers/tty/keymaps/portuguese.src | 2 +- drivers/tty/keymaps/russian-cp1251.src | 2 +- drivers/tty/keymaps/russian-cp866.src | 2 +- drivers/tty/keymaps/russian.src | 2 +- drivers/tty/keymaps/scandinavian.src | 2 +- drivers/tty/keymaps/spanish.src | 2 +- drivers/tty/keymaps/ukraine-koi8-u.src | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/tty/keymaps/abnt2.src b/drivers/tty/keymaps/abnt2.src index b0d09b345..f5c7e792d 100644 --- 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 4a9c3bc2a..659d5942a 100644 --- 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 d6a2afb5a..2cc6c776d 100644 --- 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 a5239d1aa..93ddbf6bd 100644 --- 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 d7c9d4e80..5d4d550e8 100644 --- 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 aecceba5c..f208ca015 100644 --- 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 a8d63cb2d..f81b09472 100644 --- 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 d48978b24..c45bfc261 100644 --- 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 1a5a7735a..146557195 100755 --- 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 8032fa3c6..fd5120c1e 100644 --- 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 07fa345d7..ed6922e6e 100644 --- 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 a1ad2eb8e..868038245 100644 --- 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 0ba1b5a6c..2ccacadeb 100644 --- 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 e20c41cbf..9f03266dd 100755 --- 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 }, -- 2.44.0