huge update from Sun

2 files changed, 361 insertions, 504 deletions

diff --git a/symbols/sun_vndr/se b/symbols/sun_vndr/se
index 9980a02..38e530a 100644
--- a/symbols/sun_vndr/se
+++ b/symbols/sun_vndr/se
@@ -1,197 +1,81 @@
-// $XFree86: xc/programs/xkbcomp/symbols/sun_vndr/se,v 1.2 1998/12/20 09:40:28 dawes Exp $
+// $XdotOrg: $
 //
-// Swedish layout for a Type 5/5c Sun keyboard
-xkb_symbols "sun5" {
-    include "latin(basic)+se(basic)"
-
-    name[Group1]="Swedish";
-
-    // Begin alphanumeric section
-    // These two are not supposed to be dead.
-    // A few others supposedly ARE dead, but don't care for now.
-    key <AC12> { [ apostrophe, asterisk	], 	[ 	grave ] };
-    key <AD12> { [			],	[  asciitilde ] };
-
-    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> { [ F11		],	[ SunF36]	};
-    key <FK12> { [ F12		],	[ SunF37]	};
-    key <STOP> { [ Cancel 	],	[ F11	]	};
-    key <AGAI> { [ Redo		],	[ F12	]	};
-    key <PROP> { [ SunProps	],	[ F13	]	};
-    key <UNDO> { [ Undo		],	[ F14	]	};
-    key <FRNT> { [ SunFront	],	[ F15	]	};
-    key <COPY> { [ SunCopy	],	[ F16	]	};
-    key <OPEN> { [ SunOpen	],	[ F17	]	};
-    key <PAST> { [ SunPaste	],	[ F18	]	};
-    key <FIND> { [ Find		],	[ F19	]	};
-    key <CUT>  { [ SunCut	],	[ F20	]	};
-    // End "Function" section
-
-    // Begin "Editing" section
-    key <PRSC> { [ Print	],	[ Sys_Req, SunSys_Req ]	};
-    key <SCLK> { [ Scroll_Lock	]			};
-    key <PAUS> { [ 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" section
-    key <NMLK> { [ Num_Lock 		]				};
-    key <KPDV> { [ KP_Divide		],	[	F25	]	};
-    key <KPMU> { [ KP_Multiply		],	[	F26	]	};
-    key <KPSU> { [ KP_Subtract		]				};
-
-    key  <KP7> { [  KP_Home,	KP_7	],	[	F27	]	};
-    key  <KP8> { [  KP_Up,	KP_8	],	[	F28	]	};
-    key  <KP9> { [  KP_Prior,	KP_9	],	[	F29	]	};
-    key <KPAD> { [  	KP_Add		]				};
-
-    key  <KP4> { [  KP_Left,	KP_4	],	[	F30	]	};
-    key  <KP5> { [  KP_Begin,	KP_5	],	[	F31	]	};
-    key  <KP6> { [  KP_Right,	KP_6	],	[	F32	]	};
-
-    key  <KP1> { [  KP_End,	KP_1	],	[	F33	]	};
-    key  <KP2> { [  KP_Down,	KP_2	],	[	F34	]	};
-    key  <KP3> { [  KP_Next,	KP_3	],	[	F35	]	};
-    key <KPEN> { [  	KP_Enter	]				};
-
-    key  <KP0> { [  KP_Insert,	KP_0	]				};
-    key <KPDL> { [  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	]	};
-    // End "four keys up on the right"
-
-    // Begin modifier mappings
-    modifier_map Shift  { Shift_R };
-    modifier_map Mod1	{ Meta_L, Meta_R };
-    modifier_map Mod2	{ Alt_L };
-    modifier_map Mod3	{ Mode_switch };
-    modifier_map Mod4	{ Num_Lock };
-    // End modifier mappings
+// Copyright 2004 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.
+//
+xkb_symbols "type4" {
+    key <BKSL> { [ section, onehalf	]			};
+    key <BRCR> { [ asciitilde, asciicircum ]			};
+    key <AE02> { [ 2, quotedbl		], [ at			] };
+    key <AE03> { [ 3, numbersign	], [ sterling		] };
+    key <AE04> { [ 4, currency		], [ dollar		] };
+    key <AE05> { [ 5, percent           ], [ degree           	] };
+    key <AE06> { [ 6, ampersand         ], [ notsign          	] };
+    key <AE07> { [ 7, slash             ], [ braceleft		] };
+    key <AE08> { [ 8, parenleft         ], [ bracketleft 	]};
+    key <AE09> { [ 9, parenright        ], [ bracketright     	] };
+    key <AE10> { [ 0, equal             ], [ braceright        	] };
+    key <AE11> { [ plus, question 	], [ backslash       	] };
+    key <AE12> { [ SunFA_Acute, SunFA_Grave ]			  };
+
+    key <AD03> { [ e, E                 ], [ EuroSign         ] };
+    key <AD11> { [ Aring ]					};
+    key <AD12> { [ SunFA_Diaeresis, SunFA_Circum ], [ SunFA_Tilde ] };
+
+    key <AC10> { [ Odiaeresis		]			};
+    key <AC11> { [ Adiaeresis		]			};
+    key <TLDE> { [ quoteright, asterisk	], [ quoteleft 		]};
+
+    key <LCTL> { [ Caps_Lock ] };
+    key <CAPS> { [ Control_L ] };
+    key <LSGT> { [ less, greater	]			};
+    key <AB08> { [ comma, semicolon	]			};
+    key <AB09> { [ period, colon	]			};
+    key <AB10> { [ minus, underscore	]			};
 };
 
-// Swedish layout for a Type 4 Sun keyboard
-xkb_symbols "sun4" {
-    include "latin(basic)+se(basic)"
-
-    name[Group1]="Swedish";
-
-    // Begin alphanumeric section
-    // These two are not supposed to be dead.
-    // A few others supposedly ARE dead, but don't care for now.
-    key <AC12> { [ apostrophe, asterisk	], 	[ 	grave ] };
-    key <AD12> { [			],	[  asciitilde ] };
-
-    key <AF14> { [	asciitilde,	asciicircum	] };
 
-    key <RTSH> { [ 	Shift_R		]	};
+xkb_symbols "type5" {
+    include "se"
 
-    key <LALT> { [	Alt_L		]	};
-    key <ALGR> { [	Mode_switch	]	};
-    key <LMTA> { [	Meta_L		]	};
-    key <RMTA> { [	Meta_R		]	};
-    key <COMP> { [	Multi_key	]	};
-    // End alphanumeric section
+    key <TLDE> { [ section, onehalf	]			};
+    key <AE07> { [ 7, slash             ], [ braceleft		] };
+    key <AE08> { [ 8, parenleft         ], [ bracketleft 	]};
+    key <AE09> { [ 9, parenright        ], [ bracketright     	] };
+    key <AE10> { [ 0, equal             ], [ braceright        	] };
+    key <AE11> { [ plus, question 	], [ backslash       	] };
 
-    // 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> { [ F11		],	[ SunF36]	};
-    key <FK12> { [ F12		],	[ SunF37]	};
-    key <STOP> { [ Cancel 	],	[ F11	]	};
-    key <AGAI> { [ Redo		],	[ F12	]	};
-    key <PROP> { [ SunProps	],	[ F13	]	};
-    key <UNDO> { [ Undo		],	[ F14	]	};
-    key <FRNT> { [ SunFront	],	[ F15	]	};
-    key <COPY> { [ SunCopy	],	[ F16	]	};
-    key <OPEN> { [ SunOpen	],	[ F17	]	};
-    key <PAST> { [ SunPaste	],	[ F18	]	};
-    key <FIND> { [ Find		],	[ F19	]	};
-    key <CUT>  { [ SunCut	],	[ F20	]	};
-    // End "Function" section
-
-    // Begin "Editing" section
-    key <LNFD> { [ Linefeed	]	};
-    key <DELE> { [ Delete	]			};
-    key <PRSC> { [ Print	],	[ Sys_Req, SunSys_Req ]	};
-    key <SCLK> { [ Scroll_Lock	]			};
-    key <PAUS> { [ Pause	],	[ Break	]	};
-    key <HELP> { [ Help		]			};
-    // End "Editing" section
-    
-    // Begin "Keypad" section
-    key <NMLK> { [ Num_Lock 		]				};
-    key <KPEQ> { [ KP_Equal		]				};
-    key <KPDV> { [ KP_Divide		],	[	F25	]	};
-    key <KPMU> { [ KP_Multiply		],	[	F26	]	};
-    key <KPSU> { [ KP_Subtract		]				};
-
-    key  <KP7> { [  KP_Home,	KP_7	],	[	F27	]	};
-    key  <KP8> { [  KP_Up,	KP_8	],	[	F28	]	};
-    key  <KP9> { [  KP_Prior,	KP_9	],	[	F29	]	};
-    key <KPAD> { [  	KP_Add		]				};
-
-    key  <KP4> { [  KP_Left,	KP_4	],	[	F30	]	};
-    key  <KP5> { [  KP_Begin,	KP_5	],	[	F31	]	};
-    key  <KP6> { [  KP_Right,	KP_6	],	[	F32	]	};
-
-    key  <KP1> { [  KP_End,	KP_1	],	[	F33	]	};
-    key  <KP2> { [  KP_Down,	KP_2	],	[	F34	]	};
-    key  <KP3> { [  KP_Next,	KP_3	],	[	F35	]	};
-    key <KPEN> { [  	KP_Enter	]				};
-
-    key  <KP0> { [  KP_Insert,	KP_0	]				};
-    key <KPDL> { [  KP_Delete,	KP_Decimal ]				};
-    // End "Keypad" section, 
+    key <AD12> { [ SunFA_Diaeresis, asciicircum ], [ asciitilde ] };
+    key <BKSL> { [ quoteright, asterisk	], [ quoteleft 		]};
+};
+  
+partial 
+xkb_symbols "type6" {
+    include "se(Sundeadkeys)"
 
-    // Begin modifier mappings
-    modifier_map Shift	{ Shift_R };
-    modifier_map Mod1	{ Alt_L };
-    modifier_map Mod2	{ Num_Lock };
-    modifier_map Mod3	{ Mode_switch };
-    modifier_map Mod4	{ Meta_L };
-    modifier_map Mod5	{ Meta_R };
-    // End modifier mappings
+    key <AD12> { [ SunFA_Diaeresis, asciicircum ], [ asciitilde, caron ] };
 };
diff --git a/symbols/sun_vndr/us b/symbols/sun_vndr/us
index 83207f4..4a1328b 100644
--- a/symbols/sun_vndr/us
+++ b/symbols/sun_vndr/us
@@ -1,12 +1,38 @@
-// $Xorg: us,v 1.4 2001/02/09 02:05:53 xorgcvs Exp $
+// $XdotOrg: $
+//
+// Copyright 2004 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.
+//
+// $TOG: us /main/5 1998/02/10 13:45:06 kaleb $
+// Sun: @(#)us	1.5	03/04/21 SMI
 //
 //Copyright 1996, 1998  The Open Group
 //
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
+//All Rights Reserved.
 //
 //The above copyright notice and this permission notice shall be
 //included in all copies or substantial portions of the Software.
@@ -24,351 +50,298 @@
 //other dealings in this Software without prior written authorization
 //from The Open Group.
 //
-// $XFree86: xc/programs/xkbcomp/symbols/sun_vndr/us,v 1.6 2001/12/14 20:02:05 dawes Exp $
-//
-// US/ASCII layout for a Type 4 Sun keyboard
-xkb_symbols "sun4" {
+
+// Symbols shared by all Sun Keyboard layouts
+xkb_symbols "sunbasic" {
+    include "srvr_ctrl(stdkeypad)"
     include "us(basic)"
 
-    // A few alphanumeric keys are different
-    key <TLDE> { [     grave,	asciitilde	],	[ acute	]	};
-    key <AC11> { [ apostrophe,	quotedbl	],	[ acute	]	};
-
-    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	]	};
+    key <RTSH> { [ Shift_R		]			};
+    key <LALT> { [ Alt_L		]			};
+    key <ALGR> { [ Mode_switch		]			};
+    key <LMTA> { [ Meta_L		]			};
+    key <RMTA> { [ Meta_R		]			};
+    key <RCTL> { [ Control_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> { [ F11	],		[ SunF36]	};
-    key <FK12> { [ F12	],		[ SunF37]	};
-    key <STOP> { [ Cancel	],	[ F11	]	};
-    key <AGAI> { [ Redo		],	[ F12	]	};
-    key <PROP> { [ SunProps	],	[ F13	]	};
-    key <UNDO> { [ Undo		],	[ F14	]	};
-    key <FRNT> { [ SunFront	],	[ F15	]	};
-    key <COPY> { [ SunCopy	],	[ F16	]	};
-    key <OPEN> { [ SunOpen	],	[ F17	]	};
-    key <PAST> { [ SunPaste	],	[ F18	]	};
-    key <FIND> { [ Find		],	[ F19	]	};
-    key <CUT>  { [ SunCut	],	[ F20	]	};
+    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> { [ Print			],[ 	F21	]	};
-    key <SCLK> { [ Break,	Scroll_Lock	],[ 	F22	]	};
-    key <PAUS> { [ Pause			],[ 	F23	]	};
-    key <DELE> { [ Delete			]			};
-    key <HELP> { [ Help				]			};
+    key <DELE> { [ Delete		]			};
+    key <HELP> { [ Help			]			};
 
     // End "Editing" section, begin "Keypad"
-    key <NMLK> { [ Num_Lock 		]				};
-    key <KPEQ> { [ KP_Equal 		],	[	F24	]	};
-    key <KPDV> { [ KP_Divide		],	[	F25	]	};
-    key <KPMU> { [ KP_Multiply		],	[	F26	]	};
-    key <KPSU> { [ KP_Subtract		]				};
-
-    key  <KP7> { [  KP_Home,	KP_7	],	[	F27	]	};
-    key  <KP8> { [  KP_Up,	KP_8	],	[	F28	]	};
-    key  <KP9> { [  KP_Prior,	KP_9	],	[	F29	]	};
-    key <KPAD> { [  	KP_Add		]				};
-
-    key  <KP4> { [  KP_Left,	KP_4	],	[	F30	]	};
-    key  <KP5> { [  KP_Begin,	KP_5	],	[	F31	]	};
-    key  <KP6> { [  KP_Right,	KP_6	],	[	F32	]	};
-
-    key  <KP1> { [  KP_End,	KP_1	],	[	F33	]	};
-    key  <KP2> { [  KP_Down,	KP_2	],	[	F34	]	};
-    key  <KP3> { [  KP_Next,	KP_3	],	[	F35	]	};
-    key <KPEN> { [  	KP_Enter	]				};
-    key  <KP0> { [  KP_Insert,	KP_0	]	};
-    key <KPDL> { [  KP_Delete,	KP_Decimal ]	};
-    // End "Keypad" section
 
+    key <NMLK> {	[  Num_Lock, Pointer_EnableKeys		]	};
+
+    // 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
+
+    modifier_map Control{ Control_R };
 
-    // begin modifier mappings
-    modifier_map Shift 	{ Shift_R };
-    modifier_map Mod1  	{ Meta_L, Meta_R };
-    modifier_map Mod2  	{ Alt_L };
-    modifier_map Mod3  	{ Mode_switch };
-    modifier_map Mod4  	{ Num_Lock };
-    modifier_map Mod5  	{ F13, F18, F20 };
 };
 
-hidden partial function_keys xkb_symbols "broken_openlook_map" {
-    key <STOP> { [ F11	],	[ Cancel	]	};
-    key <AGAI> { [ F12	],	[ Redo		]	};
-    key <PROP> { [ F13	],	[ SunProps	]	};
-    key <UNDO> { [ F14	],	[ Undo		]	};
-    key <FRNT> { [ F15	],	[ SunFront	]	};
-    key <COPY> { [ F16	],	[ SunCopy	]	};
-    key <OPEN> { [ F17	],	[ SunOpen	]	};
-    key <PAST> { [ F18	],	[ SunPaste	]	};
-    key <FIND> { [ F19	],	[ Find		]	};
-    key <CUT>  { [ F20	],	[ SunCut	]	};
+// US/ASCII layout for a Type 4 Sun keyboard
+xkb_symbols "type4basic" {
+    include "sun/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		] };
+
+    // begin modifier mappings
+    modifier_map Shift  	{ Shift_R, Shift_L };
+    modifier_map Mod1   	{ Meta_L, Meta_R };
+    modifier_map Mod2   	{ Mode_switch };
+    modifier_map Mod3   	{ Num_Lock };
+    modifier_map Mod4		{ Alt_L };
+
 };
 
-// US/ASCII layout for a Type 4 Sun keyboard w/ broken OpenLook keymap
-xkb_symbols "sun4ol" {
-    override "sun_vndr/us(sun4)"
-    include "sun_vndr/us(broken_openlook_map)"
+xkb_symbols "type4" {
+    include "sun/us(type4basic)"
+
+    key <BKSL> { [ backslash, bar	], [ brokenbar	]	};
 };
 
 // US/ASCII layout for a Type 5 Sun keyboard
-xkb_symbols "sun5" {
-    augment "us(basic)"
+xkb_symbols "type5basic" {
+    include "sun/us(sunbasic)"
 
-    // A alphanumeric keys are different
-    key <TLDE> { [     grave,	asciitilde	],	[ acute	]	};
-    key <AC11> { [ apostrophe,	quotedbl	],	[ acute	]	};
-
-    key <RTSH> { [ 	Shift_R		]	};
+    // Begin "Editing" section
+    key <PRSC> { [ R2, R2 		], [ Print, SunSys_Req	]	};
+    key <SCLK> { [ R3, R3		], [ Scroll_Lock	]	};
+    key <PAUS> { [ R1, R1		], [ Pause, Break	]	};
 
-    key <LALT> { [	Alt_L		]	};
-    key <ALGR> { [	Mode_switch	]	};
-    key <LMTA> { [	Meta_L		]	};
-    key <RMTA> { [	Meta_R		]	};
-    key <COMP> { [	Multi_key	]	};
-    // End alphanumeric section
+    key <LEFT> { [ Left			]			};
+    key <RGHT> { [ Right		]			};
+    key <UP>   { [ Up			]			};
+    key <DOWN> { [ Down			]			};
 
-    // 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> { [ F11	],		[ SunF36]	};
-    key <FK12> { [ F12	],		[ SunF37]	};
-    key <STOP> { [ Cancel	],	[ F11	]	};
-    key <AGAI> { [ Redo		],	[ F12	]	};
-    key <PROP> { [ SunProps	],	[ F13	]	};
-    key <UNDO> { [ Undo		],	[ F14	]	};
-    key <FRNT> { [ SunFront	],	[ F15	]	};
-    key <COPY> { [ SunCopy	],	[ F16	]	};
-    key <OPEN> { [ SunOpen	],	[ F17	]	};
-    key <PAST> { [ SunPaste	],	[ F18	]	};
-    key <FIND> { [ Find		],	[ F19	]	};
-    key <CUT>  { [ SunCut	],	[ F20	]	};
-    // End "Function" section
+    key <DELE> { [ Delete		]			};
+    key <INS>  { [ Insert		]			};
+    key <PGUP> { [ Prior		]			};
+    key <PGDN> { [ Next			]			};
+    key <HOME> { [ Home			]			};
+    key <END>  { [ End			]			};
+    key <HELP> { [ Help			]			};
 
-    // Begin "Editing" section
-    key <PRSC> { [ Print 	],	[ Sys_Req, SunSys_Req ]	};
-    key <SCLK> { [ Scroll_Lock	]				};
-    key <PAUS> { [ 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
 
-    // End "Editing" section, begin "Keypad"
-    key <NMLK> { [ Num_Lock 		]				};
-    key <KPDV> { [ KP_Divide		],	[	F25	]	};
-    key <KPMU> { [ KP_Multiply		],	[	F26	]	};
-    key <KPSU> { [ KP_Subtract		]				};
-
-    key  <KP7> { [  KP_Home,	KP_7	],	[	F27	]	};
-    key  <KP8> { [  KP_Up,	KP_8	],	[	F28	]	};
-    key  <KP9> { [  KP_Prior,	KP_9	],	[	F29	]	};
-    key <KPAD> { [  	KP_Add		]				};
-
-    key  <KP4> { [  KP_Left,	KP_4	],	[	F30	]	};
-    key  <KP5> { [  KP_Begin,	KP_5	],	[	F31	]	};
-    key  <KP6> { [  KP_Right,	KP_6	],	[	F32	]	};
-
-    key  <KP1> { [  KP_End,	KP_1	],	[	F33	]	};
-    key  <KP2> { [  KP_Down,	KP_2	],	[	F34	]	};
-    key  <KP3> { [  KP_Next,	KP_3	],	[	F35	]	};
-    key <KPEN> { [  	KP_Enter	]				};
-
-    key  <KP0> { [  KP_Insert,	KP_0	]	};
-    key <KPDL> { [  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	]	};
+    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	{ Alt_L };
-    modifier_map Mod2	{ Num_Lock };
-    modifier_map Mod3	{ Mode_switch };
-    modifier_map Mod4	{ Meta_L, Meta_R};
-    modifier_map Mod5	{ Scroll_Lock };
+    modifier_map Shift          { Shift_R, Shift_L };
+    modifier_map Mod1           { Alt_L };
+    modifier_map Mod2           { Alt_R, Mode_switch };
+    modifier_map Mod3           { Num_Lock };
+    modifier_map Mod4           { Meta_L, Meta_R };
 };
 
-// US/ASCII layout for a Type 5 Sun keyboard w/ broken OpenLook keymap
-xkb_symbols "sun5ol" {
-    override "sun_vndr/us(sun5)"
-    include "sun_vndr/us(broken_openlook_map)"
+xkb_symbols "type5" {
+    include "sun/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 6 Sun keyboard
-xkb_symbols "sun6" {
-    augment "us(basic)"
+xkb_symbols "type6" {
+    include "sun/us(type5)"
+};
 
-    key <RTSH> {       [       Shift_R         ]       };
-    key <LALT> {       [       Alt_L           ]       };
-    key <RCTL> {       [       Control_R       ]       };
-    key <RALT> {       [       Alt_R           ]       };
-    key <LMTA> {       [       Meta_L          ]       };
-    key <RMTA> {       [       Meta_R          ]       };
-    key <COMP> {       [       Multi_key       ]       };
 
-    // Begin "Function" section
-    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 ]
-    };
-    // End "Function" section
+// US/ASCII layout for a Type 5 Sun keyboard
+xkb_symbols "type5hobobasic" {
+    include "sun/us(type5basic)"
+};
 
-    // Begin "Editing" section
-    key <PRSC> {
-       type= "PC_SYSRQ",
-       symbols[Group1]= [      Print, Execute  ]
-    };
-    key <SCLK> {       [       Scroll_Lock     ]       };
-    key <PAUS> {
-       type= "PC_BREAK",
-       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   ]       };
+xkb_symbols "type5hobo" {
+    include "sun/us(type5hobobasic)"
 
-    // End "Editing" section, begin "Keypad"
-    key <NMLK> {       [       Num_Lock, Pointer_EnableKeys    ]       };
-    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 "Keypad" section
-
-    key <MUTE> { [  SunAudioMute,      SunVideoDegauss         ]       };
-    key <VOL-> { [  SunAudioLowerVolume,SunVideoLowerBrightness ]      };
-    key <VOL+> { [  SunAudioRaiseVolume,SunVideoRaiseBrightness        ]       };
-    key <POWR> { [  SunPowerSwitch,    SunPowerSwitchShift     ]       };
-
-    // from symbols/sun_vndr/us(type5)
-    key <STOP> { [ Cancel      ],      [ F11           ]       };
-    key <AGAI> { [ Redo                ],      [ F12           ]       };
-    key <PROP> { [ SunProps    ],      [ F13           ]       };
-    key <UNDO> { [ Undo                ],      [ F14           ]       };
-    key <FRNT> { [ SunFront    ],      [ F15           ]       };
-    key <COPY> { [ SunCopy     ],      [ F16           ]       };
-    key <OPEN> { [ SunOpen     ],      [ F17           ]       };
-    key <PAST> { [ SunPaste    ],      [ F18           ]       };
-    key <FIND> { [ Find                ],      [ F19           ]       };
-    key <CUT>  { [ SunCut      ],      [ F20           ]       };
-    key <HELP> { [ Help                ]       };
+    // 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	]	};
 
-    // begin modifier mappings
-    modifier_map Shift { Shift_R };
-    modifier_map Mod1  { Meta_L, Meta_R };
-    modifier_map Mod2  { Alt_L };
-    modifier_map Mod3  { Mode_switch };
-    modifier_map Mod4  { Num_Lock };
+    // 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 "pc101" {
+    include "us(pc101)"
+    key <RALT> { [ Mode_switch, Meta_R	] };
 };
 
-// US/ASCII layout for a Type 6 Sun keyboard w/ broken OpenLook keymap
-xkb_symbols "sun6ol" {
-    override "sun_vndr/us(sun6)"
-    include "sun_vndr/us(broken_openlook_map)"
+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		]				};
+};
+