Merge remote-tracking branch 'origin/released'

Conflicts:
	xorg-server/glx/glapi.h
	xorg-server/hw/xquartz/GL/indirect.c
	xorg-server/hw/xquartz/X11Application.m
	xorg-server/xkeyboard-config/symbols/jp

5 files changed, 731 insertions, 776 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/jp b/xorg-server/xkeyboard-config/symbols/jp
index 36f12e4eb..278419ce3 100644
--- a/xorg-server/xkeyboard-config/symbols/jp
+++ b/xorg-server/xkeyboard-config/symbols/jp
@@ -118,7 +118,7 @@ xkb_symbols "OADG109A" {
 partial alphanumeric_keys

 xkb_symbols "kana86" {

 

-    include "pc(function)"

+    include "srvr_ctrl(fkey2vt)"

     include "pc(editing)"

     include "keypad(numoperdecsep)"

     include "altwin(menu)"

diff --git a/xorg-server/xkeyboard-config/symbols/pc b/xorg-server/xkeyboard-config/symbols/pc
index 7ccb36dd2..e1965ce63 100644
--- a/xorg-server/xkeyboard-config/symbols/pc
+++ b/xorg-server/xkeyboard-config/symbols/pc
@@ -1,142 +1,90 @@
-default partial alphanumeric_keys modifier_keys 

-xkb_symbols "pc105" {

-

-    key <ESC>  {	[ Escape			]	};

-

-    // the extra key on most European keyboards

-    key <LSGT> {	[      less,    greater,          bar,    brokenbar ]	};

-

-    // these keys are common to all layouts

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

-    key <SPCE> {	[ 	 space			]	};

-

-    include "pc(function)"

-    include "pc(editing)"

-    include "keypad(x11)"

-

-    key <BKSP> {	[ BackSpace	]	};

-

-    key  <TAB> {	[ Tab,	ISO_Left_Tab	]	};

-    key <RTRN> {	[ Return	]	};

-

-    key <CAPS> {	[ Caps_Lock	]	};

-

-    key <NMLK> {	[ Num_Lock 	]	};

-

-    key <LFSH> {	[ Shift_L	]	};

-    key <LCTL> {	[ Control_L	]	};

-

-    key <LWIN> {	[ Super_L			]	};

-

-    key <RTSH> {	[ Shift_R	]	};

-    key <RCTL> {	[ Control_R	]	};

-

-    key <RWIN> {	[ Super_R			]	};

-

-    key <MENU> {	[ Menu			]	};

-

-    // begin modifier mappings

-    modifier_map Shift  { Shift_L, Shift_R };

-    modifier_map Lock   { Caps_Lock, ISO_Lock };

-    modifier_map Control{ Control_L, Control_R };

-    modifier_map Mod2   { Num_Lock };

-    modifier_map Mod4   { Super_L, Super_R };

-

-    //  Fake keys for virtual<->real modifiers mapping 

-    key <LVL3> {	[ ISO_Level3_Shift	]	};

-    key <MDSW> {	[ Mode_switch 		]	};

-    modifier_map Mod5   { <LVL3>, <MDSW> };

-

-    key <ALT>  {	[ NoSymbol, Alt_L	]	};

-    include "altwin(meta_alt)"

-

-    key <META> {	[ NoSymbol, Meta_L	]	};

-    modifier_map Mod1   { <META> };

-

-    key <SUPR> {	[ NoSymbol, Super_L	]	};

-    modifier_map Mod4   { <SUPR> };

-

-    key <HYPR> {	[ NoSymbol, Hyper_L	]	};

-    modifier_map Mod4   { <HYPR> };

-

-    key <OUTP> { [ XF86Display ] };

-    key <KITG> { [ XF86KbdLightOnOff ] };

-    key <KIDN> { [ XF86KbdBrightnessDown ] };

-    key <KIUP> { [ XF86KbdBrightnessUp ] };

-};

-

-partial hidden alphanumeric_keys

-xkb_symbols "function" {

-    key <FK01> {

-        type="CTRL+ALT",

-        symbols[Group1]= [ F1,	XF86_Switch_VT_1 ]

-    };

-    key <FK02> {

-        type="CTRL+ALT",

-        symbols[Group1]= [ F2,	XF86_Switch_VT_2 ]

-    };

-    key <FK03> {

-        type="CTRL+ALT",

-        symbols[Group1]= [ F3,	XF86_Switch_VT_3 ]

-    };

-    key <FK04> {

-        type="CTRL+ALT",

-        symbols[Group1]= [ F4,	XF86_Switch_VT_4 ]

-    };

-    key <FK05> {

-        type="CTRL+ALT",

-        symbols[Group1]= [ F5,	XF86_Switch_VT_5 ]

-    };

-    key <FK06> {

-        type="CTRL+ALT",

-        symbols[Group1]= [ F6,	XF86_Switch_VT_6 ]

-    };

-    key <FK07> {

-        type="CTRL+ALT",

-        symbols[Group1]= [ F7,	XF86_Switch_VT_7 ]

-    };

-    key <FK08> {

-        type="CTRL+ALT",

-        symbols[Group1]= [ F8,	XF86_Switch_VT_8 ]

-    };

-    key <FK09> {

-        type="CTRL+ALT",

-        symbols[Group1]= [ F9,	XF86_Switch_VT_9 ]

-    };

-    key <FK10> {

-        type="CTRL+ALT",

-        symbols[Group1]= [ F10,	XF86_Switch_VT_10 ]

-    };

-    key <FK11> {

-        type="CTRL+ALT",

-        symbols[Group1]= [ F11,	XF86_Switch_VT_11 ]

-    };

-    key <FK12> {

-        type="CTRL+ALT",

-        symbols[Group1]= [ F12,	XF86_Switch_VT_12 ]

-    };

-};

-

-partial hidden alphanumeric_keys

-xkb_symbols "editing" {

-    key <PRSC> {

-	type= "PC_ALT_LEVEL2",

-	symbols[Group1]= [ Print, Sys_Req ]

-    };

-    key <SCLK> {  [  Scroll_Lock	]	};

-    key <PAUS> {

-	type= "PC_CONTROL_LEVEL2",

-	symbols[Group1]= [ Pause, Break ]

-    };

-    key  <INS> {	[  Insert		]	};

-    key <HOME> {	[  Home			]	};

-    key <PGUP> {	[  Prior		]	};

-    key <DELE> {	[  Delete		]	};

-    key  <END> {	[  End			]	};

-    key <PGDN> {	[  Next			]	};

-

-    key   <UP> {	[  Up			]	};

-    key <LEFT> {	[  Left			]	};

-    key <DOWN> {	[  Down			]	};

-    key <RGHT> {	[  Right		]	};

-};

+default partial alphanumeric_keys modifier_keys 
+xkb_symbols "pc105" {
+
+    key <ESC>  {	[ Escape			]	};
+
+    // the extra key on most European keyboards
+    key <LSGT> {	[      less,    greater,          bar,    brokenbar ]	};
+
+    // these keys are common to all layouts
+    key <BKSL> {	[ backslash,	bar		]	};
+    key <SPCE> {	[ 	 space			]	};
+
+    include "srvr_ctrl(fkey2vt)"
+    include "pc(editing)"
+    include "keypad(x11)"
+
+    key <BKSP> {	[ BackSpace	]	};
+
+    key  <TAB> {	[ Tab,	ISO_Left_Tab	]	};
+    key <RTRN> {	[ Return	]	};
+
+    key <CAPS> {	[ Caps_Lock	]	};
+
+    key <NMLK> {	[ Num_Lock 	]	};
+
+    key <LFSH> {	[ Shift_L	]	};
+    key <LCTL> {	[ Control_L	]	};
+
+    key <LWIN> {	[ Super_L			]	};
+
+    key <RTSH> {	[ Shift_R	]	};
+    key <RCTL> {	[ Control_R	]	};
+
+    key <RWIN> {	[ Super_R			]	};
+
+    key <MENU> {	[ Menu			]	};
+
+    // begin modifier mappings
+    modifier_map Shift  { Shift_L, Shift_R };
+    modifier_map Lock   { Caps_Lock, ISO_Lock };
+    modifier_map Control{ Control_L, Control_R };
+    modifier_map Mod2   { Num_Lock };
+    modifier_map Mod4   { Super_L, Super_R };
+
+    //  Fake keys for virtual<->real modifiers mapping 
+    key <LVL3> {	[ ISO_Level3_Shift	]	};
+    key <MDSW> {	[ Mode_switch 		]	};
+    modifier_map Mod5   { <LVL3>, <MDSW> };
+
+    key <ALT>  {	[ NoSymbol, Alt_L	]	};
+    include "altwin(meta_alt)"
+
+    key <META> {	[ NoSymbol, Meta_L	]	};
+    modifier_map Mod1   { <META> };
+
+    key <SUPR> {	[ NoSymbol, Super_L	]	};
+    modifier_map Mod4   { <SUPR> };
+
+    key <HYPR> {	[ NoSymbol, Hyper_L	]	};
+    modifier_map Mod4   { <HYPR> };
+
+    key <OUTP> { [ XF86Display ] };
+    key <KITG> { [ XF86KbdLightOnOff ] };
+    key <KIDN> { [ XF86KbdBrightnessDown ] };
+    key <KIUP> { [ XF86KbdBrightnessUp ] };
+};
+
+partial hidden alphanumeric_keys
+xkb_symbols "editing" {
+    key <PRSC> {
+	type= "PC_ALT_LEVEL2",
+	symbols[Group1]= [ Print, Sys_Req ]
+    };
+    key <SCLK> {  [  Scroll_Lock	]	};
+    key <PAUS> {
+	type= "PC_CONTROL_LEVEL2",
+	symbols[Group1]= [ Pause, Break ]
+    };
+    key  <INS> {	[  Insert		]	};
+    key <HOME> {	[  Home			]	};
+    key <PGUP> {	[  Prior		]	};
+    key <DELE> {	[  Delete		]	};
+    key  <END> {	[  End			]	};
+    key <PGDN> {	[  Next			]	};
+
+    key   <UP> {	[  Up			]	};
+    key <LEFT> {	[  Left			]	};
+    key <DOWN> {	[  Down			]	};
+    key <RGHT> {	[  Right		]	};
+};
diff --git a/xorg-server/xkeyboard-config/symbols/srvr_ctrl b/xorg-server/xkeyboard-config/symbols/srvr_ctrl
index b3d9a865a..8bdf503a1 100644
--- a/xorg-server/xkeyboard-config/symbols/srvr_ctrl
+++ b/xorg-server/xkeyboard-config/symbols/srvr_ctrl
@@ -1,125 +1,125 @@
-// Actions which control the server's behavior

-

-partial keypad_keys function_keys

-xkb_symbols "xfree86" {

-    include "srvr_ctrl(stdkeypad)"

-    include "srvr_ctrl(fkey2vt)"

-};

-

-partial keypad_keys 

-xkb_symbols "stdkeypad" {

-

-// Ungrab cancels server/keyboard/pointer grabs

-    key <KPDV> {

-	type="CTRL+ALT",

-	symbols[Group1]= [ KP_Divide,	XF86_Ungrab ]

-    };

-

-// ClsGrb kills whichever client has a grab in effect

-    key <KPMU> {

-	type="CTRL+ALT",

-	symbols[Group1]= [ KP_Multiply,	XF86_ClearGrab ]

-    };

-

-// -VMode switches to the previous video mode

-    key <KPSU> {

-	type="CTRL+ALT",

-	symbols[Group1]= [ KP_Subtract, XF86_Prev_VMode ]

-    };

-

-// +VMode switches to the next video mode

-    key <KPAD> {

-	type="CTRL+ALT",

-	symbols[Group1]= [ KP_Add,	XF86_Next_VMode]

-    };

-

-};

-

-partial function_keys 

-xkb_symbols "fkey2vt" {

-

-    key <FK01> {

-	type="CTRL+ALT",

-	symbols[Group1]= [ F1,	XF86_Switch_VT_1 ]

-    };

-

-    key <FK02> {

-	type="CTRL+ALT",

-	symbols[Group1]= [ F2,	XF86_Switch_VT_2 ]

-    };

-

-    key <FK03> {

-	type="CTRL+ALT",

-	symbols[Group1]= [ F3,	XF86_Switch_VT_3 ]

-    };

-

-    key <FK04> {

-	type="CTRL+ALT",

-	symbols[Group1]= [ F4,	XF86_Switch_VT_4 ]

-    };

-

-    key <FK05> {

-	type="CTRL+ALT",

-	symbols[Group1]= [ F5,	XF86_Switch_VT_5 ]

-    };

-

-    key <FK06> {

-	type="CTRL+ALT",

-	symbols[Group1]= [ F6,	XF86_Switch_VT_6 ]

-    };

-

-    key <FK07> {

-	type="CTRL+ALT",

-	symbols[Group1]= [ F7,	XF86_Switch_VT_7 ]

-    };

-

-    key <FK08> {

-	type="CTRL+ALT",

-	symbols[Group1]= [ F8,	XF86_Switch_VT_8 ]

-    };

-

-    key <FK09> {

-	type="CTRL+ALT",

-	symbols[Group1]= [ F9,	XF86_Switch_VT_9 ]

-    };

-

-    key <FK10> {

-	type="CTRL+ALT",

-	symbols[Group1]= [ F10,	XF86_Switch_VT_10 ]

-    };

-

-    key <FK11> {

-	type="CTRL+ALT",

-	symbols[Group1]= [ F11,	XF86_Switch_VT_11 ]

-    };

-

-    key <FK12> {

-	type="CTRL+ALT",

-	symbols[Group1]= [ F12,	XF86_Switch_VT_12 ]

-    };

-

-};

-

-partial function_keys keypad_keys

-xkb_symbols "no_srvr_keys" {

-

-    key.type="TWO_LEVEL";

-

-    key <FK01> { [ F1, F1 ]	};

-    key <FK02> { [ F2, F2 ]	};

-    key <FK03> { [ F3, F3 ]	};

-    key <FK04> { [ F4, F4 ]	};

-    key <FK05> { [ F5, F5 ]	};

-    key <FK06> { [ F6, F6 ]	};

-    key <FK07> { [ F7, F7 ]	};

-    key <FK08> { [ F8, F8 ]	};

-    key <FK09> { [ F9, F9 ]	};

-    key <FK10> { [ F10, F10 ]	};

-    key <FK11> { [ F11, F11 ]	};

-    key <FK12> { [ F12, F12 ]	};

-

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

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

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

-    key <KPAD> { [ KP_Add,	KP_Add		] };

-};

+// Actions which control the server's behavior
+
+partial keypad_keys function_keys
+xkb_symbols "xfree86" {
+    include "srvr_ctrl(stdkeypad)"
+    include "srvr_ctrl(fkey2vt)"
+};
+
+partial keypad_keys 
+xkb_symbols "stdkeypad" {
+
+// Ungrab cancels server/keyboard/pointer grabs
+    key <KPDV> {
+	type="CTRL+ALT",
+	symbols[Group1]= [ KP_Divide,	XF86_Ungrab ]
+    };
+
+// ClsGrb kills whichever client has a grab in effect
+    key <KPMU> {
+	type="CTRL+ALT",
+	symbols[Group1]= [ KP_Multiply,	XF86_ClearGrab ]
+    };
+
+// -VMode switches to the previous video mode
+    key <KPSU> {
+	type="CTRL+ALT",
+	symbols[Group1]= [ KP_Subtract, XF86_Prev_VMode ]
+    };
+
+// +VMode switches to the next video mode
+    key <KPAD> {
+	type="CTRL+ALT",
+	symbols[Group1]= [ KP_Add,	XF86_Next_VMode]
+    };
+
+};
+
+partial function_keys 
+xkb_symbols "fkey2vt" {
+
+    key <FK01> {
+	type="CTRL+ALT",
+	symbols[Group1]= [ F1, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_1 ]
+    };
+
+    key <FK02> {
+	type="CTRL+ALT",
+	symbols[Group1]= [ F2, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_2 ]
+    };
+
+    key <FK03> {
+	type="CTRL+ALT",
+	symbols[Group1]= [ F3, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_3 ]
+    };
+
+    key <FK04> {
+	type="CTRL+ALT",
+	symbols[Group1]= [ F4, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_4 ]
+    };
+
+    key <FK05> {
+	type="CTRL+ALT",
+	symbols[Group1]= [ F5, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_5 ]
+    };
+
+    key <FK06> {
+	type="CTRL+ALT",
+	symbols[Group1]= [ F6, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_6 ]
+    };
+
+    key <FK07> {
+	type="CTRL+ALT",
+	symbols[Group1]= [ F7, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_7 ]
+    };
+
+    key <FK08> {
+	type="CTRL+ALT",
+	symbols[Group1]= [ F8, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_8 ]
+    };
+
+    key <FK09> {
+	type="CTRL+ALT",
+	symbols[Group1]= [ F9, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_9 ]
+    };
+
+    key <FK10> {
+	type="CTRL+ALT",
+	symbols[Group1]= [ F10, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_10 ]
+    };
+
+    key <FK11> {
+	type="CTRL+ALT",
+	symbols[Group1]= [ F11, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_11 ]
+    };
+
+    key <FK12> {
+	type="CTRL+ALT",
+	symbols[Group1]= [ F12, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_12 ]
+    };
+
+};
+
+partial function_keys keypad_keys
+xkb_symbols "no_srvr_keys" {
+
+    key.type="TWO_LEVEL";
+
+    key <FK01> { [ F1, F1 ]	};
+    key <FK02> { [ F2, F2 ]	};
+    key <FK03> { [ F3, F3 ]	};
+    key <FK04> { [ F4, F4 ]	};
+    key <FK05> { [ F5, F5 ]	};
+    key <FK06> { [ F6, F6 ]	};
+    key <FK07> { [ F7, F7 ]	};
+    key <FK08> { [ F8, F8 ]	};
+    key <FK09> { [ F9, F9 ]	};
+    key <FK10> { [ F10, F10 ]	};
+    key <FK11> { [ F11, F11 ]	};
+    key <FK12> { [ F12, F12 ]	};
+
+    key <KPDV> { [ KP_Divide,	KP_Divide	] };
+    key <KPMU> { [ KP_Multiply,	KP_Multiply	] };
+    key <KPSU> { [ KP_Subtract,	KP_Subtract	] };
+    key <KPAD> { [ KP_Add,	KP_Add		] };
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/us b/xorg-server/xkeyboard-config/symbols/sun_vndr/us
index 48d15df17..f2689a8a7 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/us
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/us
@@ -1,400 +1,400 @@
-//

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

-//

-

-//

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

-//

-

-// Symbols shared by all Sun Keyboard layouts

-xkb_symbols "sunbasic" {

-    include "srvr_ctrl(xfree86)"

-

-    // Needed for left function keys and volume keys

-    // Need to include this before us(basic) otherwise tilde is mapped to 

-    // a jp key

-    include "inet(evdev)"

-

-    include "us(basic)"

-    include "pc(function)"

-    include "pc(editing)"

-    include "keypad(x11)"

-

-    key <ESC>  { [ Escape               ]                       };

-

-    // the extra key on most European keyboards

-    key <LSGT> { [ less,    greater,      bar,    brokenbar   ] };

-

-    // these keys are common to almost all layouts

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

-    key <SPCE> { [ space                ]                       };

-

-    key <BKSP> { [ BackSpace            ]                       };

-    key  <TAB> { [ Tab,  ISO_Left_Tab   ]                       };

-    key <RTRN> { [ Return               ]                       };

-

-    key <NMLK> { [ Num_Lock, Pointer_EnableKeys               ] };

-

-    key <COMP> { [ Multi_key            ]                       };

-    // End alphanumeric section

-

-    key <LFSH> { [ Shift_L              ]                       };

-    key <LCTL> { [ Control_L            ]                       };

-

-    key <RTSH> { [ Shift_R              ]                       };

-    key <RCTL> { [ Control_R            ]                       };

-

-

-    // begin modifier mappings

-    modifier_map Shift  { Shift_L, Shift_R };

-    modifier_map Lock   { Caps_Lock, ISO_Lock };

-    modifier_map Control{ Control_L, Control_R };

-    modifier_map Mod2   { Num_Lock };

-

-    //  Fake keys for virtual<->real modifiers mapping 

-    key <LVL3> { [ ISO_Level3_Shift      ]                     };

-    key <MDSW> { [ Mode_switch           ]                     };

-    modifier_map Mod5   { <LVL3>, <MDSW> };

-

-    key <ALT>  { [ NoSymbol, Alt_L       ]                     };

-    key <LALT> {        [       Alt_L,  Alt_L           ]       };

-    key <LWIN> {        [       Meta_L                  ]       };

-    key <RWIN> {        [       Meta_R                  ]       };

-    modifier_map Mod1   { Alt_L };

-    modifier_map Mod4   { Meta_L, Meta_R };

-

-//    key <LALT> { [ Alt_L		]			};

-//    key <ALGR> { [ Mode_switch	]			};

-//    key <LMTA> { [ Meta_L		]			};

-//    key <RMTA> { [ Meta_R		]			};

-

-    include "sun_vndr/us(left_funkeys)"

-

-    include "capslock(capslock)"

-    //include "capslock(shiftlock)"

-

-

-// This default section uses the same symbols as other XKB implementations

-// for greater compatibility & AccessX MouseKeys support, but it is

-// different than the traditional Sun key mappings that date back to the

-// Sun Type 2 keyboard, in which the right side numpad were "R" function

-// keys.  To restore the original behavior, comment out this section and

-// uncomment the section below that lists the R key mappings.

-    key <KPDV> {        [  KP_Divide            ]       };

-    key <KPMU> {        [  KP_Multiply          ]       };

-    key <KPSU> {        [  KP_Subtract          ]       };

-

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

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

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

-    key <KPAD> {        [       KP_Add          ]       };

-

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

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

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

-

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

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

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

-    key <KPEN> {        [       KP_Enter        ]       };

-

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

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

-

-// End New Keypad section - Begin Sun traditional Keypad section

-

-//    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,      Next    ] };

-//    key <KPEN> { [ KP_Enter           ]                       };

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

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

-

-// End "Keypad" section

-

-};

-

-

-xkb_symbols "left_funkeys" {

-    // Suppliment to inet(evdev) for added functionality of left-funkeys

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

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

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

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

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

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

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

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

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

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

-

-    // The above symbols were chosen for better compatibility withother xkb

-    // mappings.  The old mappings are kepy below in case someone needs them

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

-};

-

-hidden

-xkb_symbols "volumekeys" {

-    // Suppliment to inet(evdev) for added functionality of audio keys

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

-    key <VOL-> { [ NoSymbol,    XF86MonBrightnessDown   ]       };

-    key <VOL+> { [ NoSymbol,    XF86MonBrightnessUp     ]       };

-

-    // The above symbols were chosen for better compatibility withother xkb

-    // mappings.  The old mappings are kepy below in case someone needs them

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

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

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

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

-};

-

-

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

-xkb_symbols "type4basic" {

-    include "sun_vndr/us(sunbasic)"

-

-    // A few alphanumeric keys are different

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

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

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

-

-    key <LNFD> { [ Linefeed		]			};

-

-    // Begin "Editing" section

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

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

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

-

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

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

-

-};

-

-xkb_symbols "type4" {

-    include "sun_vndr/us(type4basic)"

-

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

-};

-

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

-xkb_symbols "type5basic" {

-    include "sun_vndr/us(sunbasic)"

-    include "sun_vndr/us(volumekeys)"

-

-    // Begin "Editing" section

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

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

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

-    // End "Editing" section

-};

-

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

-};

-

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

-xkb_symbols "type5hobobasic" {

-    include "sun_vndr/us(type5basic)"

-};

-

-xkb_symbols "type5hobo" {

-    include "sun_vndr/us(type5hobobasic)"

-

-    // 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  ]       };

-

-    // Here is the hobo keypad:

-

-    key <AE07> { [ 7, ampersand, NoSymbol, NoSymbol, KP_7       ] };

-    key <AE08> { [ 8, asterisk,  NoSymbol, NoSymbol, KP_8       ] };

-    key <AE09> { [ 9, parenleft, NoSymbol, NoSymbol, KP_9       ] };

-    key <AE10> { [ 0, parenright, NoSymbol, NoSymbol, KP_Multiply] };

-

-    key <AD07> { [ u, U, NoSymbol, NoSymbol, KP_4       ] };

-    key <AD08> { [ i, I, NoSymbol, NoSymbol, KP_5       ] };

-    key <AD09> { [ o, O, NoSymbol, NoSymbol, KP_6       ] };

-    key <AD10> { [ p, P, NoSymbol, NoSymbol, KP_Subtract] };

-

-    key <AC07> { [ j, J, NoSymbol, NoSymbol, KP_1       ] };

-    key <AC08> { [ k, K, NoSymbol, NoSymbol, KP_2       ] };

-    key <AC09> { [ l, L, NoSymbol, NoSymbol, KP_3       ] };

-    key <AC10> { [ semicolon, colon, NoSymbol, NoSymbol, KP_Add   ] };

-

-    key <RTRN> { [ Return, NoSymbol, NoSymbol, KP_Enter    ] };

-

-    key <AB07> { [ m, M,  NoSymbol, NoSymbol, KP_0       ] };

-

-    key <AB09> { [ period, greater, NoSymbol, NoSymbol, KP_Decimal] };

-    key <AB10> { [ slash, question, NoSymbol, NoSymbol, KP_Divide ] };

-};

-

-

-xkb_symbols "type6" {

-    include "sun_vndr/us(sunbasic)"

-    include "sun_vndr/us(volumekeys)"

-    include "eurosign(4)"

-    include "level3(ralt_switch)"

-

-    key <SYRQ> { [ SunSys_Req                   ]};

-};

-

-

-

-xkb_symbols "pc101" {

-    include "us(pc101)"

-    key <RALT> { [ Mode_switch, Meta_R	] };

-};

-

-xkb_symbols "pc102" {

-    include "us(pc102)"

-    key <RALT> { [ Mode_switch, Meta_R	] };

-};

-

-xkb_symbols "pc104" {

-    include "us(pc104)"

-};

-

-xkb_symbols "pc101currency" {

-

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

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

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

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

-};

-

-xkb_symbols "US101A_Sun" {

-

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

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

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

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

-

-    // Begin "Editing" section

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

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

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

-    key  <INS> { [ L8, L8		], [  Insert			]};

-    key <HOME> { [ L6, L6		], [  Home			]};

-    key <PGUP> { [ L3, L3		], [  Prior			]};

-

-

-    key <DELE> { [ L10, L10		], [ Delete			]};

-    key  <END> { [ L9, L9		], [  End			]};

-    key <PGDN> { [ L4, L4		], [  Next			]};

-

-    key   <UP> {	[  Up			]	};

-    key <LEFT> {	[  Left			]	};

-    key <DOWN> {	[  Down			]	};

-    key <RGHT> {	[  Right		]	};

-

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

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

-

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

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

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

-    key <KPAD> { [ KP_Add		]				};

-

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

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

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

-

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

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

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

-    key <KPEN> { [ KP_Enter		]				};

-

-    key <LALT> { [ Meta_L		]				};

-    key <RALT> { [ Alt_L		]				};

-    key <RCTL> { [ Multi_key		]				};

-};

+//
+// 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.
+//
+
+//
+// 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
+//
+
+// Symbols shared by all Sun Keyboard layouts
+xkb_symbols "sunbasic" {
+    include "srvr_ctrl(xfree86)"
+
+    // Needed for left function keys and volume keys
+    // Need to include this before us(basic) otherwise tilde is mapped to 
+    // a jp key
+    include "inet(evdev)"
+
+    include "us(basic)"
+    include "srvr_ctrl(fkey2vt)"
+    include "pc(editing)"
+    include "keypad(x11)"
+
+    key <ESC>  { [ Escape               ]                       };
+
+    // the extra key on most European keyboards
+    key <LSGT> { [ less,    greater,      bar,    brokenbar   ] };
+
+    // these keys are common to almost all layouts
+    key <BKSL> { [ backslash,    bar    ]                       };
+    key <SPCE> { [ space                ]                       };
+
+    key <BKSP> { [ BackSpace            ]                       };
+    key  <TAB> { [ Tab,  ISO_Left_Tab   ]                       };
+    key <RTRN> { [ Return               ]                       };
+
+    key <NMLK> { [ Num_Lock, Pointer_EnableKeys               ] };
+
+    key <COMP> { [ Multi_key            ]                       };
+    // End alphanumeric section
+
+    key <LFSH> { [ Shift_L              ]                       };
+    key <LCTL> { [ Control_L            ]                       };
+
+    key <RTSH> { [ Shift_R              ]                       };
+    key <RCTL> { [ Control_R            ]                       };
+
+
+    // begin modifier mappings
+    modifier_map Shift  { Shift_L, Shift_R };
+    modifier_map Lock   { Caps_Lock, ISO_Lock };
+    modifier_map Control{ Control_L, Control_R };
+    modifier_map Mod2   { Num_Lock };
+
+    //  Fake keys for virtual<->real modifiers mapping 
+    key <LVL3> { [ ISO_Level3_Shift      ]                     };
+    key <MDSW> { [ Mode_switch           ]                     };
+    modifier_map Mod5   { <LVL3>, <MDSW> };
+
+    key <ALT>  { [ NoSymbol, Alt_L       ]                     };
+    key <LALT> {        [       Alt_L,  Alt_L           ]       };
+    key <LWIN> {        [       Meta_L                  ]       };
+    key <RWIN> {        [       Meta_R                  ]       };
+    modifier_map Mod1   { Alt_L };
+    modifier_map Mod4   { Meta_L, Meta_R };
+
+//    key <LALT> { [ Alt_L		]			};
+//    key <ALGR> { [ Mode_switch	]			};
+//    key <LMTA> { [ Meta_L		]			};
+//    key <RMTA> { [ Meta_R		]			};
+
+    include "sun_vndr/us(left_funkeys)"
+
+    include "capslock(capslock)"
+    //include "capslock(shiftlock)"
+
+
+// This default section uses the same symbols as other XKB implementations
+// for greater compatibility & AccessX MouseKeys support, but it is
+// different than the traditional Sun key mappings that date back to the
+// Sun Type 2 keyboard, in which the right side numpad were "R" function
+// keys.  To restore the original behavior, comment out this section and
+// uncomment the section below that lists the R key mappings.
+    key <KPDV> {        [  KP_Divide            ]       };
+    key <KPMU> {        [  KP_Multiply          ]       };
+    key <KPSU> {        [  KP_Subtract          ]       };
+
+    key  <KP7> {        [  KP_Home,     KP_7    ]       };
+    key  <KP8> {        [  KP_Up,       KP_8    ]       };
+    key  <KP9> {        [  KP_Prior,    KP_9    ]       };
+    key <KPAD> {        [       KP_Add          ]       };
+
+    key  <KP4> {        [  KP_Left,     KP_4    ]       };
+    key  <KP5> {        [  KP_Begin,    KP_5    ]       };
+    key  <KP6> {        [  KP_Right,    KP_6    ]       };
+
+    key  <KP1> {        [  KP_End,      KP_1    ]       };
+    key  <KP2> {        [  KP_Down,     KP_2    ]       };
+    key  <KP3> {        [  KP_Next,     KP_3    ]       };
+    key <KPEN> {        [       KP_Enter        ]       };
+
+    key  <KP0> {        [  KP_Insert,   KP_0    ]       };
+    key <KPDL> {  	[  KP_Delete, KP_Decimal ]    	};
+
+// End New Keypad section - Begin Sun traditional Keypad section
+
+//    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,      Next    ] };
+//    key <KPEN> { [ KP_Enter           ]                       };
+//    key  <KP0> { [ KP_Insert, KP_Insert], [ KP_0              ]       };
+//    key <KPDL> { [ Delete, Delete     ], [ KP_Decimal ]       };
+
+// End "Keypad" section
+
+};
+
+
+xkb_symbols "left_funkeys" {
+    // Suppliment to inet(evdev) for added functionality of left-funkeys
+    //key <STOP> { [ NoSymbol ],      [ L1, L1   ]       };
+    //key <AGAI> { [ NoSymbol ],      [ L2, L2   ]       };
+    //key <PROP> { [ NoSymbol ],      [ L3, L3   ]       };
+    //key <UNDO> { [ NoSymbol ],      [ L4, L4   ]       };
+    //key <FRNT> { [ NoSymbol ],      [ L5, L5   ]       };
+    //key <COPY> { [ NoSymbol ],      [ L6, L6   ]       };
+    //key <OPEN> { [ NoSymbol ],      [ L7, L7   ]       };
+    //key <PAST> { [ NoSymbol ],      [ L8, L8   ]       };
+    //key <FIND> { [ NoSymbol ],      [ L9, L9   ]       };
+    //key <CUT>  { [ NoSymbol ],      [ L10, L10 ]       };
+
+    // The above symbols were chosen for better compatibility withother xkb
+    // mappings.  The old mappings are kepy below in case someone needs them
+    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     ]       };
+};
+
+hidden
+xkb_symbols "volumekeys" {
+    // Suppliment to inet(evdev) for added functionality of audio keys
+    key <MUTE> { [ NoSymbol,    SunVideoDegauss         ]       };
+    key <VOL-> { [ NoSymbol,    XF86MonBrightnessDown   ]       };
+    key <VOL+> { [ NoSymbol,    XF86MonBrightnessUp     ]       };
+
+    // The above symbols were chosen for better compatibility withother xkb
+    // mappings.  The old mappings are kepy below in case someone needs them
+    //key <MUTE> { [ SunAudioMute,      SunVideoDegauss         ]       };
+    //key <VOL-> { [ SunAudioLowerVolume,       SunVideoLowerBrightness ]       };
+    //key <VOL+> { [ SunAudioRaiseVolume,       SunVideoRaiseBrightness ]       };
+    //key <POWR> { [ SunPowerSwitch,    SunPowerSwitchShift     ]       };
+};
+
+
+// US/ASCII layout for a Type 4 Sun keyboard
+xkb_symbols "type4basic" {
+    include "sun_vndr/us(sunbasic)"
+
+    // A few alphanumeric keys are different
+    key <AE04> { [ 4, dollar,  EuroSign	]	};
+    key <AE05> { [ 5, percent,  EuroSign	]	};
+    key <AD03> { [ e, E,  EuroSign	]	};
+
+    key <LNFD> { [ Linefeed		]			};
+
+    // Begin "Editing" section
+    key <PRSC> { [ R2,	R2,  Print		] };
+    key <SCLK> { [ R3,	R3,  Scroll_Lock, Break	] };
+    key <PAUS> { [ R1,	R1,  Pause		] };
+
+    // End "Editing" section, begin "Keypad"
+    key <KPEQ> { [ R4,	KP_Equal,  KP_Equal		] };
+
+};
+
+xkb_symbols "type4" {
+    include "sun_vndr/us(type4basic)"
+
+    key <BKSL> { [ backslash, bar,  brokenbar	]	};
+};
+
+// US/ASCII layout for a Type 5 Sun keyboard
+xkb_symbols "type5basic" {
+    include "sun_vndr/us(sunbasic)"
+    include "sun_vndr/us(volumekeys)"
+
+    // Begin "Editing" section
+    key <PRSC> { [ R2, R2,  Print, SunSys_Req	]	};
+    key <SCLK> { [ R3, R3,  Scroll_Lock	]	};
+    key <PAUS> { [ R1, R1,  Pause, Break	]	};
+    // End "Editing" section
+};
+
+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	]	};
+};
+
+// US/ASCII layout for a Type 5 Sun keyboard
+xkb_symbols "type5hobobasic" {
+    include "sun_vndr/us(type5basic)"
+};
+
+xkb_symbols "type5hobo" {
+    include "sun_vndr/us(type5hobobasic)"
+
+    // 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  ]       };
+
+    // Here is the hobo keypad:
+
+    key <AE07> { [ 7, ampersand, NoSymbol, NoSymbol, KP_7       ] };
+    key <AE08> { [ 8, asterisk,  NoSymbol, NoSymbol, KP_8       ] };
+    key <AE09> { [ 9, parenleft, NoSymbol, NoSymbol, KP_9       ] };
+    key <AE10> { [ 0, parenright, NoSymbol, NoSymbol, KP_Multiply] };
+
+    key <AD07> { [ u, U, NoSymbol, NoSymbol, KP_4       ] };
+    key <AD08> { [ i, I, NoSymbol, NoSymbol, KP_5       ] };
+    key <AD09> { [ o, O, NoSymbol, NoSymbol, KP_6       ] };
+    key <AD10> { [ p, P, NoSymbol, NoSymbol, KP_Subtract] };
+
+    key <AC07> { [ j, J, NoSymbol, NoSymbol, KP_1       ] };
+    key <AC08> { [ k, K, NoSymbol, NoSymbol, KP_2       ] };
+    key <AC09> { [ l, L, NoSymbol, NoSymbol, KP_3       ] };
+    key <AC10> { [ semicolon, colon, NoSymbol, NoSymbol, KP_Add   ] };
+
+    key <RTRN> { [ Return, NoSymbol, NoSymbol, KP_Enter    ] };
+
+    key <AB07> { [ m, M,  NoSymbol, NoSymbol, KP_0       ] };
+
+    key <AB09> { [ period, greater, NoSymbol, NoSymbol, KP_Decimal] };
+    key <AB10> { [ slash, question, NoSymbol, NoSymbol, KP_Divide ] };
+};
+
+
+xkb_symbols "type6" {
+    include "sun_vndr/us(sunbasic)"
+    include "sun_vndr/us(volumekeys)"
+    include "eurosign(4)"
+    include "level3(ralt_switch)"
+
+    key <SYRQ> { [ SunSys_Req                   ]};
+};
+
+
+
+xkb_symbols "pc101" {
+    include "us(pc101)"
+    key <RALT> { [ Mode_switch, Meta_R	] };
+};
+
+xkb_symbols "pc102" {
+    include "us(pc102)"
+    key <RALT> { [ Mode_switch, Meta_R	] };
+};
+
+xkb_symbols "pc104" {
+    include "us(pc104)"
+};
+
+xkb_symbols "pc101currency" {
+
+    key <AE04> { [ 4, dollar		], [ EuroSign	]	};
+    key <AE05> { [ 5, percent		], [ EuroSign	]	};
+    key <AD03> { [ e, E			], [ EuroSign	]	};
+    key <BKSL> { [ backslash, bar	], [ brokenbar			]};
+};
+
+xkb_symbols "US101A_Sun" {
+
+    key <AE04> { [ 4, dollar		], [ EuroSign	]	};
+    key <AE05> { [ 5, percent		], [ EuroSign	]	};
+    key <AD03> { [ e, E			], [ EuroSign	]	};
+    key <BKSL> { [ backslash, bar	], [ brokenbar			]};
+
+    // Begin "Editing" section
+    key <PRSC> { [ L5, L5		], [ Print, SunSys_Req 		]};
+    key <SCLK> { [ L7, L7		], [  Scroll_Lock		]};
+    key <PAUS> { [ L1, L1		], [ Pause, Break 		]};
+    key  <INS> { [ L8, L8		], [  Insert			]};
+    key <HOME> { [ L6, L6		], [  Home			]};
+    key <PGUP> { [ L3, L3		], [  Prior			]};
+
+
+    key <DELE> { [ L10, L10		], [ Delete			]};
+    key  <END> { [ L9, L9		], [  End			]};
+    key <PGDN> { [ L4, L4		], [  Next			]};
+
+    key   <UP> {	[  Up			]	};
+    key <LEFT> {	[  Left			]	};
+    key <DOWN> {	[  Down			]	};
+    key <RGHT> {	[  Right		]	};
+
+    key <KPDV> { [ R5, R5		], [ KP_Divide	]	};
+    key <KPMU> { [ R6, R6		], [ KP_Multiply	]	};
+
+    key  <KP7> { [ R7, KP_7		], [ KP_7, Home		]	};
+    key  <KP8> { [ KP_Up, KP_8		], [ KP_8		]	};
+    key  <KP9> { [ R9, KP_9		], [ KP_9, Prior	]	};
+    key <KPAD> { [ KP_Add		]				};
+
+    key  <KP4> { [ KP_Left, KP_4	], [ KP_4		]	};
+    key  <KP5> { [ R11,	KP_5		], [ KP_5		]	};
+    key  <KP6> { [ KP_Right, KP_6	], [ KP_6		]	};
+
+    key  <KP1> { [ R13,	KP_1		], [ KP_1, End		]	};
+    key  <KP2> { [ KP_Down, KP_2	], [ KP_2		]	};
+    key  <KP3> { [ R15,	KP_3		], [ KP_3, Next		]	};
+    key <KPEN> { [ KP_Enter		]				};
+
+    key <LALT> { [ Meta_L		]				};
+    key <RALT> { [ Alt_L		]				};
+    key <RCTL> { [ Multi_key		]				};
+};
diff --git a/xorg-server/xkeyboard-config/types/pc b/xorg-server/xkeyboard-config/types/pc
index c2d085ed5..01a5634ad 100644
--- a/xorg-server/xkeyboard-config/types/pc
+++ b/xorg-server/xkeyboard-config/types/pc
@@ -1,108 +1,115 @@
-partial default xkb_types "default" {

-

-    // Some types that are necessary

-    // for a full implementation of

-    // a PC compatible keyboard.

-    virtual_modifiers Alt;

-    virtual_modifiers LevelThree;

-    virtual_modifiers LAlt;

-    virtual_modifiers RAlt;

-    virtual_modifiers RControl;

-    virtual_modifiers LControl;

-

-    type "PC_CONTROL_LEVEL2" {

-	modifiers = Control;

-	map[None] = Level1;

-	map[Control] = Level2;

-	level_name[Level1] = "Base";

-	level_name[Level2] = "Control";

-    };

-

-    type "PC_LCONTROL_LEVEL2" {

-	modifiers = LControl;

-	map[None] = Level1;

-	map[LControl] = Level2;

-	level_name[Level1] = "Base";

-	level_name[Level2] = "LControl";

-    };

-

-    type "PC_RCONTROL_LEVEL2" {

-	modifiers = RControl;

-	map[None] = Level1;

-	map[RControl] = Level2;

-	level_name[Level1] = "Base";

-	level_name[Level2] = "RControl";

-    };

-

-    type "PC_ALT_LEVEL2" {

-	modifiers = Alt;

-	map[None] = Level1;

-	map[Alt] = Level2;

-	level_name[Level1] = "Base";

-	level_name[Level2] = "Alt";

-    };

-

-    type "PC_LALT_LEVEL2" {

-	modifiers = LAlt;

-	map[None] = Level1;

-	map[LAlt] = Level2;

-	level_name[Level1] = "Base";

-	level_name[Level2] = "LAlt";

-    };

-

-    type "PC_RALT_LEVEL2" {

-	modifiers = RAlt;

-	map[None] = Level1;

-	map[RAlt] = Level2;

-	level_name[Level1] = "Base";

-	level_name[Level2] = "RAlt";

-    };

-

-    type "CTRL+ALT" {

-	modifiers = Control+Alt;

-	map[Control+Alt] = Level2;

-	level_name[Level1] = "Base";

-	level_name[Level2] = "Ctrl+Alt";

-    };

-

-   // Local eight level

-   // Needed when you want part of your layout eight-level but can not use

-   // LevelFive as modifier, as this will take over right ctrl by default

-   // for all the layout and is too invasive for your average four-level user

-   // Needed to fix bug #9529

-   // FIXME Should really use RControl but it's seems not to be enabled by

-   // default and touching this requires a lot of testing

-   type "LOCAL_EIGHT_LEVEL" {

-	modifiers = Shift+Lock+LevelThree+Control;

-

-	map[None]       = Level1;

-	map[Lock+Shift] = Level1;

-	map[Shift] = Level2;

-	map[Lock]  = Level2;

-

-	map[LevelThree]            = Level3;

-	map[Lock+Shift+LevelThree] = Level3;

-	map[Shift+LevelThree] = Level4;

-	map[Lock+LevelThree]  = Level4;

-

-	map[Control]            = Level5;

-	map[Lock+Shift+Control] = Level5;

-	map[Shift+Control] = Level6;

-	map[Lock+Control]  = Level6;

-

-	map[LevelThree+Control]            = Level7;

-	map[Lock+Shift+LevelThree+Control] = Level7;

-	map[Shift+LevelThree+Control] = Level8;

-	map[Lock+LevelThree+Control]  = Level8;

-

-	level_name[Level1] = "Base";

-	level_name[Level2] = "Shift";

-	level_name[Level3] = "Level3";

-	level_name[Level4] = "Shift Level3";

-	level_name[Level5] = "Ctrl";

-	level_name[Level6] = "Shift Ctrl";

-	level_name[Level7] = "Level3 Ctrl";

-	level_name[Level8] = "Shift Level3 Ctrl";

-    };

-

-};

+partial default xkb_types "default" {
+
+    // Some types that are necessary
+    // for a full implementation of
+    // a PC compatible keyboard.
+    virtual_modifiers Alt;
+    virtual_modifiers LevelThree;
+    virtual_modifiers LAlt;
+    virtual_modifiers RAlt;
+    virtual_modifiers RControl;
+    virtual_modifiers LControl;
+
+    type "PC_CONTROL_LEVEL2" {
+	modifiers = Control;
+	map[None] = Level1;
+	map[Control] = Level2;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Control";
+    };
+
+    type "PC_LCONTROL_LEVEL2" {
+	modifiers = LControl;
+	map[None] = Level1;
+	map[LControl] = Level2;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "LControl";
+    };
+
+    type "PC_RCONTROL_LEVEL2" {
+	modifiers = RControl;
+	map[None] = Level1;
+	map[RControl] = Level2;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "RControl";
+    };
+
+    type "PC_ALT_LEVEL2" {
+	modifiers = Alt;
+	map[None] = Level1;
+	map[Alt] = Level2;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Alt";
+    };
+
+    type "PC_LALT_LEVEL2" {
+	modifiers = LAlt;
+	map[None] = Level1;
+	map[LAlt] = Level2;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "LAlt";
+    };
+
+    type "PC_RALT_LEVEL2" {
+	modifiers = RAlt;
+	map[None] = Level1;
+	map[RAlt] = Level2;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "RAlt";
+    };
+
+    type "CTRL+ALT" {
+	modifiers = Control+Alt+Shift+LevelThree;
+        map[None] = Level1;
+        map[Shift] = Level2;
+        map[LevelThree] = Level3;
+        map[Shift+LevelThree] = Level4;
+	map[Control+Alt] = Level5;
+        level_name[Level1] = "Base";
+        level_name[Level2] = "Shift";
+        level_name[Level3] = "Alt Base";
+        level_name[Level4] = "Shift Alt";
+	level_name[Level5] = "Ctrl+Alt";
+    };
+
+   // Local eight level
+   // Needed when you want part of your layout eight-level but can not use
+   // LevelFive as modifier, as this will take over right ctrl by default
+   // for all the layout and is too invasive for your average four-level user
+   // Needed to fix bug #9529
+   // FIXME Should really use RControl but it's seems not to be enabled by
+   // default and touching this requires a lot of testing
+   type "LOCAL_EIGHT_LEVEL" {
+	modifiers = Shift+Lock+LevelThree+Control;
+
+	map[None]       = Level1;
+	map[Lock+Shift] = Level1;
+	map[Shift] = Level2;
+	map[Lock]  = Level2;
+
+	map[LevelThree]            = Level3;
+	map[Lock+Shift+LevelThree] = Level3;
+	map[Shift+LevelThree] = Level4;
+	map[Lock+LevelThree]  = Level4;
+
+	map[Control]            = Level5;
+	map[Lock+Shift+Control] = Level5;
+	map[Shift+Control] = Level6;
+	map[Lock+Control]  = Level6;
+
+	map[LevelThree+Control]            = Level7;
+	map[Lock+Shift+LevelThree+Control] = Level7;
+	map[Shift+LevelThree+Control] = Level8;
+	map[Lock+LevelThree+Control]  = Level8;
+
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Shift";
+	level_name[Level3] = "Level3";
+	level_name[Level4] = "Shift Level3";
+	level_name[Level5] = "Ctrl";
+	level_name[Level6] = "Shift Ctrl";
+	level_name[Level7] = "Level3 Ctrl";
+	level_name[Level8] = "Shift Level3 Ctrl";
+    };
+
+};