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, 261 insertions, 261 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/tuv b/xorg-server/xkeyboard-config/symbols/sun_vndr/tuv
index 64037ac42..f098f9f27 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/tuv
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/tuv
@@ -1,261 +1,261 @@
-//

-// Copyright 2010 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, and/or sell copies of the Software, and to permit persons

-// to whom the Software is furnished to do so, provided that the above

-// copyright notice(s) and this permission notice appear in all copies of

-// the Software and that both the above copyright notice(s) and this

-// permission notice appear in supporting documentation.

-// 

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

-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR 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.

-// 

-// Except as contained in this notice, the name of a copyright holder

-// shall not be used in advertising or otherwise to promote the sale, use

-// or other dealings in this Software without prior written authorization

-// of the copyright holder.

-//

-//

-//Copyright 1996, 1998  The Open Group

-//

-//All Rights Reserved.

-//

-//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.

-//

-// US/ASCII layout for a Type 4 Sun keyboard

-

-//

-// CDDL HEADER START

-//

-// The contents of this file are subject to the terms of the

-// Common Development and Distribution License (the "License").

-// You may not use this file except in compliance with the License.

-//

-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

-// or http://www.opensolaris.org/os/licensing.

-// See the License for the specific language governing permissions

-// and limitations under the License.

-//

-// When distributing Covered Code, include this CDDL HEADER in each

-// file and include the License file at src/OPENSOLARIS.LICENSE.

-// If applicable, add the following below this CDDL HEADER, with the

-// fields enclosed by brackets "[]" replaced with your own identifying

-// information: Portions Copyright [yyyy] [name of copyright owner]

-//

-// CDDL HEADER END

-//

-

-

-xkb_symbols "type4basic" {

-    include "us(basic)"

-

-    key <RTSH> { [ Shift_R		]			};

-    key <LALT> { [ Alt_L		]			};

-    key <ALGR> { [ Mode_switch		]			};

-    key <LMTA> { [ Meta_L		]			};

-    key <RMTA> { [ Meta_R		]			};

-    key <LNFD> { [ Linefeed		]			};

-    key <COMP> { [ Multi_key		]			};

-    // End alphanumeric section

-

-    // Begin "Function" section

-    key <FK01> { [ F1			]			};

-    key <FK02> { [ F2			]			};

-    key <FK03> { [ F3			]			};

-    key <FK04> { [ F4			]			};

-    key <FK05> { [ F5			]			};

-    key <FK06> { [ F6			]			};

-    key <FK07> { [ F7			]			};

-    key <FK08> { [ F8			]			};

-    key <FK09> { [ F9			]			};

-    key <FK10> { [ F10			]			};

-    key <FK11> { [ SunF36		]			};

-    key <FK12> { [ SunF37		]			};

-    key <STOP> { [ L1,	L1		], [ SunStop	]	};

-    key <AGAI> { [ L2,	L2		], [ SunAgain	]	};

-    key <PROP> { [ L3,	L3		], [ SunProps	]	};

-    key <UNDO> { [ L4,	L4		], [ SunUndo	]	};

-    key <FRNT> { [ L5,	L5		], [ SunFront	]	};

-    key <COPY> { [ L6,	L6		], [ SunCopy	]	};

-    key <OPEN> { [ L7,	L7		], [ SunOpen	]	};

-    key <PAST> { [ L8,	L8		], [ SunPaste	]	};

-    key <FIND> { [ L9,	L9		], [ SunFind	]	};

-    key <CUT>  { [ L10,	L10		], [ SunCut	]	};

-    // End "Function" section

-

-    // Begin "Editing" section

-    key <PRSC> { [ R2,	R2		], [ Print		] };

-    key <SCLK> { [ R3,	R3		], [ Scroll_Lock, Break	] };

-    key <PAUS> { [ R1,	R1		], [ Pause		] };

-    key <DELE> { [ Delete		]			};

-    key <HELP> { [ Help			]			};

-

-    // End "Editing" section, begin "Keypad"

-    key <NMLK> { [ Num_Lock 		]			};

-    key <KPEQ> { [ R4,	R4 		], [ KP_Equal		] };

-    key <KPDV> { [ R5,	R5		], [ KP_Divide		] };

-    key <KPMU> { [ R6,	R6		], [ KP_Multiply	] };

-    key <KPSU> { [ KP_Subtract		]			};

-

-    key  <KP7> { [ R7,	R7		], [ KP_7, Home		] };

-    key  <KP8> { [ Up, R8               ], [ KP_8               ] };

-//    key  <KP8> { [ R8,	R8		], [ KP_8		] };

-    key  <KP9> { [ R9,	R9		], [ KP_9, Prior	] };

-    key <KPAD> { [ KP_Add		]			};

-

-    key  <KP4> { [ Left, R10		], [ KP_4		] };

-    key  <KP5> { [ R11,	R11		], [ KP_5		] };

-    key  <KP6> { [ Right, R12		], [ KP_6		] };

-

-    key  <KP1> { [ R13,	R13		], [ KP_1,	End	] };

-    key  <KP2> { [ Down, R14		], [ KP_2		] };

-    key  <KP3> { [ R15,	R15		], [ KP_3,	Next	] };

-    key <KPEN> { [ KP_Enter		]			}; 

-    key  <KP0> { [ KP_Insert, KP_Insert], [ KP_0		]	};

-    key <KPDL> { [ Delete, Delete	], [ KP_Decimal ]	};

-    // End "Keypad" section

-

-

-    // begin modifier mappings

-    modifier_map Shift  	{ Shift_R, Shift_L };

-    modifier_map Mod1   	{ Meta_L, Meta_R };

-    modifier_map Mod2           { Num_Lock };

-    modifier_map Mod3   	{ Mode_switch };

-    modifier_map Mod4		{ Alt_L };

-};

-

-xkb_symbols "type4" {

-    include "sun_vndr/us(type4basic)"

-

-    // A few alphanumeric keys are different

-    key <AE04> { [ 4, dollar		], [ EuroSign	]	};

-    key <AE05> { [ 5, percent		], [ EuroSign	]	};

-    key <AD03> { [ e, E			], [ EuroSign	]	};

-};

-

-// US/ASCII layout for a Type 5 Sun keyboard

-xkb_symbols "type5basic" {

-    include "us(basic)"

-

-    key <RTSH> { [ Shift_R		]	};

-    key <LALT> { [ Alt_L		]	};

-    key <ALGR> { [ Mode_switch		]	};

-    key <LMTA> { [ Meta_L		]	};

-    key <RMTA> { [ Meta_R		]	};

-    key <COMP> { [ Multi_key		]	};

-    // End alphanumeric section

-

-    // Begin "Function" section

-    key <FK01> { [ F1			]			};

-    key <FK02> { [ F2			]			};

-    key <FK03> { [ F3			]			};

-    key <FK04> { [ F4			]			};

-    key <FK05> { [ F5			]			};

-    key <FK06> { [ F6			]			};

-    key <FK07> { [ F7			]			};

-    key <FK08> { [ F8			]			};

-    key <FK09> { [ F9			]			};

-    key <FK10> { [ F10			]			};

-    key <FK11> { [ SunF36		]			};

-    key <FK12> { [ SunF37		]			};

-    key <STOP> { [ L1, L1		], [ SunStop	]	};

-    key <AGAI> { [ L2, L2		], [ SunAgain	]	};

-    key <PROP> { [ L3, L3		], [ SunProps	]	};

-    key <UNDO> { [ L4, L4		], [ SunUndo	]	};

-    key <FRNT> { [ L5, L5		], [ SunFront	]	};

-    key <COPY> { [ L6, L6		], [ SunCopy	]	};

-    key <OPEN> { [ L7, L7		], [ SunOpen	]	};

-    key <PAST> { [ L8, L8		], [ SunPaste	]	};

-    key <FIND> { [ L9, L9		], [ SunFind	]	};

-    key <CUT>  { [ L10, L10		], [ SunCut	]	};

-    // End "Function" section

-

-    // Begin "Editing" section

-    key <PRSC> { [ R2, R2 		], [ Print, SunSys_Req	]	};

-    key <SCLK> { [ R3, R3		], [ Scroll_Lock	]	};

-    key <PAUS> { [ R1, R1		], [ Pause, Break	]	};

-    key <LEFT> { [ Left			]			};

-    key <RGHT> { [ Right		]			};

-    key <UP>   { [ Up			]			};

-    key <DOWN> { [ Down			]			};

-

-    key <DELE> { [ Delete		]			};

-    key <INS>  { [ Insert		]			};

-    key <PGUP> { [ Prior		]			};

-    key <PGDN> { [ Next			]			};

-    key <HOME> { [ Home			]			};

-    key <END>  { [ End			]			};

-    key <HELP> { [ Help			]			};

-

-    // End "Editing" section, begin "Keypad"

-    key <NMLK> { [ Num_Lock 		]				};

-    key <KPDV> { [ R5, R5		], [ KP_Divide	]	};

-    key <KPMU> { [ R6, R6		], [ KP_Multiply	]	};

-    key <KPSU> { [ R4, R4		], [ KP_Subtract	]	};

-

-    key  <KP7> { [ R7, R7		], [ KP_7, Home		]	};

-    key  <KP8> { [ Up, R8		], [ KP_8		]	};

-    key  <KP9> { [ R9, R9		], [ KP_9, Prior	]	};

-    key <KPAD> { [ KP_Add		]				};

-

-    key  <KP4> { [ Left, R10		], [ KP_4		]	};

-    key  <KP5> { [ R11,	R11		], [ KP_5		]	};

-    key  <KP6> { [ Right, R12		], [ KP_6		]	};

-

-    key  <KP1> { [ R13,	R13		], [ KP_1, End		]	};

-    key  <KP2> { [ Down, R14		], [ KP_2		]	};

-    key  <KP3> { [ R15,	R15		], [ KP_3		]	};

-    key <KPEN> { [ KP_Enter		]				};

-

-    key  <KP0> { [ KP_Insert, KP_Insert	], [ KP_0		]	};

-    key <KPDL> { [ KP_Delete, KP_Delete ], [ KP_Decimal 	]	};

-    // End "Keypad" section, 

-    // begin "four keys up on the right"

-

-    key <MUTE> { [ SunAudioMute,	SunVideoDegauss		]	};

-    key <VOL-> { [ SunAudioLowerVolume,	SunVideoLowerBrightness ]	};

-    key <VOL+> { [ SunAudioRaiseVolume,	SunVideoRaiseBrightness	]	};

-    key <POWR> { [ SunPowerSwitch,	SunPowerSwitchShift	]	};

-

-    // begin modifier mappings

-    modifier_map Shift  { Shift_R };

-    modifier_map Mod1	{ Meta_L, Meta_R };

-    modifier_map Mod2   { Num_Lock };

-    modifier_map Mod3	{ Alt_R };

-    modifier_map Mod4	{ Alt_L };

-};

-

-xkb_symbols "type5" {

-    include "sun_vndr/us(type5basic)"

-

-    // A few alphanumeric keys are different

-    key <AE04> { [ 4, dollar		], [ EuroSign	]	};

-    key <AE05> { [ 5, percent		], [ EuroSign	]	};

-    key <AD03> { [ e, E			], [ EuroSign	]	};

-    key <BKSL> { [ backslash, bar	], [ brokenbar	]	};

-};

+//
+// Copyright 2010 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, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// 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
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR 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.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+//
+//Copyright 1996, 1998  The Open Group
+//
+//All Rights Reserved.
+//
+//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.
+//
+// US/ASCII layout for a Type 4 Sun keyboard
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+
+xkb_symbols "type4basic" {
+    include "us(basic)"
+
+    key <RTSH> { [ Shift_R		]			};
+    key <LALT> { [ Alt_L		]			};
+    key <ALGR> { [ Mode_switch		]			};
+    key <LMTA> { [ Meta_L		]			};
+    key <RMTA> { [ Meta_R		]			};
+    key <LNFD> { [ Linefeed		]			};
+    key <COMP> { [ Multi_key		]			};
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key <FK01> { [ F1			]			};
+    key <FK02> { [ F2			]			};
+    key <FK03> { [ F3			]			};
+    key <FK04> { [ F4			]			};
+    key <FK05> { [ F5			]			};
+    key <FK06> { [ F6			]			};
+    key <FK07> { [ F7			]			};
+    key <FK08> { [ F8			]			};
+    key <FK09> { [ F9			]			};
+    key <FK10> { [ F10			]			};
+    key <FK11> { [ SunF36		]			};
+    key <FK12> { [ SunF37		]			};
+    key <STOP> { [ L1,	L1		], [ SunStop	]	};
+    key <AGAI> { [ L2,	L2		], [ SunAgain	]	};
+    key <PROP> { [ L3,	L3		], [ SunProps	]	};
+    key <UNDO> { [ L4,	L4		], [ SunUndo	]	};
+    key <FRNT> { [ L5,	L5		], [ SunFront	]	};
+    key <COPY> { [ L6,	L6		], [ SunCopy	]	};
+    key <OPEN> { [ L7,	L7		], [ SunOpen	]	};
+    key <PAST> { [ L8,	L8		], [ SunPaste	]	};
+    key <FIND> { [ L9,	L9		], [ SunFind	]	};
+    key <CUT>  { [ L10,	L10		], [ SunCut	]	};
+    // End "Function" section
+
+    // Begin "Editing" section
+    key <PRSC> { [ R2,	R2		], [ Print		] };
+    key <SCLK> { [ R3,	R3		], [ Scroll_Lock, Break	] };
+    key <PAUS> { [ R1,	R1		], [ Pause		] };
+    key <DELE> { [ Delete		]			};
+    key <HELP> { [ Help			]			};
+
+    // End "Editing" section, begin "Keypad"
+    key <NMLK> { [ Num_Lock 		]			};
+    key <KPEQ> { [ R4,	R4 		], [ KP_Equal		] };
+    key <KPDV> { [ R5,	R5		], [ KP_Divide		] };
+    key <KPMU> { [ R6,	R6		], [ KP_Multiply	] };
+    key <KPSU> { [ KP_Subtract		]			};
+
+    key  <KP7> { [ R7,	R7		], [ KP_7, Home		] };
+    key  <KP8> { [ Up, R8               ], [ KP_8               ] };
+//    key  <KP8> { [ R8,	R8		], [ KP_8		] };
+    key  <KP9> { [ R9,	R9		], [ KP_9, Prior	] };
+    key <KPAD> { [ KP_Add		]			};
+
+    key  <KP4> { [ Left, R10		], [ KP_4		] };
+    key  <KP5> { [ R11,	R11		], [ KP_5		] };
+    key  <KP6> { [ Right, R12		], [ KP_6		] };
+
+    key  <KP1> { [ R13,	R13		], [ KP_1,	End	] };
+    key  <KP2> { [ Down, R14		], [ KP_2		] };
+    key  <KP3> { [ R15,	R15		], [ KP_3,	Next	] };
+    key <KPEN> { [ KP_Enter		]			}; 
+    key  <KP0> { [ KP_Insert, KP_Insert], [ KP_0		]	};
+    key <KPDL> { [ Delete, Delete	], [ KP_Decimal ]	};
+    // End "Keypad" section
+
+
+    // begin modifier mappings
+    modifier_map Shift  	{ Shift_R, Shift_L };
+    modifier_map Mod1   	{ Meta_L, Meta_R };
+    modifier_map Mod2           { Num_Lock };
+    modifier_map Mod3   	{ Mode_switch };
+    modifier_map Mod4		{ Alt_L };
+};
+
+xkb_symbols "type4" {
+    include "sun_vndr/us(type4basic)"
+
+    // A few alphanumeric keys are different
+    key <AE04> { [ 4, dollar		], [ EuroSign	]	};
+    key <AE05> { [ 5, percent		], [ EuroSign	]	};
+    key <AD03> { [ e, E			], [ EuroSign	]	};
+};
+
+// US/ASCII layout for a Type 5 Sun keyboard
+xkb_symbols "type5basic" {
+    include "us(basic)"
+
+    key <RTSH> { [ Shift_R		]	};
+    key <LALT> { [ Alt_L		]	};
+    key <ALGR> { [ Mode_switch		]	};
+    key <LMTA> { [ Meta_L		]	};
+    key <RMTA> { [ Meta_R		]	};
+    key <COMP> { [ Multi_key		]	};
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key <FK01> { [ F1			]			};
+    key <FK02> { [ F2			]			};
+    key <FK03> { [ F3			]			};
+    key <FK04> { [ F4			]			};
+    key <FK05> { [ F5			]			};
+    key <FK06> { [ F6			]			};
+    key <FK07> { [ F7			]			};
+    key <FK08> { [ F8			]			};
+    key <FK09> { [ F9			]			};
+    key <FK10> { [ F10			]			};
+    key <FK11> { [ SunF36		]			};
+    key <FK12> { [ SunF37		]			};
+    key <STOP> { [ L1, L1		], [ SunStop	]	};
+    key <AGAI> { [ L2, L2		], [ SunAgain	]	};
+    key <PROP> { [ L3, L3		], [ SunProps	]	};
+    key <UNDO> { [ L4, L4		], [ SunUndo	]	};
+    key <FRNT> { [ L5, L5		], [ SunFront	]	};
+    key <COPY> { [ L6, L6		], [ SunCopy	]	};
+    key <OPEN> { [ L7, L7		], [ SunOpen	]	};
+    key <PAST> { [ L8, L8		], [ SunPaste	]	};
+    key <FIND> { [ L9, L9		], [ SunFind	]	};
+    key <CUT>  { [ L10, L10		], [ SunCut	]	};
+    // End "Function" section
+
+    // Begin "Editing" section
+    key <PRSC> { [ R2, R2 		], [ Print, SunSys_Req	]	};
+    key <SCLK> { [ R3, R3		], [ Scroll_Lock	]	};
+    key <PAUS> { [ R1, R1		], [ Pause, Break	]	};
+    key <LEFT> { [ Left			]			};
+    key <RGHT> { [ Right		]			};
+    key <UP>   { [ Up			]			};
+    key <DOWN> { [ Down			]			};
+
+    key <DELE> { [ Delete		]			};
+    key <INS>  { [ Insert		]			};
+    key <PGUP> { [ Prior		]			};
+    key <PGDN> { [ Next			]			};
+    key <HOME> { [ Home			]			};
+    key <END>  { [ End			]			};
+    key <HELP> { [ Help			]			};
+
+    // End "Editing" section, begin "Keypad"
+    key <NMLK> { [ Num_Lock 		]				};
+    key <KPDV> { [ R5, R5		], [ KP_Divide	]	};
+    key <KPMU> { [ R6, R6		], [ KP_Multiply	]	};
+    key <KPSU> { [ R4, R4		], [ KP_Subtract	]	};
+
+    key  <KP7> { [ R7, R7		], [ KP_7, Home		]	};
+    key  <KP8> { [ Up, R8		], [ KP_8		]	};
+    key  <KP9> { [ R9, R9		], [ KP_9, Prior	]	};
+    key <KPAD> { [ KP_Add		]				};
+
+    key  <KP4> { [ Left, R10		], [ KP_4		]	};
+    key  <KP5> { [ R11,	R11		], [ KP_5		]	};
+    key  <KP6> { [ Right, R12		], [ KP_6		]	};
+
+    key  <KP1> { [ R13,	R13		], [ KP_1, End		]	};
+    key  <KP2> { [ Down, R14		], [ KP_2		]	};
+    key  <KP3> { [ R15,	R15		], [ KP_3		]	};
+    key <KPEN> { [ KP_Enter		]				};
+
+    key  <KP0> { [ KP_Insert, KP_Insert	], [ KP_0		]	};
+    key <KPDL> { [ KP_Delete, KP_Delete ], [ KP_Decimal 	]	};
+    // End "Keypad" section, 
+    // begin "four keys up on the right"
+
+    key <MUTE> { [ SunAudioMute,	SunVideoDegauss		]	};
+    key <VOL-> { [ SunAudioLowerVolume,	SunVideoLowerBrightness ]	};
+    key <VOL+> { [ SunAudioRaiseVolume,	SunVideoRaiseBrightness	]	};
+    key <POWR> { [ SunPowerSwitch,	SunPowerSwitchShift	]	};
+
+    // begin modifier mappings
+    modifier_map Shift  { Shift_R };
+    modifier_map Mod1	{ Meta_L, Meta_R };
+    modifier_map Mod2   { Num_Lock };
+    modifier_map Mod3	{ Alt_R };
+    modifier_map Mod4	{ Alt_L };
+};
+
+xkb_symbols "type5" {
+    include "sun_vndr/us(type5basic)"
+
+    // A few alphanumeric keys are different
+    key <AE04> { [ 4, dollar		], [ EuroSign	]	};
+    key <AE05> { [ 5, percent		], [ EuroSign	]	};
+    key <AD03> { [ e, E			], [ EuroSign	]	};
+    key <BKSL> { [ backslash, bar	], [ brokenbar	]	};
+};