--- np2/keystat.c	2004/03/30 20:01:29	1.10
+++ np2/keystat.c	2005/02/04 05:32:22	1.16
@@ -5,6 +5,7 @@
 #include	"iocore.h"
 #include	"keystat.h"
 #include	"keystat.tbl"
+#include	"softkbd.h"
 
 
 typedef struct {
@@ -18,7 +19,6 @@ typedef struct {
 	UINT8	d_rt;
 } KEYSTAT;
 
-
 		NKEYTBL		nkeytbl;
 		KEYCTRL		keyctrl;
 static	KEYSTAT		keystat;
@@ -28,6 +28,11 @@ void keystat_initialize(void) {
 
 	char	path[MAX_PATH];
 
+	ZeroMemory(&keyctrl, sizeof(keyctrl));
+	keyctrl.keyrep = 0x21;
+	keyctrl.capsref = NKEYREF_NC;
+	keyctrl.kanaref = NKEYREF_NC;
+
 	ZeroMemory(&keystat, sizeof(keystat));
 	FillMemory(keystat.ref, sizeof(keystat.ref), NKEYREF_NC);
 	keystat_tblreset();
@@ -157,15 +162,41 @@ kstbl_err:
 
 // ----
 
+static REG8 getledstat(void) {
+
+	REG8	ret;
+
+	ret = 0;
+	if (keyctrl.kanaref != NKEYREF_NC) {
+		ret |= 8;
+	}
+	if (keyctrl.capsref != NKEYREF_NC) {
+		ret |= 4;
+	}
+	return(ret);
+}
+
+static void reloadled(void) {
+
+	keyctrl.kanaref = keystat.ref[0x72];
+	keyctrl.capsref = keystat.ref[0x71];
+#if defined(SUPPORT_SOFTKBD)
+	softkbd_led(getledstat());
+#endif
+}
+
 void keystat_ctrlreset(void) {
 
-	ZeroMemory(&keyctrl, sizeof(keyctrl));
+	keyctrl.reqparam = 0;
+	keystat.ref[0x72] = keyctrl.kanaref;
+	keystat.ref[0x71] = keyctrl.capsref;
+#if defined(SUPPORT_SOFTKBD)
+	softkbd_led(getledstat());
+#endif
 }
 
 void keystat_ctrlsend(REG8 dat) {
 
-//	return;					// まだテスト
-
 	if (!keyctrl.reqparam) {
 		keyctrl.mode = dat;
 		switch(dat) {
@@ -202,11 +233,25 @@ void keystat_ctrlsend(REG8 dat) {
 #if defined(SUPPORT_PC9801_119)
 			case 0x95:
 				keyctrl.kbdtype = dat;
+				keyboard_ctrl(0xfa);
 				break;
 #endif
 			case 0x9c:
 				keyboard_ctrl(0xfa);
 				break;
+
+			case 0x9d:
+				if (dat == 0x60) {
+					keyboard_ctrl(0xfa);
+					keyboard_ctrl((REG8)(0x70 + getledstat()));
+				}
+				else if ((dat & 0xf0) == 0x70) {
+					keyboard_ctrl(0xfa);
+					keystat.ref[0x72] = (dat & 8)?NKEYREF_uPD8255:NKEYREF_NC;
+					keystat.ref[0x71] = (dat & 4)?NKEYREF_uPD8255:NKEYREF_NC;
+					reloadled();
+				}
+				break;
 		}
 		keyctrl.reqparam = 0;
 	}
@@ -225,22 +270,36 @@ void keystat_down(const UINT8 *key, REG8
 		keydata = *key++;
 		keycode = (keydata & 0x7f);
 		if (keycode < 0x70) {
+#if 1												// 05/02/04
+			if (keystat.ref[keycode] != NKEYREF_NC) {
+				if (!(kbexflag[keycode] & KBEX_NONREP)) {
+					keyboard_send((REG8)(keycode + 0x80));
+					keystat.ref[keycode] = NKEYREF_NC;
+				}
+			}
+			if (keystat.ref[keycode] == NKEYREF_NC) {
+				keyboard_send(keycode);
+			}
+#else
 			if ((keystat.ref[keycode] == NKEYREF_NC) ||
 				(!(kbexflag[keycode] & KBEX_NONREP))) {
 				keyboard_send(keycode);
 			}
+#endif
 			keystat.ref[keycode] = ref;
 		}
 		else {
 #if defined(SUPPORT_PC9801_119)
-			if ((keyctrl.kbdtype != 0x03) && (keycode >= 0x75)) {
-				continue;
-			}
-#else
-			if (keycode >= 0x75) {
-				continue;
-			}
+			if (keyctrl.kbdtype != 0x03)
 #endif
+			{
+				if (keycode == 0x7d) {
+					keycode = 0x70;
+				}
+				else if (keycode >= 0x75) {
+					continue;
+				}
+			}
 			if ((np2cfg.XSHIFT) &&
 				(((keycode == 0x70) && (np2cfg.XSHIFT & 1)) ||
 				((keycode == 0x74) && (np2cfg.XSHIFT & 2)) ||
@@ -264,6 +323,9 @@ void keystat_down(const UINT8 *key, REG8
 				}
 				keyboard_send(data);
 			}
+			if ((keycode == 0x71) || (keycode == 0x72)) {
+				reloadled();
+			}
 		}
 	}
 }
@@ -284,14 +346,16 @@ void keystat_up(const UINT8 *key, REG8 k
 		}
 		else {
 #if defined(SUPPORT_PC9801_119)
-			if ((keyctrl.kbdtype != 0x03) && (keycode >= 0x75)) {
-				continue;
-			}
-#else
-			if (keycode >= 0x75) {
-				continue;
-			}
+			if (keyctrl.kbdtype != 0x03)
 #endif
+			{
+				if (keycode == 0x7d) {
+					keycode = 0x70;
+				}
+				else if (keycode >= 0x75) {
+					continue;
+				}
+			}
 			if ((np2cfg.XSHIFT) &&
 				(((keycode == 0x70) && (np2cfg.XSHIFT & 1)) ||
 				((keycode == 0x74) && (np2cfg.XSHIFT & 2)) ||
@@ -302,6 +366,9 @@ void keystat_up(const UINT8 *key, REG8 k
 				if (keystat.ref[keycode] != NKEYREF_NC) {
 					keystat.ref[keycode] = NKEYREF_NC;
 					keyboard_send((REG8)(keycode + 0x80));
+					if ((keycode == 0x71) || (keycode == 0x72)) {
+						reloadled();
+					}
 				}
 			}
 		}
@@ -394,9 +461,11 @@ void keystat_resetjoykey(void) {
 void keystat_releasekey(REG8 key) {
 
 	key &= 0x7f;
-	if (keystat.ref[key] != NKEYREF_NC) {
-		keystat.ref[key] = NKEYREF_NC;
-		keyboard_send((REG8)(key + 0x80));
+	if ((key != 0x71) && (key != 0x72)) {
+		if (keystat.ref[key] != NKEYREF_NC) {
+			keystat.ref[key] = NKEYREF_NC;
+			keyboard_send((REG8)(key + 0x80));
+		}
 	}
 }