aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkeyboard-config/keycodes
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-02-20 14:23:37 +0000
committermarha <marha@users.sourceforge.net>2011-02-20 14:23:37 +0000
commit684eb992146cad24b690073f33b909f47150b841 (patch)
tree7bc62d6f06c5e8a8114b56fa78485cb7ec08f26b /xorg-server/xkeyboard-config/keycodes
parent53810445215dc45ae303bc89feb6e0aaf04aa6fa (diff)
parent8a191c08ddda2e66fa26f148d6c21959bb08f923 (diff)
downloadvcxsrv-684eb992146cad24b690073f33b909f47150b841.tar.gz
vcxsrv-684eb992146cad24b690073f33b909f47150b841.tar.bz2
vcxsrv-684eb992146cad24b690073f33b909f47150b841.zip
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/xkeyboard-config/keycodes')
-rw-r--r--xorg-server/xkeyboard-config/keycodes/amiga456
-rw-r--r--xorg-server/xkeyboard-config/keycodes/ataritt240
-rw-r--r--xorg-server/xkeyboard-config/keycodes/digital_vndr/lk541
-rw-r--r--xorg-server/xkeyboard-config/keycodes/digital_vndr/pc557
-rw-r--r--xorg-server/xkeyboard-config/keycodes/evdev627
-rw-r--r--xorg-server/xkeyboard-config/keycodes/fujitsu373
-rw-r--r--xorg-server/xkeyboard-config/keycodes/hp541
-rw-r--r--xorg-server/xkeyboard-config/keycodes/ibm301
-rw-r--r--xorg-server/xkeyboard-config/keycodes/macintosh3
-rw-r--r--xorg-server/xkeyboard-config/keycodes/sgi_vndr/indigo279
-rw-r--r--xorg-server/xkeyboard-config/keycodes/sgi_vndr/indy405
-rw-r--r--xorg-server/xkeyboard-config/keycodes/sgi_vndr/iris21
-rw-r--r--xorg-server/xkeyboard-config/keycodes/sony283
-rw-r--r--xorg-server/xkeyboard-config/keycodes/sun1904
-rw-r--r--xorg-server/xkeyboard-config/keycodes/xfree86822
-rw-r--r--xorg-server/xkeyboard-config/keycodes/xfree98307
16 files changed, 3810 insertions, 3850 deletions
diff --git a/xorg-server/xkeyboard-config/keycodes/amiga b/xorg-server/xkeyboard-config/keycodes/amiga
index 7d2576701..f374ea658 100644
--- a/xorg-server/xkeyboard-config/keycodes/amiga
+++ b/xorg-server/xkeyboard-config/keycodes/amiga
@@ -1,231 +1,225 @@
-// $Xorg: amiga,v 1.3 2000/08/17 19:54:37 cpqbld Exp $
-
-
-
-// $XFree86: xc/programs/xkbcomp/keycodes/amiga,v 3.2 1997/10/26 13:25:35 dawes Exp $
-
-default xkb_keycodes "usa1" {
-
- minimum= 8;
- maximum= 255;
-
- <ESC> = 77;
- <FK01> = 88;
- <FK02> = 89;
- <FK03> = 90;
- <FK04> = 91;
- <FK05> = 92;
- <FK06> = 93;
- <FK07> = 94;
- <FK08> = 95;
- <FK09> = 96;
- <FK10> = 97;
-
- <TLDE> = 8;
- <AE01> = 9;
- <AE02> = 10;
- <AE03> = 11;
- <AE04> = 12;
- <AE05> = 13;
- <AE06> = 14;
- <AE07> = 15;
- <AE08> = 16;
- <AE09> = 17;
- <AE10> = 18;
- <AE11> = 19;
- <AE12> = 20;
- <BKSL> = 21;
- <BKSP> = 73;
-
- <TAB> = 74;
- <AD01> = 24;
- <AD02> = 25;
- <AD03> = 26;
- <AD04> = 27;
- <AD05> = 28;
- <AD06> = 29;
- <AD07> = 30;
- <AD08> = 31;
- <AD09> = 32;
- <AD10> = 33;
- <AD11> = 34;
- <AD12> = 35;
- <RTRN> = 76;
-
- <LCTL> = 107;
- <CAPS> = 106;
- <AC01> = 40;
- <AC02> = 41;
- <AC03> = 42;
- <AC04> = 43;
- <AC05> = 44;
- <AC06> = 45;
- <AC07> = 46;
- <AC08> = 47;
- <AC09> = 48;
- <AC10> = 49;
- <AC11> = 50;
-
- <LFSH> = 104;
- <AB01> = 57;
- <AB02> = 58;
- <AB03> = 59;
- <AB04> = 60;
- <AB05> = 61;
- <AB06> = 62;
- <AB07> = 63;
- <AB08> = 64;
- <AB09> = 65;
- <AB10> = 66;
- <RTSH> = 105;
-
- <LALT> = 108;
- <LAMI> = 110;
- <SPCE> = 72;
- <RAMI> = 111;
- <RALT> = 109;
-
- <DELE> = 78;
- <HELP> = 103;
- <UP> = 84;
- <LEFT> = 87;
- <DOWN> = 85;
- <RGHT> = 86;
-
- <KPLP> = 98;
- <KPRP> = 99;
- <KPDV> = 100;
- <KPMU> = 101;
-
- <KP7> = 69;
- <KP8> = 70;
- <KP9> = 71;
- <KPSU> = 82;
-
- <KP4> = 53;
- <KP5> = 54;
- <KP6> = 55;
- <KPAD> = 102;
-
- <KP1> = 37;
- <KP2> = 38;
- <KP3> = 39;
-
- <KP0> = 23;
- <KPDC> = 68;
- <KPEN> = 75;
-};
-
-xkb_keycodes "de" {
-
- minimum= 8;
- maximum= 255;
-
- <ESC> = 77;
- <FK01> = 88;
- <FK02> = 89;
- <FK03> = 90;
- <FK04> = 91;
- <FK05> = 92;
- <FK06> = 93;
- <FK07> = 94;
- <FK08> = 95;
- <FK09> = 96;
- <FK10> = 97;
-
- <TLDE> = 8;
- <AE01> = 9;
- <AE02> = 10;
- <AE03> = 11;
- <AE04> = 12;
- <AE05> = 13;
- <AE06> = 14;
- <AE07> = 15;
- <AE08> = 16;
- <AE09> = 17;
- <AE10> = 18;
- <AE11> = 19;
- <AE12> = 20;
- <BKSL> = 21;
- <BKSP> = 73;
-
- <TAB> = 74;
- <AD01> = 24;
- <AD02> = 25;
- <AD03> = 26;
- <AD04> = 27;
- <AD05> = 28;
- <AD06> = 29;
- <AD07> = 30;
- <AD08> = 31;
- <AD09> = 32;
- <AD10> = 33;
- <AD11> = 34;
- <AD12> = 35;
- <RTRN> = 76;
-
- <LCTL> = 107;
- <CAPS> = 106;
- <AC01> = 40;
- <AC02> = 41;
- <AC03> = 42;
- <AC04> = 43;
- <AC05> = 44;
- <AC06> = 45;
- <AC07> = 46;
- <AC08> = 47;
- <AC09> = 48;
- <AC10> = 49;
- <AC11> = 50;
- <AC12> = 51;
-
- <LFSH> = 104;
- <LSGT> = 56;
- <AB01> = 57;
- <AB02> = 58;
- <AB03> = 59;
- <AB04> = 60;
- <AB05> = 61;
- <AB06> = 62;
- <AB07> = 63;
- <AB08> = 64;
- <AB09> = 65;
- <AB10> = 66;
- <RTSH> = 105;
-
- <LALT> = 108;
- <LAMI> = 110;
- <SPCE> = 72;
- <RAMI> = 111;
- <RALT> = 109;
-
- <DELE> = 78;
- <HELP> = 103;
- <UP> = 84;
- <LEFT> = 87;
- <DOWN> = 85;
- <RGHT> = 86;
-
- <KPLP> = 98;
- <KPRP> = 99;
- <KPDV> = 100;
- <KPMU> = 101;
-
- <KP7> = 69;
- <KP8> = 70;
- <KP9> = 71;
- <KPSU> = 82;
-
- <KP4> = 53;
- <KP5> = 54;
- <KP6> = 55;
- <KPAD> = 102;
-
- <KP1> = 37;
- <KP2> = 38;
- <KP3> = 39;
-
- <KP0> = 23;
- <KPDC> = 68;
- <KPEN> = 75;
-};
+default xkb_keycodes "usa1" {
+
+ minimum= 8;
+ maximum= 255;
+
+ <ESC> = 77;
+ <FK01> = 88;
+ <FK02> = 89;
+ <FK03> = 90;
+ <FK04> = 91;
+ <FK05> = 92;
+ <FK06> = 93;
+ <FK07> = 94;
+ <FK08> = 95;
+ <FK09> = 96;
+ <FK10> = 97;
+
+ <TLDE> = 8;
+ <AE01> = 9;
+ <AE02> = 10;
+ <AE03> = 11;
+ <AE04> = 12;
+ <AE05> = 13;
+ <AE06> = 14;
+ <AE07> = 15;
+ <AE08> = 16;
+ <AE09> = 17;
+ <AE10> = 18;
+ <AE11> = 19;
+ <AE12> = 20;
+ <BKSL> = 21;
+ <BKSP> = 73;
+
+ <TAB> = 74;
+ <AD01> = 24;
+ <AD02> = 25;
+ <AD03> = 26;
+ <AD04> = 27;
+ <AD05> = 28;
+ <AD06> = 29;
+ <AD07> = 30;
+ <AD08> = 31;
+ <AD09> = 32;
+ <AD10> = 33;
+ <AD11> = 34;
+ <AD12> = 35;
+ <RTRN> = 76;
+
+ <LCTL> = 107;
+ <CAPS> = 106;
+ <AC01> = 40;
+ <AC02> = 41;
+ <AC03> = 42;
+ <AC04> = 43;
+ <AC05> = 44;
+ <AC06> = 45;
+ <AC07> = 46;
+ <AC08> = 47;
+ <AC09> = 48;
+ <AC10> = 49;
+ <AC11> = 50;
+
+ <LFSH> = 104;
+ <AB01> = 57;
+ <AB02> = 58;
+ <AB03> = 59;
+ <AB04> = 60;
+ <AB05> = 61;
+ <AB06> = 62;
+ <AB07> = 63;
+ <AB08> = 64;
+ <AB09> = 65;
+ <AB10> = 66;
+ <RTSH> = 105;
+
+ <LALT> = 108;
+ <LAMI> = 110;
+ <SPCE> = 72;
+ <RAMI> = 111;
+ <RALT> = 109;
+
+ <DELE> = 78;
+ <HELP> = 103;
+ <UP> = 84;
+ <LEFT> = 87;
+ <DOWN> = 85;
+ <RGHT> = 86;
+
+ <KPLP> = 98;
+ <KPRP> = 99;
+ <KPDV> = 100;
+ <KPMU> = 101;
+
+ <KP7> = 69;
+ <KP8> = 70;
+ <KP9> = 71;
+ <KPSU> = 82;
+
+ <KP4> = 53;
+ <KP5> = 54;
+ <KP6> = 55;
+ <KPAD> = 102;
+
+ <KP1> = 37;
+ <KP2> = 38;
+ <KP3> = 39;
+
+ <KP0> = 23;
+ <KPDC> = 68;
+ <KPEN> = 75;
+};
+
+xkb_keycodes "de" {
+
+ minimum= 8;
+ maximum= 255;
+
+ <ESC> = 77;
+ <FK01> = 88;
+ <FK02> = 89;
+ <FK03> = 90;
+ <FK04> = 91;
+ <FK05> = 92;
+ <FK06> = 93;
+ <FK07> = 94;
+ <FK08> = 95;
+ <FK09> = 96;
+ <FK10> = 97;
+
+ <TLDE> = 8;
+ <AE01> = 9;
+ <AE02> = 10;
+ <AE03> = 11;
+ <AE04> = 12;
+ <AE05> = 13;
+ <AE06> = 14;
+ <AE07> = 15;
+ <AE08> = 16;
+ <AE09> = 17;
+ <AE10> = 18;
+ <AE11> = 19;
+ <AE12> = 20;
+ <BKSL> = 21;
+ <BKSP> = 73;
+
+ <TAB> = 74;
+ <AD01> = 24;
+ <AD02> = 25;
+ <AD03> = 26;
+ <AD04> = 27;
+ <AD05> = 28;
+ <AD06> = 29;
+ <AD07> = 30;
+ <AD08> = 31;
+ <AD09> = 32;
+ <AD10> = 33;
+ <AD11> = 34;
+ <AD12> = 35;
+ <RTRN> = 76;
+
+ <LCTL> = 107;
+ <CAPS> = 106;
+ <AC01> = 40;
+ <AC02> = 41;
+ <AC03> = 42;
+ <AC04> = 43;
+ <AC05> = 44;
+ <AC06> = 45;
+ <AC07> = 46;
+ <AC08> = 47;
+ <AC09> = 48;
+ <AC10> = 49;
+ <AC11> = 50;
+ <AC12> = 51;
+
+ <LFSH> = 104;
+ <LSGT> = 56;
+ <AB01> = 57;
+ <AB02> = 58;
+ <AB03> = 59;
+ <AB04> = 60;
+ <AB05> = 61;
+ <AB06> = 62;
+ <AB07> = 63;
+ <AB08> = 64;
+ <AB09> = 65;
+ <AB10> = 66;
+ <RTSH> = 105;
+
+ <LALT> = 108;
+ <LAMI> = 110;
+ <SPCE> = 72;
+ <RAMI> = 111;
+ <RALT> = 109;
+
+ <DELE> = 78;
+ <HELP> = 103;
+ <UP> = 84;
+ <LEFT> = 87;
+ <DOWN> = 85;
+ <RGHT> = 86;
+
+ <KPLP> = 98;
+ <KPRP> = 99;
+ <KPDV> = 100;
+ <KPMU> = 101;
+
+ <KP7> = 69;
+ <KP8> = 70;
+ <KP9> = 71;
+ <KPSU> = 82;
+
+ <KP4> = 53;
+ <KP5> = 54;
+ <KP6> = 55;
+ <KPAD> = 102;
+
+ <KP1> = 37;
+ <KP2> = 38;
+ <KP3> = 39;
+
+ <KP0> = 23;
+ <KPDC> = 68;
+ <KPEN> = 75;
+};
diff --git a/xorg-server/xkeyboard-config/keycodes/ataritt b/xorg-server/xkeyboard-config/keycodes/ataritt
index 7eae09f49..c6d31d3ae 100644
--- a/xorg-server/xkeyboard-config/keycodes/ataritt
+++ b/xorg-server/xkeyboard-config/keycodes/ataritt
@@ -1,123 +1,117 @@
-// $Xorg: ataritt,v 1.3 2000/08/17 19:54:37 cpqbld Exp $
-
-
-
-// $XFree86: xc/programs/xkbcomp/keycodes/ataritt,v 3.1 1997/10/26 13:25:35 dawes Exp $
-
-default xkb_keycodes "us" {
-
- minimum= 8;
- maximum= 255;
-
- <ESC> = 9;
- <AE01> = 10;
- <AE02> = 11;
- <AE03> = 12;
- <AE04> = 13;
- <AE05> = 14;
- <AE06> = 15;
- <AE07> = 16;
- <AE08> = 17;
- <AE09> = 18;
- <AE10> = 19;
- <AE11> = 20;
- <AE12> = 21;
- <TLDE> = 49;
- <BKSP> = 22;
-
- <TAB> = 23;
- <AD01> = 24;
- <AD02> = 25;
- <AD03> = 26;
- <AD04> = 27;
- <AD05> = 28;
- <AD06> = 29;
- <AD07> = 30;
- <AD08> = 31;
- <AD09> = 32;
- <AD10> = 33;
- <AD11> = 34;
- <AD12> = 35;
- <RTRN> = 36;
- <DELE> = 91;
-
- <LCTL> = 37;
- <AC01> = 38;
- <AC02> = 39;
- <AC03> = 40;
- <AC04> = 41;
- <AC05> = 42;
- <AC06> = 43;
- <AC07> = 44;
- <AC08> = 45;
- <AC09> = 46;
- <AC10> = 47;
- <AC11> = 48;
- <BKSL> = 51;
-
- <LFSH> = 50;
- <AB01> = 52;
- <AB02> = 53;
- <AB03> = 54;
- <AB04> = 55;
- <AB05> = 56;
- <AB06> = 57;
- <AB07> = 58;
- <AB08> = 59;
- <AB09> = 60;
- <AB10> = 61;
- <RTSH> = 62;
-
- <ALT> = 64;
- <SPCE> = 65;
- <CAPS> = 66;
-
- <FK01> = 67;
- <FK02> = 68;
- <FK03> = 69;
- <FK04> = 70;
- <FK05> = 71;
- <FK06> = 72;
- <FK07> = 73;
- <FK08> = 74;
- <FK09> = 75;
- <FK10> = 76;
-
- <HELP> = 106;
- <UNDO> = 105;
- <INS> = 90;
- <HOME> = 79;
- <UP> = 80;
- <LEFT> = 83;
- <DOWN> = 88;
- <RGHT> = 85;
-
- <KPLP> = 107;
- <KPRP> = 108;
- <KPDV> = 109;
- <KPMU> = 110;
-
- <KP7> = 111;
- <KP8> = 112;
- <KP9> = 113;
- <KPSU> = 82;
-
- <KP4> = 114;
- <KP5> = 115;
- <KP6> = 116;
- <KPAD> = 86;
-
- <KP1> = 117;
- <KP2> = 118;
- <KP3> = 119;
-
- <KP0> = 120;
- <KPDC> = 121;
- <KPEN> = 122;
-};
-
-xkb_keycodes "de" {
- include "ataritt(us)"
-
- <LSGT> = 104;
-};
+default xkb_keycodes "us" {
+
+ minimum= 8;
+ maximum= 255;
+
+ <ESC> = 9;
+ <AE01> = 10;
+ <AE02> = 11;
+ <AE03> = 12;
+ <AE04> = 13;
+ <AE05> = 14;
+ <AE06> = 15;
+ <AE07> = 16;
+ <AE08> = 17;
+ <AE09> = 18;
+ <AE10> = 19;
+ <AE11> = 20;
+ <AE12> = 21;
+ <TLDE> = 49;
+ <BKSP> = 22;
+
+ <TAB> = 23;
+ <AD01> = 24;
+ <AD02> = 25;
+ <AD03> = 26;
+ <AD04> = 27;
+ <AD05> = 28;
+ <AD06> = 29;
+ <AD07> = 30;
+ <AD08> = 31;
+ <AD09> = 32;
+ <AD10> = 33;
+ <AD11> = 34;
+ <AD12> = 35;
+ <RTRN> = 36;
+ <DELE> = 91;
+
+ <LCTL> = 37;
+ <AC01> = 38;
+ <AC02> = 39;
+ <AC03> = 40;
+ <AC04> = 41;
+ <AC05> = 42;
+ <AC06> = 43;
+ <AC07> = 44;
+ <AC08> = 45;
+ <AC09> = 46;
+ <AC10> = 47;
+ <AC11> = 48;
+ <BKSL> = 51;
+
+ <LFSH> = 50;
+ <AB01> = 52;
+ <AB02> = 53;
+ <AB03> = 54;
+ <AB04> = 55;
+ <AB05> = 56;
+ <AB06> = 57;
+ <AB07> = 58;
+ <AB08> = 59;
+ <AB09> = 60;
+ <AB10> = 61;
+ <RTSH> = 62;
+
+ <ALT> = 64;
+ <SPCE> = 65;
+ <CAPS> = 66;
+
+ <FK01> = 67;
+ <FK02> = 68;
+ <FK03> = 69;
+ <FK04> = 70;
+ <FK05> = 71;
+ <FK06> = 72;
+ <FK07> = 73;
+ <FK08> = 74;
+ <FK09> = 75;
+ <FK10> = 76;
+
+ <HELP> = 106;
+ <UNDO> = 105;
+ <INS> = 90;
+ <HOME> = 79;
+ <UP> = 80;
+ <LEFT> = 83;
+ <DOWN> = 88;
+ <RGHT> = 85;
+
+ <KPLP> = 107;
+ <KPRP> = 108;
+ <KPDV> = 109;
+ <KPMU> = 110;
+
+ <KP7> = 111;
+ <KP8> = 112;
+ <KP9> = 113;
+ <KPSU> = 82;
+
+ <KP4> = 114;
+ <KP5> = 115;
+ <KP6> = 116;
+ <KPAD> = 86;
+
+ <KP1> = 117;
+ <KP2> = 118;
+ <KP3> = 119;
+
+ <KP0> = 120;
+ <KPDC> = 121;
+ <KPEN> = 122;
+};
+
+xkb_keycodes "de" {
+ include "ataritt(us)"
+
+ <LSGT> = 104;
+};
diff --git a/xorg-server/xkeyboard-config/keycodes/digital_vndr/lk b/xorg-server/xkeyboard-config/keycodes/digital_vndr/lk
index 8523b95dd..2c1421e88 100644
--- a/xorg-server/xkeyboard-config/keycodes/digital_vndr/lk
+++ b/xorg-server/xkeyboard-config/keycodes/digital_vndr/lk
@@ -1,271 +1,270 @@
-// $Xorg: lk,v 1.3 2000/08/17 19:54:38 cpqbld Exp $
-//
-//Copyright (c) 1996 Digital Equipment Corporation
-//
-//Permission is hereby granted, free of charge, to any person obtaining
-//a copy of this software and associated documentation files (the
-//"Software"), to deal in the Software without restriction, including
-//without limitation the rights to use, copy, modify, merge, publish,
-//distribute, sublicense, and sell copies of the Software, and to
-//permit persons to whom the Software is furnished to do so, subject to
-//the following conditions:
-//
-//The above copyright notice and this permission notice shall be included
-//in all copies or substantial portions of the Software.
-//
-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-//OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-//IN NO EVENT SHALL DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM,
-//DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-//OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-//THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-//Except as contained in this notice, the name of the Digital Equipment
-//Corporation shall not be used in advertising or otherwise to promote
-//the sale, use or other dealings in this Software without prior written
-//authorization from Digital Equipment Corporation.
-//
-// HISTORY
-// Log
-// Revision 1.2 1996/06/18 09:13:22 erik
-// use flags correctly, assorted cleanups and consortium fixes
-//
-// Revision 1.1.6.2 1995/08/07 17:40:34 William_Walker
-// Upgrade XKB to protocol 0.62 (dual submit from decx11)
-// [1995/08/06 14:06:25 William_Walker]
-//
-// Revision 1.1.2.4 1995/08/05 15:25:55 William_Walker
-// Upgrade to XKB protocol 0.62
-// [1995/08/05 14:39:58 William_Walker]
-//
-// Revision 1.1.2.3 1995/06/27 12:17:31 William_Walker
-// Rename <TLDE> to ISO9995 compliant <AE00>.
-// [1995/06/26 20:24:04 William_Walker]
-//
-// Revision 1.1.2.2 1995/06/05 19:21:28 William_Walker
-// New file. I love keymaps.
-// [1995/06/05 18:07:29 William_Walker]
-//
-// EndLog
-//
-// @(#)RCSfile: lk Revision: /main/3 (DEC) Date: 1996/01/24 12:13:31
-//
-xkb_keycodes "lk_common" {
- // "Function" keys
- <FK01> = 86;
- <FK02> = 87;
- <FK03> = 88;
- <FK04> = 89;
- <FK05> = 90;
- <FK06> = 100;
- <FK07> = 101;
- <FK08> = 102;
- <FK09> = 103;
- <FK10> = 104;
- <FK11> = 113;
- <FK12> = 114;
-
- <UP> = 170;
- <LEFT> = 167;
- <DOWN> = 169;
- <RGHT> = 168;
-
- // "Keypad" keys
- <KP7> = 157;
- <KP8> = 158;
- <KP9> = 159;
- <KP4> = 153;
- <KP5> = 154;
- <KP6> = 155;
- <KP1> = 150;
- <KP2> = 151;
- <KP3> = 152;
- <KPEN> = 149;
- <KP0> = 146;
- <KPDL> = 148;
-
- // "Alphanumeric" keys
- <AE00> = 191;
- <AE01> = 192;
- <AE02> = 197;
- <AE03> = 203;
- <AE04> = 208;
- <AE05> = 214;
- <AE06> = 219;
- <AE07> = 224;
- <AE08> = 229;
- <AE09> = 234;
- <AE10> = 239;
- <AE11> = 249;
- <AE12> = 245;
- <BKSP> = 188;
-
- <TAB> = 190;
- <AD01> = 193;
- <AD02> = 198;
- <AD03> = 204;
- <AD04> = 209;
- <AD05> = 215;
- <AD06> = 220;
- <AD07> = 225;
- <AD08> = 230;
- <AD09> = 235;
- <AD10> = 240;
- <AD11> = 250;
- <AD12> = 246;
- <RTRN> = 189;
-
- <LCTL> = 175;
- <CAPS> = 176;
- <AC01> = 194;
- <AC02> = 199;
- <AC03> = 205;
- <AC04> = 210;
- <AC05> = 216;
- <AC06> = 221;
- <AC07> = 226;
- <AC08> = 231;
- <AC09> = 236;
- <AC10> = 242;
- <AC11> = 251;
-
- <LFSH> = 174;
- <AB01> = 195;
- <AB02> = 200;
- <AB03> = 206;
- <AB04> = 211;
- <AB05> = 217;
- <AB06> = 222;
- <AB07> = 227;
- <AB08> = 232;
- <AB09> = 237;
- <AB10> = 243;
- <RTSH> = 171;
-
- <SPCE> = 212;
-
- <LDM> = 255; // Support R5 Lock Down Modifiers
-
- alias <TLDE> = <AE00>;
-};
-
-xkb_keycodes "lkx01" {
- include "digital_vndr/lk(lk_common)"
- <AB00> = 201;
- <FK13> = 115;
- <FK14> = 116;
- <FK17> = 128;
- <FK18> = 129;
- <FK19> = 130;
- <FK20> = 131;
- <HELP> = 124;
- <DO> = 125;
- <FIND> = 138;
- <INS> = 139;
- <DELE> = 140;
- <SELE> = 141;
- <PGUP> = 142;
- <PGDN> = 143;
- <KPF1> = 161;
- <KPF2> = 162;
- <KPF3> = 163;
- <KPF4> = 164;
- <KPSU> = 160;
- <KPCO> = 156;
- <BKSL> = 247;
- <LCMP> = 177;
-};
-
-xkb_keycodes "lk201" {
- include "digital_vndr/lk(lkx01)"
- indicator 4 = "Scroll Lock";
- indicator 3 = "Caps Lock";
- indicator 2 = "Compose";
- indicator 1 = "Wait";
-};
-
-xkb_keycodes "lk421" {
- include "digital_vndr/lk(lkx01)"
- <LALT> = 172;
- <RALT> = 178;
- <RCMP> = 173;
-};
-
-xkb_keycodes "lk401" {
- include "digital_vndr/lk(lk421)"
- indicator 4 = "Scroll Lock";
- indicator 3 = "Caps Lock";
-};
-
-xkb_keycodes "lk44x" {
- include "digital_vndr/lk(lk_common)"
- <ESC> = 85;
- <PRSC> = 115;
- <SCLK> = 116;
- <PAUS> = 124;
- <INS> = 138;
- <HOME> = 139;
- <PGUP> = 140;
- <DELE> = 141;
- <END> = 142;
- <PGDN> = 143;
- <NMLK> = 161;
- <KPDV> = 162;
- <KPMU> = 163;
- <KPSU> = 164;
- <KPAD> = 156;
- <LALT> = 172;
- <RALT> = 178;
- <RCTL> = 173;
-};
-
-xkb_keycodes "lk443" {
- include "digital_vndr/lk(lk44x)"
- <BKSL> = 247;
- indicator 3 = "Caps Lock";
- indicator 4 = "Scroll Lock";
- indicator 5 = "Num Lock";
-};
-
-xkb_keycodes "lk444" {
- include "digital_vndr/lk(lk44x)"
- <BKSL> = 201;
- <AC12> = 247;
- indicator 3 = "Caps Lock";
- indicator 4 = "Scroll Lock";
- indicator 5 = "Num Lock";
-};
-
-// LK201-LT = lk201
-// LK421-AJ = lk421 +AB11
-// LK421-JJ = lk421aj+MUHE+KANJ+HIRA
-// LK401-AJ = lk401
-// LK401-BJ = lk401 +MUHE+KANJ+HIRA
-// LK401-JJ = lk401bj+AB11
-// LK401-LT = lk401
-// LK441-LT = lk443
-
-xkb_keycodes "lk421aj" {
- include "digital_vndr/lk(lk421)"
- <AB11> = 252;
-};
-
-xkb_keycodes "lk421jj" {
- include "digital_vndr/lk(lk421aj)"
- <MUHE> = 94;
- <KANJ> = 95;
- <HIRA> = 97;
-};
-
-xkb_keycodes "lk401bj" {
- include "digital_vndr/lk(lk401)"
- <MUHE> = 94;
- <KANJ> = 95;
- <HIRA> = 97;
-};
-
-xkb_keycodes "lk401jj" {
- include "digital_vndr/lk(lk401bj)"
- <AB11> = 252;
-};
+//
+//Copyright (c) 1996 Digital Equipment Corporation
+//
+//Permission is hereby granted, free of charge, to any person obtaining
+//a copy of this software and associated documentation files (the
+//"Software"), to deal in the Software without restriction, including
+//without limitation the rights to use, copy, modify, merge, publish,
+//distribute, sublicense, and sell copies of the Software, and to
+//permit persons to whom the Software is furnished to do so, subject to
+//the following conditions:
+//
+//The above copyright notice and this permission notice shall be included
+//in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+//OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM,
+//DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+//OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+//THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of the Digital Equipment
+//Corporation shall not be used in advertising or otherwise to promote
+//the sale, use or other dealings in this Software without prior written
+//authorization from Digital Equipment Corporation.
+//
+// HISTORY
+// Log
+// Revision 1.2 1996/06/18 09:13:22 erik
+// use flags correctly, assorted cleanups and consortium fixes
+//
+// Revision 1.1.6.2 1995/08/07 17:40:34 William_Walker
+// Upgrade XKB to protocol 0.62 (dual submit from decx11)
+// [1995/08/06 14:06:25 William_Walker]
+//
+// Revision 1.1.2.4 1995/08/05 15:25:55 William_Walker
+// Upgrade to XKB protocol 0.62
+// [1995/08/05 14:39:58 William_Walker]
+//
+// Revision 1.1.2.3 1995/06/27 12:17:31 William_Walker
+// Rename <TLDE> to ISO9995 compliant <AE00>.
+// [1995/06/26 20:24:04 William_Walker]
+//
+// Revision 1.1.2.2 1995/06/05 19:21:28 William_Walker
+// New file. I love keymaps.
+// [1995/06/05 18:07:29 William_Walker]
+//
+// EndLog
+//
+// @(#)RCSfile: lk Revision: /main/3 (DEC) Date: 1996/01/24 12:13:31
+//
+xkb_keycodes "lk_common" {
+ // "Function" keys
+ <FK01> = 86;
+ <FK02> = 87;
+ <FK03> = 88;
+ <FK04> = 89;
+ <FK05> = 90;
+ <FK06> = 100;
+ <FK07> = 101;
+ <FK08> = 102;
+ <FK09> = 103;
+ <FK10> = 104;
+ <FK11> = 113;
+ <FK12> = 114;
+
+ <UP> = 170;
+ <LEFT> = 167;
+ <DOWN> = 169;
+ <RGHT> = 168;
+
+ // "Keypad" keys
+ <KP7> = 157;
+ <KP8> = 158;
+ <KP9> = 159;
+ <KP4> = 153;
+ <KP5> = 154;
+ <KP6> = 155;
+ <KP1> = 150;
+ <KP2> = 151;
+ <KP3> = 152;
+ <KPEN> = 149;
+ <KP0> = 146;
+ <KPDL> = 148;
+
+ // "Alphanumeric" keys
+ <AE00> = 191;
+ <AE01> = 192;
+ <AE02> = 197;
+ <AE03> = 203;
+ <AE04> = 208;
+ <AE05> = 214;
+ <AE06> = 219;
+ <AE07> = 224;
+ <AE08> = 229;
+ <AE09> = 234;
+ <AE10> = 239;
+ <AE11> = 249;
+ <AE12> = 245;
+ <BKSP> = 188;
+
+ <TAB> = 190;
+ <AD01> = 193;
+ <AD02> = 198;
+ <AD03> = 204;
+ <AD04> = 209;
+ <AD05> = 215;
+ <AD06> = 220;
+ <AD07> = 225;
+ <AD08> = 230;
+ <AD09> = 235;
+ <AD10> = 240;
+ <AD11> = 250;
+ <AD12> = 246;
+ <RTRN> = 189;
+
+ <LCTL> = 175;
+ <CAPS> = 176;
+ <AC01> = 194;
+ <AC02> = 199;
+ <AC03> = 205;
+ <AC04> = 210;
+ <AC05> = 216;
+ <AC06> = 221;
+ <AC07> = 226;
+ <AC08> = 231;
+ <AC09> = 236;
+ <AC10> = 242;
+ <AC11> = 251;
+
+ <LFSH> = 174;
+ <AB01> = 195;
+ <AB02> = 200;
+ <AB03> = 206;
+ <AB04> = 211;
+ <AB05> = 217;
+ <AB06> = 222;
+ <AB07> = 227;
+ <AB08> = 232;
+ <AB09> = 237;
+ <AB10> = 243;
+ <RTSH> = 171;
+
+ <SPCE> = 212;
+
+ <LDM> = 255; // Support R5 Lock Down Modifiers
+
+ alias <TLDE> = <AE00>;
+};
+
+xkb_keycodes "lkx01" {
+ include "digital_vndr/lk(lk_common)"
+ <AB00> = 201;
+ <FK13> = 115;
+ <FK14> = 116;
+ <FK17> = 128;
+ <FK18> = 129;
+ <FK19> = 130;
+ <FK20> = 131;
+ <HELP> = 124;
+ <DO> = 125;
+ <FIND> = 138;
+ <INS> = 139;
+ <DELE> = 140;
+ <SELE> = 141;
+ <PGUP> = 142;
+ <PGDN> = 143;
+ <KPF1> = 161;
+ <KPF2> = 162;
+ <KPF3> = 163;
+ <KPF4> = 164;
+ <KPSU> = 160;
+ <KPCO> = 156;
+ <BKSL> = 247;
+ <LCMP> = 177;
+};
+
+xkb_keycodes "lk201" {
+ include "digital_vndr/lk(lkx01)"
+ indicator 4 = "Scroll Lock";
+ indicator 3 = "Caps Lock";
+ indicator 2 = "Compose";
+ indicator 1 = "Wait";
+};
+
+xkb_keycodes "lk421" {
+ include "digital_vndr/lk(lkx01)"
+ <LALT> = 172;
+ <RALT> = 178;
+ <RCMP> = 173;
+};
+
+xkb_keycodes "lk401" {
+ include "digital_vndr/lk(lk421)"
+ indicator 4 = "Scroll Lock";
+ indicator 3 = "Caps Lock";
+};
+
+xkb_keycodes "lk44x" {
+ include "digital_vndr/lk(lk_common)"
+ <ESC> = 85;
+ <PRSC> = 115;
+ <SCLK> = 116;
+ <PAUS> = 124;
+ <INS> = 138;
+ <HOME> = 139;
+ <PGUP> = 140;
+ <DELE> = 141;
+ <END> = 142;
+ <PGDN> = 143;
+ <NMLK> = 161;
+ <KPDV> = 162;
+ <KPMU> = 163;
+ <KPSU> = 164;
+ <KPAD> = 156;
+ <LALT> = 172;
+ <RALT> = 178;
+ <RCTL> = 173;
+};
+
+xkb_keycodes "lk443" {
+ include "digital_vndr/lk(lk44x)"
+ <BKSL> = 247;
+ indicator 3 = "Caps Lock";
+ indicator 4 = "Scroll Lock";
+ indicator 5 = "Num Lock";
+};
+
+xkb_keycodes "lk444" {
+ include "digital_vndr/lk(lk44x)"
+ <BKSL> = 201;
+ <AC12> = 247;
+ indicator 3 = "Caps Lock";
+ indicator 4 = "Scroll Lock";
+ indicator 5 = "Num Lock";
+};
+
+// LK201-LT = lk201
+// LK421-AJ = lk421 +AB11
+// LK421-JJ = lk421aj+MUHE+KANJ+HIRA
+// LK401-AJ = lk401
+// LK401-BJ = lk401 +MUHE+KANJ+HIRA
+// LK401-JJ = lk401bj+AB11
+// LK401-LT = lk401
+// LK441-LT = lk443
+
+xkb_keycodes "lk421aj" {
+ include "digital_vndr/lk(lk421)"
+ <AB11> = 252;
+};
+
+xkb_keycodes "lk421jj" {
+ include "digital_vndr/lk(lk421aj)"
+ <MUHE> = 94;
+ <KANJ> = 95;
+ <HIRA> = 97;
+};
+
+xkb_keycodes "lk401bj" {
+ include "digital_vndr/lk(lk401)"
+ <MUHE> = 94;
+ <KANJ> = 95;
+ <HIRA> = 97;
+};
+
+xkb_keycodes "lk401jj" {
+ include "digital_vndr/lk(lk401bj)"
+ <AB11> = 252;
+};
diff --git a/xorg-server/xkeyboard-config/keycodes/digital_vndr/pc b/xorg-server/xkeyboard-config/keycodes/digital_vndr/pc
index 511715627..8cf06f3f0 100644
--- a/xorg-server/xkeyboard-config/keycodes/digital_vndr/pc
+++ b/xorg-server/xkeyboard-config/keycodes/digital_vndr/pc
@@ -1,280 +1,277 @@
-// $Xorg: pc,v 1.3 2000/08/17 19:54:38 cpqbld Exp $
-//
-//Copyright (c) 1996 Digital Equipment Corporation
-//
-//Permission is hereby granted, free of charge, to any person obtaining
-//a copy of this software and associated documentation files (the
-//"Software"), to deal in the Software without restriction, including
-//without limitation the rights to use, copy, modify, merge, publish,
-//distribute, sublicense, and sell copies of the Software, and to
-//permit persons to whom the Software is furnished to do so, subject to
-//the following conditions:
-//
-//The above copyright notice and this permission notice shall be included
-//in all copies or substantial portions of the Software.
-//
-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-//OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-//IN NO EVENT SHALL DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM,
-//DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-//OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-//THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-//Except as contained in this notice, the name of the Digital Equipment
-//Corporation shall not be used in advertising or otherwise to promote
-//the sale, use or other dealings in this Software without prior written
-//authorization from Digital Equipment Corporation.
-//
-// HISTORY
-// Log
-// Revision 1.2 1996/06/18 09:13:25 erik
-// use flags correctly, assorted cleanups and consortium fixes
-//
-// Revision 1.1.6.3 1995/10/25 21:00:14 William_Walker
-// Add pc104-key support
-// [1995/10/23 15:46:21 William_Walker]
-//
-// Revision 1.1.6.2 1995/08/07 17:40:37 William_Walker
-// Upgrade XKB to protocol 0.62 (dual submit from decx11)
-// [1995/08/06 14:06:28 William_Walker]
-//
-// Revision 1.1.2.4 1995/08/05 15:25:56 William_Walker
-// Upgrade to XKB protocol 0.62
-// [1995/08/05 14:40:02 William_Walker]
-//
-// Revision 1.1.2.3 1995/06/27 12:17:32 William_Walker
-// Rename <TLDE> to ISO9995 compliant <AE00>.
-// [1995/06/26 20:24:07 William_Walker]
-//
-// Revision 1.1.2.2 1995/06/05 19:21:31 William_Walker
-// New file. I love keymaps.
-// [1995/06/05 18:07:34 William_Walker]
-//
-// EndLog
-//
-// @(#)RCSfile: pc Revision: /main/3 (DEC) Date: 1996/01/24 12:13:36
-//
-xkb_keycodes "pc_common" {
- // "Function" keys
- <FK01> = 9;
- <FK02> = 15;
- <FK03> = 23;
- <FK04> = 31;
- <FK05> = 39;
- <FK06> = 47;
- <FK07> = 55;
- <FK08> = 63;
- <FK09> = 71;
- <FK10> = 79;
- <FK11> = 86;
- <FK12> = 94;
-
- // "Editing" keys
-
- <UP> = 99;
- <LEFT> = 97;
- <DOWN> = 96;
- <RGHT> = 106;
-
- // "Keypad" keys
- <KP7> = 108;
- <KP8> = 117;
- <KP9> = 125;
-
- <KP4> = 107;
- <KP5> = 115;
- <KP6> = 116;
-
- <KP1> = 105;
- <KP2> = 114;
- <KP3> = 122;
- <KPEN> = 121;
-
- <KP0> = 112;
- <KPDL> = 113;
-
- // "Alphanumeric" keys
- <AE01> = 22;
- <AE02> = 30;
- <AE03> = 38;
- <AE04> = 37;
- <AE05> = 46;
- <AE06> = 54;
- <AE07> = 61;
- <AE08> = 62;
- <AE09> = 70;
- <AE10> = 69;
- <AE11> = 78;
- <AE12> = 85;
- <BKSP> = 102;
-
- <TAB> = 13;
- <AD01> = 21;
- <AD02> = 29;
- <AD03> = 36;
- <AD04> = 45;
- <AD05> = 44;
- <AD06> = 53;
- <AD07> = 60;
- <AD08> = 67;
- <AD09> = 68;
- <AD10> = 77;
- <AD11> = 84;
- <AD12> = 91;
-
- <CAPS> = 20;
- <AC01> = 28;
- <AC02> = 27;
- <AC03> = 35;
- <AC04> = 43;
- <AC05> = 52;
- <AC06> = 51;
- <AC07> = 59;
- <AC08> = 66;
- <AC09> = 75;
- <AC10> = 76;
- <AC11> = 82;
- <RTRN> = 90;
-
- <LFSH> = 18;
- <AB01> = 26;
- <AB02> = 34;
- <AB03> = 33;
- <AB04> = 42;
- <AB05> = 50;
- <AB06> = 49;
- <AB07> = 58;
- <AB08> = 65;
- <AB09> = 73;
- <AB10> = 74;
- <RTSH> = 89;
-
- <LCTL> = 17;
- <LALT> = 25;
- <SPCE> = 41;
- <RALT> = 57;
-
- <LDM> = 255; // Support R5 Lock Down Modifiers
-
-};
-
-xkb_keycodes "pc10x" {
- include "digital_vndr/pc(pc_common)"
- <ESC> = 8;
- <AE00> = 14;
- <PRSC> = 87;
- <SCLK> = 95;
- <PAUS> = 98;
- <INS> = 103;
- <HOME> = 110;
- <PGUP> = 111;
- <DELE> = 100;
- <END> = 101;
- <PGDN> = 109;
- <NMLK> = 118;
- <KPDV> = 119;
- <KPMU> = 126;
- <KPSU> = 132;
- <KPAD> = 124;
- <RCTL> = 88;
-
- alias <TLDE> = <AE00>;
-
- indicator 3 = "Caps Lock";
- indicator 4 = "Scroll Lock";
-};
-
-xkb_keycodes "pc101" {
- include "digital_vndr/pc(pc10x)"
- <BKSL> = 92;
- indicator 5 = "Num Lock";
-};
-
-
-xkb_keycodes "pc102" {
- include "digital_vndr/pc(pc10x)"
- <BKSL> = 19;
- <AC12> = 83;
- indicator 5 = "Num Lock";
-};
-
-xkb_keycodes "pc104" {
- include "digital_vndr/pc(pc101)"
- <LWIN> = 139;
- <RWIN> = 140;
- <MENU> = 141;
-};
-
-xkb_keycodes "lk411_common" {
- include "digital_vndr/pc(pc_common)"
- <AE00> = 8;
- <AB00> = 14;
- <FK13> = 24;
- <FK14> = 10;
- <FK17> = 16;
- <FK18> = 87;
- <FK19> = 95;
- <FK20> = 98;
- <HELP> = 11;
- <DO> = 12;
- <FIND> = 110;
- <INS> = 103;
- <DELE> = 100;
- <SELE> = 101;
- <PGUP> = 111;
- <PGDN> = 109;
- <KPF1> = 118;
- <KPF2> = 119;
- <KPF3> = 126;
- <KPF4> = 132;
- <KPSU> = 19;
- <KPCO> = 124;
- <LCMP> = 40;
- <RCMP> = 88;
-
- alias <TLDE> = <AE00>;
-
- indicator 3 = "Caps Lock";
- indicator 4 = "Scroll Lock";
-};
-
-xkb_keycodes "lk411" {
- include "digital_vndr/pc(lk411_common)"
- <BKSL> = 92;
-};
-
-xkb_keycodes "lk450" {
- include "digital_vndr/pc(lk411)"
- indicator 2 = "Compose";
- indicator 1 = "Wait";
-};
-
-// Japanese variants
-//
-// PCXAJ-AA = pc+BKSL+AC12+AB11+MUHE+KANJ+HIRA+indicator
-// LK411-AJ = lk411+MUHE+KANJ+HIRA
-// LK411-JJ = lk411+BKSL+AZ01+MUHE+KANJ+HIRA
-// LK411-LT = lk411
-
-xkb_keycodes "pcxajaa" {
- include "digital_vndr/pc(pc10x)"
- <BKSL> = 93;
- <AC12> = 83;
- <AB11> = 81;
- <MUHE> = 133;
- <KANJ> = 134;
- <HIRA> = 135;
- indicator 5 = "Group 2";
-};
-
-xkb_keycodes "lk411jj" {
- include "digital_vndr/pc(lk411_common)"
- <AB11> = 81;
- <BKSL> = 83;
- <MUHE> = 133;
- <KANJ> = 134;
- <HIRA> = 135;
-};
-
-
+//
+//Copyright (c) 1996 Digital Equipment Corporation
+//
+//Permission is hereby granted, free of charge, to any person obtaining
+//a copy of this software and associated documentation files (the
+//"Software"), to deal in the Software without restriction, including
+//without limitation the rights to use, copy, modify, merge, publish,
+//distribute, sublicense, and sell copies of the Software, and to
+//permit persons to whom the Software is furnished to do so, subject to
+//the following conditions:
+//
+//The above copyright notice and this permission notice shall be included
+//in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+//OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM,
+//DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+//OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+//THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of the Digital Equipment
+//Corporation shall not be used in advertising or otherwise to promote
+//the sale, use or other dealings in this Software without prior written
+//authorization from Digital Equipment Corporation.
+//
+// HISTORY
+// Log
+// Revision 1.2 1996/06/18 09:13:25 erik
+// use flags correctly, assorted cleanups and consortium fixes
+//
+// Revision 1.1.6.3 1995/10/25 21:00:14 William_Walker
+// Add pc104-key support
+// [1995/10/23 15:46:21 William_Walker]
+//
+// Revision 1.1.6.2 1995/08/07 17:40:37 William_Walker
+// Upgrade XKB to protocol 0.62 (dual submit from decx11)
+// [1995/08/06 14:06:28 William_Walker]
+//
+// Revision 1.1.2.4 1995/08/05 15:25:56 William_Walker
+// Upgrade to XKB protocol 0.62
+// [1995/08/05 14:40:02 William_Walker]
+//
+// Revision 1.1.2.3 1995/06/27 12:17:32 William_Walker
+// Rename <TLDE> to ISO9995 compliant <AE00>.
+// [1995/06/26 20:24:07 William_Walker]
+//
+// Revision 1.1.2.2 1995/06/05 19:21:31 William_Walker
+// New file. I love keymaps.
+// [1995/06/05 18:07:34 William_Walker]
+//
+// EndLog
+//
+// @(#)RCSfile: pc Revision: /main/3 (DEC) Date: 1996/01/24 12:13:36
+//
+xkb_keycodes "pc_common" {
+ // "Function" keys
+ <FK01> = 9;
+ <FK02> = 15;
+ <FK03> = 23;
+ <FK04> = 31;
+ <FK05> = 39;
+ <FK06> = 47;
+ <FK07> = 55;
+ <FK08> = 63;
+ <FK09> = 71;
+ <FK10> = 79;
+ <FK11> = 86;
+ <FK12> = 94;
+
+ // "Editing" keys
+
+ <UP> = 99;
+ <LEFT> = 97;
+ <DOWN> = 96;
+ <RGHT> = 106;
+
+ // "Keypad" keys
+ <KP7> = 108;
+ <KP8> = 117;
+ <KP9> = 125;
+
+ <KP4> = 107;
+ <KP5> = 115;
+ <KP6> = 116;
+
+ <KP1> = 105;
+ <KP2> = 114;
+ <KP3> = 122;
+ <KPEN> = 121;
+
+ <KP0> = 112;
+ <KPDL> = 113;
+
+ // "Alphanumeric" keys
+ <AE01> = 22;
+ <AE02> = 30;
+ <AE03> = 38;
+ <AE04> = 37;
+ <AE05> = 46;
+ <AE06> = 54;
+ <AE07> = 61;
+ <AE08> = 62;
+ <AE09> = 70;
+ <AE10> = 69;
+ <AE11> = 78;
+ <AE12> = 85;
+ <BKSP> = 102;
+
+ <TAB> = 13;
+ <AD01> = 21;
+ <AD02> = 29;
+ <AD03> = 36;
+ <AD04> = 45;
+ <AD05> = 44;
+ <AD06> = 53;
+ <AD07> = 60;
+ <AD08> = 67;
+ <AD09> = 68;
+ <AD10> = 77;
+ <AD11> = 84;
+ <AD12> = 91;
+
+ <CAPS> = 20;
+ <AC01> = 28;
+ <AC02> = 27;
+ <AC03> = 35;
+ <AC04> = 43;
+ <AC05> = 52;
+ <AC06> = 51;
+ <AC07> = 59;
+ <AC08> = 66;
+ <AC09> = 75;
+ <AC10> = 76;
+ <AC11> = 82;
+ <RTRN> = 90;
+
+ <LFSH> = 18;
+ <AB01> = 26;
+ <AB02> = 34;
+ <AB03> = 33;
+ <AB04> = 42;
+ <AB05> = 50;
+ <AB06> = 49;
+ <AB07> = 58;
+ <AB08> = 65;
+ <AB09> = 73;
+ <AB10> = 74;
+ <RTSH> = 89;
+
+ <LCTL> = 17;
+ <LALT> = 25;
+ <SPCE> = 41;
+ <RALT> = 57;
+
+ <LDM> = 255; // Support R5 Lock Down Modifiers
+
+};
+
+xkb_keycodes "pc10x" {
+ include "digital_vndr/pc(pc_common)"
+ <ESC> = 8;
+ <AE00> = 14;
+ <PRSC> = 87;
+ <SCLK> = 95;
+ <PAUS> = 98;
+ <INS> = 103;
+ <HOME> = 110;
+ <PGUP> = 111;
+ <DELE> = 100;
+ <END> = 101;
+ <PGDN> = 109;
+ <NMLK> = 118;
+ <KPDV> = 119;
+ <KPMU> = 126;
+ <KPSU> = 132;
+ <KPAD> = 124;
+ <RCTL> = 88;
+
+ alias <TLDE> = <AE00>;
+
+ indicator 3 = "Caps Lock";
+ indicator 4 = "Scroll Lock";
+};
+
+xkb_keycodes "pc101" {
+ include "digital_vndr/pc(pc10x)"
+ <BKSL> = 92;
+ indicator 5 = "Num Lock";
+};
+
+
+xkb_keycodes "pc102" {
+ include "digital_vndr/pc(pc10x)"
+ <BKSL> = 19;
+ <AC12> = 83;
+ indicator 5 = "Num Lock";
+};
+
+xkb_keycodes "pc104" {
+ include "digital_vndr/pc(pc101)"
+ <LWIN> = 139;
+ <RWIN> = 140;
+ <MENU> = 141;
+};
+
+xkb_keycodes "lk411_common" {
+ include "digital_vndr/pc(pc_common)"
+ <AE00> = 8;
+ <AB00> = 14;
+ <FK13> = 24;
+ <FK14> = 10;
+ <FK17> = 16;
+ <FK18> = 87;
+ <FK19> = 95;
+ <FK20> = 98;
+ <HELP> = 11;
+ <DO> = 12;
+ <FIND> = 110;
+ <INS> = 103;
+ <DELE> = 100;
+ <SELE> = 101;
+ <PGUP> = 111;
+ <PGDN> = 109;
+ <KPF1> = 118;
+ <KPF2> = 119;
+ <KPF3> = 126;
+ <KPF4> = 132;
+ <KPSU> = 19;
+ <KPCO> = 124;
+ <LCMP> = 40;
+ <RCMP> = 88;
+
+ alias <TLDE> = <AE00>;
+
+ indicator 3 = "Caps Lock";
+ indicator 4 = "Scroll Lock";
+};
+
+xkb_keycodes "lk411" {
+ include "digital_vndr/pc(lk411_common)"
+ <BKSL> = 92;
+};
+
+xkb_keycodes "lk450" {
+ include "digital_vndr/pc(lk411)"
+ indicator 2 = "Compose";
+ indicator 1 = "Wait";
+};
+
+// Japanese variants
+//
+// PCXAJ-AA = pc+BKSL+AC12+AB11+MUHE+KANJ+HIRA+indicator
+// LK411-AJ = lk411+MUHE+KANJ+HIRA
+// LK411-JJ = lk411+BKSL+AZ01+MUHE+KANJ+HIRA
+// LK411-LT = lk411
+
+xkb_keycodes "pcxajaa" {
+ include "digital_vndr/pc(pc10x)"
+ <BKSL> = 93;
+ <AC12> = 83;
+ <AB11> = 81;
+ <MUHE> = 133;
+ <KANJ> = 134;
+ <HIRA> = 135;
+ indicator 5 = "Group 2";
+};
+
+xkb_keycodes "lk411jj" {
+ include "digital_vndr/pc(lk411_common)"
+ <AB11> = 81;
+ <BKSL> = 83;
+ <MUHE> = 133;
+ <KANJ> = 134;
+ <HIRA> = 135;
+};
diff --git a/xorg-server/xkeyboard-config/keycodes/evdev b/xorg-server/xkeyboard-config/keycodes/evdev
index d6963a2d5..de035c898 100644
--- a/xorg-server/xkeyboard-config/keycodes/evdev
+++ b/xorg-server/xkeyboard-config/keycodes/evdev
@@ -1,313 +1,314 @@
-// translation from evdev scancodes to something resembling xfree86 keycodes.
-
-default xkb_keycodes "evdev" {
- minimum = 8;
- maximum = 255;
-
- # Added for pc105 compatibility
- <LSGT> = 94;
-
- <TLDE> = 49;
- <AE01> = 10;
- <AE02> = 11;
- <AE03> = 12;
- <AE04> = 13;
- <AE05> = 14;
- <AE06> = 15;
- <AE07> = 16;
- <AE08> = 17;
- <AE09> = 18;
- <AE10> = 19;
- <AE11> = 20;
- <AE12> = 21;
- <BKSP> = 22;
-
- <TAB> = 23;
- <AD01> = 24;
- <AD02> = 25;
- <AD03> = 26;
- <AD04> = 27;
- <AD05> = 28;
- <AD06> = 29;
- <AD07> = 30;
- <AD08> = 31;
- <AD09> = 32;
- <AD10> = 33;
- <AD11> = 34;
- <AD12> = 35;
- <BKSL> = 51;
- alias <AC12> = <BKSL>;
- <RTRN> = 36;
-
- <CAPS> = 66;
- <AC01> = 38;
- <AC02> = 39;
- <AC03> = 40;
- <AC04> = 41;
- <AC05> = 42;
- <AC06> = 43;
- <AC07> = 44;
- <AC08> = 45;
- <AC09> = 46;
- <AC10> = 47;
- <AC11> = 48;
-
- <LFSH> = 50;
- <AB01> = 52;
- <AB02> = 53;
- <AB03> = 54;
- <AB04> = 55;
- <AB05> = 56;
- <AB06> = 57;
- <AB07> = 58;
- <AB08> = 59;
- <AB09> = 60;
- <AB10> = 61;
- <RTSH> = 62;
-
- <LALT> = 64;
- <LCTL> = 37;
- <SPCE> = 65;
- <RCTL> = 105;
- <RALT> = 108;
- // Microsoft keyboard extra keys
- <LWIN> = 133;
- <RWIN> = 134;
- <COMP> = 135;
- alias <MENU> = <COMP>;
-
- <ESC> = 9;
- <FK01> = 67;
- <FK02> = 68;
- <FK03> = 69;
- <FK04> = 70;
- <FK05> = 71;
- <FK06> = 72;
- <FK07> = 73;
- <FK08> = 74;
- <FK09> = 75;
- <FK10> = 76;
- <FK11> = 95;
- <FK12> = 96;
-
- <PRSC> = 107;
- // <SYRQ> = 107;
- <SCLK> = 78;
- <PAUS> = 127;
- // <BRK> = 419;
-
- <INS> = 118;
- <HOME> = 110;
- <PGUP> = 112;
- <DELE> = 119;
- <END> = 115;
- <PGDN> = 117;
-
- <UP> = 111;
- <LEFT> = 113;
- <DOWN> = 116;
- <RGHT> = 114;
-
- <NMLK> = 77;
- <KPDV> = 106;
- <KPMU> = 63;
- <KPSU> = 82;
-
- <KP7> = 79;
- <KP8> = 80;
- <KP9> = 81;
- <KPAD> = 86;
-
- <KP4> = 83;
- <KP5> = 84;
- <KP6> = 85;
-
- <KP1> = 87;
- <KP2> = 88;
- <KP3> = 89;
- <KPEN> = 104;
-
- <KP0> = 90;
- <KPDL> = 91;
- <KPEQ> = 125;
-
- <FK13> = 191;
- <FK14> = 192;
- <FK15> = 193;
- <FK16> = 194;
- <FK17> = 195;
- <FK18> = 196;
- <FK19> = 197;
- <FK20> = 198;
- <FK21> = 199;
- <FK22> = 200;
- <FK23> = 201;
- <FK24> = 202;
-
- // Keys that are generated on Japanese keyboards
-
- //<HZTG> = 93; // Hankaku/Zenkakau toggle - not actually used
- alias <HZTG> = <TLDE>;
- <HKTG> = 101; // Hiragana/Katakana toggle
- <AB11> = 97; // backslash/underscore
- <HENK> = 100; // Henkan
- <MUHE> = 102; // Muhenkan
- <AE13> = 132; // Yen
- <KATA> = 98; // Katakana
- <HIRA> = 99; // Hiragana
- <JPCM> = 103; // KPJPComma
- //<RO> = 97; // Romaji
-
- // Keys that are generated on Korean keyboards
-
- <HNGL> = 130; // Hangul Latin toggle
- <HJCV> = 131; // Hangul to Hanja conversion
-
- // Solaris compatibility
-
- alias <LMTA> = <LWIN>;
- alias <RMTA> = <RWIN>;
- <MUTE> = 121;
- <VOL-> = 122;
- <VOL+> = 123;
- <POWR> = 124;
- <STOP> = 136;
- <AGAI> = 137;
- <PROP> = 138;
- <UNDO> = 139;
- <FRNT> = 140;
- <COPY> = 141;
- <OPEN> = 142;
- <PAST> = 143;
- <FIND> = 144;
- <CUT> = 145;
- <HELP> = 146;
-
- // Extended keys that may be generated on "Internet" keyboards.
- // evdev has standardize names for these.
-
- <LNFD> = 109; // #define KEY_LINEFEED 101
- <I120> = 120; // #define KEY_MACRO 112
- <I126> = 126; // #define KEY_KPPLUSMINUS 118
- <I129> = 129; // #define KEY_KPCOMMA 121
- <I147> = 147; // #define KEY_MENU 139
- <I148> = 148; // #define KEY_CALC 140
- <I149> = 149; // #define KEY_SETUP 141
- <I150> = 150; // #define KEY_SLEEP 142
- <I151> = 151; // #define KEY_WAKEUP 143
- <I152> = 152; // #define KEY_FILE 144
- <I153> = 153; // #define KEY_SENDFILE 145
- <I154> = 154; // #define KEY_DELETEFILE 146
- <I155> = 155; // #define KEY_XFER 147
- <I156> = 156; // #define KEY_PROG1 148
- <I157> = 157; // #define KEY_PROG2 149
- <I158> = 158; // #define KEY_WWW 150
- <I159> = 159; // #define KEY_MSDOS 151
- <I160> = 160; // #define KEY_COFFEE 152
- <I161> = 161; // #define KEY_DIRECTION 153
- <I162> = 162; // #define KEY_CYCLEWINDOWS 154
- <I163> = 163; // #define KEY_MAIL 155
- <I164> = 164; // #define KEY_BOOKMARKS 156
- <I165> = 165; // #define KEY_COMPUTER 157
- <I166> = 166; // #define KEY_BACK 158
- <I167> = 167; // #define KEY_FORWARD 159
- <I168> = 168; // #define KEY_CLOSECD 160
- <I169> = 169; // #define KEY_EJECTCD 161
- <I170> = 170; // #define KEY_EJECTCLOSECD 162
- <I171> = 171; // #define KEY_NEXTSONG 163
- <I172> = 172; // #define KEY_PLAYPAUSE 164
- <I173> = 173; // #define KEY_PREVIOUSSONG 165
- <I174> = 174; // #define KEY_STOPCD 166
- <I175> = 175; // #define KEY_RECORD 167
- <I176> = 176; // #define KEY_REWIND 168
- <I177> = 177; // #define KEY_PHONE 169
- <I178> = 178; // #define KEY_ISO 170
- <I179> = 179; // #define KEY_CONFIG 171
- <I180> = 180; // #define KEY_HOMEPAGE 172
- <I181> = 181; // #define KEY_REFRESH 173
- <I182> = 182; // #define KEY_EXIT 174
- <I183> = 183; // #define KEY_MOVE 175
- <I184> = 184; // #define KEY_EDIT 176
- <I185> = 185; // #define KEY_SCROLLUP 177
- <I186> = 186; // #define KEY_SCROLLDOWN 178
- <I187> = 187; // #define KEY_KPLEFTPAREN 179
- <I188> = 188; // #define KEY_KPRIGHTPAREN 180
- <I189> = 189; // #define KEY_NEW 181
- <I190> = 190; // #define KEY_REDO 182
- <I208> = 208; // #define KEY_PLAYCD 200
- <I209> = 209; // #define KEY_PAUSECD 201
- <I210> = 210; // #define KEY_PROG3 202
- <I211> = 211; // #define KEY_PROG4 203 conflicts with AB11
- <I213> = 213; // #define KEY_SUSPEND 205
- <I214> = 214; // #define KEY_CLOSE 206
- <I215> = 215; // #define KEY_PLAY 207
- <I216> = 216; // #define KEY_FASTFORWARD 208
- <I217> = 217; // #define KEY_BASSBOOST 209
- <I218> = 218; // #define KEY_PRINT 210
- <I219> = 219; // #define KEY_HP 211
- <I220> = 220; // #define KEY_CAMERA 212
- <I221> = 221; // #define KEY_SOUND 213
- <I222> = 222; // #define KEY_QUESTION 214
- <I223> = 223; // #define KEY_EMAIL 215
- <I224> = 224; // #define KEY_CHAT 216
- <I225> = 225; // #define KEY_SEARCH 217
- <I226> = 226; // #define KEY_CONNECT 218
- <I227> = 227; // #define KEY_FINANCE 219
- <I228> = 228; // #define KEY_SPORT 220
- <I229> = 229; // #define KEY_SHOP 221
- <I230> = 230; // #define KEY_ALTERASE 222
- <I231> = 231; // #define KEY_CANCEL 223
- <I232> = 232; // #define KEY_BRIGHTNESSDOWN 224
- <I233> = 233; // #define KEY_BRIGHTNESSUP 225
- <I234> = 234; // #define KEY_MEDIA 226
- <I235> = 235; // #define KEY_SWITCHVIDEOMODE 227
- <I236> = 236; // #define KEY_KBDILLUMTOGGLE 228
- <I237> = 237; // #define KEY_KBDILLUMDOWN 229
- <I238> = 238; // #define KEY_KBDILLUMUP 230
- <I239> = 239; // #define KEY_SEND 231
- <I240> = 240; // #define KEY_REPLY 232
- <I241> = 241; // #define KEY_FORWARDMAIL 233
- <I242> = 242; // #define KEY_SAVE 234
- <I243> = 243; // #define KEY_DOCUMENTS 235
- <I244> = 244; // #define KEY_BATTERY 236
- <I245> = 245; // #define KEY_BLUETOOTH 237
- <I246> = 246; // #define KEY_WLAN 238
- <I247> = 247; // #define KEY_UWB 239
- <I248> = 248; // #define KEY_UNKNOWN 240
- <I249> = 249; // #define KEY_VIDEO_NEXT 241
- <I250> = 250; // #define KEY_VIDEO_PREV 242
- <I251> = 251; // #define KEY_BRIGHTNESS_CYCLE 243
- <I252> = 252; // #define KEY_BRIGHTNESS_ZERO 244
- <I253> = 253; // #define KEY_DISPLAY_OFF 245
-
- // Fake keycodes for virtual keys
- <LVL3> = 92;
- <MDSW> = 203;
- <ALT> = 204;
- <META> = 205;
- <SUPR> = 206;
- <HYPR> = 207;
-
- indicator 1 = "Caps Lock";
- indicator 2 = "Num Lock";
- indicator 3 = "Scroll Lock";
- indicator 4 = "Compose";
- indicator 5 = "Kana";
- indicator 6 = "Sleep";
- indicator 7 = "Suspend";
- indicator 8 = "Mute";
- indicator 9 = "Misc";
- indicator 10 = "Mail";
- indicator 11 = "Charging";
-
- alias <ALGR> = <RALT>;
-
- // For Brazilian ABNT2
- alias <KPPT> = <I129>;
-};
-
-// PC98
-xkb_keycodes "pc98" {
- include "evdev(evdev)"
-};
-
+// translation from evdev scancodes to something resembling xfree86 keycodes.
+
+default xkb_keycodes "evdev" {
+ minimum = 8;
+ maximum = 255;
+
+ # Added for pc105 compatibility
+ <LSGT> = 94;
+
+ <TLDE> = 49;
+ <AE01> = 10;
+ <AE02> = 11;
+ <AE03> = 12;
+ <AE04> = 13;
+ <AE05> = 14;
+ <AE06> = 15;
+ <AE07> = 16;
+ <AE08> = 17;
+ <AE09> = 18;
+ <AE10> = 19;
+ <AE11> = 20;
+ <AE12> = 21;
+ <BKSP> = 22;
+
+ <TAB> = 23;
+ <AD01> = 24;
+ <AD02> = 25;
+ <AD03> = 26;
+ <AD04> = 27;
+ <AD05> = 28;
+ <AD06> = 29;
+ <AD07> = 30;
+ <AD08> = 31;
+ <AD09> = 32;
+ <AD10> = 33;
+ <AD11> = 34;
+ <AD12> = 35;
+ <BKSL> = 51;
+ alias <AC12> = <BKSL>;
+ <RTRN> = 36;
+
+ <CAPS> = 66;
+ <AC01> = 38;
+ <AC02> = 39;
+ <AC03> = 40;
+ <AC04> = 41;
+ <AC05> = 42;
+ <AC06> = 43;
+ <AC07> = 44;
+ <AC08> = 45;
+ <AC09> = 46;
+ <AC10> = 47;
+ <AC11> = 48;
+
+ <LFSH> = 50;
+ <AB01> = 52;
+ <AB02> = 53;
+ <AB03> = 54;
+ <AB04> = 55;
+ <AB05> = 56;
+ <AB06> = 57;
+ <AB07> = 58;
+ <AB08> = 59;
+ <AB09> = 60;
+ <AB10> = 61;
+ <RTSH> = 62;
+
+ <LALT> = 64;
+ <LCTL> = 37;
+ <SPCE> = 65;
+ <RCTL> = 105;
+ <RALT> = 108;
+ // Microsoft keyboard extra keys
+ <LWIN> = 133;
+ <RWIN> = 134;
+ <COMP> = 135;
+ alias <MENU> = <COMP>;
+
+ <ESC> = 9;
+ <FK01> = 67;
+ <FK02> = 68;
+ <FK03> = 69;
+ <FK04> = 70;
+ <FK05> = 71;
+ <FK06> = 72;
+ <FK07> = 73;
+ <FK08> = 74;
+ <FK09> = 75;
+ <FK10> = 76;
+ <FK11> = 95;
+ <FK12> = 96;
+
+ <PRSC> = 107;
+ // <SYRQ> = 107;
+ <SCLK> = 78;
+ <PAUS> = 127;
+ // <BRK> = 419;
+
+ <INS> = 118;
+ <HOME> = 110;
+ <PGUP> = 112;
+ <DELE> = 119;
+ <END> = 115;
+ <PGDN> = 117;
+
+ <UP> = 111;
+ <LEFT> = 113;
+ <DOWN> = 116;
+ <RGHT> = 114;
+
+ <NMLK> = 77;
+ <KPDV> = 106;
+ <KPMU> = 63;
+ <KPSU> = 82;
+
+ <KP7> = 79;
+ <KP8> = 80;
+ <KP9> = 81;
+ <KPAD> = 86;
+
+ <KP4> = 83;
+ <KP5> = 84;
+ <KP6> = 85;
+
+ <KP1> = 87;
+ <KP2> = 88;
+ <KP3> = 89;
+ <KPEN> = 104;
+
+ <KP0> = 90;
+ <KPDL> = 91;
+ <KPEQ> = 125;
+
+ <FK13> = 191;
+ <FK14> = 192;
+ <FK15> = 193;
+ <FK16> = 194;
+ <FK17> = 195;
+ <FK18> = 196;
+ <FK19> = 197;
+ <FK20> = 198;
+ <FK21> = 199;
+ <FK22> = 200;
+ <FK23> = 201;
+ <FK24> = 202;
+
+ // Keys that are generated on Japanese keyboards
+
+ //<HZTG> = 93; // Hankaku/Zenkakau toggle - not actually used
+ alias <HZTG> = <TLDE>;
+ <HKTG> = 101; // Hiragana/Katakana toggle
+ <AB11> = 97; // backslash/underscore
+ <HENK> = 100; // Henkan
+ <MUHE> = 102; // Muhenkan
+ <AE13> = 132; // Yen
+ <KATA> = 98; // Katakana
+ <HIRA> = 99; // Hiragana
+ <JPCM> = 103; // KPJPComma
+ //<RO> = 97; // Romaji
+
+ // Keys that are generated on Korean keyboards
+
+ <HNGL> = 130; // Hangul Latin toggle
+ <HJCV> = 131; // Hangul to Hanja conversion
+
+ // Solaris compatibility
+
+ alias <LMTA> = <LWIN>;
+ alias <RMTA> = <RWIN>;
+ <MUTE> = 121;
+ <VOL-> = 122;
+ <VOL+> = 123;
+ <POWR> = 124;
+ <STOP> = 136;
+ <AGAI> = 137;
+ <PROP> = 138;
+ <UNDO> = 139;
+ <FRNT> = 140;
+ <COPY> = 141;
+ <OPEN> = 142;
+ <PAST> = 143;
+ <FIND> = 144;
+ <CUT> = 145;
+ <HELP> = 146;
+
+ // Extended keys that may be generated on "Internet" keyboards.
+ // evdev has standardize names for these.
+
+ <LNFD> = 109; // #define KEY_LINEFEED 101
+ <I120> = 120; // #define KEY_MACRO 112
+ <I126> = 126; // #define KEY_KPPLUSMINUS 118
+ <I128> = 128; // #define KEY_SCALE 120
+ <I129> = 129; // #define KEY_KPCOMMA 121
+ <I147> = 147; // #define KEY_MENU 139
+ <I148> = 148; // #define KEY_CALC 140
+ <I149> = 149; // #define KEY_SETUP 141
+ <I150> = 150; // #define KEY_SLEEP 142
+ <I151> = 151; // #define KEY_WAKEUP 143
+ <I152> = 152; // #define KEY_FILE 144
+ <I153> = 153; // #define KEY_SENDFILE 145
+ <I154> = 154; // #define KEY_DELETEFILE 146
+ <I155> = 155; // #define KEY_XFER 147
+ <I156> = 156; // #define KEY_PROG1 148
+ <I157> = 157; // #define KEY_PROG2 149
+ <I158> = 158; // #define KEY_WWW 150
+ <I159> = 159; // #define KEY_MSDOS 151
+ <I160> = 160; // #define KEY_COFFEE 152
+ <I161> = 161; // #define KEY_DIRECTION 153
+ <I162> = 162; // #define KEY_CYCLEWINDOWS 154
+ <I163> = 163; // #define KEY_MAIL 155
+ <I164> = 164; // #define KEY_BOOKMARKS 156
+ <I165> = 165; // #define KEY_COMPUTER 157
+ <I166> = 166; // #define KEY_BACK 158
+ <I167> = 167; // #define KEY_FORWARD 159
+ <I168> = 168; // #define KEY_CLOSECD 160
+ <I169> = 169; // #define KEY_EJECTCD 161
+ <I170> = 170; // #define KEY_EJECTCLOSECD 162
+ <I171> = 171; // #define KEY_NEXTSONG 163
+ <I172> = 172; // #define KEY_PLAYPAUSE 164
+ <I173> = 173; // #define KEY_PREVIOUSSONG 165
+ <I174> = 174; // #define KEY_STOPCD 166
+ <I175> = 175; // #define KEY_RECORD 167
+ <I176> = 176; // #define KEY_REWIND 168
+ <I177> = 177; // #define KEY_PHONE 169
+ <I178> = 178; // #define KEY_ISO 170
+ <I179> = 179; // #define KEY_CONFIG 171
+ <I180> = 180; // #define KEY_HOMEPAGE 172
+ <I181> = 181; // #define KEY_REFRESH 173
+ <I182> = 182; // #define KEY_EXIT 174
+ <I183> = 183; // #define KEY_MOVE 175
+ <I184> = 184; // #define KEY_EDIT 176
+ <I185> = 185; // #define KEY_SCROLLUP 177
+ <I186> = 186; // #define KEY_SCROLLDOWN 178
+ <I187> = 187; // #define KEY_KPLEFTPAREN 179
+ <I188> = 188; // #define KEY_KPRIGHTPAREN 180
+ <I189> = 189; // #define KEY_NEW 181
+ <I190> = 190; // #define KEY_REDO 182
+ <I208> = 208; // #define KEY_PLAYCD 200
+ <I209> = 209; // #define KEY_PAUSECD 201
+ <I210> = 210; // #define KEY_PROG3 202
+ <I211> = 211; // #define KEY_PROG4 203 conflicts with AB11
+ <I212> = 212; // #define KEY_DASHBOARD 204
+ <I213> = 213; // #define KEY_SUSPEND 205
+ <I214> = 214; // #define KEY_CLOSE 206
+ <I215> = 215; // #define KEY_PLAY 207
+ <I216> = 216; // #define KEY_FASTFORWARD 208
+ <I217> = 217; // #define KEY_BASSBOOST 209
+ <I218> = 218; // #define KEY_PRINT 210
+ <I219> = 219; // #define KEY_HP 211
+ <I220> = 220; // #define KEY_CAMERA 212
+ <I221> = 221; // #define KEY_SOUND 213
+ <I222> = 222; // #define KEY_QUESTION 214
+ <I223> = 223; // #define KEY_EMAIL 215
+ <I224> = 224; // #define KEY_CHAT 216
+ <I225> = 225; // #define KEY_SEARCH 217
+ <I226> = 226; // #define KEY_CONNECT 218
+ <I227> = 227; // #define KEY_FINANCE 219
+ <I228> = 228; // #define KEY_SPORT 220
+ <I229> = 229; // #define KEY_SHOP 221
+ <I230> = 230; // #define KEY_ALTERASE 222
+ <I231> = 231; // #define KEY_CANCEL 223
+ <I232> = 232; // #define KEY_BRIGHTNESSDOWN 224
+ <I233> = 233; // #define KEY_BRIGHTNESSUP 225
+ <I234> = 234; // #define KEY_MEDIA 226
+ <I235> = 235; // #define KEY_SWITCHVIDEOMODE 227
+ <I236> = 236; // #define KEY_KBDILLUMTOGGLE 228
+ <I237> = 237; // #define KEY_KBDILLUMDOWN 229
+ <I238> = 238; // #define KEY_KBDILLUMUP 230
+ <I239> = 239; // #define KEY_SEND 231
+ <I240> = 240; // #define KEY_REPLY 232
+ <I241> = 241; // #define KEY_FORWARDMAIL 233
+ <I242> = 242; // #define KEY_SAVE 234
+ <I243> = 243; // #define KEY_DOCUMENTS 235
+ <I244> = 244; // #define KEY_BATTERY 236
+ <I245> = 245; // #define KEY_BLUETOOTH 237
+ <I246> = 246; // #define KEY_WLAN 238
+ <I247> = 247; // #define KEY_UWB 239
+ <I248> = 248; // #define KEY_UNKNOWN 240
+ <I249> = 249; // #define KEY_VIDEO_NEXT 241
+ <I250> = 250; // #define KEY_VIDEO_PREV 242
+ <I251> = 251; // #define KEY_BRIGHTNESS_CYCLE 243
+ <I252> = 252; // #define KEY_BRIGHTNESS_ZERO 244
+ <I253> = 253; // #define KEY_DISPLAY_OFF 245
+
+ // Fake keycodes for virtual keys
+ <LVL3> = 92;
+ <MDSW> = 203;
+ <ALT> = 204;
+ <META> = 205;
+ <SUPR> = 206;
+ <HYPR> = 207;
+
+ indicator 1 = "Caps Lock";
+ indicator 2 = "Num Lock";
+ indicator 3 = "Scroll Lock";
+ indicator 4 = "Compose";
+ indicator 5 = "Kana";
+ indicator 6 = "Sleep";
+ indicator 7 = "Suspend";
+ indicator 8 = "Mute";
+ indicator 9 = "Misc";
+ indicator 10 = "Mail";
+ indicator 11 = "Charging";
+
+ alias <ALGR> = <RALT>;
+
+ // For Brazilian ABNT2
+ alias <KPPT> = <I129>;
+};
+
+// PC98
+xkb_keycodes "pc98" {
+ include "evdev(evdev)"
+};
diff --git a/xorg-server/xkeyboard-config/keycodes/fujitsu b/xorg-server/xkeyboard-config/keycodes/fujitsu
index c36a3a984..373621038 100644
--- a/xorg-server/xkeyboard-config/keycodes/fujitsu
+++ b/xorg-server/xkeyboard-config/keycodes/fujitsu
@@ -1,187 +1,186 @@
-// $Xorg: fujitsu,v 1.4 2001/02/09 02:05:52 xorgcvs Exp $
-//
-//Copyright 1996, 1998 The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//The above copyright notice and this permission notice shall be
-//included in all copies or substantial portions of the Software.
-//
-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-//OTHER DEALINGS IN THE SOFTWARE.
-//
-//Except as contained in this notice, the name of The Open Group shall
-//not be used in advertising or otherwise to promote the sale, use or
-//other dealings in this Software without prior written authorization
-//from The Open Group.
-//
-default xkb_keycodes "138" {
-
- minimum= 8;
- maximum= 255;
-
- <ESC> = 37;
- <AE01> = 38;
- <AE02> = 39;
- <AE03> = 40;
- <AE04> = 41;
- <AE05> = 42;
- <AE06> = 43;
- <AE07> = 44;
- <AE08> = 45;
- <AE09> = 46;
- <AE10> = 47;
- <AE11> = 48;
- <AE12> = 49;
- <TLDE> = 50;
- <BKSP> = 51;
-
- <TAB> = 61;
- <AD01> = 62;
- <AD02> = 63;
- <AD03> = 64;
- <AD04> = 65;
- <AD05> = 66;
- <AD06> = 67;
- <AD07> = 68;
- <AD08> = 69;
- <AD09> = 70;
- <AD10> = 71;
- <AD11> = 72;
- <AD12> = 73;
-
- <LCTL> = 84;
- <AC01> = 85;
- <AC02> = 86;
- <AC03> = 87;
- <AC04> = 88;
- <AC05> = 89;
- <AC06> = 90;
- <AC07> = 91;
- <AC08> = 92;
- <AC09> = 93;
- <AC10> = 94;
- <AC11> = 95;
- <BKSL> = 96;
- <RTRN> = 97;
-
- <LFSH> = 107;
- <AB01> = 108;
- <AB02> = 109;
- <AB03> = 110;
- <AB04> = 111;
- <AB05> = 112;
- <AB06> = 113;
- <AB07> = 114;
- <AB08> = 115;
- <AB09> = 116;
- <AB10> = 117;
- <AB11> = 52;
- <RTSH> = 118;
-
- <CAPS> = 127;
- <LALT> = 27;
- <LMTA> = 128;
- <UNK4> = 125;
- <SPCE> = 129;
- <UNK5> = 10;
- <RMTA> = 130;
- <RALT> = 23;
- <COMP> = 75;
- <LNFD> = 119;
- <UNK6> = 56;
-
- <FK01> = 13;
- <FK02> = 14;
- <FK03> = 16;
- <FK04> = 18;
- <FK05> = 20;
- <FK06> = 22;
- <FK07> = 24;
- <FK08> = 25;
- <FK09> = 26;
- <FK10> = 15;
- <FK11> = 17;
- <FK12> = 19;
- <FK13> = 137;
- <FK14> = 138;
- <FK15> = 139;
- <FK16> = 140;
- <FK17> = 141;
- <FK18> = 142;
- <FK19> = 143;
- <FK20> = 144;
- <FK21> = 145;
- <FK22> = 146;
- <FK23> = 147;
- <FK24> = 148;
- <FK25> = 153;
- <FK26> = 154;
- <FK27> = 155;
- <FK28> = 156;
- <FK29> = 149;
- <FK30> = 150;
- <FK31> = 151;
- <FK32> = 152;
-
- <UNDO> = 34;
- <COPY> = 59;
- <PAST> = 81;
- <CUT> = 105;
- <HELP> = 126;
-
- <BREA> = 9;
- <PRSC> = 30;
- <KNJI> = 21;
- <PAUS> = 29;
-
- <UNK0> = 82;
- <UNK1> = 83;
- <UNK2> = 12;
- <PGUP> = 35;
- <HOME> = 32;
- <PGDN> = 36;
- <UNK3> = 28;
- <DEL> = 74;
- <INS> = 60;
- <UP> = 33;
- <DOWN> = 103;
- <LEFT> = 57;
- <RGHT> = 80;
- <EXEC> = 11;
-
- <KPMU> = 55;
- <KPDV> = 54;
- <KPAD> = 133;
- <KPSU> = 79;
-
- <KP7> = 76;
- <KP8> = 77;
- <KP9> = 78;
- <KPEQ> = 53;
-
- <KP4> = 99;
- <KP5> = 100;
- <KP6> = 101;
- <KPDC> = 58;
-
- <KP1> = 120;
- <KP2> = 121;
- <KP3> = 122;
- <KPEN> = 98;
-
- <KP0> = 102;
- <KP00> = 31;
-
- <UNK7> = 123;
- <UNK8> = 124;
-};
+//
+//Copyright 1996, 1998 The Open Group
+//
+//Permission to use, copy, modify, distribute, and sell this software and its
+//documentation for any purpose is hereby granted without fee, provided that
+//the above copyright notice appear in all copies and that both that
+//copyright notice and this permission notice appear in supporting
+//documentation.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from The Open Group.
+//
+default xkb_keycodes "138" {
+
+ minimum= 8;
+ maximum= 255;
+
+ <ESC> = 37;
+ <AE01> = 38;
+ <AE02> = 39;
+ <AE03> = 40;
+ <AE04> = 41;
+ <AE05> = 42;
+ <AE06> = 43;
+ <AE07> = 44;
+ <AE08> = 45;
+ <AE09> = 46;
+ <AE10> = 47;
+ <AE11> = 48;
+ <AE12> = 49;
+ <TLDE> = 50;
+ <BKSP> = 51;
+
+ <TAB> = 61;
+ <AD01> = 62;
+ <AD02> = 63;
+ <AD03> = 64;
+ <AD04> = 65;
+ <AD05> = 66;
+ <AD06> = 67;
+ <AD07> = 68;
+ <AD08> = 69;
+ <AD09> = 70;
+ <AD10> = 71;
+ <AD11> = 72;
+ <AD12> = 73;
+
+ <LCTL> = 84;
+ <AC01> = 85;
+ <AC02> = 86;
+ <AC03> = 87;
+ <AC04> = 88;
+ <AC05> = 89;
+ <AC06> = 90;
+ <AC07> = 91;
+ <AC08> = 92;
+ <AC09> = 93;
+ <AC10> = 94;
+ <AC11> = 95;
+ <BKSL> = 96;
+ <RTRN> = 97;
+
+ <LFSH> = 107;
+ <AB01> = 108;
+ <AB02> = 109;
+ <AB03> = 110;
+ <AB04> = 111;
+ <AB05> = 112;
+ <AB06> = 113;
+ <AB07> = 114;
+ <AB08> = 115;
+ <AB09> = 116;
+ <AB10> = 117;
+ <AB11> = 52;
+ <RTSH> = 118;
+
+ <CAPS> = 127;
+ <LALT> = 27;
+ <LMTA> = 128;
+ <UNK4> = 125;
+ <SPCE> = 129;
+ <UNK5> = 10;
+ <RMTA> = 130;
+ <RALT> = 23;
+ <COMP> = 75;
+ <LNFD> = 119;
+ <UNK6> = 56;
+
+ <FK01> = 13;
+ <FK02> = 14;
+ <FK03> = 16;
+ <FK04> = 18;
+ <FK05> = 20;
+ <FK06> = 22;
+ <FK07> = 24;
+ <FK08> = 25;
+ <FK09> = 26;
+ <FK10> = 15;
+ <FK11> = 17;
+ <FK12> = 19;
+ <FK13> = 137;
+ <FK14> = 138;
+ <FK15> = 139;
+ <FK16> = 140;
+ <FK17> = 141;
+ <FK18> = 142;
+ <FK19> = 143;
+ <FK20> = 144;
+ <FK21> = 145;
+ <FK22> = 146;
+ <FK23> = 147;
+ <FK24> = 148;
+ <FK25> = 153;
+ <FK26> = 154;
+ <FK27> = 155;
+ <FK28> = 156;
+ <FK29> = 149;
+ <FK30> = 150;
+ <FK31> = 151;
+ <FK32> = 152;
+
+ <UNDO> = 34;
+ <COPY> = 59;
+ <PAST> = 81;
+ <CUT> = 105;
+ <HELP> = 126;
+
+ <BREA> = 9;
+ <PRSC> = 30;
+ <KNJI> = 21;
+ <PAUS> = 29;
+
+ <UNK0> = 82;
+ <UNK1> = 83;
+ <UNK2> = 12;
+ <PGUP> = 35;
+ <HOME> = 32;
+ <PGDN> = 36;
+ <UNK3> = 28;
+ <DEL> = 74;
+ <INS> = 60;
+ <UP> = 33;
+ <DOWN> = 103;
+ <LEFT> = 57;
+ <RGHT> = 80;
+ <EXEC> = 11;
+
+ <KPMU> = 55;
+ <KPDV> = 54;
+ <KPAD> = 133;
+ <KPSU> = 79;
+
+ <KP7> = 76;
+ <KP8> = 77;
+ <KP9> = 78;
+ <KPEQ> = 53;
+
+ <KP4> = 99;
+ <KP5> = 100;
+ <KP6> = 101;
+ <KPDC> = 58;
+
+ <KP1> = 120;
+ <KP2> = 121;
+ <KP3> = 122;
+ <KPEN> = 98;
+
+ <KP0> = 102;
+ <KP00> = 31;
+
+ <UNK7> = 123;
+ <UNK8> = 124;
+};
diff --git a/xorg-server/xkeyboard-config/keycodes/hp b/xorg-server/xkeyboard-config/keycodes/hp
index 0c98072d3..544389578 100644
--- a/xorg-server/xkeyboard-config/keycodes/hp
+++ b/xorg-server/xkeyboard-config/keycodes/hp
@@ -1,271 +1,270 @@
-// $Xorg: hp,v 1.4 2001/02/09 02:05:52 xorgcvs Exp $
-//
-//Copyright 1996, 1998 The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//The above copyright notice and this permission notice shall be
-//included in all copies or substantial portions of the Software.
-//
-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-//OTHER DEALINGS IN THE SOFTWARE.
-//
-//Except as contained in this notice, the name of The Open Group shall
-//not be used in advertising or otherwise to promote the sale, use or
-//other dealings in this Software without prior written authorization
-//from The Open Group.
-//
-default xkb_keycodes "hp-101" {
-
- <TLDE> = 23;
- <AE01> = 31;
- <AE02> = 39;
- <AE03> = 47;
- <AE04> = 46;
- <AE05> = 55;
- <AE06> = 63;
- <AE07> = 70;
- <AE08> = 71;
- <AE09> = 79;
- <AE10> = 78;
- <AE11> = 87;
- <AE12> = 94;
- <BKSP> = 111;
-
- <TAB> = 22;
- <AD01> = 30;
- <AD02> = 38;
- <AD03> = 45;
- <AD04> = 54;
- <AD05> = 53;
- <AD06> = 62;
- <AD07> = 69;
- <AD08> = 76;
- <AD09> = 77;
- <AD10> = 86;
- <AD11> = 93;
- <AD12> = 100;
- <BKSL> = 101;
-
- <CAPS> = 29;
- <AC01> = 37;
- <AC02> = 36;
- <AC03> = 44;
- <AC04> = 52;
- <AC05> = 61;
- <AC06> = 60;
- <AC07> = 68;
- <AC08> = 75;
- <AC09> = 84;
- <AC10> = 85;
- <AC11> = 91;
- <RTRN> = 99;
-
- <LFSH> = 27;
- <AB01> = 35;
- <AB02> = 43;
- <AB03> = 42;
- <AB04> = 51;
- <AB05> = 59;
- <AB06> = 58;
- <AB07> = 67;
- <AB08> = 74;
- <AB09> = 82;
- <AB10> = 83;
- <RTSH> = 98;
-
- <LCTL> = 26;
- <LALT> = 34;
- <SPCE> = 50;
- <RALT> = 66;
- <RCTL> = 97;
-
- <ESC> = 17;
- <FK01> = 16;
- <FK02> = 24;
- <FK03> = 32;
- <FK04> = 40;
- <FK05> = 48;
- <FK06> = 56;
- <FK07> = 64;
- <FK08> = 72;
- <FK09> = 80;
- <FK10> = 88;
- <FK11> = 95;
- <FK12> = 103;
-
- <PRSC> = 96;
- <SCLK> = 104;
- <PAUS> = 107;
-
- <INS> = 112;
- <HOME> = 119;
- <PGUP> = 120;
- <DELE> = 109;
- <END> = 110;
- <PGDN> = 118;
-
- <UP> = 108;
- <LEFT> = 106;
- <DOWN> = 105;
- <RGHT> = 115;
-
- <NMLK> = 127;
- <KPDV> = 128;
- <KPMU> = 135;
- <KPSU> = 141;
-
- <KP7> = 117;
- <KP8> = 126;
- <KP9> = 134;
- <KPAD> = 133;
-
- <KP4> = 116;
- <KP5> = 124;
- <KP6> = 125;
-
- <KP1> = 114;
- <KP2> = 123;
- <KP3> = 131;
- <KPEN> = 130;
-
- <KP0> = 121;
- <KPDL> = 122;
-
- indicator 1 = "Caps Lock";
- indicator 2 = "Num Lock";
- indicator 3 = "Scroll Lock";
-};
-
-xkb_keycodes "hil" {
-
- <TLDE> = 71;
- <AE01> = 70;
- <AE02> = 69;
- <AE03> = 68;
- <AE04> = 67;
- <AE05> = 66;
- <AE06> = 65;
- <AE07> = 64;
- <AE08> = 96;
- <AE09> = 97;
- <AE10> = 98;
- <AE11> = 99;
- <AE12> = 100;
- <BKSP> = 101;
-
- <TAB> = 63;
- <AD01> = 62;
- <AD02> = 61;
- <AD03> = 60;
- <AD04> = 59;
- <AD05> = 58;
- <AD06> = 57;
- <AD07> = 56;
- <AD08> = 104;
- <AD09> = 105;
- <AD10> = 106;
- <AD11> = 107;
- <AD12> = 108;
- <BKSL> = 109;
-
- <CAPS> = 55;
- <AC01> = 53;
- <AC02> = 52;
- <AC03> = 51;
- <AC04> = 50;
- <AC05> = 49;
- <AC06> = 48;
- <AC07> = 112;
- <AC08> = 113;
- <AC09> = 114;
- <AC10> = 115;
- <AC11> = 116;
- <RTRN> = 117;
-
- <LFSH> = 13;
- <AB01> = 36;
- <AB02> = 35;
- <AB03> = 34;
- <AB04> = 33;
- <AB05> = 32;
- <AB06> = 128;
- <AB07> = 120;
- <AB08> = 121;
- <AB09> = 122;
- <AB10> = 123;
- <RTSH> = 12;
-
- <LCTL> = 14;
- <LALT> = 11;
- <SPCE> = 129;
- <RALT> = 10;
- <PRSC> = 87;
-
- <ESC> = 39;
- <BRK> = 15;
- <STOP> = 86;
- <FK01> = 84;
- <FK02> = 83;
- <FK03> = 82;
- <FK04> = 81;
- <MENU> = 80;
- <SYST> = 88;
- <FK05> = 89;
- <FK06> = 90;
- <FK07> = 91;
- <FK08> = 92;
- <FK09> = 45;
- <FK10> = 41;
- <FK11> = 43;
- <FK12> = 47;
- <CLRL> = 94;
- <CLR> = 95;
-
- <INSL> = 102;
- <DELL> = 103;
- <INSC> = 110;
- <DELC> = 111;
-
- <HOME> = 118;
- <PGUP> = 119;
- <PGDN> = 127;
- <SELE> = 125;
-
- <UP> = 134;
- <LEFT> = 132;
- <DOWN> = 133;
- <RGHT> = 135;
-
- <KPDV> = 25;
- <KPMU> = 29;
- <KPAD> = 27;
- <KPSU> = 31;
-
- <KP7> = 21;
- <KP8> = 17;
- <KP9> = 19;
- <KPEN> = 23;
-
- <KP4> = 16;
- <KP5> = 18;
- <KP6> = 20;
- <KPSP> = 22;
-
- <KP1> = 24;
- <KP2> = 26;
- <KP3> = 28;
- <KPTB> = 46;
-
- <KP0> = 30;
- <KPDL> = 44;
-};
+//
+//Copyright 1996, 1998 The Open Group
+//
+//Permission to use, copy, modify, distribute, and sell this software and its
+//documentation for any purpose is hereby granted without fee, provided that
+//the above copyright notice appear in all copies and that both that
+//copyright notice and this permission notice appear in supporting
+//documentation.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from The Open Group.
+//
+default xkb_keycodes "hp-101" {
+
+ <TLDE> = 23;
+ <AE01> = 31;
+ <AE02> = 39;
+ <AE03> = 47;
+ <AE04> = 46;
+ <AE05> = 55;
+ <AE06> = 63;
+ <AE07> = 70;
+ <AE08> = 71;
+ <AE09> = 79;
+ <AE10> = 78;
+ <AE11> = 87;
+ <AE12> = 94;
+ <BKSP> = 111;
+
+ <TAB> = 22;
+ <AD01> = 30;
+ <AD02> = 38;
+ <AD03> = 45;
+ <AD04> = 54;
+ <AD05> = 53;
+ <AD06> = 62;
+ <AD07> = 69;
+ <AD08> = 76;
+ <AD09> = 77;
+ <AD10> = 86;
+ <AD11> = 93;
+ <AD12> = 100;
+ <BKSL> = 101;
+
+ <CAPS> = 29;
+ <AC01> = 37;
+ <AC02> = 36;
+ <AC03> = 44;
+ <AC04> = 52;
+ <AC05> = 61;
+ <AC06> = 60;
+ <AC07> = 68;
+ <AC08> = 75;
+ <AC09> = 84;
+ <AC10> = 85;
+ <AC11> = 91;
+ <RTRN> = 99;
+
+ <LFSH> = 27;
+ <AB01> = 35;
+ <AB02> = 43;
+ <AB03> = 42;
+ <AB04> = 51;
+ <AB05> = 59;
+ <AB06> = 58;
+ <AB07> = 67;
+ <AB08> = 74;
+ <AB09> = 82;
+ <AB10> = 83;
+ <RTSH> = 98;
+
+ <LCTL> = 26;
+ <LALT> = 34;
+ <SPCE> = 50;
+ <RALT> = 66;
+ <RCTL> = 97;
+
+ <ESC> = 17;
+ <FK01> = 16;
+ <FK02> = 24;
+ <FK03> = 32;
+ <FK04> = 40;
+ <FK05> = 48;
+ <FK06> = 56;
+ <FK07> = 64;
+ <FK08> = 72;
+ <FK09> = 80;
+ <FK10> = 88;
+ <FK11> = 95;
+ <FK12> = 103;
+
+ <PRSC> = 96;
+ <SCLK> = 104;
+ <PAUS> = 107;
+
+ <INS> = 112;
+ <HOME> = 119;
+ <PGUP> = 120;
+ <DELE> = 109;
+ <END> = 110;
+ <PGDN> = 118;
+
+ <UP> = 108;
+ <LEFT> = 106;
+ <DOWN> = 105;
+ <RGHT> = 115;
+
+ <NMLK> = 127;
+ <KPDV> = 128;
+ <KPMU> = 135;
+ <KPSU> = 141;
+
+ <KP7> = 117;
+ <KP8> = 126;
+ <KP9> = 134;
+ <KPAD> = 133;
+
+ <KP4> = 116;
+ <KP5> = 124;
+ <KP6> = 125;
+
+ <KP1> = 114;
+ <KP2> = 123;
+ <KP3> = 131;
+ <KPEN> = 130;
+
+ <KP0> = 121;
+ <KPDL> = 122;
+
+ indicator 1 = "Caps Lock";
+ indicator 2 = "Num Lock";
+ indicator 3 = "Scroll Lock";
+};
+
+xkb_keycodes "hil" {
+
+ <TLDE> = 71;
+ <AE01> = 70;
+ <AE02> = 69;
+ <AE03> = 68;
+ <AE04> = 67;
+ <AE05> = 66;
+ <AE06> = 65;
+ <AE07> = 64;
+ <AE08> = 96;
+ <AE09> = 97;
+ <AE10> = 98;
+ <AE11> = 99;
+ <AE12> = 100;
+ <BKSP> = 101;
+
+ <TAB> = 63;
+ <AD01> = 62;
+ <AD02> = 61;
+ <AD03> = 60;
+ <AD04> = 59;
+ <AD05> = 58;
+ <AD06> = 57;
+ <AD07> = 56;
+ <AD08> = 104;
+ <AD09> = 105;
+ <AD10> = 106;
+ <AD11> = 107;
+ <AD12> = 108;
+ <BKSL> = 109;
+
+ <CAPS> = 55;
+ <AC01> = 53;
+ <AC02> = 52;
+ <AC03> = 51;
+ <AC04> = 50;
+ <AC05> = 49;
+ <AC06> = 48;
+ <AC07> = 112;
+ <AC08> = 113;
+ <AC09> = 114;
+ <AC10> = 115;
+ <AC11> = 116;
+ <RTRN> = 117;
+
+ <LFSH> = 13;
+ <AB01> = 36;
+ <AB02> = 35;
+ <AB03> = 34;
+ <AB04> = 33;
+ <AB05> = 32;
+ <AB06> = 128;
+ <AB07> = 120;
+ <AB08> = 121;
+ <AB09> = 122;
+ <AB10> = 123;
+ <RTSH> = 12;
+
+ <LCTL> = 14;
+ <LALT> = 11;
+ <SPCE> = 129;
+ <RALT> = 10;
+ <PRSC> = 87;
+
+ <ESC> = 39;
+ <BRK> = 15;
+ <STOP> = 86;
+ <FK01> = 84;
+ <FK02> = 83;
+ <FK03> = 82;
+ <FK04> = 81;
+ <MENU> = 80;
+ <SYST> = 88;
+ <FK05> = 89;
+ <FK06> = 90;
+ <FK07> = 91;
+ <FK08> = 92;
+ <FK09> = 45;
+ <FK10> = 41;
+ <FK11> = 43;
+ <FK12> = 47;
+ <CLRL> = 94;
+ <CLR> = 95;
+
+ <INSL> = 102;
+ <DELL> = 103;
+ <INSC> = 110;
+ <DELC> = 111;
+
+ <HOME> = 118;
+ <PGUP> = 119;
+ <PGDN> = 127;
+ <SELE> = 125;
+
+ <UP> = 134;
+ <LEFT> = 132;
+ <DOWN> = 133;
+ <RGHT> = 135;
+
+ <KPDV> = 25;
+ <KPMU> = 29;
+ <KPAD> = 27;
+ <KPSU> = 31;
+
+ <KP7> = 21;
+ <KP8> = 17;
+ <KP9> = 19;
+ <KPEN> = 23;
+
+ <KP4> = 16;
+ <KP5> = 18;
+ <KP6> = 20;
+ <KPSP> = 22;
+
+ <KP1> = 24;
+ <KP2> = 26;
+ <KP3> = 28;
+ <KPTB> = 46;
+
+ <KP0> = 30;
+ <KPDL> = 44;
+};
diff --git a/xorg-server/xkeyboard-config/keycodes/ibm b/xorg-server/xkeyboard-config/keycodes/ibm
index 303d4b360..3ce84a70a 100644
--- a/xorg-server/xkeyboard-config/keycodes/ibm
+++ b/xorg-server/xkeyboard-config/keycodes/ibm
@@ -1,151 +1,150 @@
-// $Xorg: ibm,v 1.4 2001/02/09 02:05:52 xorgcvs Exp $
-//
-//Copyright 1996, 1998 The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//The above copyright notice and this permission notice shall be
-//included in all copies or substantial portions of the Software.
-//
-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-//OTHER DEALINGS IN THE SOFTWARE.
-//
-//Except as contained in this notice, the name of The Open Group shall
-//not be used in advertising or otherwise to promote the sale, use or
-//other dealings in this Software without prior written authorization
-//from The Open Group.
-//
-xkb_keycodes "rs6k-101" {
-
- <TLDE> = 9;
- <AE01> = 10;
- <AE02> = 11;
- <AE03> = 12;
- <AE04> = 13;
- <AE05> = 14;
- <AE06> = 15;
- <AE07> = 16;
- <AE08> = 17;
- <AE09> = 18;
- <AE10> = 19;
- <AE11> = 20;
- <AE12> = 21;
- <BKSP> = 23;
-
- <TAB> = 24;
- <AD01> = 25;
- <AD02> = 26;
- <AD03> = 27;
- <AD04> = 28;
- <AD05> = 29;
- <AD06> = 30;
- <AD07> = 31;
- <AD08> = 32;
- <AD09> = 33;
- <AD10> = 34;
- <AD11> = 35;
- <AD12> = 36;
- <BKSL> = 37;
-
- <CAPS> = 38;
- <AC01> = 39;
- <AC02> = 40;
- <AC03> = 41;
- <AC04> = 42;
- <AC05> = 43;
- <AC06> = 44;
- <AC07> = 45;
- <AC08> = 46;
- <AC09> = 47;
- <AC10> = 48;
- <AC11> = 49;
- <RTRN> = 51;
-
- <LFSH> = 52;
- <AB01> = 54;
- <AB02> = 55;
- <AB03> = 56;
- <AB04> = 57;
- <AB05> = 58;
- <AB06> = 59;
- <AB07> = 60;
- <AB08> = 61;
- <AB09> = 62;
- <AB10> = 63;
- <RTSH> = 65;
-
- <LCTL> = 66;
- <LALT> = 68;
- <SPCE> = 69;
- <RALT> = 70;
- <RCTL> = 72;
-
- <ESC> = 118;
- <FK01> = 120;
- <FK02> = 121;
- <FK03> = 122;
- <FK04> = 123;
- <FK05> = 124;
- <FK06> = 125;
- <FK07> = 126;
- <FK08> = 127;
- <FK09> = 128;
- <FK10> = 129;
- <FK11> = 130;
- <FK12> = 131;
-
- <PRSC> = 132;
- <SCLK> = 133;
- <PAUS> = 134;
-
- <INS> = 83;
- <HOME> = 88;
- <PGUP> = 93;
- <DELE> = 84;
- <END> = 89;
- <PGDN> = 94;
-
- <UP> = 91;
- <LEFT> = 87;
- <DOWN> = 92;
- <RGHT> = 97;
-
- <NMLK> = 98;
- <KPDV> = 103;
- <KPMU> = 108;
- <KPSU> = 113;
-
- <KP7> = 99;
- <KP8> = 104;
- <KP9> = 109;
- <KPAD> = 114;
-
- <KP4> = 100;
- <KP5> = 105;
- <KP6> = 110;
-
- <KP1> = 101;
- <KP2> = 106;
- <KP3> = 111;
- <KPEN> = 116;
-
- <KP0> = 107;
- <KPDL> = 112;
-
- indicator 1 = "Caps Lock";
- indicator 2 = "Num Lock";
- indicator 3 = "Scroll Lock";
-};
-xkb_keycodes "rs6k-102" {
- include "ibm(rs6k-101)"
- <LSGT> = 53;
-};
+//
+//Copyright 1996, 1998 The Open Group
+//
+//Permission to use, copy, modify, distribute, and sell this software and its
+//documentation for any purpose is hereby granted without fee, provided that
+//the above copyright notice appear in all copies and that both that
+//copyright notice and this permission notice appear in supporting
+//documentation.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from The Open Group.
+//
+xkb_keycodes "rs6k-101" {
+
+ <TLDE> = 9;
+ <AE01> = 10;
+ <AE02> = 11;
+ <AE03> = 12;
+ <AE04> = 13;
+ <AE05> = 14;
+ <AE06> = 15;
+ <AE07> = 16;
+ <AE08> = 17;
+ <AE09> = 18;
+ <AE10> = 19;
+ <AE11> = 20;
+ <AE12> = 21;
+ <BKSP> = 23;
+
+ <TAB> = 24;
+ <AD01> = 25;
+ <AD02> = 26;
+ <AD03> = 27;
+ <AD04> = 28;
+ <AD05> = 29;
+ <AD06> = 30;
+ <AD07> = 31;
+ <AD08> = 32;
+ <AD09> = 33;
+ <AD10> = 34;
+ <AD11> = 35;
+ <AD12> = 36;
+ <BKSL> = 37;
+
+ <CAPS> = 38;
+ <AC01> = 39;
+ <AC02> = 40;
+ <AC03> = 41;
+ <AC04> = 42;
+ <AC05> = 43;
+ <AC06> = 44;
+ <AC07> = 45;
+ <AC08> = 46;
+ <AC09> = 47;
+ <AC10> = 48;
+ <AC11> = 49;
+ <RTRN> = 51;
+
+ <LFSH> = 52;
+ <AB01> = 54;
+ <AB02> = 55;
+ <AB03> = 56;
+ <AB04> = 57;
+ <AB05> = 58;
+ <AB06> = 59;
+ <AB07> = 60;
+ <AB08> = 61;
+ <AB09> = 62;
+ <AB10> = 63;
+ <RTSH> = 65;
+
+ <LCTL> = 66;
+ <LALT> = 68;
+ <SPCE> = 69;
+ <RALT> = 70;
+ <RCTL> = 72;
+
+ <ESC> = 118;
+ <FK01> = 120;
+ <FK02> = 121;
+ <FK03> = 122;
+ <FK04> = 123;
+ <FK05> = 124;
+ <FK06> = 125;
+ <FK07> = 126;
+ <FK08> = 127;
+ <FK09> = 128;
+ <FK10> = 129;
+ <FK11> = 130;
+ <FK12> = 131;
+
+ <PRSC> = 132;
+ <SCLK> = 133;
+ <PAUS> = 134;
+
+ <INS> = 83;
+ <HOME> = 88;
+ <PGUP> = 93;
+ <DELE> = 84;
+ <END> = 89;
+ <PGDN> = 94;
+
+ <UP> = 91;
+ <LEFT> = 87;
+ <DOWN> = 92;
+ <RGHT> = 97;
+
+ <NMLK> = 98;
+ <KPDV> = 103;
+ <KPMU> = 108;
+ <KPSU> = 113;
+
+ <KP7> = 99;
+ <KP8> = 104;
+ <KP9> = 109;
+ <KPAD> = 114;
+
+ <KP4> = 100;
+ <KP5> = 105;
+ <KP6> = 110;
+
+ <KP1> = 101;
+ <KP2> = 106;
+ <KP3> = 111;
+ <KPEN> = 116;
+
+ <KP0> = 107;
+ <KPDL> = 112;
+
+ indicator 1 = "Caps Lock";
+ indicator 2 = "Num Lock";
+ indicator 3 = "Scroll Lock";
+};
+xkb_keycodes "rs6k-102" {
+ include "ibm(rs6k-101)"
+ <LSGT> = 53;
+};
diff --git a/xorg-server/xkeyboard-config/keycodes/macintosh b/xorg-server/xkeyboard-config/keycodes/macintosh
index 5b0a2614a..a6e6ee061 100644
--- a/xorg-server/xkeyboard-config/keycodes/macintosh
+++ b/xorg-server/xkeyboard-config/keycodes/macintosh
@@ -1,4 +1,3 @@
-// $XConsortium: macintosh /main/10 1996/01/24 12:17:35 kaleb $
//
//Copyright (c) 1996 X Consortium
//
@@ -26,7 +25,6 @@
//other dealings in this Software without prior written authorization
//from the X Consortium.
//
-// $XFree86: xc/programs/xkbcomp/keycodes/macintosh,v 1.4 2001/10/02 19:57:00 alanh Exp $
//
default xkb_keycodes "macintosh" {
include "xfree86"
@@ -208,4 +206,3 @@ xkb_keycodes "jisevdev" {
alias <KANA> = <HJCV>; // Switch to kana mode
alias <EISU> = <HNGL>; // Switch to alphanumeric mode
};
-
diff --git a/xorg-server/xkeyboard-config/keycodes/sgi_vndr/indigo b/xorg-server/xkeyboard-config/keycodes/sgi_vndr/indigo
index 6605ade53..2f5f45bfc 100644
--- a/xorg-server/xkeyboard-config/keycodes/sgi_vndr/indigo
+++ b/xorg-server/xkeyboard-config/keycodes/sgi_vndr/indigo
@@ -1,140 +1,139 @@
-// $Xorg: indigo,v 1.3 2000/08/17 19:54:39 cpqbld Exp $
-default xkb_keycodes "pc101" {
- minimum= 8;
- maximum= 255;
-
- <TLDE> = 62;
- <AE01> = 15;
- <AE02> = 21;
- <AE03> = 22;
- <AE04> = 29;
- <AE05> = 30;
- <AE06> = 37;
- <AE07> = 38;
- <AE08> = 45;
- <AE09> = 46;
- <AE10> = 53;
- <AE11> = 54;
- <AE12> = 61;
- <BKSP> = 68;
-
- <TAB> = 16;
- <AD01> = 17;
- <AD02> = 23;
- <AD03> = 24;
- <AD04> = 31;
- <AD05> = 32;
- <AD06> = 39;
- <AD07> = 40;
- <AD08> = 47;
- <AD09> = 48;
- <AD10> = 55;
- <AD11> = 56;
- <AD12> = 63;
- <RTRN> = 58;
-
- <CAPS> = 11;
- <AC01> = 18;
- <AC02> = 19;
- <AC03> = 25;
- <AC04> = 26;
- <AC05> = 33;
- <AC06> = 34;
- <AC07> = 41;
- <AC08> = 42;
- <AC09> = 49;
- <AC10> = 50;
- <AC11> = 57;
-
- <LFSH> = 13;
- <AB01> = 27;
- <AB02> = 28;
- <AB03> = 35;
- <AB04> = 36;
- <AB05> = 43;
- <AB06> = 44;
- <AB07> = 51;
- <AB08> = 52;
- <AB09> = 59;
- <AB10> = 60;
- <RTSH> = 12;
- <BKSL> = 64;
-
- <LALT> = 91;
- <LCTL> = 10;
- <SPCE> = 90;
- <RCTL> = 93;
- <RALT> = 92;
-
- <ESC> = 14;
- <FK01> = 94;
- <FK02> = 95;
- <FK03> = 96;
- <FK04> = 97;
- <FK05> = 98;
- <FK06> = 99;
- <FK07> = 100;
- <FK08> = 101;
- <FK09> = 102;
- <FK10> = 103;
- <FK11> = 104;
- <FK12> = 105;
-
- <PRSC> = 106;
- <SCLK> = 107;
- <PAUS> = 108;
-
- <INS> = 109;
- <HOME> = 110;
- <PGUP> = 111;
- <DELE> = 69;
- <END> = 112;
- <PGDN> = 113;
-
- <UP> = 88;
- <LEFT> = 80;
- <DOWN> = 81;
- <RGHT> = 87;
-
- <NMLK> = 114;
- <KPDV> = 115;
- <KPMU> = 116;
- <KPSU> = 83;
-
- <KP7> = 74;
- <KP8> = 75;
- <KP9> = 82;
- <KPAD> = 117;
-
- <KP4> = 70;
- <KP5> = 76;
- <KP6> = 77;
-
- <KP1> = 65;
- <KP2> = 71;
- <KP3> = 72;
- <KPEN> = 89;
-
- <KP0> = 66;
- <KPDL> = 73;
-
- alias <AE00> = <TLDE>;
- alias <AC00> = <CAPS>;
- alias <AA00> = <LCTL>;
- alias <AA01> = <LALT>;
- alias <AA09> = <RALT>;
- alias <ALGR> = <RALT>;
- alias <AA12> = <RCTL>;
-
- virtual indicator 1 = "L1";
- virtual indicator 2 = "L2";
- virtual indicator 3 = "L3";
- virtual indicator 4 = "L4";
- indicator 5 = "Caps Lock";
- indicator 6 = "Num Lock";
- indicator 7 = "Scroll Lock";
-};
-xkb_keycodes "pc102" {
- include "sgi_vndr/indigo(pc101)"
- <LSGT> = 118;
-};
+default xkb_keycodes "pc101" {
+ minimum= 8;
+ maximum= 255;
+
+ <TLDE> = 62;
+ <AE01> = 15;
+ <AE02> = 21;
+ <AE03> = 22;
+ <AE04> = 29;
+ <AE05> = 30;
+ <AE06> = 37;
+ <AE07> = 38;
+ <AE08> = 45;
+ <AE09> = 46;
+ <AE10> = 53;
+ <AE11> = 54;
+ <AE12> = 61;
+ <BKSP> = 68;
+
+ <TAB> = 16;
+ <AD01> = 17;
+ <AD02> = 23;
+ <AD03> = 24;
+ <AD04> = 31;
+ <AD05> = 32;
+ <AD06> = 39;
+ <AD07> = 40;
+ <AD08> = 47;
+ <AD09> = 48;
+ <AD10> = 55;
+ <AD11> = 56;
+ <AD12> = 63;
+ <RTRN> = 58;
+
+ <CAPS> = 11;
+ <AC01> = 18;
+ <AC02> = 19;
+ <AC03> = 25;
+ <AC04> = 26;
+ <AC05> = 33;
+ <AC06> = 34;
+ <AC07> = 41;
+ <AC08> = 42;
+ <AC09> = 49;
+ <AC10> = 50;
+ <AC11> = 57;
+
+ <LFSH> = 13;
+ <AB01> = 27;
+ <AB02> = 28;
+ <AB03> = 35;
+ <AB04> = 36;
+ <AB05> = 43;
+ <AB06> = 44;
+ <AB07> = 51;
+ <AB08> = 52;
+ <AB09> = 59;
+ <AB10> = 60;
+ <RTSH> = 12;
+ <BKSL> = 64;
+
+ <LALT> = 91;
+ <LCTL> = 10;
+ <SPCE> = 90;
+ <RCTL> = 93;
+ <RALT> = 92;
+
+ <ESC> = 14;
+ <FK01> = 94;
+ <FK02> = 95;
+ <FK03> = 96;
+ <FK04> = 97;
+ <FK05> = 98;
+ <FK06> = 99;
+ <FK07> = 100;
+ <FK08> = 101;
+ <FK09> = 102;
+ <FK10> = 103;
+ <FK11> = 104;
+ <FK12> = 105;
+
+ <PRSC> = 106;
+ <SCLK> = 107;
+ <PAUS> = 108;
+
+ <INS> = 109;
+ <HOME> = 110;
+ <PGUP> = 111;
+ <DELE> = 69;
+ <END> = 112;
+ <PGDN> = 113;
+
+ <UP> = 88;
+ <LEFT> = 80;
+ <DOWN> = 81;
+ <RGHT> = 87;
+
+ <NMLK> = 114;
+ <KPDV> = 115;
+ <KPMU> = 116;
+ <KPSU> = 83;
+
+ <KP7> = 74;
+ <KP8> = 75;
+ <KP9> = 82;
+ <KPAD> = 117;
+
+ <KP4> = 70;
+ <KP5> = 76;
+ <KP6> = 77;
+
+ <KP1> = 65;
+ <KP2> = 71;
+ <KP3> = 72;
+ <KPEN> = 89;
+
+ <KP0> = 66;
+ <KPDL> = 73;
+
+ alias <AE00> = <TLDE>;
+ alias <AC00> = <CAPS>;
+ alias <AA00> = <LCTL>;
+ alias <AA01> = <LALT>;
+ alias <AA09> = <RALT>;
+ alias <ALGR> = <RALT>;
+ alias <AA12> = <RCTL>;
+
+ virtual indicator 1 = "L1";
+ virtual indicator 2 = "L2";
+ virtual indicator 3 = "L3";
+ virtual indicator 4 = "L4";
+ indicator 5 = "Caps Lock";
+ indicator 6 = "Num Lock";
+ indicator 7 = "Scroll Lock";
+};
+xkb_keycodes "pc102" {
+ include "sgi_vndr/indigo(pc101)"
+ <LSGT> = 118;
+};
diff --git a/xorg-server/xkeyboard-config/keycodes/sgi_vndr/indy b/xorg-server/xkeyboard-config/keycodes/sgi_vndr/indy
index e16a0cbc1..aab3749b5 100644
--- a/xorg-server/xkeyboard-config/keycodes/sgi_vndr/indy
+++ b/xorg-server/xkeyboard-config/keycodes/sgi_vndr/indy
@@ -1,203 +1,202 @@
-// $Xorg: indy,v 1.3 2000/08/17 19:54:39 cpqbld Exp $
-default xkb_keycodes "universal" {
- minimum= 8;
- maximum= 255;
- include "sgi_vndr/indy(pc105)"
- alternate <BKSL> = 91;
- alternate <BKSL> = 100;
- alternate <BKSL> = 101;
-};
-xkb_keycodes "pc101" {
- minimum= 8;
- maximum= 255;
-
- <TLDE> = 22;
- <AE01> = 30;
- <AE02> = 38;
- <AE03> = 46;
- <AE04> = 45;
- <AE05> = 54;
- <AE06> = 62;
- <AE07> = 69;
- <AE08> = 70;
- <AE09> = 78;
- <AE10> = 77;
- <AE11> = 86;
- <AE12> = 93;
- <BKSP> = 110;
-
- <TAB> = 21;
- <AD01> = 29;
- <AD02> = 37;
- <AD03> = 44;
- <AD04> = 53;
- <AD05> = 52;
- <AD06> = 61;
- <AD07> = 68;
- <AD08> = 75;
- <AD09> = 76;
- <AD10> = 85;
- <AD11> = 92;
- <AD12> = 99;
- <RTRN> = 98;
-
- <CAPS> = 28;
- <AC01> = 36;
- <AC02> = 35;
- <AC03> = 43;
- <AC04> = 51;
- <AC05> = 60;
- <AC06> = 59;
- <AC07> = 67;
- <AC08> = 74;
- <AC09> = 83;
- <AC10> = 84;
- <AC11> = 90;
-
- <LFSH> = 26;
- <AB01> = 34;
- <AB02> = 42;
- <AB03> = 41;
- <AB04> = 50;
- <AB05> = 58;
- <AB06> = 57;
- <AB07> = 66;
- <AB08> = 73;
- <AB09> = 81;
- <AB10> = 82;
- <RTSH> = 97;
- <BKSL> = 100;
-
- <LALT> = 33;
- <LCTL> = 25;
- <SPCE> = 49;
- <RCTL> = 96;
- <RALT> = 65;
-
- <ESC> = 16;
- <FK01> = 15;
- <FK02> = 23;
- <FK03> = 31;
- <FK04> = 39;
- <FK05> = 47;
- <FK06> = 55;
- <FK07> = 63;
- <FK08> = 71;
- <FK09> = 79;
- <FK10> = 87;
- <FK11> = 94;
- <FK12> = 102;
-
- <PRSC> = 95;
- <SCLK> = 103;
- <PAUS> = 106;
-
- <INS> = 111;
- <HOME> = 118;
- <PGUP> = 119;
- <DELE> = 108;
- <END> = 109;
- <PGDN> = 117;
-
- <UP> = 107;
- <LEFT> = 105;
- <DOWN> = 104;
- <RGHT> = 114;
-
- <NMLK> = 126;
- <KPDV> = 127;
- <KPMU> = 134;
- <KPSU> = 140;
-
- <KP7> = 116;
- <KP8> = 125;
- <KP9> = 133;
- <KPAD> = 132;
-
- <KP4> = 115;
- <KP5> = 123;
- <KP6> = 124;
-
- <KP1> = 113;
- <KP2> = 122;
- <KP3> = 130;
- <KPEN> = 129;
-
- <KP0> = 120;
- <KPDL> = 121;
-
- alias <AE00> = <TLDE>;
- alias <AC00> = <CAPS>;
- alias <AA00> = <LCTL>;
- alias <AA01> = <LALT>;
- alias <AA09> = <RALT>;
- alias <ALGR> = <RALT>;
- alias <AA12> = <RCTL>;
-
- virtual indicator 1 = "L1";
- virtual indicator 2 = "L2";
- virtual indicator 3 = "L3";
- virtual indicator 4 = "L4";
- indicator 5 = "Caps Lock";
- indicator 6 = "Num Lock";
- indicator 7 = "Scroll Lock";
-
-};
-xkb_keycodes "pc102" {
- <BKSL> = 91;
- <LSGT> = 27;
- augment "sgi_vndr/indy(pc101)"
- maximum= 255;
- minimum= 8;
-};
-xkb_keycodes "pc104" {
- include "sgi_vndr/indy(pc101)"
- minimum= 8;
- maximum= 255;
-
- // These key names are here to support so-called "Windows95"
- // keyboards like the Microsoft Natural keyboard.
- <LWIN> = 147;
- <RWIN> = 148;
- <MENU> = 149;
-};
-xkb_keycodes "pc105" {
- <LSGT> = 27;
- augment "sgi_vndr/indy(pc104)"
- minimum= 8;
- maximum= 255;
-};
-xkb_keycodes "jp106" {
- <HZTG> = 22;
- <AB11> = 89;
- <AC12> = 91;
- <NFER> = 141;
- <XFER> = 142;
- <HKTG> = 143;
- alias <TLDE> = <HZTG>;
- alias <AE00> = <HZTG>;
- alias <AE13> = <BKSL>;
- augment "sgi_vndr/indy(pc101)"
- minimum= 8;
- maximum= 255;
-};
-// can be combined with any other "indy" keycode
-// description to add virtual keys which can be
-// used to implement an overlay-based numeric
-// keypad.
-partial hidden xkb_keycodes "overlayKeypad" {
- <KO7> = 17;
- <KO8> = 18;
- <KO9> = 19;
- <KO6> = 146;
- <KO5> = 145;
- <KO4> = 144;
- <KO1> = 136;
- <KO2> = 137;
- <KO3> = 138;
- <KO0> = 135;
- <KODL> = 139;
-};
-partial hidden xkb_keycodes "shiftLock" {
- indicator 5 = "Shift Lock";
-};
+default xkb_keycodes "universal" {
+ minimum= 8;
+ maximum= 255;
+ include "sgi_vndr/indy(pc105)"
+ alternate <BKSL> = 91;
+ alternate <BKSL> = 100;
+ alternate <BKSL> = 101;
+};
+xkb_keycodes "pc101" {
+ minimum= 8;
+ maximum= 255;
+
+ <TLDE> = 22;
+ <AE01> = 30;
+ <AE02> = 38;
+ <AE03> = 46;
+ <AE04> = 45;
+ <AE05> = 54;
+ <AE06> = 62;
+ <AE07> = 69;
+ <AE08> = 70;
+ <AE09> = 78;
+ <AE10> = 77;
+ <AE11> = 86;
+ <AE12> = 93;
+ <BKSP> = 110;
+
+ <TAB> = 21;
+ <AD01> = 29;
+ <AD02> = 37;
+ <AD03> = 44;
+ <AD04> = 53;
+ <AD05> = 52;
+ <AD06> = 61;
+ <AD07> = 68;
+ <AD08> = 75;
+ <AD09> = 76;
+ <AD10> = 85;
+ <AD11> = 92;
+ <AD12> = 99;
+ <RTRN> = 98;
+
+ <CAPS> = 28;
+ <AC01> = 36;
+ <AC02> = 35;
+ <AC03> = 43;
+ <AC04> = 51;
+ <AC05> = 60;
+ <AC06> = 59;
+ <AC07> = 67;
+ <AC08> = 74;
+ <AC09> = 83;
+ <AC10> = 84;
+ <AC11> = 90;
+
+ <LFSH> = 26;
+ <AB01> = 34;
+ <AB02> = 42;
+ <AB03> = 41;
+ <AB04> = 50;
+ <AB05> = 58;
+ <AB06> = 57;
+ <AB07> = 66;
+ <AB08> = 73;
+ <AB09> = 81;
+ <AB10> = 82;
+ <RTSH> = 97;
+ <BKSL> = 100;
+
+ <LALT> = 33;
+ <LCTL> = 25;
+ <SPCE> = 49;
+ <RCTL> = 96;
+ <RALT> = 65;
+
+ <ESC> = 16;
+ <FK01> = 15;
+ <FK02> = 23;
+ <FK03> = 31;
+ <FK04> = 39;
+ <FK05> = 47;
+ <FK06> = 55;
+ <FK07> = 63;
+ <FK08> = 71;
+ <FK09> = 79;
+ <FK10> = 87;
+ <FK11> = 94;
+ <FK12> = 102;
+
+ <PRSC> = 95;
+ <SCLK> = 103;
+ <PAUS> = 106;
+
+ <INS> = 111;
+ <HOME> = 118;
+ <PGUP> = 119;
+ <DELE> = 108;
+ <END> = 109;
+ <PGDN> = 117;
+
+ <UP> = 107;
+ <LEFT> = 105;
+ <DOWN> = 104;
+ <RGHT> = 114;
+
+ <NMLK> = 126;
+ <KPDV> = 127;
+ <KPMU> = 134;
+ <KPSU> = 140;
+
+ <KP7> = 116;
+ <KP8> = 125;
+ <KP9> = 133;
+ <KPAD> = 132;
+
+ <KP4> = 115;
+ <KP5> = 123;
+ <KP6> = 124;
+
+ <KP1> = 113;
+ <KP2> = 122;
+ <KP3> = 130;
+ <KPEN> = 129;
+
+ <KP0> = 120;
+ <KPDL> = 121;
+
+ alias <AE00> = <TLDE>;
+ alias <AC00> = <CAPS>;
+ alias <AA00> = <LCTL>;
+ alias <AA01> = <LALT>;
+ alias <AA09> = <RALT>;
+ alias <ALGR> = <RALT>;
+ alias <AA12> = <RCTL>;
+
+ virtual indicator 1 = "L1";
+ virtual indicator 2 = "L2";
+ virtual indicator 3 = "L3";
+ virtual indicator 4 = "L4";
+ indicator 5 = "Caps Lock";
+ indicator 6 = "Num Lock";
+ indicator 7 = "Scroll Lock";
+
+};
+xkb_keycodes "pc102" {
+ <BKSL> = 91;
+ <LSGT> = 27;
+ augment "sgi_vndr/indy(pc101)"
+ maximum= 255;
+ minimum= 8;
+};
+xkb_keycodes "pc104" {
+ include "sgi_vndr/indy(pc101)"
+ minimum= 8;
+ maximum= 255;
+
+ // These key names are here to support so-called "Windows95"
+ // keyboards like the Microsoft Natural keyboard.
+ <LWIN> = 147;
+ <RWIN> = 148;
+ <MENU> = 149;
+};
+xkb_keycodes "pc105" {
+ <LSGT> = 27;
+ augment "sgi_vndr/indy(pc104)"
+ minimum= 8;
+ maximum= 255;
+};
+xkb_keycodes "jp106" {
+ <HZTG> = 22;
+ <AB11> = 89;
+ <AC12> = 91;
+ <NFER> = 141;
+ <XFER> = 142;
+ <HKTG> = 143;
+ alias <TLDE> = <HZTG>;
+ alias <AE00> = <HZTG>;
+ alias <AE13> = <BKSL>;
+ augment "sgi_vndr/indy(pc101)"
+ minimum= 8;
+ maximum= 255;
+};
+// can be combined with any other "indy" keycode
+// description to add virtual keys which can be
+// used to implement an overlay-based numeric
+// keypad.
+partial hidden xkb_keycodes "overlayKeypad" {
+ <KO7> = 17;
+ <KO8> = 18;
+ <KO9> = 19;
+ <KO6> = 146;
+ <KO5> = 145;
+ <KO4> = 144;
+ <KO1> = 136;
+ <KO2> = 137;
+ <KO3> = 138;
+ <KO0> = 135;
+ <KODL> = 139;
+};
+partial hidden xkb_keycodes "shiftLock" {
+ indicator 5 = "Shift Lock";
+};
diff --git a/xorg-server/xkeyboard-config/keycodes/sgi_vndr/iris b/xorg-server/xkeyboard-config/keycodes/sgi_vndr/iris
index a4118a6b4..18068175d 100644
--- a/xorg-server/xkeyboard-config/keycodes/sgi_vndr/iris
+++ b/xorg-server/xkeyboard-config/keycodes/sgi_vndr/iris
@@ -1,11 +1,10 @@
-// $Xorg: iris,v 1.3 2000/08/17 19:54:39 cpqbld Exp $
-default xkb_keycodes "iris" {
- include "sgi_vndr/indigo(pc101)"
- indicator 1 = "L1";
- indicator 2 = "L2";
- indicator 3 = "L3";
- indicator 4 = "L4";
- indicator 5 = "Caps Lock";
- indicator 6 = "Num Lock";
- indicator 7 = "Scroll Lock";
-};
+default xkb_keycodes "iris" {
+ include "sgi_vndr/indigo(pc101)"
+ indicator 1 = "L1";
+ indicator 2 = "L2";
+ indicator 3 = "L3";
+ indicator 4 = "L4";
+ indicator 5 = "Caps Lock";
+ indicator 6 = "Num Lock";
+ indicator 7 = "Scroll Lock";
+};
diff --git a/xorg-server/xkeyboard-config/keycodes/sony b/xorg-server/xkeyboard-config/keycodes/sony
index 0e720b422..def1eaf6b 100644
--- a/xorg-server/xkeyboard-config/keycodes/sony
+++ b/xorg-server/xkeyboard-config/keycodes/sony
@@ -1,142 +1,141 @@
-// $Xorg: sony,v 1.4 2001/02/09 02:05:52 xorgcvs Exp $
-//
-//Copyright 1996, 1998 The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//The above copyright notice and this permission notice shall be
-//included in all copies or substantial portions of the Software.
-//
-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-//OTHER DEALINGS IN THE SOFTWARE.
-//
-//Except as contained in this notice, the name of The Open Group shall
-//not be used in advertising or otherwise to promote the sale, use or
-//other dealings in this Software without prior written authorization
-//from The Open Group.
-//
-xkb_keycodes "nwp5461" {
-
- <ESC> = 18;
- <AE01> = 19;
- <AE02> = 20;
- <AE03> = 21;
- <AE04> = 22;
- <AE05> = 23;
- <AE06> = 24;
- <AE07> = 25;
- <AE08> = 26;
- <AE09> = 27;
- <AE10> = 28;
- <AE11> = 29;
- <AE12> = 30;
- <BKSL> = 31;
- <BKSP> = 32;
-
- <TAB> = 33;
- <AD01> = 34;
- <AD02> = 35;
- <AD03> = 36;
- <AD04> = 37;
- <AD05> = 38;
- <AD06> = 39;
- <AD07> = 40;
- <AD08> = 41;
- <AD09> = 42;
- <AD10> = 43;
- <AD11> = 44;
- <AD12> = 45;
- <DELE> = 46;
-
- <LCTL> = 47;
- <AC01> = 48;
- <AC02> = 49;
- <AC03> = 50;
- <AC04> = 51;
- <AC05> = 52;
- <AC06> = 53;
- <AC07> = 54;
- <AC08> = 55;
- <AC09> = 56;
- <AC10> = 57;
- <AC11> = 58;
- <TLDE> = 59;
- <RTRN> = 60;
-
- <LFSH> = 61;
- <AB01> = 62;
- <AB02> = 63;
- <AB03> = 64;
- <AB04> = 65;
- <AB05> = 66;
- <AB06> = 67;
- <AB07> = 68;
- <AB08> = 69;
- <AB09> = 70;
- <AB10> = 71;
- <AB11> = 72;
- <RTSH> = 73;
-
- <LALT> = 74;
- <CAPS> = 75;
- <STOP> = 76;
- <SPCE> = 77;
- <CUT> = 78;
- <EXEC> = 81;
-
- <FK01> = 8;
- <FK02> = 9;
- <FK03> = 10;
- <FK04> = 11;
- <FK05> = 12;
- <FK06> = 13;
- <FK07> = 14;
- <FK08> = 15;
- <FK09> = 16;
- <FK10> = 17;
- <FK11> = 111;
- <FK12> = 112;
-
- <HELP> = 113;
- <INS> = 114;
- <CLR> = 115;
- <PGUP> = 116;
- <PGDN> = 117;
-
- <KPTB> = 109;
- <UP> = 95;
- <LEFT> = 98;
- <DOWN> = 99;
- <RGHT> = 100;
-
- <KPMU> = 107;
- <KPDV> = 108;
- <KPAD> = 89;
-
- <KP7> = 82;
- <KP8> = 83;
- <KP9> = 84;
- <KPSU> = 85;
-
- <KP4> = 86;
- <KP5> = 87;
- <KP6> = 88;
- <KPSP> = 93;
-
- <KP1> = 90;
- <KP2> = 91;
- <KP3> = 92;
- <KPEN> = 97;
-
- <KP0> = 94;
- <KPDC> = 96;
-};
+//
+//Copyright 1996, 1998 The Open Group
+//
+//Permission to use, copy, modify, distribute, and sell this software and its
+//documentation for any purpose is hereby granted without fee, provided that
+//the above copyright notice appear in all copies and that both that
+//copyright notice and this permission notice appear in supporting
+//documentation.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from The Open Group.
+//
+xkb_keycodes "nwp5461" {
+
+ <ESC> = 18;
+ <AE01> = 19;
+ <AE02> = 20;
+ <AE03> = 21;
+ <AE04> = 22;
+ <AE05> = 23;
+ <AE06> = 24;
+ <AE07> = 25;
+ <AE08> = 26;
+ <AE09> = 27;
+ <AE10> = 28;
+ <AE11> = 29;
+ <AE12> = 30;
+ <BKSL> = 31;
+ <BKSP> = 32;
+
+ <TAB> = 33;
+ <AD01> = 34;
+ <AD02> = 35;
+ <AD03> = 36;
+ <AD04> = 37;
+ <AD05> = 38;
+ <AD06> = 39;
+ <AD07> = 40;
+ <AD08> = 41;
+ <AD09> = 42;
+ <AD10> = 43;
+ <AD11> = 44;
+ <AD12> = 45;
+ <DELE> = 46;
+
+ <LCTL> = 47;
+ <AC01> = 48;
+ <AC02> = 49;
+ <AC03> = 50;
+ <AC04> = 51;
+ <AC05> = 52;
+ <AC06> = 53;
+ <AC07> = 54;
+ <AC08> = 55;
+ <AC09> = 56;
+ <AC10> = 57;
+ <AC11> = 58;
+ <TLDE> = 59;
+ <RTRN> = 60;
+
+ <LFSH> = 61;
+ <AB01> = 62;
+ <AB02> = 63;
+ <AB03> = 64;
+ <AB04> = 65;
+ <AB05> = 66;
+ <AB06> = 67;
+ <AB07> = 68;
+ <AB08> = 69;
+ <AB09> = 70;
+ <AB10> = 71;
+ <AB11> = 72;
+ <RTSH> = 73;
+
+ <LALT> = 74;
+ <CAPS> = 75;
+ <STOP> = 76;
+ <SPCE> = 77;
+ <CUT> = 78;
+ <EXEC> = 81;
+
+ <FK01> = 8;
+ <FK02> = 9;
+ <FK03> = 10;
+ <FK04> = 11;
+ <FK05> = 12;
+ <FK06> = 13;
+ <FK07> = 14;
+ <FK08> = 15;
+ <FK09> = 16;
+ <FK10> = 17;
+ <FK11> = 111;
+ <FK12> = 112;
+
+ <HELP> = 113;
+ <INS> = 114;
+ <CLR> = 115;
+ <PGUP> = 116;
+ <PGDN> = 117;
+
+ <KPTB> = 109;
+ <UP> = 95;
+ <LEFT> = 98;
+ <DOWN> = 99;
+ <RGHT> = 100;
+
+ <KPMU> = 107;
+ <KPDV> = 108;
+ <KPAD> = 89;
+
+ <KP7> = 82;
+ <KP8> = 83;
+ <KP9> = 84;
+ <KPSU> = 85;
+
+ <KP4> = 86;
+ <KP5> = 87;
+ <KP6> = 88;
+ <KPSP> = 93;
+
+ <KP1> = 90;
+ <KP2> = 91;
+ <KP3> = 92;
+ <KPEN> = 97;
+
+ <KP0> = 94;
+ <KPDC> = 96;
+};
diff --git a/xorg-server/xkeyboard-config/keycodes/sun b/xorg-server/xkeyboard-config/keycodes/sun
index a6ffdb39f..7cb38e304 100644
--- a/xorg-server/xkeyboard-config/keycodes/sun
+++ b/xorg-server/xkeyboard-config/keycodes/sun
@@ -1,954 +1,950 @@
-// $XdotOrg: $
-// $Xorg: sun,v 1.4 2001/02/09 02:05:52 xorgcvs Exp $
-//
-//Copyright 1996, 1998 The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//The above copyright notice and this permission notice shall be
-//included in all copies or substantial portions of the Software.
-//
-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-//OTHER DEALINGS IN THE SOFTWARE.
-//
-//Except as contained in this notice, the name of The Open Group shall
-//not be used in advertising or otherwise to promote the sale, use or
-//other dealings in this Software without prior written authorization
-//from The Open Group.
-//
-// ---------------------------------------------------------------------------
-// Copyright 2004 Sun Microsystems, Inc. All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice (including the next
-// paragraph) shall be included in all copies or substantial portions of the
-// Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-// ---------------------------------------------------------------------------
-//
-// $XFree86: xc/programs/xkbcomp/keycodes/sun,v 3.6 2003/08/09 14:30:48 pascal Exp $
-//
-
-default xkb_keycodes "type4" {
-
- minimum= 8;
- maximum= 255;
-
- <ESC> = 36;
- <AE01> = 37;
- <AE02> = 38;
- <AE03> = 39;
- <AE04> = 40;
- <AE05> = 41;
- <AE06> = 42;
- <AE07> = 43;
- <AE08> = 44;
- <AE09> = 45;
- <AE10> = 46;
- <AE11> = 47;
- <AE12> = 48;
- <TLDE> = 49;
- <BKSP> = 50;
-
- <TAB> = 60;
- <AD01> = 61;
- <AD02> = 62;
- <AD03> = 63;
- <AD04> = 64;
- <AD05> = 65;
- <AD06> = 66;
- <AD07> = 67;
- <AD08> = 68;
- <AD09> = 69;
- <AD10> = 70;
- <AD11> = 71;
- <AD12> = 72;
- <DELE> = 73;
-
- <LCTL> = 83;
- <AC01> = 84;
- <AC02> = 85;
- <AC03> = 86;
- <AC04> = 87;
- <AC05> = 88;
- <AC06> = 89;
- <AC07> = 90;
- <AC08> = 91;
- <AC09> = 92;
- <AC10> = 93;
- <AC11> = 94;
- <BKSL> = 95;
- <RTRN> = 96;
-
- <LFSH> = 106;
- <AB01> = 107;
- <AB02> = 108;
- <AB03> = 109;
- <AB04> = 110;
- <AB05> = 111;
- <AB06> = 112;
- <AB07> = 113;
- <AB08> = 114;
- <AB09> = 115;
- <AB10> = 116;
- <RTSH> = 117;
- <LNFD> = 118;
-
- <HELP> = 125;
- <CAPS> = 126;
- <LALT> = 26;
- <LMTA> = 127;
- <SPCE> = 128;
- <RMTA> = 129;
- <COMP> = 74;
- <ALGR> = 20;
- alias <RALT> = <ALGR>;
-
- <FK01> = 12;
- <FK02> = 13;
- <FK03> = 15;
- <FK04> = 17;
- <FK05> = 19;
- <FK06> = 21;
- <FK07> = 23;
- <FK08> = 24;
- <FK09> = 25;
- <FK10> = 14;
- <FK11> = 16;
- <FK12> = 18;
-
- <STOP> = 8;
- <AGAI> = 10;
- <PROP> = 32;
- <UNDO> = 33;
- <FRNT> = 56;
- <COPY> = 58;
- <OPEN> = 79;
- <PAST> = 80;
- <FIND> = 102;
- <CUT> = 104;
-
- <PRSC> = 29;
- <SCLK> = 30;
- <PAUS> = 28;
-
- <NMLK> = 105;
- <KPEQ> = 52;
- <KPDV> = 53;
- <KPMU> = 54;
- <KPSU> = 78;
-
- <KP7> = 75;
- <KP8> = 76;
- <KP9> = 77;
- <KPAD> = 132;
-
- <KP4> = 98;
- <KP5> = 99;
- <KP6> = 100;
-
- <KP1> = 119;
- <KP2> = 120;
- <KP3> = 121;
- <KPEN> = 97;
-
- <KP0> = 101;
- <KPDL> = 57;
- indicator 4 = "Caps Lock";
- indicator 3 = "Compose";
- indicator 2 = "Scroll Lock";
- indicator 1 = "Num Lock";
-};
-
-xkb_keycodes "type5" {
-
- minimum= 8;
- maximum= 255;
-
- <ESC> = 36;
- <AE01> = 37;
- <AE02> = 38;
- <AE03> = 39;
- <AE04> = 40;
- <AE05> = 41;
- <AE06> = 42;
- <AE07> = 43;
- <AE08> = 44;
- <AE09> = 45;
- <AE10> = 46;
- <AE11> = 47;
- <AE12> = 48;
- <TLDE> = 49;
- <BKSP> = 50;
-
- <TAB> = 60;
- <AD01> = 61;
- <AD02> = 62;
- <AD03> = 63;
- <AD04> = 64;
- <AD05> = 65;
- <AD06> = 66;
- <AD07> = 67;
- <AD08> = 68;
- <AD09> = 69;
- <AD10> = 70;
- <AD11> = 71;
- <AD12> = 72;
- <DELE> = 73;
- <COMP> = 74;
- <ALGR> = 20;
- alias <RALT> = <ALGR>;
-
- <LCTL> = 83;
- <AC01> = 84;
- <AC02> = 85;
- <AC03> = 86;
- <AC04> = 87;
- <AC05> = 88;
- <AC06> = 89;
- <AC07> = 90;
- <AC08> = 91;
- <AC09> = 92;
- <AC10> = 93;
- <AC11> = 94;
- <BKSL> = 95;
- <RTRN> = 96;
-
- <LFSH> = 106;
- <AB01> = 107;
- <AB02> = 108;
- <AB03> = 109;
- <AB04> = 110;
- <AB05> = 111;
- <AB06> = 112;
- <AB07> = 113;
- <AB08> = 114;
- <AB09> = 115;
- <AB10> = 116;
- <RTSH> = 117;
-
- <LALT> = 26;
- <CAPS> = 126;
- <LMTA> = 127;
- <SPCE> = 128;
- <RMTA> = 129;
-
- <FK01> = 12;
- <FK02> = 13;
- <FK03> = 15;
- <FK04> = 17;
- <FK05> = 19;
- <FK06> = 21;
- <FK07> = 23;
- <FK08> = 24;
- <FK09> = 25;
- <FK10> = 14;
- <FK11> = 16;
- <FK12> = 18;
- <STOP> = 8;
- <AGAI> = 10;
- <PROP> = 32;
- <UNDO> = 33;
- <FRNT> = 56;
- <COPY> = 58;
- <OPEN> = 79;
- <PAST> = 80;
- <FIND> = 102;
- <CUT> = 104;
-
- <PRSC> = 29;
- <SCLK> = 30;
- <PAUS> = 28;
-
- <NMLK> = 105;
- <KPDV> = 53;
- <KPMU> = 54;
- <KPSU> = 78;
-
- <KP7> = 75;
- <KP8> = 76;
- <KP9> = 77;
- <KPAD> = 132;
-
- <KP4> = 98;
- <KP5> = 99;
- <KP6> = 100;
-
- <KP1> = 119;
- <KP2> = 120;
- <KP3> = 121;
- <KPEN> = 97;
-
- <KP0> = 101;
- <KPDL> = 57;
-
- <UP> = 27;
- <LEFT> = 31;
- <DOWN> = 34;
- <RGHT> = 35;
-
- <INS> = 51;
- <HOME> = 59;
- <END> = 81;
- <PGUP> = 103;
- <PGDN> = 130;
- <HELP> = 125;
-
- <MUTE> = 52;
- <VOL-> = 9;
- <VOL+> = 11;
- <POWR> = 55;
- indicator 4 = "Caps Lock";
- indicator 3 = "Compose";
- indicator 2 = "Scroll Lock";
- indicator 1 = "Num Lock";
-};
-
-xkb_keycodes "type4tuv" {
- include "sun(type4)"
- <LSGT> = 131;
- <BRCR> = 22;
-};
-
-xkb_keycodes "type4_ca" {
- include "sun(type4)"
- <LSGT> = 131;
-};
-
-xkb_keycodes "type4_jp" {
- include "sun(type4)"
- <EXEC> = 122;
- <KANJ> = 123;
- <HENK> = 124;
- <BRCR> = 22;
- alias <UNDR> = <LNFD>;
-};
-
-xkb_keycodes "type4_euro" {
- include "sun(type4)"
- <LSGT> = 131;
-};
-
-xkb_keycodes "type5tuv" {
- include "sun(type5)"
- <LSGT> = 131;
-};
-
-xkb_keycodes "type5_jp" {
- include "sun(type5)"
- <EXEC> = 122;
- <KANJ> = 123;
- <HENK> = 124;
- <UNDR> = 118;
-};
-
-xkb_keycodes "type5_euro" {
- include "sun(type5)"
- <LSGT> = 131;
-};
-
-xkb_keycodes "type5hobo" {
-
- minimum= 8;
- maximum= 255;
-
- <ESC> = 36;
- <AE01> = 37;
- <AE02> = 38;
- <AE03> = 39;
- <AE04> = 40;
- <AE05> = 41;
- <AE06> = 42;
- <AE07> = 43;
- <AE08> = 44;
- <AE09> = 45;
- <AE10> = 46;
- <AE11> = 47;
- <AE12> = 48;
- <TLDE> = 49;
- <BKSP> = 50;
-
- <TAB> = 60;
- <AD01> = 61;
- <AD02> = 62;
- <AD03> = 63;
- <AD04> = 64;
- <AD05> = 65;
- <AD06> = 66;
- <AD07> = 67;
- <AD08> = 68;
- <AD09> = 69;
- <AD10> = 70;
- <AD11> = 71;
- <AD12> = 72;
- <DELE> = 73;
- <COMP> = 74;
- <ALGR> = 20;
- alias <RALT> = <ALGR>;
-
- <LCTL> = 83;
- <AC01> = 84;
- <AC02> = 85;
- <AC03> = 86;
- <AC04> = 87;
- <AC05> = 88;
- <AC06> = 89;
- <AC07> = 90;
- <AC08> = 91;
- <AC09> = 92;
- <AC10> = 93;
- <AC11> = 94;
- <BKSL> = 95;
- <RTRN> = 96;
-
- <LFSH> = 106;
- <AB01> = 107;
- <AB02> = 108;
- <AB03> = 109;
- <AB04> = 110;
- <AB05> = 111;
- <AB06> = 112;
- <AB07> = 113;
- <AB08> = 114;
- <AB09> = 115;
- <AB10> = 116;
- <RTSH> = 117;
-
- <LALT> = 26;
- <CAPS> = 126;
- <LMTA> = 127;
- <SPCE> = 128;
- <RMTA> = 129;
-
- <FK01> = 12;
- <FK02> = 13;
- <FK03> = 15;
- <FK04> = 17;
- <FK05> = 19;
- <FK06> = 21;
- <FK07> = 23;
- <FK08> = 24;
- <FK09> = 25;
- <FK10> = 14;
- <FK11> = 16;
- <FK12> = 18;
- <STOP> = 8;
- <AGAI> = 10;
- <PROP> = 32;
- <UNDO> = 33;
- <FRNT> = 56;
- <COPY> = 58;
- <OPEN> = 79;
- <PAST> = 80;
- <FIND> = 102;
- <CUT> = 104;
-
- <PRSC> = 29;
- <SCLK> = 30;
- <PAUS> = 28;
-
- <NMLK> = 105;
-// <KPDV> = 53;
-// <KPMU> = 54;
-// <KPSU> = 78;
-
-// <KP7> = 75;
-// <KP8> = 76;
-// <KP9> = 77;
-// <KPAD> = 132;
-
-// <KP4> = 98;
-// <KP5> = 99;
-// <KP6> = 100;
-
-// <KP1> = 119;
-// <KP2> = 120;
-// <KP3> = 121;
-// <KPEN> = 97;
-
-// <KP0> = 101;
-// <KPDL> = 57;
-
- <UP> = 27;
- <LEFT> = 31;
- <DOWN> = 34;
- <RGHT> = 35;
-
- <INS> = 51;
- <HOME> = 59;
- <END> = 81;
- <PGUP> = 103;
- <PGDN> = 130;
- <HELP> = 125;
-
- <MUTE> = 52;
- <VOL-> = 9;
- <VOL+> = 11;
- <POWR> = 55;
- indicator 4 = "Caps Lock";
- indicator 3 = "Compose";
- indicator 2 = "Scroll Lock";
- indicator 1 = "Num Lock";
-};
-
-xkb_keycodes "type5tuvhobo" {
- include "sun(type5hobo)"
- <LSGT> = 131;
-
-};
-
-xkb_keycodes "type5_jphobo" {
- include "sun(type5hobo)"
- <EXEC> = 122;
- <KANJ> = 123;
- <HENK> = 124;
- <UNDR> = 118;
-};
-
-xkb_keycodes "type6" {
- include "sun(type5)"
-};
-
-xkb_keycodes "type6tuv" {
- include "sun(type5tuv)"
-};
-
-xkb_keycodes "type6unix" {
- include "sun(type5)"
-};
-
-xkb_keycodes "type6_jp" {
- include "sun(type5_jp)"
-};
-
-xkb_keycodes "type6_euro" {
- include "sun(type5_euro)"
-};
-
-// Even though this is labeled as _usb, I verified these keycodes as accurate
-// on my type5 serial and type6 serial keyboards as well on linux-2.6 boxes.
-// I'm not sure where the "type5" keycodes above are coming from...
-xkb_keycodes "type6_usb" {
- include "xfree86"
-
- <STOP> = 232;
- <AGAI> = 133;
- <PROP> = 134;
- <UNDO> = 135;
- <FRNT> = 140;
- <COPY> = 248;
- <OPEN> = 191;
- <PAST> = 192;
- <FIND> = 122;
- <CUT> = 188;
-
- <HELP> = 245;
-
- // The blank has keycode 239 on my type6 serial kb, but 134 on
- // my type6 usb keyboard (same as <PROP>)
- <BLNK> = 239;
-
- // AltGr + PrScr actually sends a different keycode
- <SYRQ> = 92;
-
- <MUTE> = 160;
- <VOL-> = 174;
- <VOL+> = 176;
- <POWR> = 222;
-
- indicator 4 = "Compose";
-};
-
-xkb_keycodes "type6tuv_usb" {
- include "sun(type6_usb)"
- <LSGT> = 94;
-// <BKSL> = 51;
-};
-
-xkb_keycodes "type6_jp_usb" {
- include "sun(type6_usb)"
- alias <UNDR> = <KPDC>; // 123
- alias <EXEC> = <I0B>; // 139
- alias <KANJ> = <I0A>; // 138
- alias <HENK> = <XFER>; // 129
- indicator 5 = "Kana";
-};
-
-xkb_keycodes "type5_se" {
-
- minimum= 8;
- maximum= 255;
-
- // Row G
- <HELP> = 125;
- //
- <ESC> = 36;
- //
- <FK01> = 12;
- <FK02> = 13;
- <FK03> = 15;
- <FK04> = 17;
- //
- <FK05> = 19;
- <FK06> = 21;
- <FK07> = 23;
- <FK08> = 24;
- //
- <FK09> = 25;
- <FK10> = 14;
- <FK11> = 16;
- <FK12> = 18;
- //
- <PRSC> = 29;
- <SCLK> = 30;
- <PAUS> = 28;
- //
- <MUTE> = 52;
- <VOL-> = 9;
- <VOL+> = 11;
- <POWR> = 55;
- // End Row G
-
- // Row F
- //
- // End Row F
-
- // Row E
- <STOP> = 8;
- <AGAI> = 10;
- //
- <AE00> = 49;
- alias <TLDE> = <AE00>;
- <AE01> = 37;
- <AE02> = 38;
- <AE03> = 39;
- <AE04> = 40;
- <AE05> = 41;
- <AE06> = 42;
- <AE07> = 43;
- <AE08> = 44;
- <AE09> = 45;
- <AE10> = 46;
- <AE11> = 47;
- <AE12> = 48;
- <BKSP> = 50;
- //
- <INS> = 51;
- <HOME> = 59;
- <PGUP> = 103;
- //
- <NMLK> = 105;
- <KPDV> = 53;
- <KPMU> = 54;
- <KPSU> = 78;
- //End Row E
-
- // Row D
- <PROP> = 32;
- <UNDO> = 33;
- //
- <AD00> = 60;
- alias <TAB> = <AD00>;
- <AD01> = 61;
- <AD02> = 62;
- <AD03> = 63;
- <AD04> = 64;
- <AD05> = 65;
- <AD06> = 66;
- <AD07> = 67;
- <AD08> = 68;
- <AD09> = 69;
- <AD10> = 70;
- <AD11> = 71;
- <AD12> = 72;
- //
- <DELE> = 73;
- <END> = 81;
- <PGDN> = 130;
- //
- <KP7> = 75;
- <KP8> = 76;
- <KP9> = 77;
- <KPAD> = 132;
- // End Row D
-
- // Row C
- <FRNT> = 56;
- <COPY> = 58;
- //
- <AC00> = 126;
- alias <CAPS> = <AC00>;
- <AC01> = 84;
- <AC02> = 85;
- <AC03> = 86;
- <AC04> = 87;
- <AC05> = 88;
- <AC06> = 89;
- <AC07> = 90;
- <AC08> = 91;
- <AC09> = 92;
- <AC10> = 93;
- <AC11> = 94;
- <AC12> = 95;
- alias <BKSL> = <AC12>;
- <RTRN> = 96;
- //
- <KP4> = 98;
- <KP5> = 99;
- <KP6> = 100;
- // End Row C
-
- // Row B
- <OPEN> = 79;
- <PAST> = 80;
- //
- <LFSH> = 106;
- <AB00> = 131;
- alias <LSGT> = <AB00>;
- <AB01> = 107;
- <AB02> = 108;
- <AB03> = 109;
- <AB04> = 110;
- <AB05> = 111;
- <AB06> = 112;
- <AB07> = 113;
- <AB08> = 114;
- <AB09> = 115;
- <AB10> = 116;
- <RTSH> = 117;
- //
- <UP> = 27;
- //
- <KP1> = 119;
- <KP2> = 120;
- <KP3> = 121;
- <KPEN> = 97;
- // End Row B
-
- // Row A
- <FIND> = 102;
- <CUT> = 104;
- //
- <LCTL> = 83;
- <LALT> = 26;
- <LMTA> = 127;
- <SPCE> = 128;
- <RMTA> = 129;
- <COMP> = 74;
- <ALGR> = 20;
- alias <RALT> = <ALGR>;
- //
- <LEFT> = 31;
- <DOWN> = 34;
- <RGHT> = 35;
- //
- <KP0> = 101;
- <KPDL> = 57;
- // End Row A
-
- indicator 4 = "Caps Lock";
- indicator 3 = "Compose";
- indicator 2 = "Scroll Lock";
- indicator 1 = "Num Lock";
-};
-
-xkb_keycodes "type5c_se" {
- include "sun(type5_se)"
-};
-
-xkb_keycodes "type4__se" {
-
- minimum= 8;
- maximum= 255;
-
- // Row F
- <STOP> = 8;
- <AGAI> = 10;
- //
- <FK01> = 12;
- <FK02> = 13;
- <FK03> = 15;
- <FK04> = 17;
- <FK05> = 19;
- <FK06> = 21;
- <FK07> = 23;
- <FK08> = 24;
- <FK09> = 25;
- <FK10> = 14;
- <FK11> = 16;
- <FK12> = 18;
- <AF13> = 95;
- alias <TLDE> = <AF13>;
- <AF14> = 22;
- <DELE> = 73;
- //
- <PAUS> = 28;
- <PRSC> = 29;
- <SCLK> = 30;
- <NMLK> = 105;
- // End Row F
-
- // Row E
- <PROP> = 32;
- <UNDO> = 33;
- //
- <AE00> = 36;
- alias <ESC> = <AE00>;
- <AE01> = 37;
- <AE02> = 38;
- <AE03> = 39;
- <AE04> = 40;
- <AE05> = 41;
- <AE06> = 42;
- <AE07> = 43;
- <AE08> = 44;
- <AE09> = 45;
- <AE10> = 46;
- <AE11> = 47;
- <AE12> = 48;
- <BKSP> = 50;
- //
- <KPEQ> = 52;
- <KPDV> = 53;
- <KPMU> = 54;
- <KPSU> = 78;
- // End Row E
-
- // Row D
- <FRNT> = 56;
- <COPY> = 58;
- //
- <AD00> = 60;
- alias <TAB> = <AD00>;
- <AD01> = 61;
- <AD02> = 62;
- <AD03> = 63;
- <AD04> = 64;
- <AD05> = 65;
- <AD06> = 66;
- <AD07> = 67;
- <AD08> = 68;
- <AD09> = 69;
- <AD10> = 70;
- <AD11> = 71;
- <AD12> = 72;
- //
- <KP7> = 75;
- <KP8> = 76;
- <KP9> = 77;
- <KPAD> = 132;
- // End Row D
-
- // Row C
- <OPEN> = 79;
- <PAST> = 80;
- //
- <AC00> = 83;
- // alias <CAPS> = <AC00>;
- <AC01> = 84;
- <AC02> = 85;
- <AC03> = 86;
- <AC04> = 87;
- <AC05> = 88;
- <AC06> = 89;
- <AC07> = 90;
- <AC08> = 91;
- <AC09> = 92;
- <AC10> = 93;
- <AC11> = 94;
- <AC12> = 49;
- alias <BKSL> = <AC12>;
- <RTRN> = 96;
- //
- <KP4> = 98;
- <KP5> = 99;
- <KP6> = 100;
- // End Row C
-
- // Row B
- <FIND> = 102;
- <CUT> = 104;
- //
- <LFSH> = 106;
- <AB00> = 131;
- alias <LSGT> = <AB00>;
- <AB01> = 107;
- <AB02> = 108;
- <AB03> = 109;
- <AB04> = 110;
- <AB05> = 111;
- <AB06> = 112;
- <AB07> = 113;
- <AB08> = 114;
- <AB09> = 115;
- <AB10> = 116;
- <RTSH> = 117;
- <LNFD> = 118;
- //
- <KP1> = 119;
- <KP2> = 120;
- <KP3> = 121;
- <KPEN> = 97;
- // End Row B
-
- // Row A
- <HELP> = 125;
- //
- <AA00> = 126;
- // alias <LCTL> = <AA00>;
- <LALT> = 26;
- <LMTA> = 127;
- <SPCE> = 128;
- <RMTA> = 129;
- <COMP> = 74;
- <ALGR> = 20;
- alias <RALT> = <ALGR>;
- //
- <KP0> = 101;
- <KPDL> = 57;
- // End Row A
-
- indicator 4 = "Caps Lock";
- indicator 3 = "Compose";
- indicator 2 = "Scroll Lock";
- indicator 1 = "Num Lock";
-};
-
-xkb_keycodes "type4_se" {
-
- include "sun(type4__se)"
-
- alias <LCTL> = <AA00>;
- alias <CAPS> = <AC00>;
-};
-
-xkb_keycodes "type4_se_swapctl" {
-
- include "sun(type4__se)"
-
- alias <LCTL> = <AC00>;
- alias <CAPS> = <AA00>;
-};
+//
+//Copyright 1996, 1998 The Open Group
+//
+//Permission to use, copy, modify, distribute, and sell this software and its
+//documentation for any purpose is hereby granted without fee, provided that
+//the above copyright notice appear in all copies and that both that
+//copyright notice and this permission notice appear in supporting
+//documentation.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from The Open Group.
+//
+// ---------------------------------------------------------------------------
+// Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice (including the next
+// paragraph) shall be included in all copies or substantial portions of the
+// Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+// ---------------------------------------------------------------------------
+//
+
+default xkb_keycodes "type4" {
+
+ minimum= 8;
+ maximum= 255;
+
+ <ESC> = 36;
+ <AE01> = 37;
+ <AE02> = 38;
+ <AE03> = 39;
+ <AE04> = 40;
+ <AE05> = 41;
+ <AE06> = 42;
+ <AE07> = 43;
+ <AE08> = 44;
+ <AE09> = 45;
+ <AE10> = 46;
+ <AE11> = 47;
+ <AE12> = 48;
+ <TLDE> = 49;
+ <BKSP> = 50;
+
+ <TAB> = 60;
+ <AD01> = 61;
+ <AD02> = 62;
+ <AD03> = 63;
+ <AD04> = 64;
+ <AD05> = 65;
+ <AD06> = 66;
+ <AD07> = 67;
+ <AD08> = 68;
+ <AD09> = 69;
+ <AD10> = 70;
+ <AD11> = 71;
+ <AD12> = 72;
+ <DELE> = 73;
+
+ <LCTL> = 83;
+ <AC01> = 84;
+ <AC02> = 85;
+ <AC03> = 86;
+ <AC04> = 87;
+ <AC05> = 88;
+ <AC06> = 89;
+ <AC07> = 90;
+ <AC08> = 91;
+ <AC09> = 92;
+ <AC10> = 93;
+ <AC11> = 94;
+ <BKSL> = 95;
+ <RTRN> = 96;
+
+ <LFSH> = 106;
+ <AB01> = 107;
+ <AB02> = 108;
+ <AB03> = 109;
+ <AB04> = 110;
+ <AB05> = 111;
+ <AB06> = 112;
+ <AB07> = 113;
+ <AB08> = 114;
+ <AB09> = 115;
+ <AB10> = 116;
+ <RTSH> = 117;
+ <LNFD> = 118;
+
+ <HELP> = 125;
+ <CAPS> = 126;
+ <LALT> = 26;
+ <LMTA> = 127;
+ <SPCE> = 128;
+ <RMTA> = 129;
+ <COMP> = 74;
+ <ALGR> = 20;
+ alias <RALT> = <ALGR>;
+
+ <FK01> = 12;
+ <FK02> = 13;
+ <FK03> = 15;
+ <FK04> = 17;
+ <FK05> = 19;
+ <FK06> = 21;
+ <FK07> = 23;
+ <FK08> = 24;
+ <FK09> = 25;
+ <FK10> = 14;
+ <FK11> = 16;
+ <FK12> = 18;
+
+ <STOP> = 8;
+ <AGAI> = 10;
+ <PROP> = 32;
+ <UNDO> = 33;
+ <FRNT> = 56;
+ <COPY> = 58;
+ <OPEN> = 79;
+ <PAST> = 80;
+ <FIND> = 102;
+ <CUT> = 104;
+
+ <PRSC> = 29;
+ <SCLK> = 30;
+ <PAUS> = 28;
+
+ <NMLK> = 105;
+ <KPEQ> = 52;
+ <KPDV> = 53;
+ <KPMU> = 54;
+ <KPSU> = 78;
+
+ <KP7> = 75;
+ <KP8> = 76;
+ <KP9> = 77;
+ <KPAD> = 132;
+
+ <KP4> = 98;
+ <KP5> = 99;
+ <KP6> = 100;
+
+ <KP1> = 119;
+ <KP2> = 120;
+ <KP3> = 121;
+ <KPEN> = 97;
+
+ <KP0> = 101;
+ <KPDL> = 57;
+ indicator 4 = "Caps Lock";
+ indicator 3 = "Compose";
+ indicator 2 = "Scroll Lock";
+ indicator 1 = "Num Lock";
+};
+
+xkb_keycodes "type5" {
+
+ minimum= 8;
+ maximum= 255;
+
+ <ESC> = 36;
+ <AE01> = 37;
+ <AE02> = 38;
+ <AE03> = 39;
+ <AE04> = 40;
+ <AE05> = 41;
+ <AE06> = 42;
+ <AE07> = 43;
+ <AE08> = 44;
+ <AE09> = 45;
+ <AE10> = 46;
+ <AE11> = 47;
+ <AE12> = 48;
+ <TLDE> = 49;
+ <BKSP> = 50;
+
+ <TAB> = 60;
+ <AD01> = 61;
+ <AD02> = 62;
+ <AD03> = 63;
+ <AD04> = 64;
+ <AD05> = 65;
+ <AD06> = 66;
+ <AD07> = 67;
+ <AD08> = 68;
+ <AD09> = 69;
+ <AD10> = 70;
+ <AD11> = 71;
+ <AD12> = 72;
+ <DELE> = 73;
+ <COMP> = 74;
+ <ALGR> = 20;
+ alias <RALT> = <ALGR>;
+
+ <LCTL> = 83;
+ <AC01> = 84;
+ <AC02> = 85;
+ <AC03> = 86;
+ <AC04> = 87;
+ <AC05> = 88;
+ <AC06> = 89;
+ <AC07> = 90;
+ <AC08> = 91;
+ <AC09> = 92;
+ <AC10> = 93;
+ <AC11> = 94;
+ <BKSL> = 95;
+ <RTRN> = 96;
+
+ <LFSH> = 106;
+ <AB01> = 107;
+ <AB02> = 108;
+ <AB03> = 109;
+ <AB04> = 110;
+ <AB05> = 111;
+ <AB06> = 112;
+ <AB07> = 113;
+ <AB08> = 114;
+ <AB09> = 115;
+ <AB10> = 116;
+ <RTSH> = 117;
+
+ <LALT> = 26;
+ <CAPS> = 126;
+ <LMTA> = 127;
+ <SPCE> = 128;
+ <RMTA> = 129;
+
+ <FK01> = 12;
+ <FK02> = 13;
+ <FK03> = 15;
+ <FK04> = 17;
+ <FK05> = 19;
+ <FK06> = 21;
+ <FK07> = 23;
+ <FK08> = 24;
+ <FK09> = 25;
+ <FK10> = 14;
+ <FK11> = 16;
+ <FK12> = 18;
+ <STOP> = 8;
+ <AGAI> = 10;
+ <PROP> = 32;
+ <UNDO> = 33;
+ <FRNT> = 56;
+ <COPY> = 58;
+ <OPEN> = 79;
+ <PAST> = 80;
+ <FIND> = 102;
+ <CUT> = 104;
+
+ <PRSC> = 29;
+ <SCLK> = 30;
+ <PAUS> = 28;
+
+ <NMLK> = 105;
+ <KPDV> = 53;
+ <KPMU> = 54;
+ <KPSU> = 78;
+
+ <KP7> = 75;
+ <KP8> = 76;
+ <KP9> = 77;
+ <KPAD> = 132;
+
+ <KP4> = 98;
+ <KP5> = 99;
+ <KP6> = 100;
+
+ <KP1> = 119;
+ <KP2> = 120;
+ <KP3> = 121;
+ <KPEN> = 97;
+
+ <KP0> = 101;
+ <KPDL> = 57;
+
+ <UP> = 27;
+ <LEFT> = 31;
+ <DOWN> = 34;
+ <RGHT> = 35;
+
+ <INS> = 51;
+ <HOME> = 59;
+ <END> = 81;
+ <PGUP> = 103;
+ <PGDN> = 130;
+ <HELP> = 125;
+
+ <MUTE> = 52;
+ <VOL-> = 9;
+ <VOL+> = 11;
+ <POWR> = 55;
+ indicator 4 = "Caps Lock";
+ indicator 3 = "Compose";
+ indicator 2 = "Scroll Lock";
+ indicator 1 = "Num Lock";
+};
+
+xkb_keycodes "type4tuv" {
+ include "sun(type4)"
+ <LSGT> = 131;
+ <BRCR> = 22;
+};
+
+xkb_keycodes "type4_ca" {
+ include "sun(type4)"
+ <LSGT> = 131;
+};
+
+xkb_keycodes "type4_jp" {
+ include "sun(type4)"
+ <EXEC> = 122;
+ <KANJ> = 123;
+ <HENK> = 124;
+ <BRCR> = 22;
+ alias <UNDR> = <LNFD>;
+};
+
+xkb_keycodes "type4_euro" {
+ include "sun(type4)"
+ <LSGT> = 131;
+};
+
+xkb_keycodes "type5tuv" {
+ include "sun(type5)"
+ <LSGT> = 131;
+};
+
+xkb_keycodes "type5_jp" {
+ include "sun(type5)"
+ <EXEC> = 122;
+ <KANJ> = 123;
+ <HENK> = 124;
+ <UNDR> = 118;
+};
+
+xkb_keycodes "type5_euro" {
+ include "sun(type5)"
+ <LSGT> = 131;
+};
+
+xkb_keycodes "type5hobo" {
+
+ minimum= 8;
+ maximum= 255;
+
+ <ESC> = 36;
+ <AE01> = 37;
+ <AE02> = 38;
+ <AE03> = 39;
+ <AE04> = 40;
+ <AE05> = 41;
+ <AE06> = 42;
+ <AE07> = 43;
+ <AE08> = 44;
+ <AE09> = 45;
+ <AE10> = 46;
+ <AE11> = 47;
+ <AE12> = 48;
+ <TLDE> = 49;
+ <BKSP> = 50;
+
+ <TAB> = 60;
+ <AD01> = 61;
+ <AD02> = 62;
+ <AD03> = 63;
+ <AD04> = 64;
+ <AD05> = 65;
+ <AD06> = 66;
+ <AD07> = 67;
+ <AD08> = 68;
+ <AD09> = 69;
+ <AD10> = 70;
+ <AD11> = 71;
+ <AD12> = 72;
+ <DELE> = 73;
+ <COMP> = 74;
+ <ALGR> = 20;
+ alias <RALT> = <ALGR>;
+
+ <LCTL> = 83;
+ <AC01> = 84;
+ <AC02> = 85;
+ <AC03> = 86;
+ <AC04> = 87;
+ <AC05> = 88;
+ <AC06> = 89;
+ <AC07> = 90;
+ <AC08> = 91;
+ <AC09> = 92;
+ <AC10> = 93;
+ <AC11> = 94;
+ <BKSL> = 95;
+ <RTRN> = 96;
+
+ <LFSH> = 106;
+ <AB01> = 107;
+ <AB02> = 108;
+ <AB03> = 109;
+ <AB04> = 110;
+ <AB05> = 111;
+ <AB06> = 112;
+ <AB07> = 113;
+ <AB08> = 114;
+ <AB09> = 115;
+ <AB10> = 116;
+ <RTSH> = 117;
+
+ <LALT> = 26;
+ <CAPS> = 126;
+ <LMTA> = 127;
+ <SPCE> = 128;
+ <RMTA> = 129;
+
+ <FK01> = 12;
+ <FK02> = 13;
+ <FK03> = 15;
+ <FK04> = 17;
+ <FK05> = 19;
+ <FK06> = 21;
+ <FK07> = 23;
+ <FK08> = 24;
+ <FK09> = 25;
+ <FK10> = 14;
+ <FK11> = 16;
+ <FK12> = 18;
+ <STOP> = 8;
+ <AGAI> = 10;
+ <PROP> = 32;
+ <UNDO> = 33;
+ <FRNT> = 56;
+ <COPY> = 58;
+ <OPEN> = 79;
+ <PAST> = 80;
+ <FIND> = 102;
+ <CUT> = 104;
+
+ <PRSC> = 29;
+ <SCLK> = 30;
+ <PAUS> = 28;
+
+ <NMLK> = 105;
+// <KPDV> = 53;
+// <KPMU> = 54;
+// <KPSU> = 78;
+
+// <KP7> = 75;
+// <KP8> = 76;
+// <KP9> = 77;
+// <KPAD> = 132;
+
+// <KP4> = 98;
+// <KP5> = 99;
+// <KP6> = 100;
+
+// <KP1> = 119;
+// <KP2> = 120;
+// <KP3> = 121;
+// <KPEN> = 97;
+
+// <KP0> = 101;
+// <KPDL> = 57;
+
+ <UP> = 27;
+ <LEFT> = 31;
+ <DOWN> = 34;
+ <RGHT> = 35;
+
+ <INS> = 51;
+ <HOME> = 59;
+ <END> = 81;
+ <PGUP> = 103;
+ <PGDN> = 130;
+ <HELP> = 125;
+
+ <MUTE> = 52;
+ <VOL-> = 9;
+ <VOL+> = 11;
+ <POWR> = 55;
+ indicator 4 = "Caps Lock";
+ indicator 3 = "Compose";
+ indicator 2 = "Scroll Lock";
+ indicator 1 = "Num Lock";
+};
+
+xkb_keycodes "type5tuvhobo" {
+ include "sun(type5hobo)"
+ <LSGT> = 131;
+
+};
+
+xkb_keycodes "type5_jphobo" {
+ include "sun(type5hobo)"
+ <EXEC> = 122;
+ <KANJ> = 123;
+ <HENK> = 124;
+ <UNDR> = 118;
+};
+
+xkb_keycodes "type6" {
+ include "sun(type5)"
+};
+
+xkb_keycodes "type6tuv" {
+ include "sun(type5tuv)"
+};
+
+xkb_keycodes "type6unix" {
+ include "sun(type5)"
+};
+
+xkb_keycodes "type6_jp" {
+ include "sun(type5_jp)"
+};
+
+xkb_keycodes "type6_euro" {
+ include "sun(type5_euro)"
+};
+
+// Even though this is labeled as _usb, I verified these keycodes as accurate
+// on my type5 serial and type6 serial keyboards as well on linux-2.6 boxes.
+// I'm not sure where the "type5" keycodes above are coming from...
+xkb_keycodes "type6_usb" {
+ include "xfree86"
+
+ <STOP> = 232;
+ <AGAI> = 133;
+ <PROP> = 134;
+ <UNDO> = 135;
+ <FRNT> = 140;
+ <COPY> = 248;
+ <OPEN> = 191;
+ <PAST> = 192;
+ <FIND> = 122;
+ <CUT> = 188;
+
+ <HELP> = 245;
+
+ // The blank has keycode 239 on my type6 serial kb, but 134 on
+ // my type6 usb keyboard (same as <PROP>)
+ <BLNK> = 239;
+
+ // AltGr + PrScr actually sends a different keycode
+ <SYRQ> = 92;
+
+ <MUTE> = 160;
+ <VOL-> = 174;
+ <VOL+> = 176;
+ <POWR> = 222;
+
+ indicator 4 = "Compose";
+};
+
+xkb_keycodes "type6tuv_usb" {
+ include "sun(type6_usb)"
+ <LSGT> = 94;
+// <BKSL> = 51;
+};
+
+xkb_keycodes "type6_jp_usb" {
+ include "sun(type6_usb)"
+ alias <UNDR> = <KPDC>; // 123
+ alias <EXEC> = <I0B>; // 139
+ alias <KANJ> = <I0A>; // 138
+ alias <HENK> = <XFER>; // 129
+ indicator 5 = "Kana";
+};
+
+xkb_keycodes "type5_se" {
+
+ minimum= 8;
+ maximum= 255;
+
+ // Row G
+ <HELP> = 125;
+ //
+ <ESC> = 36;
+ //
+ <FK01> = 12;
+ <FK02> = 13;
+ <FK03> = 15;
+ <FK04> = 17;
+ //
+ <FK05> = 19;
+ <FK06> = 21;
+ <FK07> = 23;
+ <FK08> = 24;
+ //
+ <FK09> = 25;
+ <FK10> = 14;
+ <FK11> = 16;
+ <FK12> = 18;
+ //
+ <PRSC> = 29;
+ <SCLK> = 30;
+ <PAUS> = 28;
+ //
+ <MUTE> = 52;
+ <VOL-> = 9;
+ <VOL+> = 11;
+ <POWR> = 55;
+ // End Row G
+
+ // Row F
+ //
+ // End Row F
+
+ // Row E
+ <STOP> = 8;
+ <AGAI> = 10;
+ //
+ <AE00> = 49;
+ alias <TLDE> = <AE00>;
+ <AE01> = 37;
+ <AE02> = 38;
+ <AE03> = 39;
+ <AE04> = 40;
+ <AE05> = 41;
+ <AE06> = 42;
+ <AE07> = 43;
+ <AE08> = 44;
+ <AE09> = 45;
+ <AE10> = 46;
+ <AE11> = 47;
+ <AE12> = 48;
+ <BKSP> = 50;
+ //
+ <INS> = 51;
+ <HOME> = 59;
+ <PGUP> = 103;
+ //
+ <NMLK> = 105;
+ <KPDV> = 53;
+ <KPMU> = 54;
+ <KPSU> = 78;
+ //End Row E
+
+ // Row D
+ <PROP> = 32;
+ <UNDO> = 33;
+ //
+ <AD00> = 60;
+ alias <TAB> = <AD00>;
+ <AD01> = 61;
+ <AD02> = 62;
+ <AD03> = 63;
+ <AD04> = 64;
+ <AD05> = 65;
+ <AD06> = 66;
+ <AD07> = 67;
+ <AD08> = 68;
+ <AD09> = 69;
+ <AD10> = 70;
+ <AD11> = 71;
+ <AD12> = 72;
+ //
+ <DELE> = 73;
+ <END> = 81;
+ <PGDN> = 130;
+ //
+ <KP7> = 75;
+ <KP8> = 76;
+ <KP9> = 77;
+ <KPAD> = 132;
+ // End Row D
+
+ // Row C
+ <FRNT> = 56;
+ <COPY> = 58;
+ //
+ <AC00> = 126;
+ alias <CAPS> = <AC00>;
+ <AC01> = 84;
+ <AC02> = 85;
+ <AC03> = 86;
+ <AC04> = 87;
+ <AC05> = 88;
+ <AC06> = 89;
+ <AC07> = 90;
+ <AC08> = 91;
+ <AC09> = 92;
+ <AC10> = 93;
+ <AC11> = 94;
+ <AC12> = 95;
+ alias <BKSL> = <AC12>;
+ <RTRN> = 96;
+ //
+ <KP4> = 98;
+ <KP5> = 99;
+ <KP6> = 100;
+ // End Row C
+
+ // Row B
+ <OPEN> = 79;
+ <PAST> = 80;
+ //
+ <LFSH> = 106;
+ <AB00> = 131;
+ alias <LSGT> = <AB00>;
+ <AB01> = 107;
+ <AB02> = 108;
+ <AB03> = 109;
+ <AB04> = 110;
+ <AB05> = 111;
+ <AB06> = 112;
+ <AB07> = 113;
+ <AB08> = 114;
+ <AB09> = 115;
+ <AB10> = 116;
+ <RTSH> = 117;
+ //
+ <UP> = 27;
+ //
+ <KP1> = 119;
+ <KP2> = 120;
+ <KP3> = 121;
+ <KPEN> = 97;
+ // End Row B
+
+ // Row A
+ <FIND> = 102;
+ <CUT> = 104;
+ //
+ <LCTL> = 83;
+ <LALT> = 26;
+ <LMTA> = 127;
+ <SPCE> = 128;
+ <RMTA> = 129;
+ <COMP> = 74;
+ <ALGR> = 20;
+ alias <RALT> = <ALGR>;
+ //
+ <LEFT> = 31;
+ <DOWN> = 34;
+ <RGHT> = 35;
+ //
+ <KP0> = 101;
+ <KPDL> = 57;
+ // End Row A
+
+ indicator 4 = "Caps Lock";
+ indicator 3 = "Compose";
+ indicator 2 = "Scroll Lock";
+ indicator 1 = "Num Lock";
+};
+
+xkb_keycodes "type5c_se" {
+ include "sun(type5_se)"
+};
+
+xkb_keycodes "type4__se" {
+
+ minimum= 8;
+ maximum= 255;
+
+ // Row F
+ <STOP> = 8;
+ <AGAI> = 10;
+ //
+ <FK01> = 12;
+ <FK02> = 13;
+ <FK03> = 15;
+ <FK04> = 17;
+ <FK05> = 19;
+ <FK06> = 21;
+ <FK07> = 23;
+ <FK08> = 24;
+ <FK09> = 25;
+ <FK10> = 14;
+ <FK11> = 16;
+ <FK12> = 18;
+ <AF13> = 95;
+ alias <TLDE> = <AF13>;
+ <AF14> = 22;
+ <DELE> = 73;
+ //
+ <PAUS> = 28;
+ <PRSC> = 29;
+ <SCLK> = 30;
+ <NMLK> = 105;
+ // End Row F
+
+ // Row E
+ <PROP> = 32;
+ <UNDO> = 33;
+ //
+ <AE00> = 36;
+ alias <ESC> = <AE00>;
+ <AE01> = 37;
+ <AE02> = 38;
+ <AE03> = 39;
+ <AE04> = 40;
+ <AE05> = 41;
+ <AE06> = 42;
+ <AE07> = 43;
+ <AE08> = 44;
+ <AE09> = 45;
+ <AE10> = 46;
+ <AE11> = 47;
+ <AE12> = 48;
+ <BKSP> = 50;
+ //
+ <KPEQ> = 52;
+ <KPDV> = 53;
+ <KPMU> = 54;
+ <KPSU> = 78;
+ // End Row E
+
+ // Row D
+ <FRNT> = 56;
+ <COPY> = 58;
+ //
+ <AD00> = 60;
+ alias <TAB> = <AD00>;
+ <AD01> = 61;
+ <AD02> = 62;
+ <AD03> = 63;
+ <AD04> = 64;
+ <AD05> = 65;
+ <AD06> = 66;
+ <AD07> = 67;
+ <AD08> = 68;
+ <AD09> = 69;
+ <AD10> = 70;
+ <AD11> = 71;
+ <AD12> = 72;
+ //
+ <KP7> = 75;
+ <KP8> = 76;
+ <KP9> = 77;
+ <KPAD> = 132;
+ // End Row D
+
+ // Row C
+ <OPEN> = 79;
+ <PAST> = 80;
+ //
+ <AC00> = 83;
+ // alias <CAPS> = <AC00>;
+ <AC01> = 84;
+ <AC02> = 85;
+ <AC03> = 86;
+ <AC04> = 87;
+ <AC05> = 88;
+ <AC06> = 89;
+ <AC07> = 90;
+ <AC08> = 91;
+ <AC09> = 92;
+ <AC10> = 93;
+ <AC11> = 94;
+ <AC12> = 49;
+ alias <BKSL> = <AC12>;
+ <RTRN> = 96;
+ //
+ <KP4> = 98;
+ <KP5> = 99;
+ <KP6> = 100;
+ // End Row C
+
+ // Row B
+ <FIND> = 102;
+ <CUT> = 104;
+ //
+ <LFSH> = 106;
+ <AB00> = 131;
+ alias <LSGT> = <AB00>;
+ <AB01> = 107;
+ <AB02> = 108;
+ <AB03> = 109;
+ <AB04> = 110;
+ <AB05> = 111;
+ <AB06> = 112;
+ <AB07> = 113;
+ <AB08> = 114;
+ <AB09> = 115;
+ <AB10> = 116;
+ <RTSH> = 117;
+ <LNFD> = 118;
+ //
+ <KP1> = 119;
+ <KP2> = 120;
+ <KP3> = 121;
+ <KPEN> = 97;
+ // End Row B
+
+ // Row A
+ <HELP> = 125;
+ //
+ <AA00> = 126;
+ // alias <LCTL> = <AA00>;
+ <LALT> = 26;
+ <LMTA> = 127;
+ <SPCE> = 128;
+ <RMTA> = 129;
+ <COMP> = 74;
+ <ALGR> = 20;
+ alias <RALT> = <ALGR>;
+ //
+ <KP0> = 101;
+ <KPDL> = 57;
+ // End Row A
+
+ indicator 4 = "Caps Lock";
+ indicator 3 = "Compose";
+ indicator 2 = "Scroll Lock";
+ indicator 1 = "Num Lock";
+};
+
+xkb_keycodes "type4_se" {
+
+ include "sun(type4__se)"
+
+ alias <LCTL> = <AA00>;
+ alias <CAPS> = <AC00>;
+};
+
+xkb_keycodes "type4_se_swapctl" {
+
+ include "sun(type4__se)"
+
+ alias <LCTL> = <AC00>;
+ alias <CAPS> = <AA00>;
+};
diff --git a/xorg-server/xkeyboard-config/keycodes/xfree86 b/xorg-server/xkeyboard-config/keycodes/xfree86
index bf91fa8ff..7d4813e89 100644
--- a/xorg-server/xkeyboard-config/keycodes/xfree86
+++ b/xorg-server/xkeyboard-config/keycodes/xfree86
@@ -1,415 +1,407 @@
-// $XdotOrg: xc/programs/xkbcomp/keycodes/xfree86,v 1.1.4.4 2004/03/05 13:41:30 eich Exp $
-// $Xorg: xfree86,v 1.3 2000/08/17 19:54:37 cpqbld Exp $
-
-
-
-
-// $XFree86: xc/programs/xkbcomp/keycodes/xfree86,v 3.28 2003/11/21 04:46:42 dawes Exp $
-
-// "standard" XFree86 codes
-// It seems that the "default" must be the first entry in the file.
-
-default xkb_keycodes "xfree86" {
- include "xfree86(basic)"
- <BKSL> = 51;
- alias <AC12> = <BKSL>;
- <LSGT> = 94;
-};
-
-xkb_keycodes "basic" {
-
- minimum= 8;
- maximum= 255;
-
- <TLDE> = 49;
- alias <AE00> = <TLDE>; // Some geometries use AE00
- <AE01> = 10;
- <AE02> = 11;
- <AE03> = 12;
- <AE04> = 13;
- <AE05> = 14;
- <AE06> = 15;
- <AE07> = 16;
- <AE08> = 17;
- <AE09> = 18;
- <AE10> = 19;
- <AE11> = 20;
- <AE12> = 21;
- <BKSP> = 22;
-
- <TAB> = 23;
- <AD01> = 24;
- <AD02> = 25;
- <AD03> = 26;
- <AD04> = 27;
- <AD05> = 28;
- <AD06> = 29;
- <AD07> = 30;
- <AD08> = 31;
- <AD09> = 32;
- <AD10> = 33;
- <AD11> = 34;
- <AD12> = 35;
- <RTRN> = 36;
-
- <CAPS> = 66;
- <AC01> = 38;
- <AC02> = 39;
- <AC03> = 40;
- <AC04> = 41;
- <AC05> = 42;
- <AC06> = 43;
- <AC07> = 44;
- <AC08> = 45;
- <AC09> = 46;
- <AC10> = 47;
- <AC11> = 48;
-
- <LFSH> = 50;
- <AB01> = 52;
- <AB02> = 53;
- <AB03> = 54;
- <AB04> = 55;
- <AB05> = 56;
- <AB06> = 57;
- <AB07> = 58;
- <AB08> = 59;
- <AB09> = 60;
- <AB10> = 61;
- <RTSH> = 62;
-
- <LALT> = 64;
- <LCTL> = 37;
- <SPCE> = 65;
- <RCTL> = 109;
- <RALT> = 113;
- // Microsoft keyboard extra keys
- <LWIN> = 115;
- <RWIN> = 116;
- <MENU> = 117;
-
- <ESC> = 9;
- <FK01> = 67;
- <FK02> = 68;
- <FK03> = 69;
- <FK04> = 70;
- <FK05> = 71;
- <FK06> = 72;
- <FK07> = 73;
- <FK08> = 74;
- <FK09> = 75;
- <FK10> = 76;
- <FK11> = 95;
- <FK12> = 96;
-
- <PRSC> = 111;
- <SYRQ> = 92;
- <SCLK> = 78;
- <PAUS> = 110;
- <BRK> = 114;
-
- <INS> = 106;
- <HOME> = 97;
- <PGUP> = 99;
- <DELE> = 107;
- <END> = 103;
- <PGDN> = 105;
-
- <UP> = 98;
- <LEFT> = 100;
- <DOWN> = 104;
- <RGHT> = 102;
-
- <NMLK> = 77;
- <KPDV> = 112;
- <KPMU> = 63;
- <KPSU> = 82;
-
- <KP7> = 79;
- <KP8> = 80;
- <KP9> = 81;
- <KPAD> = 86;
-
- <KP4> = 83;
- <KP5> = 84;
- <KP6> = 85;
-
- <KP1> = 87;
- <KP2> = 88;
- <KP3> = 89;
- <KPEN> = 108;
-
- <KP0> = 90;
- <KPDL> = 91;
- <KPEQ> = 126;
-
- <FK13> = 118;
- <FK14> = 119;
- <FK15> = 120;
- <FK16> = 121;
- <FK17> = 122;
- <KPDC> = 123;
-
- // Keys that are generated on Japanese keyboards
-
- alias <HZTG> = <TLDE>; // Hankaku_Zenkaku toggle
- <HKTG> = 208; // Hiragana_Katakana toggle
- <AB11> = 211; // backslash/underscore
- <XFER> = 129; // Henkan
- <NFER> = 131; // Muhenkan
- <AE13> = 133; // Yen
- <EISU> = 210; // Alphanumeric mode on macintosh
- <KANA> = 209; // Kana mode on macintosh
-
- // Keys that are generated on Korean keyboards
-
- alias <HNGL> = <FK16>; // Hangul Latin toggle
- alias <HJCV> = <FK17>; // Hangul to Hanja conversion
-
- // Extended keys that may be generated on "Internet" keyboards.
- // These are not standardised, hence the meaningless names.
- // The entries commented out are never generated because the raw codes
- // in those positions are already used for well-defined keys.
-
- alias <I01> = <XFER>;
- <I02> = 130;
- alias <I03> = <NFER>;
- <I04> = 132;
- alias <I05> = <AE13>;
- <I06> = 134;
- <I07> = 135;
- <I08> = 136;
- <I09> = 137;
- <I0A> = 138;
- <I0B> = 139;
- <I0C> = 140;
- <I0D> = 141;
- <I0E> = 142;
- <I0F> = 143;
- <I10> = 144;
- <I11> = 145;
- <I12> = 146;
- <I13> = 147;
- <I14> = 148;
- <I15> = 149;
- <I16> = 150;
- <I17> = 151;
- <I18> = 152;
- <I19> = 153;
- <I1A> = 154;
- <I1B> = 155;
- // <I1C> = 156; <META>
- // <I1D> = 157; <K59>
- <I1E> = 158;
- <I1F> = 159;
- <I20> = 160;
- <I21> = 161;
- <I22> = 162;
- <I23> = 163;
- <I24> = 164;
- <I25> = 165;
- <I26> = 166;
- <I27> = 167;
- <I28> = 168;
- <I29> = 169;
- // <I2A> = 170; <K5A>
- <I2B> = 171;
- <I2C> = 172;
- <I2D> = 173;
- <I2E> = 174;
- <I2F> = 175;
- <I30> = 176;
- <I31> = 177;
- <I32> = 178;
- <I33> = 179;
- <I34> = 180;
- // <I35> = 181; <K5B>
- // <I36> = 182; <K5D>
- // <I37> = 183; <K5E>
- // <I38> = 184; <K5F>
- <I39> = 185;
- <I3A> = 186;
- <I3B> = 187;
- <I3C> = 188;
- // <I3D> = 189; <K62>
- // <I3E> = 190; <K63>
- // <I3F> = 191; <K64>
- // <I40> = 192; <K65>
- // <I41> = 193; <K66>
- <I42> = 194;
- <I43> = 195;
- <I44> = 196;
- <I45> = 197;
- // <I46> = 198; <K67>
- // <I47> = 199; <K68>
- // <I48> = 200; <K69>
- // <I49> = 201; <K6A>
- <I4A> = 202;
- // <I4B> = 203; <K6B>
- // <I4C> = 204; <K6C>
- // <I4D> = 205; <K6D>
- // <I4E> = 206; <K6E>
- // <I4F> = 207; <K6F>
- // <I50> = 208; <K70>
- // <I51> = 209; <K71>
- // <I52> = 210; <K72>
- // <I53> = 211; <K73>
- <I54> = 212;
- <I55> = 213;
- <I56> = 214;
- <I57> = 215;
- <I58> = 216;
- <I59> = 217;
- <I5A> = 218;
- // <I5B> = 219; <K74>
- // <I5C> = 220; <K75>
- // <I5D> = 221; <K76>
- <I5E> = 222;
- <I5F> = 223;
- <I60> = 224;
- <I61> = 225;
- <I62> = 226;
- <I63> = 227;
- <I64> = 228;
- <I65> = 229;
- <I66> = 230;
- <I67> = 231;
- <I68> = 232;
- <I69> = 233;
- <I6A> = 234;
- <I6B> = 235;
- <I6C> = 236;
- <I6D> = 237;
- <I6E> = 238;
- <I6F> = 239;
- <I70> = 240;
- <I71> = 241;
- <I72> = 242;
- <I73> = 243;
- <I74> = 244;
- <I75> = 245;
- <I76> = 246;
- <I77> = 247;
- <I78> = 248;
- <I79> = 249;
- <I7A> = 250;
- <I7B> = 251;
- <I7C> = 252;
- <I7D> = 253;
- <I7E> = 254;
- <I7F> = 255;
-
- // MacBooks generate 0x65 for the lower brightness key
- <II65> = 101;
-
- // Codes generated for scancodes 0x59-0x5f, 0x62-0x76
- <K59> = 157; // <I1D>
- <K5A> = 170; // <I2A>
- <K5B> = 181; // <I35>
- alias <K5C> = <KPEQ>;
- <K5D> = 182; // <I36>
- <K5E> = 183; // <I37>
- <K5F> = 184; // <I38>
- <K62> = 189; // <I3D>
- <K63> = 190; // <I3E>
- <K64> = 191; // <I3F>
- <K65> = 192; // <I40>
- <K66> = 193; // <I41>
- <K67> = 198; // <I46>
- <K68> = 199; // <I47>
- <K69> = 200; // <I48>
- <K6A> = 201; // <I49>
- <K6B> = 203; // <I4B>
- <K6C> = 204; // <I4C>
- <K6D> = 205; // <I4D>
- <K6E> = 206; // <I4E>
- <K6F> = 207; // <I4F>
- alias <K70> = <HKTG>; // <I50>
- alias <K71> = <KANA>; // <I51>
- alias <K72> = <EISU>; // <I52>
- alias <K73> = <AB11>; // <I53>
- <K74> = 219; // <I5B>
- <K75> = 220; // <I5C>
- <K76> = 221; // <I5D>
-
- // Solaris compatibility
-
- alias <LMTA> = <LWIN>;
- alias <RMTA> = <RWIN>;
- alias <COMP> = <MENU>;
- alias <POWR> = <I0C>;
- alias <MUTE> = <I0D>;
- alias <VOL-> = <I0E>;
- alias <VOL+> = <I0F>;
- alias <HELP> = <I10>;
- alias <STOP> = <I11>;
- alias <AGAI> = <I12>;
- alias <PROP> = <I13>;
- alias <UNDO> = <I14>;
- alias <FRNT> = <I15>;
- alias <COPY> = <I16>;
- alias <OPEN> = <I17>;
- alias <PAST> = <I18>;
- alias <FIND> = <I19>;
- alias <CUT> = <I1A>;
- alias <OUTP> = <I56>;
- alias <KITG> = <I57>;
- alias <KIDN> = <I58>;
- alias <KIUP> = <I59>;
-
- // Other codes never generated. The XFree86 ddx never generates
- // these codes.
- // Thus we can use them as fake keys
- <MDSW> = 93; // <U5D>
- <LVL3> = 124; // <U7C>
- <ALT> = 125; // <U7D>
- <META> = 156; // <I1C>
- <SUPR> = 127; // <U7F>
- <HYPR> = 128; // <U80>
-
- indicator 1 = "Caps Lock";
- indicator 2 = "Num Lock";
- indicator 3 = "Scroll Lock";
-
- alias <ALGR> = <RALT>;
-
- // For Brazilian ABNT2
- alias <KPPT> = <I06>;
-};
-
-// What keyboard is this?
-
-xkb_keycodes "102" {
- include "xfree86(xfree86)"
-
- // There will be warnings from xkbcomp because of multiple definitions.
-
- <RALT> = 122;
- <RCTL> = 123;
-
- <PRSC> = 121;
- <PAUS> = 118;
-
- <INS> = 131;
- <HOME> = 135;
- <PGUP> = 119;
- <DELE> = 129;
- <END> = 130;
- <PGDN> = 134;
-
- <UP> = 128;
- <LEFT> = 132;
- <DOWN> = 120;
- <RGHT> = 133;
-
- <KPDV> = 125;
-
- <KPEN> = 124;
-};
-
-
-// IBM ThinkPad Z60m/Z60t/Z61m/Z61t
-xkb_keycodes "thinkpadz60" {
- include "xfree86(xfree86)"
- <MENU> = 227;
-};
+// "standard" XFree86 codes
+// It seems that the "default" must be the first entry in the file.
+
+default xkb_keycodes "xfree86" {
+ include "xfree86(basic)"
+ <BKSL> = 51;
+ alias <AC12> = <BKSL>;
+ <LSGT> = 94;
+};
+
+xkb_keycodes "basic" {
+
+ minimum= 8;
+ maximum= 255;
+
+ <TLDE> = 49;
+ alias <AE00> = <TLDE>; // Some geometries use AE00
+ <AE01> = 10;
+ <AE02> = 11;
+ <AE03> = 12;
+ <AE04> = 13;
+ <AE05> = 14;
+ <AE06> = 15;
+ <AE07> = 16;
+ <AE08> = 17;
+ <AE09> = 18;
+ <AE10> = 19;
+ <AE11> = 20;
+ <AE12> = 21;
+ <BKSP> = 22;
+
+ <TAB> = 23;
+ <AD01> = 24;
+ <AD02> = 25;
+ <AD03> = 26;
+ <AD04> = 27;
+ <AD05> = 28;
+ <AD06> = 29;
+ <AD07> = 30;
+ <AD08> = 31;
+ <AD09> = 32;
+ <AD10> = 33;
+ <AD11> = 34;
+ <AD12> = 35;
+ <RTRN> = 36;
+
+ <CAPS> = 66;
+ <AC01> = 38;
+ <AC02> = 39;
+ <AC03> = 40;
+ <AC04> = 41;
+ <AC05> = 42;
+ <AC06> = 43;
+ <AC07> = 44;
+ <AC08> = 45;
+ <AC09> = 46;
+ <AC10> = 47;
+ <AC11> = 48;
+
+ <LFSH> = 50;
+ <AB01> = 52;
+ <AB02> = 53;
+ <AB03> = 54;
+ <AB04> = 55;
+ <AB05> = 56;
+ <AB06> = 57;
+ <AB07> = 58;
+ <AB08> = 59;
+ <AB09> = 60;
+ <AB10> = 61;
+ <RTSH> = 62;
+
+ <LALT> = 64;
+ <LCTL> = 37;
+ <SPCE> = 65;
+ <RCTL> = 109;
+ <RALT> = 113;
+ // Microsoft keyboard extra keys
+ <LWIN> = 115;
+ <RWIN> = 116;
+ <MENU> = 117;
+
+ <ESC> = 9;
+ <FK01> = 67;
+ <FK02> = 68;
+ <FK03> = 69;
+ <FK04> = 70;
+ <FK05> = 71;
+ <FK06> = 72;
+ <FK07> = 73;
+ <FK08> = 74;
+ <FK09> = 75;
+ <FK10> = 76;
+ <FK11> = 95;
+ <FK12> = 96;
+
+ <PRSC> = 111;
+ <SYRQ> = 92;
+ <SCLK> = 78;
+ <PAUS> = 110;
+ <BRK> = 114;
+
+ <INS> = 106;
+ <HOME> = 97;
+ <PGUP> = 99;
+ <DELE> = 107;
+ <END> = 103;
+ <PGDN> = 105;
+
+ <UP> = 98;
+ <LEFT> = 100;
+ <DOWN> = 104;
+ <RGHT> = 102;
+
+ <NMLK> = 77;
+ <KPDV> = 112;
+ <KPMU> = 63;
+ <KPSU> = 82;
+
+ <KP7> = 79;
+ <KP8> = 80;
+ <KP9> = 81;
+ <KPAD> = 86;
+
+ <KP4> = 83;
+ <KP5> = 84;
+ <KP6> = 85;
+
+ <KP1> = 87;
+ <KP2> = 88;
+ <KP3> = 89;
+ <KPEN> = 108;
+
+ <KP0> = 90;
+ <KPDL> = 91;
+ <KPEQ> = 126;
+
+ <FK13> = 118;
+ <FK14> = 119;
+ <FK15> = 120;
+ <FK16> = 121;
+ <FK17> = 122;
+ <KPDC> = 123;
+
+ // Keys that are generated on Japanese keyboards
+
+ alias <HZTG> = <TLDE>; // Hankaku_Zenkaku toggle
+ <HKTG> = 208; // Hiragana_Katakana toggle
+ <AB11> = 211; // backslash/underscore
+ <XFER> = 129; // Henkan
+ <NFER> = 131; // Muhenkan
+ <AE13> = 133; // Yen
+ <EISU> = 210; // Alphanumeric mode on macintosh
+ <KANA> = 209; // Kana mode on macintosh
+
+ // Keys that are generated on Korean keyboards
+
+ alias <HNGL> = <FK16>; // Hangul Latin toggle
+ alias <HJCV> = <FK17>; // Hangul to Hanja conversion
+
+ // Extended keys that may be generated on "Internet" keyboards.
+ // These are not standardised, hence the meaningless names.
+ // The entries commented out are never generated because the raw codes
+ // in those positions are already used for well-defined keys.
+
+ alias <I01> = <XFER>;
+ <I02> = 130;
+ alias <I03> = <NFER>;
+ <I04> = 132;
+ alias <I05> = <AE13>;
+ <I06> = 134;
+ <I07> = 135;
+ <I08> = 136;
+ <I09> = 137;
+ <I0A> = 138;
+ <I0B> = 139;
+ <I0C> = 140;
+ <I0D> = 141;
+ <I0E> = 142;
+ <I0F> = 143;
+ <I10> = 144;
+ <I11> = 145;
+ <I12> = 146;
+ <I13> = 147;
+ <I14> = 148;
+ <I15> = 149;
+ <I16> = 150;
+ <I17> = 151;
+ <I18> = 152;
+ <I19> = 153;
+ <I1A> = 154;
+ <I1B> = 155;
+ // <I1C> = 156; <META>
+ // <I1D> = 157; <K59>
+ <I1E> = 158;
+ <I1F> = 159;
+ <I20> = 160;
+ <I21> = 161;
+ <I22> = 162;
+ <I23> = 163;
+ <I24> = 164;
+ <I25> = 165;
+ <I26> = 166;
+ <I27> = 167;
+ <I28> = 168;
+ <I29> = 169;
+ // <I2A> = 170; <K5A>
+ <I2B> = 171;
+ <I2C> = 172;
+ <I2D> = 173;
+ <I2E> = 174;
+ <I2F> = 175;
+ <I30> = 176;
+ <I31> = 177;
+ <I32> = 178;
+ <I33> = 179;
+ <I34> = 180;
+ // <I35> = 181; <K5B>
+ // <I36> = 182; <K5D>
+ // <I37> = 183; <K5E>
+ // <I38> = 184; <K5F>
+ <I39> = 185;
+ <I3A> = 186;
+ <I3B> = 187;
+ <I3C> = 188;
+ // <I3D> = 189; <K62>
+ // <I3E> = 190; <K63>
+ // <I3F> = 191; <K64>
+ // <I40> = 192; <K65>
+ // <I41> = 193; <K66>
+ <I42> = 194;
+ <I43> = 195;
+ <I44> = 196;
+ <I45> = 197;
+ // <I46> = 198; <K67>
+ // <I47> = 199; <K68>
+ // <I48> = 200; <K69>
+ // <I49> = 201; <K6A>
+ <I4A> = 202;
+ // <I4B> = 203; <K6B>
+ // <I4C> = 204; <K6C>
+ // <I4D> = 205; <K6D>
+ // <I4E> = 206; <K6E>
+ // <I4F> = 207; <K6F>
+ // <I50> = 208; <K70>
+ // <I51> = 209; <K71>
+ // <I52> = 210; <K72>
+ // <I53> = 211; <K73>
+ <I54> = 212;
+ <I55> = 213;
+ <I56> = 214;
+ <I57> = 215;
+ <I58> = 216;
+ <I59> = 217;
+ <I5A> = 218;
+ // <I5B> = 219; <K74>
+ // <I5C> = 220; <K75>
+ // <I5D> = 221; <K76>
+ <I5E> = 222;
+ <I5F> = 223;
+ <I60> = 224;
+ <I61> = 225;
+ <I62> = 226;
+ <I63> = 227;
+ <I64> = 228;
+ <I65> = 229;
+ <I66> = 230;
+ <I67> = 231;
+ <I68> = 232;
+ <I69> = 233;
+ <I6A> = 234;
+ <I6B> = 235;
+ <I6C> = 236;
+ <I6D> = 237;
+ <I6E> = 238;
+ <I6F> = 239;
+ <I70> = 240;
+ <I71> = 241;
+ <I72> = 242;
+ <I73> = 243;
+ <I74> = 244;
+ <I75> = 245;
+ <I76> = 246;
+ <I77> = 247;
+ <I78> = 248;
+ <I79> = 249;
+ <I7A> = 250;
+ <I7B> = 251;
+ <I7C> = 252;
+ <I7D> = 253;
+ <I7E> = 254;
+ <I7F> = 255;
+
+ // MacBooks generate 0x65 for the lower brightness key
+ <II65> = 101;
+
+ // Codes generated for scancodes 0x59-0x5f, 0x62-0x76
+ <K59> = 157; // <I1D>
+ <K5A> = 170; // <I2A>
+ <K5B> = 181; // <I35>
+ alias <K5C> = <KPEQ>;
+ <K5D> = 182; // <I36>
+ <K5E> = 183; // <I37>
+ <K5F> = 184; // <I38>
+ <K62> = 189; // <I3D>
+ <K63> = 190; // <I3E>
+ <K64> = 191; // <I3F>
+ <K65> = 192; // <I40>
+ <K66> = 193; // <I41>
+ <K67> = 198; // <I46>
+ <K68> = 199; // <I47>
+ <K69> = 200; // <I48>
+ <K6A> = 201; // <I49>
+ <K6B> = 203; // <I4B>
+ <K6C> = 204; // <I4C>
+ <K6D> = 205; // <I4D>
+ <K6E> = 206; // <I4E>
+ <K6F> = 207; // <I4F>
+ alias <K70> = <HKTG>; // <I50>
+ alias <K71> = <KANA>; // <I51>
+ alias <K72> = <EISU>; // <I52>
+ alias <K73> = <AB11>; // <I53>
+ <K74> = 219; // <I5B>
+ <K75> = 220; // <I5C>
+ <K76> = 221; // <I5D>
+
+ // Solaris compatibility
+
+ alias <LMTA> = <LWIN>;
+ alias <RMTA> = <RWIN>;
+ alias <COMP> = <MENU>;
+ alias <POWR> = <I0C>;
+ alias <MUTE> = <I0D>;
+ alias <VOL-> = <I0E>;
+ alias <VOL+> = <I0F>;
+ alias <HELP> = <I10>;
+ alias <STOP> = <I11>;
+ alias <AGAI> = <I12>;
+ alias <PROP> = <I13>;
+ alias <UNDO> = <I14>;
+ alias <FRNT> = <I15>;
+ alias <COPY> = <I16>;
+ alias <OPEN> = <I17>;
+ alias <PAST> = <I18>;
+ alias <FIND> = <I19>;
+ alias <CUT> = <I1A>;
+ alias <OUTP> = <I56>;
+ alias <KITG> = <I57>;
+ alias <KIDN> = <I58>;
+ alias <KIUP> = <I59>;
+
+ // Other codes never generated. The XFree86 ddx never generates
+ // these codes.
+ // Thus we can use them as fake keys
+ <MDSW> = 93; // <U5D>
+ <LVL3> = 124; // <U7C>
+ <ALT> = 125; // <U7D>
+ <META> = 156; // <I1C>
+ <SUPR> = 127; // <U7F>
+ <HYPR> = 128; // <U80>
+
+ indicator 1 = "Caps Lock";
+ indicator 2 = "Num Lock";
+ indicator 3 = "Scroll Lock";
+
+ alias <ALGR> = <RALT>;
+
+ // For Brazilian ABNT2
+ alias <KPPT> = <I06>;
+};
+
+// What keyboard is this?
+
+xkb_keycodes "102" {
+ include "xfree86(xfree86)"
+
+ // There will be warnings from xkbcomp because of multiple definitions.
+
+ <RALT> = 122;
+ <RCTL> = 123;
+
+ <PRSC> = 121;
+ <PAUS> = 118;
+
+ <INS> = 131;
+ <HOME> = 135;
+ <PGUP> = 119;
+ <DELE> = 129;
+ <END> = 130;
+ <PGDN> = 134;
+
+ <UP> = 128;
+ <LEFT> = 132;
+ <DOWN> = 120;
+ <RGHT> = 133;
+
+ <KPDV> = 125;
+
+ <KPEN> = 124;
+};
+
+
+// IBM ThinkPad Z60m/Z60t/Z61m/Z61t
+xkb_keycodes "thinkpadz60" {
+ include "xfree86(xfree86)"
+ <MENU> = 227;
+};
diff --git a/xorg-server/xkeyboard-config/keycodes/xfree98 b/xorg-server/xkeyboard-config/keycodes/xfree98
index 59483caf3..3faea5ca5 100644
--- a/xorg-server/xkeyboard-config/keycodes/xfree98
+++ b/xorg-server/xkeyboard-config/keycodes/xfree98
@@ -1,155 +1,152 @@
-// $Xorg: xfree98,v 1.4 2001/02/09 02:05:52 xorgcvs Exp $
-//
-//Copyright 1996, 1998 The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//The above copyright notice and this permission notice shall be
-//included in all copies or substantial portions of the Software.
-//
-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-//OTHER DEALINGS IN THE SOFTWARE.
-//
-//Except as contained in this notice, the name of The Open Group shall
-//not be used in advertising or otherwise to promote the sale, use or
-//other dealings in this Software without prior written authorization
-//from The Open Group.
-//
-// $XFree86: xc/programs/xkbcomp/keycodes/xfree98,v 3.6 2001/01/17 23:45:51 dawes Exp $
-//
-default xkb_keycodes "pc98" {
-
- minimum= 8;
- maximum= 255;
-
- <ESC> = 8;
- <AE01> = 9;
- <AE02> = 10;
- <AE03> = 11;
- <AE04> = 12;
- <AE05> = 13;
- <AE06> = 14;
- <AE07> = 15;
- <AE08> = 16;
- <AE09> = 17;
- <AE10> = 18;
- <AE11> = 19;
- <AE12> = 20;
- <BKSL> = 21;
- <BKSP> = 22;
-
- <TAB> = 23;
- <AD01> = 24;
- <AD02> = 25;
- <AD03> = 26;
- <AD04> = 27;
- <AD05> = 28;
- <AD06> = 29;
- <AD07> = 30;
- <AD08> = 31;
- <AD09> = 32;
- <AD10> = 33;
- <AD11> = 34;
- <AD12> = 35;
- <RTRN> = 36;
-
- <LCTL> = 124;
- <CAPS> = 121;
- <AC01> = 37;
- <AC02> = 38;
- <AC03> = 39;
- <AC04> = 40;
- <AC05> = 41;
- <AC06> = 42;
- <AC07> = 43;
- <AC08> = 44;
- <AC09> = 45;
- <AC10> = 46;
- <AC11> = 47;
- <AC12> = 48;
-
- <LFSH> = 120;
- <AB01> = 49;
- <AB02> = 50;
- <AB03> = 51;
- <AB04> = 52;
- <AB05> = 53;
- <AB06> = 54;
- <AB07> = 55;
- <AB08> = 56;
- <AB09> = 57;
- <AB10> = 58;
- <AB11> = 59;
-
- <ALGR> = 122;
- <LALT> = 123;
- <NFER> = 89;
- <SPCE> = 60;
- <XFER> = 61;
-
- <BRK> = 104;
- <PRSC> = 105;
- <FK01> = 106;
- <FK02> = 107;
- <FK03> = 108;
- <FK04> = 109;
- <FK05> = 110;
- <FK06> = 111;
- <FK07> = 112;
- <FK08> = 113;
- <FK09> = 114;
- <FK10> = 115;
- <FK11> = 90;
- <FK12> = 91;
- <FK13> = 92;
- <FK14> = 93;
- <FK15> = 94;
-
-
- <INS> = 64;
- <DELE> = 65;
- <PGUP> = 63;
- <PGDN> = 62;
- <UP> = 66;
- <LEFT> = 67;
- <RGHT> = 68;
- <DOWN> = 69;
-
- <HOME> = 70;
- <HELP> = 71;
-
- <KPSU> = 72;
- <KPDV> = 73;
-
- <KP7> = 74;
- <KP8> = 75;
- <KP9> = 76;
- <KPMU> = 77;
-
- <KP4> = 78;
- <KP5> = 79;
- <KP6> = 80;
- <KPAD> = 81;
-
- <KP1> = 82;
- <KP2> = 83;
- <KP3> = 84;
- <KPEQ> = 85;
-
- <KP0> = 86;
- <KPSP> = 87;
- <KPDC> = 88;
-
- indicator 1 = "Caps Lock";
- indicator 2 = "Kana";
-};
-
+//
+//Copyright 1996, 1998 The Open Group
+//
+//Permission to use, copy, modify, distribute, and sell this software and its
+//documentation for any purpose is hereby granted without fee, provided that
+//the above copyright notice appear in all copies and that both that
+//copyright notice and this permission notice appear in supporting
+//documentation.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from The Open Group.
+//
+//
+default xkb_keycodes "pc98" {
+
+ minimum= 8;
+ maximum= 255;
+
+ <ESC> = 8;
+ <AE01> = 9;
+ <AE02> = 10;
+ <AE03> = 11;
+ <AE04> = 12;
+ <AE05> = 13;
+ <AE06> = 14;
+ <AE07> = 15;
+ <AE08> = 16;
+ <AE09> = 17;
+ <AE10> = 18;
+ <AE11> = 19;
+ <AE12> = 20;
+ <BKSL> = 21;
+ <BKSP> = 22;
+
+ <TAB> = 23;
+ <AD01> = 24;
+ <AD02> = 25;
+ <AD03> = 26;
+ <AD04> = 27;
+ <AD05> = 28;
+ <AD06> = 29;
+ <AD07> = 30;
+ <AD08> = 31;
+ <AD09> = 32;
+ <AD10> = 33;
+ <AD11> = 34;
+ <AD12> = 35;
+ <RTRN> = 36;
+
+ <LCTL> = 124;
+ <CAPS> = 121;
+ <AC01> = 37;
+ <AC02> = 38;
+ <AC03> = 39;
+ <AC04> = 40;
+ <AC05> = 41;
+ <AC06> = 42;
+ <AC07> = 43;
+ <AC08> = 44;
+ <AC09> = 45;
+ <AC10> = 46;
+ <AC11> = 47;
+ <AC12> = 48;
+
+ <LFSH> = 120;
+ <AB01> = 49;
+ <AB02> = 50;
+ <AB03> = 51;
+ <AB04> = 52;
+ <AB05> = 53;
+ <AB06> = 54;
+ <AB07> = 55;
+ <AB08> = 56;
+ <AB09> = 57;
+ <AB10> = 58;
+ <AB11> = 59;
+
+ <ALGR> = 122;
+ <LALT> = 123;
+ <NFER> = 89;
+ <SPCE> = 60;
+ <XFER> = 61;
+
+ <BRK> = 104;
+ <PRSC> = 105;
+ <FK01> = 106;
+ <FK02> = 107;
+ <FK03> = 108;
+ <FK04> = 109;
+ <FK05> = 110;
+ <FK06> = 111;
+ <FK07> = 112;
+ <FK08> = 113;
+ <FK09> = 114;
+ <FK10> = 115;
+ <FK11> = 90;
+ <FK12> = 91;
+ <FK13> = 92;
+ <FK14> = 93;
+ <FK15> = 94;
+
+
+ <INS> = 64;
+ <DELE> = 65;
+ <PGUP> = 63;
+ <PGDN> = 62;
+ <UP> = 66;
+ <LEFT> = 67;
+ <RGHT> = 68;
+ <DOWN> = 69;
+
+ <HOME> = 70;
+ <HELP> = 71;
+
+ <KPSU> = 72;
+ <KPDV> = 73;
+
+ <KP7> = 74;
+ <KP8> = 75;
+ <KP9> = 76;
+ <KPMU> = 77;
+
+ <KP4> = 78;
+ <KP5> = 79;
+ <KP6> = 80;
+ <KPAD> = 81;
+
+ <KP1> = 82;
+ <KP2> = 83;
+ <KP3> = 84;
+ <KPEQ> = 85;
+
+ <KP0> = 86;
+ <KPSP> = 87;
+ <KPDC> = 88;
+
+ indicator 1 = "Caps Lock";
+ indicator 2 = "Kana";
+};
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-28 18:55:46 +0000