--- np2/macos9/mackbd.cpp	2003/10/23 07:20:43	1.1
+++ np2/macos9/mackbd.cpp	2003/11/13 07:47:17	1.3
@@ -9,6 +9,12 @@
 
 #define		NC		0xff
 
+
+#if TARGET_API_MAC_CARBON
+
+static	BYTE	keymap[16];
+static	UINT32	shiftchktick = 0;
+
 static const BYTE keymac[128] = {
 			//	  £Á,  £Ó,  £Ä,  £Æ,  £È,  £Ç,  £Ú,  £Ø		; 0x00
 				0x1d,0x1e,0x1f,0x20,0x22,0x21,0x29,0x2a,
@@ -24,8 +30,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,0x79,  NC,  NC,  NC,  NC,
+			//	 sft, cps, alt, ctl,    ,    ,    ,    		; 0x38
+				0x70,0x79,0x73,0x74,  NC,  NC,  NC,  NC,
 			//	    , [.],    , [*],    ,    , [+],    		; 0x40
 				  NC,0x50,  NC,0x45,  NC,  NC,0x49,  NC,
 			//	    ,    ,    ,    , ret,    , [-], clr		; 0x48
@@ -43,45 +49,6 @@ static const BYTE keymac[128] = {
 			//	  F2,  rd,  F1,  ¢«,  ¢ª,  ¢­,  ¢¬,    		; 0x78
 				0x63,0x36,0x62,0x3b,0x3c,0x3d,0x3a,  NC};
 
-// ÎӸ饭¡¼²¡²¼
-static const BYTE keymac2[128] = {
-			//	  £Á,  £Ó,  £Ä,  £Æ,  £È,  £Ç,  £Ú,  £Ø		; 0x00
-				  NC,  NC,  NC,  NC,0x3f,  NC,  NC,  NC,
-			//	  £Ã,  £Ö,    ,  £Â,  £Ñ,  £×,  £Å,  £Ò		; 0x08
-				  NC,  NC,  NC,  NC,  NC,  NC,  NC,  NC,
-			//	  £Ù,  £Ô,  £±,  £²,  £³,  £´,  £¶,  £µ		; 0x10
-				  NC,  NC,0x62,0x63, 0x64,0x65,0x67,0x66,
-			//	  ¡°,  £¹,  £·,  ¡Ý,  £¸,  £°,  ¡Î,  £Ï 	; 0x18
-				  NC,0x6a,0x68,  NC,0x69,0x6b,  NC,  NC,
-			//	  £Õ,  ¡÷,  £É,  £Ð, ret,  £Ì,  £Ê,  ¡§		; 0x20
-				  NC,  NC,  NC,  NC,  NC,0x3e,  NC,  NC,
-			//	  £Ë,  ¡¨,  ¡Ï,  ¡¤,  ¡¿,  £Î,  £Í,  ¡¥		; 0x28
-				  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
-				  NC,  NC,  NC,  NC,  NC,  NC,  NC,  NC,
-			//	    , [.],    , [*],    ,    , [+],    		; 0x40
-				  NC,  NC,  NC,  NC,  NC,  NC,  NC,  NC,
-			//	    ,    ,    ,    , ret,    , [-], clr		; 0x48
-				  NC,  NC,  NC,  NC,  NC,  NC,  NC,  NC,
-			//	    , [=], [0], [1], [2], [3], [4], [5]		; 0x50
-				  NC,  NC,  NC,  NC,  NC,  NC,  NC,  NC,
-			//	 [6], [7],    , [8], [9],  ¡ï,  ¡², [,]		; 0x58
-				  NC,  NC,  NC,  NC,  NC,  NC,  NC,  NC,
-			//	  F5,  F6,  F7,  F3,  F8,  F9,    , F11		; 0x60
-				  NC,  NC,  NC,  NC,  NC,  NC,  NC,  NC,
-			//	    , F13,    , F14,    , F10,    , F12		; 0x68
-				  NC,  NC,  NC,  NC,  NC,  NC,  NC,  NC,
-			//	    , F15, hlp, hom,  ru, del,  F4, end		; 0x70
-				  NC,  NC,  NC,  NC,  NC,0x38,  NC,  NC,
-			//	  F2,  rd,  F1,  ¢«,  ¢ª,  ¢­,  ¢¬,    		; 0x78
-				  NC,  NC,  NC,  NC,  NC,  NC,  NC,  NC};
-
-
-static	BYTE	keymap[16];
-static	UINT32	shiftchktick = 0;
-
 void mackbd_initialize(void) {
 
 	shiftchktick = GETTICK();
@@ -113,6 +80,7 @@ void mackbd_callback(void) {
 			keymap[i] = key[i];
 			for (j=0; j<8; j++) {
 				if (update & (1 << j)) {
+TRACEOUT(("key %x %d", i * 8 + j, (key[i] & (1 << j))?1:0));
 					keycode = keymac[i * 8 + j];
 					if (keycode != NC) {
 						if (key[i] & (1 << j)) {
@@ -128,27 +96,220 @@ void mackbd_callback(void) {
 	}
 }
 
-void mackbd_f12down(int keycode) {
+BOOL mackbd_keydown(int keycode) {
 
 	if (keycode == 0x6f) {
 		if (np2oscfg.F12COPY == 1) {
 			keystat_senddata(0x61);
+			return(TRUE);
 		}
 		else if (np2oscfg.F12COPY == 2) {
 			keystat_senddata(0x60);
+			return(TRUE);
         }
 	}
+	return(FALSE);
 }
 
-void mackbd_f12up(int keycode) {
+BOOL mackbd_keyup(int keycode) {
 
 	if (keycode == 0x6f) {
 		if (np2oscfg.F12COPY == 1) {
 			keystat_senddata(0x61 | 0x80);
+			return(TRUE);
 		}
 		else if (np2oscfg.F12COPY == 2) {
 			keystat_senddata(0x60 | 0x80);
+			return(TRUE);
+		}
+	}
+	return(FALSE);
+}
+
+#else
+
+enum {
+	kMac_kana		= 0x37,
+	kMac_shift		= 0x38,
+	kMac_caps		= 0x39,
+	kMac_alt		= 0x3a,
+	kMac_ctrl		= 0x3b
+};
+
+#define	kMac_Basebit(a)		(1 << ((a) & 15))
+
+typedef struct {
+	UINT16	bit;
+	BYTE	code;
+} KEYSEA;
+
+static const KEYSEA keysea[] = {
+					{kMac_Basebit(kMac_shift),	0x70},
+					{kMac_Basebit(kMac_caps),	0x79},
+//					{kMac_Basebit(kMac_kana),	0x72},
+					{kMac_Basebit(kMac_alt),	0x73},
+					{kMac_Basebit(kMac_ctrl),	0x74}};
+
+static const BYTE keymac[128] = {
+			//	  £Á,  £Ó,  £Ä,  £Æ,  £È,  £Ç,  £Ú,  £Ø		; 0x00
+				0x1d,0x1e,0x1f,0x20,0x22,0x21,0x29,0x2a,
+			//	  £Ã,  £Ö,    ,  £Â,  £Ñ,  £×,  £Å,  £Ò		; 0x08
+				0x2b,0x2c,  NC,0x2d,0x10,0x11,0x12,0x13,
+			//	  £Ù,  £Ô,  £±,  £²,  £³,  £´,  £¶,  £µ		; 0x10
+				0x15,0x14,0x01,0x02,0x03,0x04,0x06,0x05,
+			//	  ¡°,  £¹,  £·,  ¡Ý,  £¸,  £°,  ¡Î,  £Ï 	; 0x18
+				0x0c,0x09,0x07,0x0b,0x08,0x0a,0x1b,0x18,
+			//	  £Õ,  ¡÷,  £É,  £Ð, ret,  £Ì,  £Ê,  ¡§		; 0x20
+				0x16,0x1a,0x17,0x19,0x1c,0x25,0x23,0x27,
+			//	  £Ë,  ¡¨,  ¡Ï,  ¡¤,  ¡¿,  £Î,  £Í,  ¡¥		; 0x28
+				0x24,0x26,0x28,0x30,0x32,0x2e,0x2f,0x31,
+			//	 TAB, SPC,    ,  BS,    , ESC,    , apl		; 0x30
+				0x0f,0x34,  NC,0x0e,  NC,0x00,  NC,  NC,
+			//	 sft, cps, alt, ctl,    ,    ,    ,    		; 0x38
+				  NC,  NC,  NC,  NC,  NC,  NC,  NC,  NC,
+			//	    , [.],    , [*],    ,    , [+],    		; 0x40
+				  NC,0x50,  NC,0x45,  NC,  NC,0x49,  NC,
+			//	    ,    ,    ,    , ret,    , [-], clr		; 0x48
+				  NC,  NC,  NC,  NC,0x1c,  NC,0x40,0x3e,
+			//	    , [=], [0], [1], [2], [3], [4], [5]		; 0x50
+				  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,
+			//	    , F15, hlp, hom,  ru, del,  F4, end		; 0x70
+				  NC,  NC,0x3f,0x3e,0x37,0x39,0x65,0x3f,
+			//	  F2,  rd,  F1,  ¢«,  ¢ª,  ¢­,  ¢¬,    		; 0x78
+				0x63,0x36,0x62,0x3b,0x3c,0x3d,0x3a,  NC};
+
+typedef struct {
+	UINT32	tick;
+	UINT16	shift;
+} MACKBD;
+
+static	MACKBD		mackbd;
+
+void mackbd_initialize(void) {
+
+	ZeroMemory(&mackbd, sizeof(mackbd));
+}
+
+void mackbd_callback(void) {
+
+	UINT32	tick;
+	BYTE	key[16];
+	UINT16	shift;
+	UINT16	shiftchg;
+	UINT	i;
+
+	tick = GETTICK();
+	if (mackbd.tick != tick) {
+		mackbd.tick = tick;
+		GetKeys((unsigned long *)key);
+		shift = ((UINT16)key[7] << 8) + key[6];
+		shiftchg = mackbd.shift ^ shift;
+		mackbd.shift = shift;
+		for (i=0; i<(sizeof(keysea) / sizeof(KEYSEA)); i++) {
+			if (shiftchg & keysea[i].bit) {
+				if (shift & keysea[i].bit) {
+					keystat_senddata(keysea[i].code);
+				}
+				else {
+					keystat_senddata(keysea[i].code | 0x80);
+				}
+			}
+		}
+	}
+}
+
+BOOL mackbd_keydown(int keycode) {
+
+	BYTE	data;
+
+	data = NC;
+	if (keycode == 0x6f) {
+		if (np2oscfg.F12COPY == 1) {
+			data = 0x61;
+		}
+		else if (np2oscfg.F12COPY == 2) {
+			data = 0x60;
+		}
+	}
+	else if (keycode < 0x80) {
+		data = keymac[keycode];
+	}
+	if (data != NC) {
+		keystat_senddata(data);
+		return(TRUE);
+	}
+	else {
+		return(FALSE);
+	}
+}
+
+BOOL mackbd_keyup(int keycode) {
+
+	BYTE	data;
+
+	data = NC;
+	if (keycode == 0x6f) {
+		if (np2oscfg.F12COPY == 1) {
+			data = 0x61;
+		}
+		else if (np2oscfg.F12COPY == 2) {
+			data = 0x60;
 		}
 	}
+	else if (keycode < 0x80) {
+		data = keymac[keycode];
+	}
+	if (data != NC) {
+		keystat_senddata(data | 0x80);
+		return(TRUE);
+	}
+	else {
+		return(FALSE);
+	}
 }
 
+#endif
+
+
+#if 0
+// ÎӸ饭¡¼²¡²¼
+static const BYTE keymac2[128] = {
+			//	  £Á,  £Ó,  £Ä,  £Æ,  £È,  £Ç,  £Ú,  £Ø		; 0x00
+				  NC,  NC,  NC,  NC,0x3f,  NC,  NC,  NC,
+			//	  £Ã,  £Ö,    ,  £Â,  £Ñ,  £×,  £Å,  £Ò		; 0x08
+				  NC,  NC,  NC,  NC,  NC,  NC,  NC,  NC,
+			//	  £Ù,  £Ô,  £±,  £²,  £³,  £´,  £¶,  £µ		; 0x10
+				  NC,  NC,0x62,0x63, 0x64,0x65,0x67,0x66,
+			//	  ¡°,  £¹,  £·,  ¡Ý,  £¸,  £°,  ¡Î,  £Ï 	; 0x18
+				  NC,0x6a,0x68,  NC,0x69,0x6b,  NC,  NC,
+			//	  £Õ,  ¡÷,  £É,  £Ð, ret,  £Ì,  £Ê,  ¡§		; 0x20
+				  NC,  NC,  NC,  NC,  NC,0x3e,  NC,  NC,
+			//	  £Ë,  ¡¨,  ¡Ï,  ¡¤,  ¡¿,  £Î,  £Í,  ¡¥		; 0x28
+				  NC,  NC,  NC,  NC,  NC,  NC,  NC,  NC,
+			//	 TAB, SPC,    ,  BS,    , ESC,    , apl		; 0x30
+				  NC,  NC,  NC,  NC,  NC,  NC,  NC,  NC,
+			//	 sft, cps, alt, ctl,    ,    ,    ,    		; 0x38
+				  NC,  NC,  NC,  NC,  NC,  NC,  NC,  NC,
+			//	    , [.],    , [*],    ,    , [+],    		; 0x40
+				  NC,  NC,  NC,  NC,  NC,  NC,  NC,  NC,
+			//	    ,    ,    ,    , ret,    , [-], clr		; 0x48
+				  NC,  NC,  NC,  NC,  NC,  NC,  NC,  NC,
+			//	    , [=], [0], [1], [2], [3], [4], [5]		; 0x50
+				  NC,  NC,  NC,  NC,  NC,  NC,  NC,  NC,
+			//	 [6], [7],    , [8], [9],  ¡ï,  ¡², [,]		; 0x58
+				  NC,  NC,  NC,  NC,  NC,  NC,  NC,  NC,
+			//	  F5,  F6,  F7,  F3,  F8,  F9,    , F11		; 0x60
+				  NC,  NC,  NC,  NC,  NC,  NC,  NC,  NC,
+			//	    , F13,    , F14,    , F10,    , F12		; 0x68
+				  NC,  NC,  NC,  NC,  NC,  NC,  NC,  NC,
+			//	    , F15, hlp, hom,  ru, del,  F4, end		; 0x70
+				  NC,  NC,  NC,  NC,  NC,0x38,  NC,  NC,
+			//	  F2,  rd,  F1,  ¢«,  ¢ª,  ¢­,  ¢¬,    		; 0x78
+				  NC,  NC,  NC,  NC,  NC,  NC,  NC,  NC};
+#endif