Index: programs/xkbcomp/keycodes/macintosh
===================================================================
RCS file: /cvs/xc/programs/xkbcomp/keycodes/macintosh,v
retrieving revision 1.5
diff -u -p -p -u -r1.5 macintosh
--- programs/xkbcomp/keycodes/macintosh	2001/10/03 07:44:22	1.5
+++ programs/xkbcomp/keycodes/macintosh	2003/08/17 11:41:32
@@ -29,7 +29,138 @@
 // $XFree86: xc/programs/xkbcomp/keycodes/macintosh,v 1.5 2001/10/03 07:44:22 alanh Exp $
 //
 default xkb_keycodes "macintosh" {
+    include "macintosh(linux_key_codes)"
+};
 
+xkb_keycodes "linux_key_codes" {
+
+    minimum= 8;
+    maximum= 134;
+
+    <TLDE> =  49;
+    <AE01> =  10;
+    <AE02> =  11;
+    <AE03> =  12;
+    <AE04> =  13;
+    <AE05> =  14;
+    <AE06> =  15;
+    <AE07> =  16;
+    <AE08> =  17;
+    <AE09> =  18;
+    <AE10> =  19;
+    <AE11> =  20;
+    <AE12> =  21;
+    <BKSP> =  22;
+
+    <TAB>  =  23;
+    <AD01> =  24;
+    <AD02> =  25;
+    <AD03> =  26;
+    <AD04> =  27;
+    <AD05> =  28;
+    <AD06> =  29;
+    <AD07> =  30;
+    <AD08> =  31;
+    <AD09> =  32;
+    <AD10> =  33;
+    <AD11> =  34;
+    <AD12> =  35;
+    <RTRN> =  36;
+
+    <CAPS> =  66;
+    <AC01> =  38;
+    <AC02> =  39;
+    <AC03> =  40;
+    <AC04> =  41;
+    <AC05> =  42;
+    <AC06> =  43;
+    <AC07> =  44;
+    <AC08> =  45;
+    <AC09> =  46;
+    <AC10> =  47;
+    <AC11> =  48;
+    <BKSL> =  51;
+
+    <LFSH> =  50;
+    <LSGT> =  94;
+    <AB01> =  52;
+    <AB02> =  53;
+    <AB03> =  54;
+    <AB04> =  55;
+    <AB05> =  56;
+    <AB06> =  57;
+    <AB07> =  58;
+    <AB08> =  59;
+    <AB09> =  60;
+    <AB10> =  61;
+    <RTSH> =  62;
+
+    <LCTL> =  37; // left control
+    <LALT> =  64; // left alt / option
+    <LCMD> = 115; // left command / apple
+    <SPCE> =  65; //
+//    alias <RCMD> = <LCMD>; // right command / apple
+    <RALT> = 113; // right altgr / option
+    <RCTL> = 109; // right control
+
+    <ESC>  =   9;
+    <FK01> =  67;
+    <FK02> =  68;
+    <FK03> =  69;
+    <FK04> =  70;
+    <FK05> =  71;
+    <FK06> =  72;
+    <FK07> =  73;
+    <FK08> =  74;
+    <FK09> =  75;
+    <FK10> =  76;
+    <FK11> =  95;
+    <FK12> =  96;
+
+    <PRSC> = 111;
+    <SYRQ> =  92;
+    <SCLK> =  78;
+    <PAUS> = 110;
+    <BRK>  = 114;
+
+    <INS>  = 106;
+    <HOME> =  97;
+    <PGUP> =  99;
+    <DELE> = 107;
+    <END>  = 103;
+    <PGDN> = 105;
+
+    <UP>   =  98;
+    <LEFT> = 100;
+    <DOWN> = 104;
+    <RGHT> = 102;
+
+    <NMLK> =  77;
+//    <KPEQ> = 100; // XXX FIXME kernel or XFree86 bug
+    <KPDV> = 112;
+    <KPMU> =  63;
+
+    <KP7>  =  79;
+    <KP8>  =  80;
+    <KP9>  =  81;
+    <KPSU> =  82;
+
+    <KP4>  =  83;
+    <KP5>  =  84;
+    <KP6>  =  85;
+    <KPAD> =  86;
+
+    <KP1>  =  87;
+    <KP2>  =  88;
+    <KP3>  =  89;
+    <KPEN> = 108;
+
+    <KP0>  =  90;
+    <KPDL> =  91;
+};
+
+xkb_keycodes "macintosh_raw_adb" {
+
     minimum= 8;
     maximum= 134;
 
@@ -92,14 +223,14 @@ default xkb_keycodes "macintosh" {
 
     <SPCE> = 57;
 
-    <LCTL> = 62;  // Left Control
-    <LALT> = 63;  // Left Option
     <LFSH> = 64;  // Left Shift
-    <RALT> = 66;  // Left Command
-//    <RTSH> = 131; // Right Shift
-//    <RALT> = 132; // Right Command
-//    <RCTL> = 133; // Right Control
-//    <RMTA> = 134; // Right Option
+    <LCTL> = 62;  // Left Control
+    <LALT> = 66;  // Left alt / Option
+    <LCMD> = 63;  // Left apple / Command
+    <RCMD> = 132; // Right apple / Command
+    <RALT> = 134; // Right alt(gr) / Option
+    <RCTL> = 133; // Right Control
+    <RTSH> = 131; // Right Shift
 
     <FK01> = 130;
     <FK02> = 128;
@@ -114,9 +245,9 @@ default xkb_keycodes "macintosh" {
     <FK11> = 111;
     <FK12> = 119;
 
-    <PRSC> = 113;
-    <SCLK> = 115;
-    <PAUS> = 121;
+    <PRSC> = 113; // F13
+    <SCLK> = 78;  // F14
+    <PAUS> = 110; // F15
 
     <INS>  = 122;
     <HOME> = 123;
Index: programs/xkbcomp/keymap/macintosh
===================================================================
RCS file: /cvs/xc/programs/xkbcomp/keymap/macintosh,v
retrieving revision 1.2
diff -u -p -p -u -r1.2 macintosh
--- programs/xkbcomp/keymap/macintosh	2001/03/05 20:18:25	1.2
+++ programs/xkbcomp/keymap/macintosh	2003/08/17 11:41:32
@@ -1,7 +1,7 @@
 // $XConsortium: macintosh /main/11 1996/03/07 13:42:13 kaleb $
 // $XFree86: xc/programs/xkbcomp/keymap/macintosh,v 1.2 2001/03/05 20:18:25 dawes Exp $
 default xkb_keymap "macintosh" {
-    xkb_keycodes	{ include "xfree86"				};
+    xkb_keycodes	{ include "macintosh(linux_key_codes)"		};
     xkb_types		{ include "default"				};
     xkb_compatibility	{ include "default"				};
     xkb_symbols		{ include "macintosh/us(extended)"		};
@@ -9,7 +9,7 @@ default xkb_keymap "macintosh" {
 };
 
 xkb_keymap "macintosh_old" {
-    xkb_keycodes	{ include "macintosh"				};
+    xkb_keycodes	{ include "macintosh(macintosh_raw_adb)"	};
     xkb_types		{ include "default"				};
     xkb_compatibility	{ include "default"				};
     xkb_symbols		{ include "macintosh/us(extended)"		};
Index: programs/xkbcomp/rules/xorg
===================================================================
RCS file: /cvs/xc/programs/xkbcomp/rules/xorg,v
retrieving revision 3.61
diff -u -p -p -u -r3.61 xorg
--- programs/xkbcomp/rules/xorg	2003/02/20 04:36:09	3.61
+++ programs/xkbcomp/rules/xorg	2003/08/17 11:41:32
@@ -21,8 +21,8 @@
 ! $mac = macintosh macintosh_old
 
 ! model 	=	keycodes
-  macintosh_old	=	macintosh
-  powerpcps2	=	powerpcps2
+  macintosh_old	=	macintosh(macintosh_raw_adb)
+  $mac		=	macintosh  // uses linux_key_codes
   pc98		=	xfree98(pc98)
   abnt2		=	xfree86(abnt2)
   *		=	xfree86
Index: programs/xkbcomp/symbols/macintosh/Imakefile
===================================================================
RCS file: /cvs/xc/programs/xkbcomp/symbols/macintosh/Imakefile,v
retrieving revision 1.3
diff -u -p -p -u -r1.3 Imakefile
--- programs/xkbcomp/symbols/macintosh/Imakefile	2000/10/02 02:32:17	1.3
+++ programs/xkbcomp/symbols/macintosh/Imakefile	2003/08/17 11:41:32
@@ -3,7 +3,8 @@ XCOMM
 XCOMM
 XCOMM $XFree86: xc/programs/xkbcomp/symbols/macintosh/Imakefile,v 1.3 2000/10/02 02:32:17 tsi Exp $
 
-     DATAFILES = de de_CH dk es fi fr fr_CH gb it nl no pt se us
+     DATAFILES = de de_CH dk dvorak es fi fr fr_CH gb it nl no pt se us
+
 
 all::
 
Index: programs/xkbcomp/symbols/macintosh/de_CH
===================================================================
RCS file: /cvs/xc/programs/xkbcomp/symbols/macintosh/de_CH,v
retrieving revision 1.2
diff -u -p -p -u -r1.2 de_CH
--- programs/xkbcomp/symbols/macintosh/de_CH	2000/09/26 15:57:25	1.2
+++ programs/xkbcomp/symbols/macintosh/de_CH	2003/08/17 11:41:32
@@ -44,7 +44,7 @@ xkb_symbols "extended" {
 			[    Greek_SIGMA, Aacute	]	};
 
     key <AD03> {	[	  e,	E		],
-			[    trademark, Ediaeresis	]	};
+			[    EuroSign, Ediaeresis	]	};
 
     key <AD04> {	[	  r,	R		],
 			[ registered, Egrave		]	};
@@ -145,6 +145,4 @@ xkb_symbols "extended" {
 			[nobreakspace,	nobreakspace	]	};
     // End alphanumeric section
     
-    key <KPDL> {	[  KP_Separator , KP_Delete	]	};
-
 };
Index: programs/xkbcomp/symbols/macintosh/dk
===================================================================
RCS file: /cvs/xc/programs/xkbcomp/symbols/macintosh/dk,v
retrieving revision 1.1
diff -u -p -p -u -r1.1 dk
--- programs/xkbcomp/symbols/macintosh/dk	2000/09/19 12:46:25	1.1
+++ programs/xkbcomp/symbols/macintosh/dk	2003/08/17 11:41:33
@@ -48,7 +48,7 @@ xkb_symbols "basic" {
     key <AC03> {        [               d,               D      ],
                         [             eth,             ETH      ]};
     key <AD03> {        [               e,               E      ],
-                        [        NoSymbol,            cent      ]};
+                        [        EuroSign,            cent      ]};
     key <AD04> {        [               r,               R      ],
                         [      registered,        NoSymbol      ]};
     key <AD05> {        [               t,               T      ],
Index: programs/xkbcomp/symbols/macintosh/dvorak
===================================================================
RCS file: dvorak
diff -N dvorak
--- /dev/null	Tue Apr  9 15:46:34 2002
+++ programs/xkbcomp/symbols/macintosh/dvorak	Sun Aug 17 11:41:33 2003
@@ -0,0 +1,7 @@
+
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+    include "dvorak(basic)"
+    name[Group1]= "Dvorak";
+};
Index: programs/xkbcomp/symbols/macintosh/es
===================================================================
RCS file: /cvs/xc/programs/xkbcomp/symbols/macintosh/es,v
retrieving revision 1.2
diff -u -p -p -u -r1.2 es
--- programs/xkbcomp/symbols/macintosh/es	2000/09/26 15:57:25	1.2
+++ programs/xkbcomp/symbols/macintosh/es	2003/08/17 11:41:33
@@ -6,6 +6,8 @@ xkb_symbols "basic" {
 
     // Describes the differences between a very simple mac_US
     // keyboard and a very simple Spanish keybaord
+    // this keymap is used by the spanish guys in Mexico
+    // people in spain use "iso", see below
 
     name[Group1]= "Spanish";
 
@@ -13,8 +15,8 @@ xkb_symbols "basic" {
     			[       braceleft,      braceright	]	};
     key <LSGT> {	[	     less,	   greater	],
 			[     bracketleft,       braceleft	]	};
-    key <AE01> {	[         	1,	exclam 		]	};
-    key <AE02> {	[               2,      exclamdown     	],	
+    key <AE01> {	[         	1,	exclamdown 	]	};
+    key <AE02> {	[               2,      exclam     	],	
 			[	       at,	 oneeighth	]	};
     key <AE03> {	[               3,      numbersign     	],
 			[   guillemotleft,  guillemotright	]	};
@@ -36,7 +38,10 @@ xkb_symbols "basic" {
     key <AD11> {	[      dead_grave,          degree 	]	};
     key <AD12> {	[      dead_acute,   dead_diaeresis    	],
 			[               bar			]	};
+    key <AD03> {	[		e,    E			],
+                        [  EuroSign				]	};
 
+
     key <AB08> {	[           comma,    questiondown   	]	};
     key <AB09> {	[          period,        question     	]	};
     key <AB10> {	[        ccedilla,        Ccedilla     	]	};
@@ -46,5 +51,18 @@ xkb_symbols "basic" {
     key <BKSL> {	[      apostrophe,        quotedbl	]	};
 
     // End alphanumeric section
+
+};
+
+xkb_symbols "nodeadkeys" {
+    // a dummy map to workaround  XF86config errors
+    include "macintosh/es(basic)"
+};
+
+xkb_symbols "iso" {
+    // the people in spain use PC style keyboards on their macs
+    // credits to Xoán Pedracova <xpedra@com.uvigo.es>
+
+    include "es(basic)"
 
 };
Index: programs/xkbcomp/symbols/macintosh/fr
===================================================================
RCS file: /cvs/xc/programs/xkbcomp/symbols/macintosh/fr,v
retrieving revision 1.2
diff -u -p -p -u -r1.2 fr
--- programs/xkbcomp/symbols/macintosh/fr	2000/09/26 15:57:25	1.2
+++ programs/xkbcomp/symbols/macintosh/fr	2003/08/17 11:41:33
@@ -11,11 +11,11 @@ xkb_symbols "extended" {
     key <TLDE> {        [        at,    numbersign      ],
                         [   periodcentered              ]	};
     key <AE01> {	[   ampersand,	  1    		],
-	 					[   dead_acute,   dead_acute] };
+	 		[   dead_acute,   dead_acute	] };
     key <AE02> {	[      eacute,	  2 		]	};
     key <AE03> {	[    quotedbl,	  3         	]	};
     key <AE04> {	[  quoteright,	  4    		],
-                        [   quoteleft                   ]	};
+                        [   quoteleft,    EuroSign	]	};
     key <AE05> {	[   parenleft,	  5    		],
               	        [   braceleft,    bracketleft 	]	};
     key <AE06> {	[     section,	  6          	],
@@ -50,7 +50,7 @@ xkb_symbols "extended" {
     key <AD10> {	[	    p,	P		]	};
     key <AD11> {	[ dead_circumflex,  dead_diaeresis  ],
                 	[ ocircumflex,	Ocircumflex     ] 	};
-    key <AD12> {	[      dollar,	asterisk        ],
+    key <AD12> {	[    EuroSign,	asterisk        ],
                 	[       comma,	yen             ] 	};
     key <BKSL> {	[   	dead_grave,  sterling        ],
 			[          at,  numbersign      ]	};
@@ -95,7 +95,13 @@ xkb_symbols "extended" {
 			[    macron,    plusminus	]	};
 
     // End alphanumeric section
-    key <KPDL> {        [ KP_Separator , KP_Delete      ]       };
+    key <KPDL> {        [ KP_Delete , KP_Separator      ]       };
 
 };
+
+xkb_symbols "nodeadkeys" {
+    // a dummy map to workaround  XF86config errors
+    include "macintosh/fr(extended)"
+};
+
 
Index: programs/xkbcomp/symbols/macintosh/it
===================================================================
RCS file: /cvs/xc/programs/xkbcomp/symbols/macintosh/it,v
retrieving revision 1.3
diff -u -p -p -u -r1.3 it
--- programs/xkbcomp/symbols/macintosh/it	2001/04/06 16:51:20	1.3
+++ programs/xkbcomp/symbols/macintosh/it	2003/08/17 11:41:33
@@ -32,7 +32,8 @@ xkb_symbols "extended" {
 
     key <AD01> {	[           q,	Q 		]	};
     key <AD02> {	[	    z,	Z		]	};
-    key <AD03> {	[	    e,	E		]	};
+    key <AD03> {	[	    e,	E		],
+    			[	EuroSign		]	};
     key <AD04> {	[	    r,	R		],
                 	[  registered			] 	};
     key <AD05> {	[	    t,	T		]	};
@@ -85,9 +86,6 @@ xkb_symbols "extended" {
 			[    exclamdown			]	};
 
     // End alphanumeric section
-
-    key <KPDL> {	[ KP_Decimal , KP_Delete	]	};
-    // End "Keypad" section
 
 };
 
Index: programs/xkbcomp/symbols/macintosh/no
===================================================================
RCS file: /cvs/xc/programs/xkbcomp/symbols/macintosh/no,v
retrieving revision 1.1
diff -u -p -p -u -r1.1 no
--- programs/xkbcomp/symbols/macintosh/no	2000/09/19 12:46:25	1.1
+++ programs/xkbcomp/symbols/macintosh/no	2003/08/17 11:41:33
@@ -31,6 +31,8 @@ xkb_symbols "basic" {
 			[      odiaeresis,     Odiaeresis	]	};
     key <AE11> {	[            plus,        question      ]	};
     key <AC11> {	[              ae,              AE 	]	};
+    key <AD03> {	[		e,  E			],
+			[       EuroSign			]	};
     key <AD11> {	[	    aring,           Aring     	]	};
     key <AE12> {	[      dead_grave,      dead_acute	],
 			[	    acute,     dead_ogonek 	]	};
Index: programs/xkbcomp/symbols/macintosh/pt
===================================================================
RCS file: /cvs/xc/programs/xkbcomp/symbols/macintosh/pt,v
retrieving revision 1.1
diff -u -p -p -u -r1.1 pt
--- programs/xkbcomp/symbols/macintosh/pt	2000/09/19 12:46:25	1.1
+++ programs/xkbcomp/symbols/macintosh/pt	2003/08/17 11:41:33
@@ -34,25 +34,13 @@ xkb_symbols "basic" {
     key <AC10> {	[        ccedilla,        Ccedilla      ]	};
     key <AC11> {	[      dead_tilde, dead_circumflex	]	};
     key <AC12> {	[       backslash,	       bar     	]	};
+    key <AD03> {        [           e,  E               ],
+	                [       EuroSign                ]       };
+
     key <AD11> {	[       masculine,     ordfeminine      ]	};
     key <AD12> {	[      dead_acute,      dead_grave 	]	};
     // End alphanumeric section
 
-};
-
-partial alphanumeric_keys 
-xkb_symbols "Sundeadkeys" {
-    include "macintosh/pt(basic)" // for consistent naming
-    
-    key <AE12> {	[	     plus,        asterisk 	],
-			[ SunFA_Diaeresis, SunFA_Diaeresis      ]	};
-    key <AC11> {	[     SunFA_Tilde,    SunFA_Circum	]	};
-    key <AD12> {	[     SunFA_Acute,     SunFA_Grave 	]	};
-};
-
-partial alphanumeric_keys 
-xkb_symbols "sundeadkeys" {
-    include "macintosh/pt(Sundeadkeys)" // for consistent naming
 };
 
 partial alphanumeric_keys 
Index: programs/xkbcomp/symbols/macintosh/se
===================================================================
RCS file: /cvs/xc/programs/xkbcomp/symbols/macintosh/se,v
retrieving revision 1.2
diff -u -p -p -u -r1.2 se
--- programs/xkbcomp/symbols/macintosh/se	2000/12/05 21:18:39	1.2
+++ programs/xkbcomp/symbols/macintosh/se	2003/08/17 11:41:33
@@ -34,6 +34,8 @@ xkb_symbols "basic" {
     key <AE11> {	[            plus,        question      ]	};
     key <AC11> {	[      adiaeresis,      Adiaeresis 	],
 			[              ae,		AE	]	};
+    key <AD03> {        [           e,  E               ],
+			[       EuroSign                ]       };
     key <AD11> {	[	    aring,           Aring     	]	};
     key <AE12> {	[           acute,           grave	]	};
     key <AD12> {	[       diaeresis,     asciicircum     	],
Index: programs/xkbcomp/symbols/macintosh/us
===================================================================
RCS file: /cvs/xc/programs/xkbcomp/symbols/macintosh/us,v
retrieving revision 1.7
diff -u -p -p -u -r1.7 us
--- programs/xkbcomp/symbols/macintosh/us	2002/10/16 01:29:41	1.7
+++ programs/xkbcomp/symbols/macintosh/us	2003/08/17 11:41:34
@@ -22,12 +22,16 @@ xkb_symbols "extended" {
     key <AE10> {	[	  0,	parenright	]	};
     key <AE11> {	[     minus,	underscore	]	};
     key <AE12> {	[     equal,	plus		]	};
-    key <BKSP> {	[ BackSpace			]	};
+    key <BKSP> {
+	type="CTRL+ALT",
+	symbols[Group1]= [ BackSpace,	Terminate_Server ]
+    };
 
     key  <TAB> {	[	Tab,	ISO_Left_Tab	]	};
     key <AD01> {	[	  q,	Q 		]	};
     key <AD02> {	[	  w,	W		]	};
-    key <AD03> {	[	  e,	E		]	};
+    key <AD03> {	[	  e,	E		],
+    			[	EuroSign		]	};
     key <AD04> {	[	  r,	R		]	};
     key <AD05> {	[	  t,	T		]	};
     key <AD06> {	[	  y,	Y		]	};
@@ -68,18 +72,54 @@ xkb_symbols "extended" {
     // 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		]	};
-    key <FK12> {	[  F12		]	};
+    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 ]
+    };
     key <FK13> {	[  Print	]	};
     key <FK14> {	[  Scroll_Lock	]	};
     key <FK15> {	[  Pause	]	};
@@ -102,18 +142,30 @@ xkb_symbols "extended" {
     // Begin "Keypad" section
     key <NMLK> {	[  Num_Lock,	Pointer_EnableKeys	]	};
     key <KPEQ> {	[  equal				]	};
-    key <KPDV> {	[  KP_Divide				]	};
-    key <KPMU> {	[  KP_Multiply				]	};
+    key <KPDV> {
+	type="CTRL+ALT",
+	symbols[Group1]=[  KP_Divide,	XF86_Ungrab		]
+    };
+    key <KPMU> {
+	type="CTRL+ALT",
+	symbols[Group1]=[  KP_Multiply,	XF86_ClearGrab		]
+    };
 
     key  <KP7> {	[  KP_7,	KP_Home			]	};
     key  <KP8> {	[  KP_8,	KP_Up			]	};
     key  <KP9> {	[  KP_9,	KP_Prior		]	};
-    key <KPSU> {	[  KP_Subtract				]	};
+    key <KPSU> {
+	type="CTRL+ALT",
+	symbols[Group1]=[  KP_Subtract,	XF86_Prev_VMode		]
+    };
 
     key  <KP4> {	[  KP_4,	KP_Left			]	};
     key  <KP5> {	[  KP_5,	KP_Begin		]	};
     key  <KP6> {	[  KP_6,	KP_Right		]	};
-    key <KPAD> {	[  KP_Add				]	};
+    key <KPAD> {
+	type="CTRL+ALT",
+	symbols[Group1]=[  KP_Add,	XF86_Next_VMode		]
+    };
 
     key  <KP1> {	[  KP_1,	KP_End			]	};
     key  <KP2> {	[  KP_2,	KP_Down			]	};
@@ -145,57 +196,5 @@ xkb_symbols "extended" {
     modifier_map Mod5   { Scroll_Lock };
     // end modifier mappings
 
-// *** FIXME
-//    key <LSGT> {	[ quoteleft,	asciitilde	]	};
-//    key <AE01> {	[	  1,	exclam 		],
-//			[exclamdown,    slash		]	};
-//    key <AE02> {	[	  2,	at		],
-//			[ trademark,    eth		]	};
-//    key <AE03> {	[	  3,	numbersign	],
-//			[ sterling			]	};
-//    key <AE04> {	[	  4,	dollar		],
-//			[      cent			]	};
-//    key <AE05> {	[	  5,	percent		],
-//			[  infinity			]	};
-//    key <AE06> {	[	  6,	asciicircum	],
-//			[ section			]	};
-//    key <AE07> {	[	  7,	ampersand	],
-//			[ paragraph			]	};
-//    key <AE08> {	[	  8,	asterisk	],
-//			[periodcentered			]	};
-//    key <AE09> {	[	  9,	parenleft	],
-//			[ordfeminine			]	};
-//    key <AE12> {	[     equal,	plus		],
-//			[  notequal,    plusminus	]	};
-//    key <AD01> {	[	  q,	Q 		],
-//			[	oe,	OE		]	};
-//    key <AD04> {	[	  r,	R		],
-//			[registered			]	};
-//    key <AD05> {	[	  t,	T		],
-//			[    dagger			]	};
-//    key <BKSL> {	[ backslash,	bar		],
-//			[guillemotleft,guillemotright	]	};
-//    key <AC01> {	[	  a,	A 		],
-//			[     aring,    Aring		]	};
-//    key <AC02> {	[	  s,	S		],
-//			[    ssharp,    Iacute		]	};
-//    key <AC03> {	[	  d,	D		],
-//				eth,	Icircumflex	]	};
-//    key <AC04> {	[	  f,	F		],
-//			[		Idiaeresis	]	};
-//    key <AC05> {	[	  g,	G		],
-//			[ copyright			]	};
-//    key <AC09> {	[	  l,	L		],
-//			[   notsign,    Ograve		]	};
-//    key <AC11> {	[ quoteright,	quotedbl	],
-//			[        ae,	AE		]	};
-//    key <AB03> {	[	  c,	C		],
-//			[ ccedilla,	Ccedilla	]	};
-//    key <AB06> {	[	  n,	N		],
-//			[asciitilde			]	};
-//    key <AB07> {	[	  m,	M		],
-//			[	 mu,	Acircumflex	]	};
-//    key <RALT> {	[ Mode_switch,	Multi_key	]	};
-//    modifier_map Mod3   { Mode_switch };
 
 };
--- programs/xkbcomp/symbols/macintosh/us
+++ programs/xkbcomp/symbols/macintosh/us
@@ -181,10 +181,9 @@
     key <RTSH> {	[  Shift_R	]	};
     key <LCTL> {	[  Control_L	]	};
     key <RCTL> {	[  Control_R	]	};
-    key <LALT> {	[  Alt_L, Meta_L ]	};
-    key <RALT> {	[  Alt_R, Meta_R ]	};
-    key <LWIN> {	[  Super_L	]	};
-    key <RWIN> {	[  Super_R	]	};
+    key <LALT> {	[  Mode_switch, Multi_key	]	};
+    key <RALT> {	[  Mode_switch, Multi_key	]	};
+    key <LCMD> {	[  Alt_L	]	};
     // End "Modifier" section
 
     // begin modifier mappings