summaryrefslogtreecommitdiffstats
path: root/src/hci/keymap
diff options
context:
space:
mode:
authorMichael Brown2011-03-16 22:31:16 +0100
committerMichael Brown2011-03-16 22:43:56 +0100
commit48624cf94ab6ece5759ab71ad40c7e69f6430c23 (patch)
tree16eef504fdb3dda83177873b3227142e3438dec0 /src/hci/keymap
parent[uri] Avoid unused variable warning in gcc 4.6 (diff)
downloadipxe-48624cf94ab6ece5759ab71ad40c7e69f6430c23.tar.gz
ipxe-48624cf94ab6ece5759ab71ad40c7e69f6430c23.tar.xz
ipxe-48624cf94ab6ece5759ab71ad40c7e69f6430c23.zip
[console] Try to avoid problems caused by keycode 86
The "us" keyboard layout contains a mapping for keycode 86 (which seems not to correspond to any physical key on many US keyboards) to the ASCII character '<'. This mapping causes conflicts with the mapping for keycode 51, which also maps (with shift) to '<'. Change the keyboard mapping generator to choose the lowest keycode for each ASCII character as indicating the relevant mapping to use, on the basis that a lower keycode roughly indicates a "more normal" key. On a German keyboard, which has keys for both keycode 51 and keycode 86 present, this causes '<' to be remapped to ';', which is a closer match to typical user expectations. Reported-by: Sven Dreyer <sven@dreyer-net.de> Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/hci/keymap')
-rw-r--r--src/hci/keymap/keymap_al.c1
-rw-r--r--src/hci/keymap/keymap_cz.c2
-rw-r--r--src/hci/keymap/keymap_de.c1
-rw-r--r--src/hci/keymap/keymap_dk.c1
-rw-r--r--src/hci/keymap/keymap_es.c1
-rw-r--r--src/hci/keymap/keymap_et.c2
-rw-r--r--src/hci/keymap/keymap_fi.c1
-rw-r--r--src/hci/keymap/keymap_fr.c1
-rw-r--r--src/hci/keymap/keymap_it.c1
-rw-r--r--src/hci/keymap/keymap_lt.c1
-rw-r--r--src/hci/keymap/keymap_mt.c1
-rw-r--r--src/hci/keymap/keymap_nl.c2
-rw-r--r--src/hci/keymap/keymap_sg.c1
-rw-r--r--src/hci/keymap/keymap_sr.c1
-rw-r--r--src/hci/keymap/keymap_th.c1
-rw-r--r--src/hci/keymap/keymap_ua.c1
-rw-r--r--src/hci/keymap/keymap_uk.c1
-rw-r--r--src/hci/keymap/keymap_wo.c1
18 files changed, 14 insertions, 7 deletions
diff --git a/src/hci/keymap/keymap_al.c b/src/hci/keymap/keymap_al.c
index bb488593..caf295e8 100644
--- a/src/hci/keymap/keymap_al.c
+++ b/src/hci/keymap/keymap_al.c
@@ -16,6 +16,7 @@ struct key_mapping al_mapping[] __keymap = {
{ 0x1a, 0x19 }, /* Ctrl-Z => Ctrl-Y */
{ 0x22, 0x7b }, /* '"' => '{' */
{ 0x27, 0x5b }, /* '\'' => '[' */
+ { 0x3c, 0x3b }, /* '<' => ';' */
{ 0x3e, 0x3a }, /* '>' => ':' */
{ 0x40, 0x22 }, /* '@' => '"' */
{ 0x59, 0x5a }, /* 'Y' => 'Z' */
diff --git a/src/hci/keymap/keymap_cz.c b/src/hci/keymap/keymap_cz.c
index c2019780..9280f84f 100644
--- a/src/hci/keymap/keymap_cz.c
+++ b/src/hci/keymap/keymap_cz.c
@@ -16,7 +16,7 @@ struct key_mapping cz_mapping[] __keymap = {
{ 0x2d, 0x3d }, /* '-' => '=' */
{ 0x2f, 0x2d }, /* '/' => '-' */
{ 0x31, 0x2b }, /* '1' => '+' */
- { 0x3c, 0x5c }, /* '<' => '\\' */
+ { 0x3c, 0x2c }, /* '<' => ',' */
{ 0x3e, 0x2e }, /* '>' => '.' */
{ 0x3f, 0x2d }, /* '?' => '-' */
{ 0x5d, 0x29 }, /* ']' => ')' */
diff --git a/src/hci/keymap/keymap_de.c b/src/hci/keymap/keymap_de.c
index 766adf84..ffcf912f 100644
--- a/src/hci/keymap/keymap_de.c
+++ b/src/hci/keymap/keymap_de.c
@@ -25,6 +25,7 @@ struct key_mapping de_mapping[] __keymap = {
{ 0x2f, 0x2d }, /* '/' => '-' */
{ 0x3a, 0x7b }, /* ':' => '{' */
{ 0x3b, 0x5b }, /* ';' => '[' */
+ { 0x3c, 0x3b }, /* '<' => ';' */
{ 0x3d, 0x27 }, /* '=' => '\'' */
{ 0x3e, 0x3a }, /* '>' => ':' */
{ 0x3f, 0x5f }, /* '?' => '_' */
diff --git a/src/hci/keymap/keymap_dk.c b/src/hci/keymap/keymap_dk.c
index 4f791156..e409018c 100644
--- a/src/hci/keymap/keymap_dk.c
+++ b/src/hci/keymap/keymap_dk.c
@@ -19,6 +19,7 @@ struct key_mapping dk_mapping[] __keymap = {
{ 0x2b, 0x60 }, /* '+' => '`' */
{ 0x2d, 0x2b }, /* '-' => '+' */
{ 0x2f, 0x2d }, /* '/' => '-' */
+ { 0x3c, 0x3b }, /* '<' => ';' */
{ 0x3e, 0x3a }, /* '>' => ':' */
{ 0x3f, 0x5f }, /* '?' => '_' */
{ 0x40, 0x22 }, /* '@' => '"' */
diff --git a/src/hci/keymap/keymap_es.c b/src/hci/keymap/keymap_es.c
index 0873312f..c1fe013a 100644
--- a/src/hci/keymap/keymap_es.c
+++ b/src/hci/keymap/keymap_es.c
@@ -18,6 +18,7 @@ struct key_mapping es_mapping[] __keymap = {
{ 0x2a, 0x28 }, /* '*' => '(' */
{ 0x2d, 0x27 }, /* '-' => '\'' */
{ 0x2f, 0x2d }, /* '/' => '-' */
+ { 0x3c, 0x3b }, /* '<' => ';' */
{ 0x3e, 0x3a }, /* '>' => ':' */
{ 0x3f, 0x5f }, /* '?' => '_' */
{ 0x40, 0x22 }, /* '@' => '"' */
diff --git a/src/hci/keymap/keymap_et.c b/src/hci/keymap/keymap_et.c
index 29558cfa..ad88cecc 100644
--- a/src/hci/keymap/keymap_et.c
+++ b/src/hci/keymap/keymap_et.c
@@ -18,6 +18,7 @@ struct key_mapping et_mapping[] __keymap = {
{ 0x2a, 0x28 }, /* '*' => '(' */
{ 0x2d, 0x2b }, /* '-' => '+' */
{ 0x2f, 0x2d }, /* '/' => '-' */
+ { 0x3c, 0x3b }, /* '<' => ';' */
{ 0x3e, 0x3a }, /* '>' => ':' */
{ 0x3f, 0x5f }, /* '?' => '_' */
{ 0x40, 0x22 }, /* '@' => '"' */
@@ -25,4 +26,5 @@ struct key_mapping et_mapping[] __keymap = {
{ 0x5e, 0x26 }, /* '^' => '&' */
{ 0x5f, 0x3f }, /* '_' => '?' */
{ 0x7c, 0x2a }, /* '|' => '*' */
+ { 0x7f, 0x1b }, /* 0x7f => 0x1b */
};
diff --git a/src/hci/keymap/keymap_fi.c b/src/hci/keymap/keymap_fi.c
index 479437f5..c8f6c3a0 100644
--- a/src/hci/keymap/keymap_fi.c
+++ b/src/hci/keymap/keymap_fi.c
@@ -23,6 +23,7 @@ struct key_mapping fi_mapping[] __keymap = {
{ 0x2f, 0x2d }, /* '/' => '-' */
{ 0x3a, 0x5c }, /* ':' => '\\' */
{ 0x3b, 0x7c }, /* ';' => '|' */
+ { 0x3c, 0x3b }, /* '<' => ';' */
{ 0x3d, 0x27 }, /* '=' => '\'' */
{ 0x3e, 0x3a }, /* '>' => ':' */
{ 0x3f, 0x5f }, /* '?' => '_' */
diff --git a/src/hci/keymap/keymap_fr.c b/src/hci/keymap/keymap_fr.c
index 7f007b69..fd615a45 100644
--- a/src/hci/keymap/keymap_fr.c
+++ b/src/hci/keymap/keymap_fr.c
@@ -42,6 +42,7 @@ struct key_mapping fr_mapping[] __keymap = {
{ 0x39, 0x2f }, /* '9' => '/' */
{ 0x3a, 0x4d }, /* ':' => 'M' */
{ 0x3b, 0x6d }, /* ';' => 'm' */
+ { 0x3c, 0x2e }, /* '<' => '.' */
{ 0x3e, 0x2f }, /* '>' => '/' */
{ 0x3f, 0x5c }, /* '?' => '\\' */
{ 0x40, 0x32 }, /* '@' => '2' */
diff --git a/src/hci/keymap/keymap_it.c b/src/hci/keymap/keymap_it.c
index 3f6b9f87..5bb05471 100644
--- a/src/hci/keymap/keymap_it.c
+++ b/src/hci/keymap/keymap_it.c
@@ -19,6 +19,7 @@ struct key_mapping it_mapping[] __keymap = {
{ 0x2b, 0x5e }, /* '+' => '^' */
{ 0x2d, 0x27 }, /* '-' => '\'' */
{ 0x2f, 0x2d }, /* '/' => '-' */
+ { 0x3c, 0x3b }, /* '<' => ';' */
{ 0x3e, 0x3a }, /* '>' => ':' */
{ 0x3f, 0x5f }, /* '?' => '_' */
{ 0x40, 0x22 }, /* '@' => '"' */
diff --git a/src/hci/keymap/keymap_lt.c b/src/hci/keymap/keymap_lt.c
index 1a76c371..3e99d8c6 100644
--- a/src/hci/keymap/keymap_lt.c
+++ b/src/hci/keymap/keymap_lt.c
@@ -12,5 +12,4 @@ FILE_LICENCE ( PUBLIC_DOMAIN );
/** "lt" keyboard mapping */
struct key_mapping lt_mapping[] __keymap = {
- { 0x7f, 0x08 }, /* 0x7f => Ctrl-H */
};
diff --git a/src/hci/keymap/keymap_mt.c b/src/hci/keymap/keymap_mt.c
index e50e2b8c..094a6fc6 100644
--- a/src/hci/keymap/keymap_mt.c
+++ b/src/hci/keymap/keymap_mt.c
@@ -17,5 +17,4 @@ struct key_mapping mt_mapping[] __keymap = {
{ 0x40, 0x22 }, /* '@' => '"' */
{ 0x5c, 0x23 }, /* '\\' => '#' */
{ 0x7c, 0x7e }, /* '|' => '~' */
- { 0x7f, 0x08 }, /* 0x7f => Ctrl-H */
};
diff --git a/src/hci/keymap/keymap_nl.c b/src/hci/keymap/keymap_nl.c
index b2b7ed2a..ba051705 100644
--- a/src/hci/keymap/keymap_nl.c
+++ b/src/hci/keymap/keymap_nl.c
@@ -20,7 +20,7 @@ struct key_mapping nl_mapping[] __keymap = {
{ 0x2d, 0x2f }, /* '-' => '/' */
{ 0x2f, 0x2d }, /* '/' => '-' */
{ 0x3b, 0x2b }, /* ';' => '+' */
- { 0x3c, 0x5d }, /* '<' => ']' */
+ { 0x3c, 0x3b }, /* '<' => ';' */
{ 0x3e, 0x3a }, /* '>' => ':' */
{ 0x3f, 0x3d }, /* '?' => '=' */
{ 0x40, 0x22 }, /* '@' => '"' */
diff --git a/src/hci/keymap/keymap_sg.c b/src/hci/keymap/keymap_sg.c
index c7131813..0b082092 100644
--- a/src/hci/keymap/keymap_sg.c
+++ b/src/hci/keymap/keymap_sg.c
@@ -24,6 +24,7 @@ struct key_mapping sg_mapping[] __keymap = {
{ 0x2b, 0x60 }, /* '+' => '`' */
{ 0x2d, 0x27 }, /* '-' => '\'' */
{ 0x2f, 0x2d }, /* '/' => '-' */
+ { 0x3c, 0x3b }, /* '<' => ';' */
{ 0x3d, 0x5e }, /* '=' => '^' */
{ 0x3e, 0x3a }, /* '>' => ':' */
{ 0x3f, 0x5f }, /* '?' => '_' */
diff --git a/src/hci/keymap/keymap_sr.c b/src/hci/keymap/keymap_sr.c
index 84e75292..0552f4d9 100644
--- a/src/hci/keymap/keymap_sr.c
+++ b/src/hci/keymap/keymap_sr.c
@@ -21,6 +21,7 @@ struct key_mapping sr_mapping[] __keymap = {
{ 0x2b, 0x2a }, /* '+' => '*' */
{ 0x2d, 0x27 }, /* '-' => '\'' */
{ 0x2f, 0x2d }, /* '/' => '-' */
+ { 0x3c, 0x3b }, /* '<' => ';' */
{ 0x3d, 0x2b }, /* '=' => '+' */
{ 0x3e, 0x3a }, /* '>' => ':' */
{ 0x3f, 0x5f }, /* '?' => '_' */
diff --git a/src/hci/keymap/keymap_th.c b/src/hci/keymap/keymap_th.c
index 78e1e2bf..e8b44d1e 100644
--- a/src/hci/keymap/keymap_th.c
+++ b/src/hci/keymap/keymap_th.c
@@ -12,5 +12,4 @@ FILE_LICENCE ( PUBLIC_DOMAIN );
/** "th" keyboard mapping */
struct key_mapping th_mapping[] __keymap = {
- { 0x7f, 0x08 }, /* 0x7f => Ctrl-H */
};
diff --git a/src/hci/keymap/keymap_ua.c b/src/hci/keymap/keymap_ua.c
index 6234780b..1106a8b2 100644
--- a/src/hci/keymap/keymap_ua.c
+++ b/src/hci/keymap/keymap_ua.c
@@ -12,5 +12,4 @@ FILE_LICENCE ( PUBLIC_DOMAIN );
/** "ua" keyboard mapping */
struct key_mapping ua_mapping[] __keymap = {
- { 0x7f, 0x08 }, /* 0x7f => Ctrl-H */
};
diff --git a/src/hci/keymap/keymap_uk.c b/src/hci/keymap/keymap_uk.c
index 9fbf30ae..6550d8ee 100644
--- a/src/hci/keymap/keymap_uk.c
+++ b/src/hci/keymap/keymap_uk.c
@@ -13,7 +13,6 @@ FILE_LICENCE ( PUBLIC_DOMAIN );
/** "uk" keyboard mapping */
struct key_mapping uk_mapping[] __keymap = {
{ 0x22, 0x40 }, /* '"' => '@' */
- { 0x3c, 0x5c }, /* '<' => '\\' */
{ 0x40, 0x22 }, /* '@' => '"' */
{ 0x5c, 0x23 }, /* '\\' => '#' */
{ 0x7c, 0x7e }, /* '|' => '~' */
diff --git a/src/hci/keymap/keymap_wo.c b/src/hci/keymap/keymap_wo.c
index 86590449..b4535761 100644
--- a/src/hci/keymap/keymap_wo.c
+++ b/src/hci/keymap/keymap_wo.c
@@ -36,6 +36,7 @@ struct key_mapping wo_mapping[] __keymap = {
{ 0x38, 0x5f }, /* '8' => '_' */
{ 0x3a, 0x4d }, /* ':' => 'M' */
{ 0x3b, 0x6d }, /* ';' => 'm' */
+ { 0x3c, 0x2e }, /* '<' => '.' */
{ 0x3e, 0x2f }, /* '>' => '/' */
{ 0x40, 0x32 }, /* '@' => '2' */
{ 0x41, 0x51 }, /* 'A' => 'Q' */
generated by cgit v1.2.3-55-g7522 (git 2.39.0) at 2024-05-29 01:52:32 +0200