--- programs/xkbcomp/keycodes/macintosh
+++ programs/xkbcomp/keycodes/macintosh	2004/10/09 13:13:03
@@ -35,7 +35,7 @@
 xkb_keycodes "linux_key_codes" {
 
     minimum= 8;
-    maximum= 134;
+    maximum= 255;
 
     <TLDE> =  49;
     <AE01> =  10;
@@ -99,7 +99,7 @@
     <LALT> =  64; // left alt / option
     <LCMD> = 115; // left command / apple
     <SPCE> =  65; //
-//    alias <RCMD> = <LCMD>; // right command / apple
+    <RCMD> = 116; // right command / apple
     <RALT> = 113; // right altgr / option
     <RCTL> = 109; // right control
 
@@ -116,6 +116,10 @@
     <FK10> =  76;
     <FK11> =  95;
     <FK12> =  96;
+    <FK13> = 182;
+    <FK14> = 183;
+    <FK15> = 184;
+    <FK16> =  93;
 
     <PRSC> = 111;
     <SYRQ> =  92;
@@ -135,8 +139,13 @@
     <DOWN> = 104;
     <RGHT> = 102;
 
+    <VOL-> = 174;
+    <VOL+> = 176;
+    <MUTE> = 160;
+    <EJCT> = 204;
+
     <NMLK> =  77;
-//    <KPEQ> = 100; // XXX FIXME kernel or XFree86 bug
+    <KPEQ> = 157;
     <KPDV> = 112;
     <KPMU> =  63;
 
--- programs/xkbcomp/symbols/macintosh/us
+++ programs/xkbcomp/symbols/macintosh/us	2004/10/09 13:13:09
@@ -120,9 +120,16 @@
 	type="CTRL+ALT",
 	symbols[Group1]= [  F12, XF86_Switch_VT_12 ]
     };
-    key <FK13> {	[  Print	]	};
-    key <FK14> {	[  Scroll_Lock	]	};
-    key <FK15> {	[  Pause	]	};
+    key <FK13> {	[  F13		]	};
+    key <FK14> {
+	type="PC_SYSRQ",
+	symbols[Group1]= [  Print, Sys_Req ]
+    };
+    key <FK15> {	[  Scroll_Lock	]	};
+    key <FK16> {
+	type="PC_BREAK",
+	symbols[Group1]= [  Pause, Break ]
+    };
     // End "Function" section
 
     // Begin "Editing" section
@@ -140,6 +147,11 @@
     // End "Editing" section
 
     // Begin "Keypad" section
+    key <VOL-> {	[  XF86AudioLowerVolume			]	};
+    key <VOL+> {	[  XF86AudioRaiseVolume			]	};
+    key <MUTE> {	[  XF86AudioMute			]	};
+    key <EJEC> {	[  XF86Eject				]	};
+
     key <NMLK> {	[  Num_Lock,	Pointer_EnableKeys	]	};
     key <KPEQ> {	[  equal				]	};
     key <KPDV> {
@@ -184,6 +196,7 @@
     key <LALT> {	[  Mode_switch, Multi_key	]	};
     key <RALT> {	[  Mode_switch, Multi_key	]	};
     key <LCMD> {	[  Alt_L	]	};
+    key <RCMD> {	[  Alt_R	]	};
     // End "Modifier" section
 
     // begin modifier mappings