--- np2/macosx/mackbd.cpp	2003/10/24 12:35:19	1.5
+++ np2/macosx/mackbd.cpp	2003/12/04 17:48:17	1.14
@@ -29,8 +29,8 @@ static const BYTE keymac[128] = {
 				0x24,0x26,0x28,0x30,0x32,0x2e,0x2f,0x31,
 			//	 TAB, SPC,    ,  BS,    , ESC,    , apl		; 0x30
 				0x0f,0x34,  NC,0x0e,  NC,0x00,  NC,  NC,
-			//	 sft, ctl, alt, cps,    ,    ,    ,    		; 0x38
-				0x70,0x74,0x73,0x71,  NC,  NC,  NC,  NC,
+			//	 sft, cps, alt, ctl,    ,    ,    ,    		; 0x38
+				0x70,0x79,0x73,0x74,  NC,  NC,  NC,  NC,		// for CW
 			//	    , [.],    , [*],    ,    , [+],    		; 0x40
 				  NC,0x50,  NC,0x45,  NC,  NC,0x49,  NC,
 			//	    ,    ,    ,    , ret,    , [-], clr		; 0x48
@@ -39,10 +39,10 @@ static const BYTE keymac[128] = {
 				  NC,0x4d,0x4e,0x4a,0x4b,0x4c,0x46,0x47,
 			//	 [6], [7],    , [8], [9],  ¡ï,  ¡², [,]		; 0x58
 				0x48,0x42,  NC,0x43,0x44,0x0d,0x33,0x4f,
-			//	  F5,  F6,  F7,  F3,  F8,  F9,    , F11		; 0x60
-				0x66,0x67,0x68,0x64,0x69,0x6a,  NC,0x72,
-			//	    , F13,    , F14,    , F10,    , F12		; 0x68
-				  NC,  NC,  NC,  NC,  NC,0x6b,  NC,  NC,
+			//	  F5,  F6,  F7,  F3,  F8,  F9,EISU, F11		; 0x60
+				0x66,0x67,0x68,0x64,0x69,0x6a,0x51,0x72,
+			//	KANA, F13,    , F14,    , F10,    , F12		; 0x68
+                0x35,  NC,  NC,  NC,  NC,0x6b,  NC,  NC,
 			//	    , F15, hlp, hom,  ru, del,  F4, end		; 0x70
 				  NC,  NC,0x3f,0x3e,0x37,0x39,0x65,0x3f,
 			//	  F2,  rd,  F1,  ¢«,  ¢ª,  ¢­,  ¢¬,    		; 0x78
@@ -64,7 +64,7 @@ static const BYTE keymac2[128] = {
 				  NC,  NC,  NC,  NC,  NC,  NC,  NC,  NC,
 			//	 TAB, SPC,    ,  BS,    , ESC,    , apl		; 0x30
 				  NC,  NC,  NC,  NC,  NC,  NC,  NC,  NC,
-			//	 sft, ctl, alt, cps,    ,    ,    ,    		; 0x38
+			//	 sft, cps, alt, ctl,    ,    ,    ,    		; 0x38
 				  NC,  NC,  NC,  NC,  NC,  NC,  NC,  NC,
 			//	    , [.],    , [*],    ,    , [+],    		; 0x40
 				  NC,  NC,  NC,  NC,  NC,  NC,  NC,  NC,
@@ -84,98 +84,85 @@ static const BYTE keymac2[128] = {
 				  NC,  NC,  NC,  NC,  NC,  NC,  NC,  NC};
 
 
-static	BYTE	keymap[16];
-static	UINT32	shiftchktick = 0;
-
-void mackbd_initialize(void) {
-
-	shiftchktick = GETTICK();
-	ZeroMemory(&keymap, sizeof(keymap));
-}
-
-void mackbd_callback(void) {
-
-	UINT32	tick;
-	BYTE	key[16];
-	UINT	i;
-	BYTE	update;
-	UINT	j;
-	BYTE	keycode;
-
-	tick = GETTICK();
-	if (shiftchktick == tick) {
-		return;
+typedef struct {
+	BYTE	f11[4];
+	BYTE	f12[4];
+} BINDTBL;
+
+static const BINDTBL bindtbl = {
+						//   ¥«¥Ê  Stop  [¡á]  NFER
+							{0x72, 0x60, 0x4d, 0x51},
+						//         Copy  [¡¤]  XFER
+							{NC,   0x61, 0x4f, 0x35}};
+
+void mackbd_initialize(void) { };
+
+void mackbd_keydown(int keycode) {
+
+	BYTE	data;
+
+	data = NC;
+	if (keycode == 0x67) {
+		if (np2oscfg.F11KEY < (sizeof(bindtbl.f11)/sizeof(BYTE))) {
+			data = bindtbl.f11[np2oscfg.F11KEY];
+		}
 	}
-	shiftchktick = tick;
-#if TARGET_API_MAC_CARBON
-	GetKeys((long *)key);
-#else
-	GetKeys((unsigned long *)key);
-#endif
-	for (i=0; i<16; i++) {
-		update = keymap[i] ^ key[i];
-		if (update) {
-			keymap[i] = key[i];
-			for (j=0; j<8; j++) {
-				if (update & (1 << j)) {
-					keycode = keymac[i * 8 + j];
-					if (keycode != NC) {
-						if (key[i] & (1 << j)) {
-							keystat_senddata(keycode);
-						}
-						else {
-							keystat_senddata(keycode + 0x80);
-						}
-					}
-				}
-			}
+	else if (keycode == 0x6f) {
+		if (np2oscfg.F12KEY < (sizeof(bindtbl.f12)/sizeof(BYTE))) {
+			data = bindtbl.f12[np2oscfg.F12KEY];
+            if (data == NC) {
+                mousemng_toggle(MOUSEPROC_SYSTEM);
+                menu_setmouse(np2oscfg.MOUSE_SW ^ 1);
+                sysmng_update(SYS_UPDATECFG);
+            }
 		}
 	}
+    else {
+        data = keymac[keycode];
+    }
+	if (data != NC) {
+		keystat_senddata(data);
+	}
 }
 
-void mackbd_f12down(int keycode) {
+void mackbd_keyup(int keycode) {
 
-	if (keycode == 0x6f) {
-		if (np2oscfg.F12COPY == 1) {
-			keystat_senddata(0x61);
+	BYTE	data;
+
+	data = NC;
+	if (keycode == 0x67) {
+		if (np2oscfg.F11KEY < (sizeof(bindtbl.f11)/sizeof(BYTE))) {
+			data = bindtbl.f11[np2oscfg.F11KEY];
 		}
-		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);
+	}
+	else if (keycode == 0x6f) {
+		if (np2oscfg.F12KEY < (sizeof(bindtbl.f12)/sizeof(BYTE))) {
+			data = bindtbl.f12[np2oscfg.F12KEY];
 		}
-#endif
-    }
+	}
     else {
-        BYTE	data;
         data = keymac[keycode];
-        if (data == 0x71) SysBeep(0);
-        if (data != NC) {
-            keystat_senddata(data);
-        }
+    }
+	if (data != NC) {
+		keystat_senddata(data | 0x80);
+		return;
 	}
 }
 
-void mackbd_f12up(int keycode) {
+void mackbd_resetf11(void) {
 
-	if (keycode == 0x6f) {
-		if (np2oscfg.F12COPY == 1) {
-			keystat_senddata(0x61 | 0x80);
-		}
-		else if (np2oscfg.F12COPY == 2) {
-			keystat_senddata(0x60 | 0x80);
-		}
-    }
-    else {
-        BYTE	data;
-        data = keymac[keycode];
-        if (data != NC) {
-            keystat_senddata(data | 0x80);
-        }
+	UINT	i;
+
+	for (i=1; i<(sizeof(bindtbl.f11)/sizeof(BYTE)); i++) {
+		keystat_forcerelease(bindtbl.f11[i]);
 	}
 }
 
+void mackbd_resetf12(void) {
+
+	UINT	i;
+
+	for (i=1; i<(sizeof(bindtbl.f12)/sizeof(BYTE)); i++) {
+		keystat_forcerelease(bindtbl.f12[i]);
+	}
+}