* Don't map keys that are special when unshifted; this caused problems for

the French keymap, and made it difficult in general to get out of a
  keymap you selected by accident (closes: Malone #31767).
master
Colin Watson 19 years ago
parent f7fdb6b0ea
commit 45b56623c0

3
debian/changelog vendored

@ -4,6 +4,9 @@ gfxboot-theme-ubuntu (0.1.14) UNRELEASED; urgency=low
language.
* Update locale-to-keymap mappings from console-keymaps-at
2002.12.04dbs-52.1ubuntu3.
* Don't map keys that are special when unshifted; this caused problems for
the French keymap, and made it difficult in general to get out of a
keymap you selected by accident (closes: Malone #31767).
-- Colin Watson <cjwatson@ubuntu.com> Tue, 21 Feb 2006 11:56:41 +0000

@ -88,15 +88,6 @@
[ 0x33 0x2c 0x3c 0x2c ]
[ 0x34 0x2e 0x3e 0x2e ]
[ 0x35 0x2f 0x3f 0x2f ]
[ 0x47 keyHome keyHome keyHome ]
[ 0x48 keyUp keyUp keyUp ]
[ 0x49 keyPgUp keyPgUp keyPgUp ]
[ 0x4b keyLeft keyLeft keyLeft ]
[ 0x4d keyRight keyRight keyRight ]
[ 0x4f keyEnd keyEnd keyEnd ]
[ 0x50 keyDown keyDown keyDown ]
[ 0x51 keyPgDown keyPgDown keyPgDown ]
[ 0x52 keyIns keyIns keyIns ]
] def
/keymap.br-abnt2 [
@ -139,15 +130,6 @@
[ 0x2e 0x63 0x43 0x63 ]
[ 0x35 0x2f 0x3f 0xb0 ]
[ 0x39 0x20 0x20 0x00 ]
[ 0x47 keyHome keyHome keyHome ]
[ 0x48 keyUp keyUp keyUp ]
[ 0x49 keyPgUp keyPgUp keyPgUp ]
[ 0x4b keyLeft keyLeft keyLeft ]
[ 0x4d keyRight keyRight keyRight ]
[ 0x4f keyEnd keyEnd keyEnd ]
[ 0x50 keyDown keyDown keyDown ]
[ 0x51 keyPgDown keyPgDown keyPgDown ]
[ 0x52 keyIns keyIns keyIns ]
] def
/keymap.cf [
@ -245,15 +227,6 @@
[ 0x33 0x2c 0x3c 0x2c ]
[ 0x34 0x2e 0x3e 0x2e ]
[ 0x35 0x2f 0x3f 0x2d ]
[ 0x47 keyHome keyHome keyHome ]
[ 0x48 keyUp keyUp keyUp ]
[ 0x49 keyPgUp keyPgUp keyPgUp ]
[ 0x4b keyLeft keyLeft keyLeft ]
[ 0x4d keyRight keyRight keyRight ]
[ 0x4f keyEnd keyEnd keyEnd ]
[ 0x50 keyDown keyDown keyDown ]
[ 0x51 keyPgDown keyPgDown keyPgDown ]
[ 0x52 keyIns keyIns keyIns ]
] def
/keymap.de-latin1-nodeadkeys [
@ -419,7 +392,6 @@
[ 0x18 0x6f 0x4f 0xf4 ]
[ 0x19 0x70 0x50 0xb6 ]
[ 0x1b 0x24 0xa3 0xa2 ]
[ 0x1c keyEnter keyEnter 0x0a ]
[ 0x1e 0x71 0x51 0xc2 ]
[ 0x1f 0x73 0x53 0xf8 ]
[ 0x20 0x64 0x44 0xca ]
@ -445,19 +417,9 @@
[ 0x35 0x21 0xa7 0xa1 ]
[ 0x37 0x2a 0x00 0x00 ]
[ 0x39 0x20 0x20 0xa0 ]
[ 0x47 0x37 0x00 keyHome ]
[ 0x48 0x38 0x00 keyUp ]
[ 0x49 0x39 0x00 keyPgUp ]
[ 0x4a 0x2d 0x00 0x00 ]
[ 0x4b 0x34 0x00 keyLeft ]
[ 0x4c 0x35 0x00 0x00 ]
[ 0x4d 0x36 0x00 keyRight ]
[ 0x4e 0x2b 0x00 0x00 ]
[ 0x4f 0x31 0x00 keyEnd ]
[ 0x50 0x32 0x00 keyDown ]
[ 0x51 0x33 0x00 keyPgDown ]
[ 0x52 0x30 0x00 keyIns ]
[ 0x53 0x2e 0x2c keyDel ]
[ 0x54 0x2a 0xb5 0xb3 ]
[ 0x60 keyEnter keyEnter keyEnter ]
[ 0x62 0x2f 0x2f 0x2f ]
@ -665,7 +627,6 @@
[ 0x19 0x70 0x50 0x00 ]
[ 0x1a 0x40 0x60 0x00 ]
[ 0x1b 0x5b 0x7b 0x00 ]
[ 0x1c keyEnter keyEnter 0x00 ]
[ 0x1e 0x61 0x41 0x00 ]
[ 0x1f 0x73 0x53 0x00 ]
[ 0x20 0x64 0x44 0x00 ]
@ -687,7 +648,6 @@
[ 0x31 0x6e 0x4e 0x00 ]
[ 0x32 0x6d 0x4d 0x00 ]
[ 0x39 0x20 0x20 0x00 ]
[ 0x53 keyDel keyDel 0x00 ]
[ 0x56 0x3c 0x3e 0x00 ]
[ 0x59 0x5c 0x5f 0x00 ]
[ 0x5c 0x20 0x20 0x00 ]
@ -743,15 +703,6 @@
[ 0x33 0x2c 0x3c 0x2c ]
[ 0x34 0x2e 0x3e 0x2e ]
[ 0x35 0x2f 0x3f 0x2f ]
[ 0x47 keyHome keyHome keyHome ]
[ 0x48 keyUp keyUp keyUp ]
[ 0x49 keyPgUp keyPgUp keyPgUp ]
[ 0x4b keyLeft keyLeft keyLeft ]
[ 0x4d keyRight keyRight keyRight ]
[ 0x4f keyEnd keyEnd keyEnd ]
[ 0x50 keyDown keyDown keyDown ]
[ 0x51 keyPgDown keyPgDown keyPgDown ]
[ 0x52 keyIns keyIns keyIns ]
] def
/keymap.lv-latin4 [
@ -770,15 +721,6 @@
[ 0x2c 0x7a 0x5a 0xb8 ]
[ 0x2e 0x63 0x43 0xe8 ]
[ 0x31 0x6e 0x4e 0xf1 ]
[ 0x47 keyHome keyHome keyHome ]
[ 0x48 keyUp keyUp keyUp ]
[ 0x49 keyPgUp keyPgUp keyPgUp ]
[ 0x4b keyLeft keyLeft keyLeft ]
[ 0x4d keyRight keyRight keyRight ]
[ 0x4f keyEnd keyEnd keyEnd ]
[ 0x50 keyDown keyDown keyDown ]
[ 0x51 keyPgDown keyPgDown keyPgDown ]
[ 0x52 keyIns keyIns keyIns ]
] def
/keymap.mk [
@ -829,15 +771,6 @@
[ 0x33 0x2c 0x3c 0x2c ]
[ 0x34 0x2e 0x3e 0x2e ]
[ 0x35 0x2f 0x3f 0x2f ]
[ 0x47 keyHome keyHome keyHome ]
[ 0x48 keyUp keyUp keyUp ]
[ 0x49 keyPgUp keyPgUp keyPgUp ]
[ 0x4b keyLeft keyLeft keyLeft ]
[ 0x4d keyRight keyRight keyRight ]
[ 0x4f keyEnd keyEnd keyEnd ]
[ 0x50 keyDown keyDown keyDown ]
[ 0x51 keyPgDown keyPgDown keyPgDown ]
[ 0x52 keyIns keyIns keyIns ]
] def
/keymap.no-latin1 [
@ -977,15 +910,6 @@
[ 0x33 0x2c 0x3c 0xc2 ]
[ 0x34 0x2e 0x3e 0xc0 ]
[ 0x35 0x2f 0x3f 0xa3 ]
[ 0x47 keyHome keyHome keyHome ]
[ 0x48 keyUp keyUp keyUp ]
[ 0x49 keyPgUp keyPgUp keyPgUp ]
[ 0x4b keyLeft keyLeft keyLeft ]
[ 0x4d keyRight keyRight keyRight ]
[ 0x4f keyEnd keyEnd keyEnd ]
[ 0x50 keyDown keyDown keyDown ]
[ 0x51 keyPgDown keyPgDown keyPgDown ]
[ 0x52 keyIns keyIns keyIns ]
] def
/keymap.se-latin1 [
@ -1060,15 +984,6 @@
[ 0x33 0x2c 0x3c 0x2c ]
[ 0x34 0x2e 0x3e 0x2e ]
[ 0x35 0x2f 0x3f 0x2d ]
[ 0x47 keyHome keyHome keyHome ]
[ 0x48 keyUp keyUp keyUp ]
[ 0x49 keyPgUp keyPgUp keyPgUp ]
[ 0x4b keyLeft keyLeft keyLeft ]
[ 0x4d keyRight keyRight keyRight ]
[ 0x4f keyEnd keyEnd keyEnd ]
[ 0x50 keyDown keyDown keyDown ]
[ 0x51 keyPgDown keyPgDown keyPgDown ]
[ 0x52 keyIns keyIns keyIns ]
] def
/keymap.slovene [
@ -1159,15 +1074,6 @@
[ 0x33 0x2c 0x3c 0x2c ]
[ 0x34 0x2e 0x3e 0x2e ]
[ 0x35 0x2f 0x3f 0xd6 ]
[ 0x47 keyHome keyHome keyHome ]
[ 0x48 keyUp keyUp keyUp ]
[ 0x49 keyPgUp keyPgUp keyPgUp ]
[ 0x4b keyLeft keyLeft keyLeft ]
[ 0x4d keyRight keyRight keyRight ]
[ 0x4f keyEnd keyEnd keyEnd ]
[ 0x50 keyDown keyDown keyDown ]
[ 0x51 keyPgDown keyPgDown keyPgDown ]
[ 0x52 keyIns keyIns keyIns ]
] def
/keymap.trfu [
@ -1277,15 +1183,6 @@
[ 0x12 0x65 0x45 0x65 ]
[ 0x2e 0x63 0x43 0x63 ]
[ 0x39 0x20 0x20 0x00 ]
[ 0x47 keyHome keyHome keyHome ]
[ 0x48 keyUp keyUp keyUp ]
[ 0x49 keyPgUp keyPgUp keyPgUp ]
[ 0x4b keyLeft keyLeft keyLeft ]
[ 0x4d keyRight keyRight keyRight ]
[ 0x4f keyEnd keyEnd keyEnd ]
[ 0x50 keyDown keyDown keyDown ]
[ 0x51 keyPgDown keyPgDown keyPgDown ]
[ 0x52 keyIns keyIns keyIns ]
] def
/keymap.uk [

@ -114,6 +114,12 @@ my %keymapfunc;
for my $keymap (sort { $a cmp $b } keys %keymaps) {
my $found = 0;
for my $index (0 .. 127) {
# Never map keys that are special when unshifted; this caused
# problems for the French keymap, and made it difficult in general
# to get out of a keymap you selected by accident.
if ($keycodes{us}{plain}[$index] =~ /^key/) {
next;
}
my $plain = $keycodes{$keymap}{plain}[$index];
my $shift = $keycodes{$keymap}{shift}[$index];
my $altgr = $keycodes{$keymap}{altgr}[$index];

Loading…
Cancel
Save