Merge remote-tracking branch 'origin/released'

Conflicts:
	fontconfig/.gitignore
	libX11/src/ConvSel.c
	libX11/src/CrGlCur.c
	libX11/src/CrWindow.c
	libX11/src/GetDflt.c
	libX11/src/Window.c
	libX11/src/xlibi18n/XimProto.h
	libX11/src/xlibi18n/lcDynamic.c
	libxcb/src/.gitignore
	libxcb/src/xcb_ext.c
	libxcb/src/xcb_xid.c
	mesalib/src/glsl/.gitignore
	mesalib/src/glsl/glcpp/.gitignore
	mesalib/src/mapi/glapi/gen/glX_API.xml
	mesalib/src/mapi/glapi/glapi_getproc.c
	mesalib/src/mesa/main/.gitignore
	mesalib/src/mesa/main/syncobj.c
	mesalib/src/mesa/program/.gitignore
	xkbcomp/listing.c
	xkbcomp/xkbpath.c
	xorg-server/.gitignore
	xorg-server/Xext/xvmain.c
	xorg-server/dix/dispatch.c
	xorg-server/hw/xwin/glx/winpriv.h
	xorg-server/hw/xwin/winprefsyacc.y
	xorg-server/hw/xwin/winscrinit.c
	xorg-server/xkeyboard-config/rules/bin/ml1_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml_s.sh
	xorg-server/xkeyboard-config/rules/bin/mlv_s.sh
	xorg-server/xkeyboard-config/rules/compat/.gitignore

1 files changed, 614 insertions, 614 deletions

diff --git a/xorg-server/xkeyboard-config/geometry/sgi_vndr/O2 b/xorg-server/xkeyboard-config/geometry/sgi_vndr/O2
index afaed76f2..8bd177970 100644
--- a/xorg-server/xkeyboard-config/geometry/sgi_vndr/O2
+++ b/xorg-server/xkeyboard-config/geometry/sgi_vndr/O2
@@ -1,614 +1,614 @@
-//

-// Copyright (c) 1996 by Silicon Graphics Computer Systems, Inc.

-//

-// Permission to use, copy, modify, and distribute this

-// software and its documentation for any purpose and without

-// fee is hereby granted, provided that the above copyright

-// notice appear in all copies and that both that copyright

-// notice and this permission notice appear in supporting

-// documentation, and that the name of Silicon Graphics not be 

-// used in advertising or publicity pertaining to distribution 

-// of the software without specific prior written permission.

-// Silicon Graphics makes no representation about the suitability 

-// of this software for any purpose. It is provided "as is"

-// without any express or implied warranty.

-// 

-// SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 

-// SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 

-// AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON

-// GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 

-// DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 

-// DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 

-// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH

-// THE USE OR PERFORMANCE OF THIS SOFTWARE.

-//

-default xkb_geometry "pc101" {

-

-    // This is an approximate layout for a 101-key (US/ASCII) SGI

-    // keyboard.  I just took a similar layout (101 key PC keyboard)

-    // and adjusted the sizes of a few keys by eye.  I didn't actually

-    // *measure* a real keyboard.

-

-    description= "101-key keyboard for Silicon Graphics O2";

-

-    width= 448;

-    height= 162;

-

-    shape "EDGE" { 

-	cornerRadius= 2, 

-	{ [ 15,    0 ], [ 433,   0 ], [ 433, 10 ], [ 448, 10 ],

-	  [ 448, 162 ], [   0, 162 ], [   0, 10 ], [ 15,  10 ] }

-    };

-    shape.cornerRadius= 1;

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

-    shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } };

-    shape "TABK" { { [ 28,18] }, { [2,1], [26,17] } };

-    shape "BKSL" { { [ 27,18] }, { [2,1], [25,17] } };

-    shape "RTRN" { { [ 40,18] }, { [2,1], [37,17] } };

-    shape "CAPS" { { [ 34,18] }, { [2,1], [29,17] } };

-    shape "RTSH" { { [ 49,18] }, { [2,1], [47,17] } };

-    shape "LFSH" { { [ 44,18] }, { [2,1], [42,17] } };

-    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };

-    shape "SPCE" { { [130,18] }, { [2,1], [128,17] } };

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

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

-    shape "LOGO" { { [ 12,12] } };

-

-    outline "Edges" {

-	top= 0;

-	left= 0;

-	shape= "EDGE";

-    };

-

-    section.left= 6;

-    row.left= 1;

-    key.shape= "NORM";

-    key.gap=  1;

-    section "Function" {

-	top= 25;

-	row {

-	    top= 1;

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

-			{ <FK01>, 19}, <FK02>, <FK03>, <FK04>,

-			{ <FK05>, 11}, <FK06>, <FK07>, <FK08>,

-			{ <FK09>, 11}, <FK10>, <FK11>, <FK12>

-	    };

-	};

-    }; // End of "Function" section

-

-    section "Alpha" {

-	top= 58;

-	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>,

-			{ <BKSL>, "BKSL" }

-	    };	

-	};

-	row {

-	    top= 39;

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

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

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

-			<AC11>, { <RTRN>, "RTRN", color="grey20" }

-	    };

-	};

-	row {

-	    top= 58;

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

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

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

-			{ <RTSH>, "RTSH", color="grey20" }

-	    };

-	};

-	row {

-	    top= 77;

-	    key.shape= "MODK";

-	    key.color= "grey20";

-	    keys {	<LCTL>,	{ <LALT>, 20 },

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

-			<RALT>, { <RCTL>, 20 }

-	    };

-	};

-    }; // End of "Alpha" section

-

-    section "Editing" {

-	top= 25;

-	left= 299;

-	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

-

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

-    shape "LED"  { cornerRadius= 0, { [  3, 1.5] } };

-    solid "LedPanel" {

-	shape= "LEDS";

-	top=  25;

-	left= 364;

-	color= "grey10";

-    };

-    indicator.onColor= "green";

-    indicator.offColor= "green30";

-    indicator.top= 40.5;

-    indicator.shape= "LED";

-    indicator "Num Lock"     { left= 372; };

-    indicator "Caps Lock"    { left= 397; };

-    indicator "Scro llLock"  { left= 422; };

-

-    text.font= "helvetica";

-    text.weight= "bold";

-    text.slant= "r";

-    text.fontWidth= "normal";

-    text.fontSize= 12;

-    text.top= 39.5;

-    text.color= "black";

-    text "NumLockLabel"		{ left= 376.5; text="1"; };

-    text "CapsLockLabel"	{ left= 401.5; text="A"; };

-    text "ScrollLockLabel"	{ left= 426.5; text="S"; };

-    

-    logo "SGILogoImage" 	{ 

-	top= 26.5;

-	left= 396;

-	name= "SGI"; 

-	shape= "LOGO"; 

-    };

-    text.font= "helvetica";

-    text.weight= "bold";

-    text.slant= "o";

-    text.fontWidth= "narrow";

-    text.fontSize= 18;

-    text "SiliconLogoText"	{

-	top= 27;

-	left= 375;

-	width= 20;

-	text= "Silicon";

-    };

-    text "GraphicsLogoText"	{

-	top= 27;

-	left= 409;

-	width= 20;

-	text= "Graphics";

-    };

-

-    section "Keypad" {

-	top= 58;

-	left= 363;

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

-};

-

-xkb_geometry "pc102" {

-

-    // This is an approximate layout for 102-key SGI international

-    // keyboards.  I just took a similar layout (101 key PC keyboard)

-    // and adjusted the sizes of a few keys by eye.  I didn't actually

-    // *measure* a real keyboard.

-

-    description= "Silicon Graphics 102-key Keyboard";

-    width= 470;

-    height= 193;

-

-    shape.cornerRadius= 1;

-    shape "EDGE" { cornerRadius=2, { [ 470, 193 ] } };

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

-    shape "BKSP" { { [35,18] }, { [2,1], [33,17] } };

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

-    shape "RTRN" {

-	approx = { [ 0, 0], [26,37] },

-	{ [ 0, 0], [26, 0], [26,37],

-	  [ 5,37], [ 5,18], [ 0,18] },

-	{ [ 1, 1], [24, 1], [24,36],

-	  [ 7,36], [ 7,17], [ 1,17] }

-    };

-    shape "CAPS" { { [ 32,18] }, { [2,1], [25,17] } };

-    shape "RTSH" { { [ 50,18] }, { [2,1], [48,17] } };

-    shape "LFSH" { { [ 22,18] }, { [2,1], [20,17] } };

-    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };

-    shape "SPCE" { { [130,18] }, { [2,1], [128,17] } };

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

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

-    shape "LOGO" { { [ 16,16] } };

-

-    outline "Edges" {

-	top= 0;

-	left= 0;

-	shape= "EDGE";

-    };

-

-    section.left= 19;

-    row.left= 1;

-    key.shape= "NORM";

-    key.gap=  1;

-    section "Function" {

-	top= 50;

-	row {

-	    top= 1;

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

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

-			{ <FK05>, 10}, <FK06>, <FK07>, <FK08>,

-			{ <FK09>, 10}, <FK10>, <FK11>, <FK12>

-	    };

-	};

-    }; // End of "Function" section

-

-    section "Alpha" {

-	top= 83;

-	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", color= "grey20" }

-	    };

-	};

-	row {

-	    top= 39;

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

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

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

-			<AC11>, <BKSL>

-	    };

-	};

-	row {

-	    top= 58;

-	    keys { 	{ <LFSH>, "LFSH", color= "grey20" }, <LSGT>,

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

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

-			{ <RTSH>, "RTSH", color= "grey20" }

-	    };

-	};

-	row {

-	    top= 77;

-	    key.shape= "MODK";

-	    key.color= "grey20";

-	    keys {	<LCTL>,

-			{ <LALT>, 19 },

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

-			<RALT>,

-			{ <RCTL>, 19 }

-	    };

-	};

-    }; // End of "Alpha" section

-

-    section "Editing" {

-	top= 50;

-	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

-

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

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

-    solid "LedPanel" {

-	shape= "LEDS";

-	top=  50;

-	left= 375;

-	color= "grey10";

-    };

-    indicator.onColor= "green";

-    indicator.offColor= "green30";

-    indicator.top= 64.5;

-    indicator.shape= "LED";

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

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

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

-    text.top= 52;

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

-

-    logo "SGILogoImage" { 

-	top= 17;

-	left= 22;

-	name= "SGI"; 

-	shape= "LOGO"; 

-    };

-    text "SGILogoText"	{

-	top= 21;

-	left= 40;

-	width= 50;

-	text= "SiliconGraphics";

-	font= "helvetica";

-	slant= "o";

-	weight= "bold";

-	setWidth= "narrow";

-	fontSize= 24;

-    };

-

-    section "Keypad" {

-	top= 83;

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

-};

-

-xkb_geometry "jp106" {

-    description= "Silicon Graphics 106-key Japanese keyboard";

-    width= 442;

-    height= 167;

-

-    shape "EDGE" { cornerRadius= 2, { [ 442, 167 ] } };

-    shape.cornerRadius= 1;

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

-    shape "BKSP" { { [ 18,18] }, { [2,1], [ 16,17] } };

-    shape "TABK" { { [ 28,18] }, { [2,1], [ 26,17] } };

-    shape "BKSL" { { [ 27,18] }, { [2,1], [ 25,17] } };

-    shape "RTRN" {

-        { [0,0],[ 27,0],[27,37],[4,37],[4,18],[0,18] } ,

-        { [2,1],[ 25,1],[25,36],[5,36],[5,17],[2,17] } };

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

-    shape "LFSH" { { [ 42,18] }, { [2,1], [ 40,17] } };

-    shape "RTSH" { { [ 32,18] }, { [2,1], [ 30,17] } };

-    shape "MODK" { { [ 28,18] }, { [2,1], [ 26,17] } };

-    shape "SPCE" { { [ 46,18] }, { [2,1], [ 44,17] } };

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

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

-    shape "LOGO" { { [ 16,16] } };

-

-    outline "Edges" {

-	top= 0;

-	left= 0;

-	shape= "EDGE";

-    };

-

-    logo "SGILogoImage" { 

-	top= 5;

-	left= 6;

-	name= "SGI"; 

-	shape= "LOGO"; 

-    };

-

-    text "SGILogoText"	{

-	top= 9;

-	left= 25;

-	width= 50;

-	text= "SiliconGraphics";

-	font= "helvetica";

-	slant= "o";

-	weight= "bold";

-	fontWidth= "narrow";

-	fontSize= 24;

-    };

-

-    shape "LEDS" { cornerRadius= 0.1, { [ 76 ,20 ] } };

-    shape "LED"  { cornerRadius= 0, { [  5,  1 ] } };

-    solid "LedPanel" {

-	shape= "LEDS";

-	top=  25;

-	left= 362;

-	color= "grey10";

-    };

-

-    indicator.onColor= "green";

-    indicator.offColor= "green30";

-    indicator.top= 40;

-    indicator.shape= "LED";

-    indicator "Num Lock"     { left= 366; };

-    indicator "Caps Lock"    { left= 391; };

-    indicator "Scroll Lock"  { left= 416; };

-    text.top= 28;

-    text.color= "black";

-    text "NumLockLabel"		{ left= 366; text="Num\nLock"; };

-    text "CapsLockLabel"	{ left= 391; text="Caps\nLock"; };

-    text "ScrollLockLabel"	{ left= 416; text="Scroll\nLock"; };

-

-    section.left= 5;

-    row.left= 1;

-    key.shape= "NORM";

-    key.gap=  1;

-    section "Function" {

-	top= 25;

-	row {

-	    top= 1;

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

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

-		    { <FK05>, 11 ,color="grey20"}, {<FK06>,color="grey20"}, 

-		    { <FK07>, color="grey20"}, {<FK08>,color="grey20"},

-		    { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,

-		    { <PRSC>, 8 }, <SCLK>, <PAUS> 

-	    };

-	};

-    }; // End of "Function" section

-

-    section "Alpha" {

-	top= 61;

-	row {

-	    top= 1;

-	    keys { {<HZTG>,color="grey20"}, <AE01>, <AE02>, 

-                    <AE03>, <AE04>, <AE05>, <AE06>, <AE07>, 

-	            <AE08>, <AE09>, <AE10>, <AE11>, <AE12>,

-		    <AE13>, { <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>, 1 ,"RTRN",color="grey20" }

-	    };

-	};

-	row {

-	    top= 39;

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

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

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

-		   <AC11>, <AC12>

-	    };

-	};

-	row {

-	    top= 58;

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

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

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

-		    <AB11>, { <RTSH>, "RTSH", color="grey20" }

-	    };

-	};

-	row {

-	    top= 77;

-	    key.shape= "MODK";

-	    key.color= "grey20";

-	    keys { <LCTL>, { <LALT>, 20 },<NFER>,

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

-		   <XFER>,<HKTG>,<RALT>, { <RCTL>, 17 }

-	    };

-	};

-    }; // End of "Alpha" section

-

-    section "Editing" {

-	top= 61;

-	left= 296;

-	key.color= "grey20";

-	row {

-	    top= 1;

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

-	};

-        row {

-	    top= 20;

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

-	};

-	row {

-	    top= 58;

-	    left= 20;

-	    keys { <UP> };

-	};

-	row {

-	    top= 77;

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

-	};

-    }; // End of "Editing" section

-

-    section "Keypad" {

-	top= 61;

-	left= 361;

-	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 "jp106" geometry

+//
+// Copyright (c) 1996 by Silicon Graphics Computer Systems, Inc.
+//
+// Permission to use, copy, modify, and distribute this
+// software and its documentation for any purpose and without
+// fee is hereby granted, provided that the above copyright
+// notice appear in all copies and that both that copyright
+// notice and this permission notice appear in supporting
+// documentation, and that the name of Silicon Graphics not be 
+// used in advertising or publicity pertaining to distribution 
+// of the software without specific prior written permission.
+// Silicon Graphics makes no representation about the suitability 
+// of this software for any purpose. It is provided "as is"
+// without any express or implied warranty.
+// 
+// SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
+// SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+// AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
+// GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
+// DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
+// DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
+// THE USE OR PERFORMANCE OF THIS SOFTWARE.
+//
+default xkb_geometry "pc101" {
+
+    // This is an approximate layout for a 101-key (US/ASCII) SGI
+    // keyboard.  I just took a similar layout (101 key PC keyboard)
+    // and adjusted the sizes of a few keys by eye.  I didn't actually
+    // *measure* a real keyboard.
+
+    description= "101-key keyboard for Silicon Graphics O2";
+
+    width= 448;
+    height= 162;
+
+    shape "EDGE" { 
+	cornerRadius= 2, 
+	{ [ 15,    0 ], [ 433,   0 ], [ 433, 10 ], [ 448, 10 ],
+	  [ 448, 162 ], [   0, 162 ], [   0, 10 ], [ 15,  10 ] }
+    };
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } };
+    shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "TABK" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "BKSL" { { [ 27,18] }, { [2,1], [25,17] } };
+    shape "RTRN" { { [ 40,18] }, { [2,1], [37,17] } };
+    shape "CAPS" { { [ 34,18] }, { [2,1], [29,17] } };
+    shape "RTSH" { { [ 49,18] }, { [2,1], [47,17] } };
+    shape "LFSH" { { [ 44,18] }, { [2,1], [42,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "SPCE" { { [130,18] }, { [2,1], [128,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
+    shape "LOGO" { { [ 12,12] } };
+
+    outline "Edges" {
+	top= 0;
+	left= 0;
+	shape= "EDGE";
+    };
+
+    section.left= 6;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 25;
+	row {
+	    top= 1;
+	    keys {	{ <ESC>, color="grey20" },
+			{ <FK01>, 19}, <FK02>, <FK03>, <FK04>,
+			{ <FK05>, 11}, <FK06>, <FK07>, <FK08>,
+			{ <FK09>, 11}, <FK10>, <FK11>, <FK12>
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 58;
+	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>,
+			{ <BKSL>, "BKSL" }
+	    };	
+	};
+	row {
+	    top= 39;
+	    keys { 	{ <CAPS>, "CAPS", color="grey20" },
+	 		<AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+			<AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+			<AC11>, { <RTRN>, "RTRN", color="grey20" }
+	    };
+	};
+	row {
+	    top= 58;
+	    keys {	{ <LFSH>, "LFSH", color="grey20" }, 
+	 		<AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+			<AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+			{ <RTSH>, "RTSH", color="grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "MODK";
+	    key.color= "grey20";
+	    keys {	<LCTL>,	{ <LALT>, 20 },
+			{ <SPCE>, "SPCE",color="white" },
+			<RALT>, { <RCTL>, 20 }
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 25;
+	left= 299;
+	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
+
+    shape "LEDS" { cornerRadius= 0, { [ 76 ,20 ] } };
+    shape "LED"  { cornerRadius= 0, { [  3, 1.5] } };
+    solid "LedPanel" {
+	shape= "LEDS";
+	top=  25;
+	left= 364;
+	color= "grey10";
+    };
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 40.5;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 372; };
+    indicator "Caps Lock"    { left= 397; };
+    indicator "Scro llLock"  { left= 422; };
+
+    text.font= "helvetica";
+    text.weight= "bold";
+    text.slant= "r";
+    text.fontWidth= "normal";
+    text.fontSize= 12;
+    text.top= 39.5;
+    text.color= "black";
+    text "NumLockLabel"		{ left= 376.5; text="1"; };
+    text "CapsLockLabel"	{ left= 401.5; text="A"; };
+    text "ScrollLockLabel"	{ left= 426.5; text="S"; };
+    
+    logo "SGILogoImage" 	{ 
+	top= 26.5;
+	left= 396;
+	name= "SGI"; 
+	shape= "LOGO"; 
+    };
+    text.font= "helvetica";
+    text.weight= "bold";
+    text.slant= "o";
+    text.fontWidth= "narrow";
+    text.fontSize= 18;
+    text "SiliconLogoText"	{
+	top= 27;
+	left= 375;
+	width= 20;
+	text= "Silicon";
+    };
+    text "GraphicsLogoText"	{
+	top= 27;
+	left= 409;
+	width= 20;
+	text= "Graphics";
+    };
+
+    section "Keypad" {
+	top= 58;
+	left= 363;
+	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>;
+};
+
+xkb_geometry "pc102" {
+
+    // This is an approximate layout for 102-key SGI international
+    // keyboards.  I just took a similar layout (101 key PC keyboard)
+    // and adjusted the sizes of a few keys by eye.  I didn't actually
+    // *measure* a real keyboard.
+
+    description= "Silicon Graphics 102-key Keyboard";
+    width= 470;
+    height= 193;
+
+    shape.cornerRadius= 1;
+    shape "EDGE" { cornerRadius=2, { [ 470, 193 ] } };
+    shape "NORM" { { [18,18] }, { [2,1], [16,17] } };
+    shape "BKSP" { { [35,18] }, { [2,1], [33,17] } };
+    shape "TABK" { { [27,18] }, { [2,1], [25,17] } };
+    shape "RTRN" {
+	approx = { [ 0, 0], [26,37] },
+	{ [ 0, 0], [26, 0], [26,37],
+	  [ 5,37], [ 5,18], [ 0,18] },
+	{ [ 1, 1], [24, 1], [24,36],
+	  [ 7,36], [ 7,17], [ 1,17] }
+    };
+    shape "CAPS" { { [ 32,18] }, { [2,1], [25,17] } };
+    shape "RTSH" { { [ 50,18] }, { [2,1], [48,17] } };
+    shape "LFSH" { { [ 22,18] }, { [2,1], [20,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "SPCE" { { [130,18] }, { [2,1], [128,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
+    shape "LOGO" { { [ 16,16] } };
+
+    outline "Edges" {
+	top= 0;
+	left= 0;
+	shape= "EDGE";
+    };
+
+    section.left= 19;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 50;
+	row {
+	    top= 1;
+	    keys {  	{ <ESC>, color="grey20" },
+			{ <FK01>, 18}, <FK02>, <FK03>, <FK04>,
+			{ <FK05>, 10}, <FK06>, <FK07>, <FK08>,
+			{ <FK09>, 10}, <FK10>, <FK11>, <FK12>
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 83;
+	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", color= "grey20" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { 	{ <CAPS>, "CAPS", color= "grey20" },
+			<AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+			<AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+			<AC11>, <BKSL>
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { 	{ <LFSH>, "LFSH", color= "grey20" }, <LSGT>,
+			<AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+			<AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+			{ <RTSH>, "RTSH", color= "grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "MODK";
+	    key.color= "grey20";
+	    keys {	<LCTL>,
+			{ <LALT>, 19 },
+			{ <SPCE>, "SPCE", color="white" },
+			<RALT>,
+			{ <RCTL>, 19 }
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 50;
+	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
+
+    shape "LEDS" { cornerRadius= 0, { [ 76 ,20 ] } };
+    shape "LED"  { cornerRadius= 0, { [  1,  3 ] } };
+    solid "LedPanel" {
+	shape= "LEDS";
+	top=  50;
+	left= 375;
+	color= "grey10";
+    };
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 64.5;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 384; };
+    indicator "Caps Lock"    { left= 409; };
+    indicator "Scroll Lock"  { left= 434; };
+    text.top= 52;
+    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"; };
+
+    logo "SGILogoImage" { 
+	top= 17;
+	left= 22;
+	name= "SGI"; 
+	shape= "LOGO"; 
+    };
+    text "SGILogoText"	{
+	top= 21;
+	left= 40;
+	width= 50;
+	text= "SiliconGraphics";
+	font= "helvetica";
+	slant= "o";
+	weight= "bold";
+	setWidth= "narrow";
+	fontSize= 24;
+    };
+
+    section "Keypad" {
+	top= 83;
+	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>;
+};
+
+xkb_geometry "jp106" {
+    description= "Silicon Graphics 106-key Japanese keyboard";
+    width= 442;
+    height= 167;
+
+    shape "EDGE" { cornerRadius= 2, { [ 442, 167 ] } };
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,17] } };
+    shape "BKSP" { { [ 18,18] }, { [2,1], [ 16,17] } };
+    shape "TABK" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "BKSL" { { [ 27,18] }, { [2,1], [ 25,17] } };
+    shape "RTRN" {
+        { [0,0],[ 27,0],[27,37],[4,37],[4,18],[0,18] } ,
+        { [2,1],[ 25,1],[25,36],[5,36],[5,17],[2,17] } };
+    shape "CAPS" { { [ 32,18] }, { [2,1], [ 30,17] } };
+    shape "LFSH" { { [ 42,18] }, { [2,1], [ 40,17] } };
+    shape "RTSH" { { [ 32,18] }, { [2,1], [ 30,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "SPCE" { { [ 46,18] }, { [2,1], [ 44,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,17] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [ 16,36] } };
+    shape "LOGO" { { [ 16,16] } };
+
+    outline "Edges" {
+	top= 0;
+	left= 0;
+	shape= "EDGE";
+    };
+
+    logo "SGILogoImage" { 
+	top= 5;
+	left= 6;
+	name= "SGI"; 
+	shape= "LOGO"; 
+    };
+
+    text "SGILogoText"	{
+	top= 9;
+	left= 25;
+	width= 50;
+	text= "SiliconGraphics";
+	font= "helvetica";
+	slant= "o";
+	weight= "bold";
+	fontWidth= "narrow";
+	fontSize= 24;
+    };
+
+    shape "LEDS" { cornerRadius= 0.1, { [ 76 ,20 ] } };
+    shape "LED"  { cornerRadius= 0, { [  5,  1 ] } };
+    solid "LedPanel" {
+	shape= "LEDS";
+	top=  25;
+	left= 362;
+	color= "grey10";
+    };
+
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 40;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 366; };
+    indicator "Caps Lock"    { left= 391; };
+    indicator "Scroll Lock"  { left= 416; };
+    text.top= 28;
+    text.color= "black";
+    text "NumLockLabel"		{ left= 366; text="Num\nLock"; };
+    text "CapsLockLabel"	{ left= 391; text="Caps\nLock"; };
+    text "ScrollLockLabel"	{ left= 416; text="Scroll\nLock"; };
+
+    section.left= 5;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 25;
+	row {
+	    top= 1;
+	    keys {  { <ESC>, color="grey20" },
+		    { <FK01>, 18 }, <FK02>, <FK03>, <FK04>,
+		    { <FK05>, 11 ,color="grey20"}, {<FK06>,color="grey20"}, 
+		    { <FK07>, color="grey20"}, {<FK08>,color="grey20"},
+		    { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
+		    { <PRSC>, 8 }, <SCLK>, <PAUS> 
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 61;
+	row {
+	    top= 1;
+	    keys { {<HZTG>,color="grey20"}, <AE01>, <AE02>, 
+                    <AE03>, <AE04>, <AE05>, <AE06>, <AE07>, 
+	            <AE08>, <AE09>, <AE10>, <AE11>, <AE12>,
+		    <AE13>, { <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>, 1 ,"RTRN",color="grey20" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { { <CAPS>, "CAPS", color="grey20" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, <AC12>
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { { <LFSH>, "LFSH", color="grey20" },
+		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		    <AB11>, { <RTSH>, "RTSH", color="grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "MODK";
+	    key.color= "grey20";
+	    keys { <LCTL>, { <LALT>, 20 },<NFER>,
+		   { <SPCE>, "SPCE", color="white" },
+		   <XFER>,<HKTG>,<RALT>, { <RCTL>, 17 }
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 61;
+	left= 296;
+	key.color= "grey20";
+	row {
+	    top= 1;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+        row {
+	    top= 20;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 58;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 77;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 61;
+	left= 361;
+	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 "jp106" geometry