svn merge ^/branches/released .

3 files changed, 351 insertions, 354 deletions

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";

+};