--- np2/macosx/mackbd.cpp	2003/10/19 14:56:15	1.3
+++ np2/macosx/mackbd.cpp	2003/10/25 16:52:58	1.6
@@ -6,6 +6,11 @@
 #include	"pccore.h"
 #include	"iocore.h"
 
+#if defined(NP2GCC)
+#include	"mousemng.h"
+#include	"menu.h"
+#include	"sysmng.h"
+#endif
 
 #define		NC		0xff
 
@@ -25,7 +30,7 @@ static const BYTE keymac[128] = {
 			//	 TAB, SPC,    ,  BS,    , ESC,    , apl		; 0x30
 				0x0f,0x34,  NC,0x0e,  NC,0x00,  NC,  NC,
 			//	 sft, ctl, alt, cps,    ,    ,    ,    		; 0x38
-				0x70,0x74,0x73,0x79,  NC,  NC,  NC,  NC,
+				0x70,0x74,0x73,0x71,  NC,  NC,  NC,  NC,
 			//	    , [.],    , [*],    ,    , [+],    		; 0x40
 				  NC,0x50,  NC,0x45,  NC,  NC,0x49,  NC,
 			//	    ,    ,    ,    , ret,    , [-], clr		; 0x48
@@ -136,7 +141,23 @@ void mackbd_f12down(int keycode) {
 		}
 		else if (np2oscfg.F12COPY == 2) {
 			keystat_senddata(0x60);
+        }
+#if defined(NP2GCC)
+        else if(!np2oscfg.F12COPY) {
+            mouse_running(MOUSE_XOR);
+            menu_setmouse(np2oscfg.MOUSE_SW ^ 1);
+            sysmng_update(SYS_UPDATECFG);
+            toggleMenubar();
 		}
+#endif
+    }
+    else {
+        BYTE	data;
+        data = keymac[keycode];
+        if (data == 0x71) SysBeep(0);
+        if (data != NC) {
+            keystat_senddata(data);
+        }
 	}
 }
 
@@ -149,6 +170,13 @@ void mackbd_f12up(int keycode) {
 		else if (np2oscfg.F12COPY == 2) {
 			keystat_senddata(0x60 | 0x80);
 		}
+    }
+    else {
+        BYTE	data;
+        data = keymac[keycode];
+        if (data != NC) {
+            keystat_senddata(data | 0x80);
+        }
 	}
 }