svn merge ^/branches/released .

1 files changed, 168 insertions, 170 deletions

diff --git a/xorg-server/xkeyboard-config/geometry/northgate b/xorg-server/xkeyboard-config/geometry/northgate
index cf0c6f477..cec2e35a3 100644
--- a/xorg-server/xkeyboard-config/geometry/northgate
+++ b/xorg-server/xkeyboard-config/geometry/northgate
@@ -1,170 +1,168 @@
-// $Xorg: northgate,v 1.3 2000/08/17 19:54:36 cpqbld Exp $
-//
-default xkb_geometry "omnikey101" {
-
-    description= "North Gate Omnikey 101";
-    width= 470;
-    height= 175;
-
-    shape.cornerRadius= 1;
-    shape "NORM" { { [18,18] }, { [2,1], [16,17] } };
-    shape "BKSP" { { [34,18] }, { [2,1], [32,17] } };
-    shape "TABK" { { [27,18] }, { [2,1], [25,17] } };
-    shape "RTRN" {
-	approx = { [15, 0], [40,37] },
-	{ [15, 0], [40, 0], [40,37],
-	  [ 0,37], [ 0,19], [15,19] },
-	{ [17, 1], [38, 1], [38,36],
-	  [ 2,36], [ 2,20], [17,20] }
-    };
-    shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } };
-    shape "LFSH" { { [ 41,18] }, { [2,1], [39,17] } };
-    shape "RTSH" { { [ 30,18] }, { [2,1], [28,17] } };
-    shape "MODK" { { [ 26,18] }, { [2,1], [24,17] } };
-    shape "SPCE" { { [129,18] }, { [2,1], [127,17] } };
-    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
-    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
-
-    shape "LEDS" { cornerRadius= 0, { [ 76 ,20 ] } };
-    shape "LED"  { cornerRadius= 0, { [  1,  3 ] } };
-    solid "LedPanel" {
-	shape= "LEDS";
-	top=  32;
-	left= 375;
-	color= "grey10";
-    };
-
-    indicator.onColor= "green";
-    indicator.offColor= "green30";
-    indicator.top= 46.5;
-    indicator.shape= "LED";
-    indicator "Num Lock"     { left= 384; };
-    indicator "Caps Lock"    { left= 409; };
-    indicator "Scroll Lock"  { left= 434; };
-    text.top= 34;
-    text.color= "black";
-    text "NumLockLabel"	{ left= 380.5; text="Num\nLock"; };
-    text "CapsLockLabel"	{ left= 405; text="Caps\nLock"; };
-    text "ScrollLockLabel"	{ left= 430; text="Scroll\nLock"; };
-
-    section.left= 19;
-    row.left= 1;
-    key.shape= "NORM";
-    key.gap=  1;
-    section "Function" {
-	top= 32;
-	row {
-	    top= 1;
-	    keys {  { <ESC>, color="grey20" },
-		    { <FK01>, 18}, <FK02>, <FK03>, <FK04>,
-		    { <FK05>, 9 }, <FK06>, <FK07>, <FK08>,
-		    { <FK09>, 9 }, <FK10>, <FK11>, <FK12>
-	    };
-	};
-    }; // End of "Function" section
-
-    section "Alpha" {
-	top= 65;
-	row {
-	    top= 1;
-	    keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
-		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
-		   <AE10>, <AE11>, <AE12>,
-		   { <BKSP>, "BKSP", color="grey20" }
-	    };
-	};
-	row {
-	    top= 20;
-	    keys { { <TAB>, "TABK", color="grey20" },
-		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-		   <AD11>, <AD12>,
-		   { <RTRN>, "RTRN", -14, color="grey20" }
-	    };
-	};
-	row {
-	    top= 39;
-	    keys { { <CAPS>, "CAPS", color="grey20" },
-		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
-		   <AC11>
-	    };
-	};
-	row {
-	    top= 58;
-	    keys { { <LFSH>, "LFSH", color="grey20" },
-		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
-		    { <RTSH>, "RTSH", color="grey20" }, <BKSL>
-	    };
-	};
-	row {
-	    top= 77;
-	    key.shape= "MODK";
-	    key.color= "grey20";
-	    keys { <LALT>,
-		   { <LCTL>, 23 },
-		   { <SPCE>, "SPCE", color="white" },
-		   <RCTL>,
-		    { <RALT>, 23 }
-	    };
-	};
-    }; // End of "Alpha" section
-
-    section "Editing" {
-	top= 32;
-	left= 308;
-	key.color= "grey20";
-	row {
-	    top= 1;
-	    keys { <PRSC>, <SCLK>, <PAUS> };
-	};
-	row {
-	    top= 33;
-	    keys { <INS>, <HOME>, <PGUP> };
-	};
-        row {
-	    top= 53;
-	    keys { <DELE>, <END>, <PGDN> };
-	};
-	row {
-	    top= 91;
-	    left= 20;
-	    keys { <UP> };
-	};
-	row {
-	    top= 110;
-	    keys { <LEFT>, <DOWN>, <RGHT> };
-	};
-    }; // End of "Editing" section
-
-    section "Keypad" {
-	top= 65;
-	left= 374;
-	row {
-	    top= 1;
-	    key.color= "grey20";
-	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
-	};
-	row {
-	    top= 20;
-	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color="grey20" } };
-	};
-	row {
-	    top= 39;
-	    keys { <KP4>, <KP5>, <KP6> };
-	};
-	row {
-	    top= 58;
-	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color="grey20" } };
-	};
-	row {
-	    top= 77;
-	    keys { { <KP0>, "KP0" }, <KPDL> };
-	};
-    }; // End of "Keypad" section
-
-    alias <AC00> = <CAPS>;
-    alias <AA00> = <LCTL>;
-
-}; // End of "default" geometry
+default xkb_geometry "omnikey101" {

+

+    description= "North Gate Omnikey 101";

+    width= 470;

+    height= 175;

+

+    shape.cornerRadius= 1;

+    shape "NORM" { { [18,18] }, { [2,1], [16,17] } };

+    shape "BKSP" { { [34,18] }, { [2,1], [32,17] } };

+    shape "TABK" { { [27,18] }, { [2,1], [25,17] } };

+    shape "RTRN" {

+	approx = { [15, 0], [40,37] },

+	{ [15, 0], [40, 0], [40,37],

+	  [ 0,37], [ 0,19], [15,19] },

+	{ [17, 1], [38, 1], [38,36],

+	  [ 2,36], [ 2,20], [17,20] }

+    };

+    shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } };

+    shape "LFSH" { { [ 41,18] }, { [2,1], [39,17] } };

+    shape "RTSH" { { [ 30,18] }, { [2,1], [28,17] } };

+    shape "MODK" { { [ 26,18] }, { [2,1], [24,17] } };

+    shape "SPCE" { { [129,18] }, { [2,1], [127,17] } };

+    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };

+    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };

+

+    shape "LEDS" { cornerRadius= 0, { [ 76 ,20 ] } };

+    shape "LED"  { cornerRadius= 0, { [  1,  3 ] } };

+    solid "LedPanel" {

+	shape= "LEDS";

+	top=  32;

+	left= 375;

+	color= "grey10";

+    };

+

+    indicator.onColor= "green";

+    indicator.offColor= "green30";

+    indicator.top= 46.5;

+    indicator.shape= "LED";

+    indicator "Num Lock"     { left= 384; };

+    indicator "Caps Lock"    { left= 409; };

+    indicator "Scroll Lock"  { left= 434; };

+    text.top= 34;

+    text.color= "black";

+    text "NumLockLabel"	{ left= 380.5; text="Num\nLock"; };

+    text "CapsLockLabel"	{ left= 405; text="Caps\nLock"; };

+    text "ScrollLockLabel"	{ left= 430; text="Scroll\nLock"; };

+

+    section.left= 19;

+    row.left= 1;

+    key.shape= "NORM";

+    key.gap=  1;

+    section "Function" {

+	top= 32;

+	row {

+	    top= 1;

+	    keys {  { <ESC>, color="grey20" },

+		    { <FK01>, 18}, <FK02>, <FK03>, <FK04>,

+		    { <FK05>, 9 }, <FK06>, <FK07>, <FK08>,

+		    { <FK09>, 9 }, <FK10>, <FK11>, <FK12>

+	    };

+	};

+    }; // End of "Function" section

+

+    section "Alpha" {

+	top= 65;

+	row {

+	    top= 1;

+	    keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,

+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,

+		   <AE10>, <AE11>, <AE12>,

+		   { <BKSP>, "BKSP", color="grey20" }

+	    };

+	};

+	row {

+	    top= 20;

+	    keys { { <TAB>, "TABK", color="grey20" },

+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 

+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 

+		   <AD11>, <AD12>,

+		   { <RTRN>, "RTRN", -14, color="grey20" }

+	    };

+	};

+	row {

+	    top= 39;

+	    keys { { <CAPS>, "CAPS", color="grey20" },

+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 

+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 

+		   <AC11>

+	    };

+	};

+	row {

+	    top= 58;

+	    keys { { <LFSH>, "LFSH", color="grey20" },

+		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 

+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 

+		    { <RTSH>, "RTSH", color="grey20" }, <BKSL>

+	    };

+	};

+	row {

+	    top= 77;

+	    key.shape= "MODK";

+	    key.color= "grey20";

+	    keys { <LALT>,

+		   { <LCTL>, 23 },

+		   { <SPCE>, "SPCE", color="white" },

+		   <RCTL>,

+		    { <RALT>, 23 }

+	    };

+	};

+    }; // End of "Alpha" section

+

+    section "Editing" {

+	top= 32;

+	left= 308;

+	key.color= "grey20";

+	row {

+	    top= 1;

+	    keys { <PRSC>, <SCLK>, <PAUS> };

+	};

+	row {

+	    top= 33;

+	    keys { <INS>, <HOME>, <PGUP> };

+	};

+        row {

+	    top= 53;

+	    keys { <DELE>, <END>, <PGDN> };

+	};

+	row {

+	    top= 91;

+	    left= 20;

+	    keys { <UP> };

+	};

+	row {

+	    top= 110;

+	    keys { <LEFT>, <DOWN>, <RGHT> };

+	};

+    }; // End of "Editing" section

+

+    section "Keypad" {

+	top= 65;

+	left= 374;

+	row {

+	    top= 1;

+	    key.color= "grey20";

+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };

+	};

+	row {

+	    top= 20;

+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color="grey20" } };

+	};

+	row {

+	    top= 39;

+	    keys { <KP4>, <KP5>, <KP6> };

+	};

+	row {

+	    top= 58;

+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color="grey20" } };

+	};

+	row {

+	    top= 77;

+	    keys { { <KP0>, "KP0" }, <KPDL> };

+	};

+    }; // End of "Keypad" section

+

+    alias <AC00> = <CAPS>;

+    alias <AA00> = <LCTL>;

+

+}; // End of "default" geometry