--- np2/io/serial.c	2003/10/16 17:57:57	1.1
+++ np2/io/serial.c	2003/11/13 07:47:17	1.5
@@ -1,7 +1,5 @@
 #include	"compiler.h"
-#include	"dosio.h"
 #include	"commng.h"
-#include	"memory.h"
 #include	"pccore.h"
 #include	"iocore.h"
 
@@ -98,11 +96,16 @@ void keystat_reset(void) {
 	ZeroMemory(keystat, sizeof(keystat));
 }
 
+
 void keystat_senddata(BYTE data) {
 
-	BYTE	key = data & 0x7f;
-	BOOL	keynochange = FALSE;
+	BYTE	key;
+	BOOL	keynochange;
+
+	key = data & 0x7f;
+	keynochange = FALSE;
 
+	// CTRL:カナ 0x71,0x72 bit7==0でトルグ処理 (標準処理)
 	if ((key == 0x71) || (key == 0x72)) {
 		if (data & 0x80) {
 			return;
@@ -112,9 +115,9 @@ void keystat_senddata(BYTE data) {
 	}
 	else {
 		if ((np2cfg.XSHIFT) &&
-			((key == 0x70) && (np2cfg.XSHIFT & 1)) ||
+			(((key == 0x70) && (np2cfg.XSHIFT & 1)) ||
 			((key == 0x74) && (np2cfg.XSHIFT & 2)) ||
-			((key == 0x73) && (np2cfg.XSHIFT & 4))) {
+			((key == 0x73) && (np2cfg.XSHIFT & 4)))) {
 			if (data & 0x80) {
 				return;
 			}
@@ -122,6 +125,12 @@ void keystat_senddata(BYTE data) {
 			keystat[key] ^= 0x80;
 		}
 		else {
+			// CTRL:カナ 0x79,0x7a bit7をそのまま通知
+			// (ハードウェアでメカニカル処理してる場合)
+			if ((key == 0x79) || (key == 0x7a)) {
+				key -= 0x08;
+				data -= 0x08;
+			}
 			if (!((keystat[key] ^ data) & 0x80)) {
 				keystat[key] ^= 0x80;
 			}
@@ -156,6 +165,18 @@ void keystat_resetcopyhelp(void) {
 	}
 }
 
+void keystat_allrelease(void) {
+
+	UINT	i;
+
+	for (i=0; i<0x80; i++) {
+		if (keystat[i] & 0x80) {
+			keystat[i] &= ~0x80;
+			keyb_out((BYTE)(i + 0x80));
+		}
+	}
+}
+
 void keystat_forcerelease(BYTE value) {
 
 	if (keystat[value & 0x7f] & 0x80) {
@@ -178,17 +199,114 @@ void keystat_resetjoykey(void) {
 	}
 }
 
-BYTE keystat_getjoy(void) {
 
-	BYTE	ret = 0xff;
-	BYTE	*p = (BYTE *)joykeytable;
+// ----
+
+typedef struct {
+	BYTE	joysync;
+	BYTE	joylast;
+	BYTE	mouselast;
+	BYTE	padding;
+	BYTE	d_up;
+	BYTE	d_dn;
+	BYTE	d_lt;
+	BYTE	d_rt;
+} KEYEXT;
+
+static	KEYEXT	keyext;
+static const BYTE mousedelta[] = {1, 1, 1, 1,
+									2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 4};
+#define	MOUSESTEPMAX ((sizeof(mousedelta) / sizeof(BYTE)) - 1)
+
+void keyext_flash(void) {
+
+	keyext.joysync = 0;
+}
+
+BYTE keyext_getjoy(void) {
+
+	BYTE	flg;
+const BYTE	*p;
 	BYTE	bit;
 
-	for (bit=0x20; bit; bit>>=1, p+=2) {
-		if ((keystat[*p] & 0x80) || (keystat[*(p+1)] & 0x80)) {
-			ret &= ~bit;
+	if (!keyext.joysync) {
+		keyext.joysync = 1;
+		flg = 0xff;
+		p = joykeytable;
+		for (bit=0x20; bit; bit>>=1) {
+			if ((keystat[p[0]] & 0x80) || (keystat[p[1]] & 0x80)) {
+				flg ^= bit;
+			}
+			p += 2;
 		}
+		keyext.joylast = flg;
 	}
+	return(keyext.joylast);
+}
+
+BYTE keyext_getmouse(SINT16 *x, SINT16 *y) {
+
+	BYTE	btn;
+	BYTE	acc;
+	SINT16	tmp;
+	BYTE	ret;
+
+	btn = keyext_getjoy();
+	acc = btn | keyext.mouselast;
+	keyext.mouselast = btn;
+	tmp = 0;
+	if (!(btn & 1)) {
+		tmp -= mousedelta[keyext.d_up];
+	}
+	if (!(acc & 1)) {
+		if (keyext.d_up < MOUSESTEPMAX) {
+			keyext.d_up++;
+		}
+	}
+	else {
+		keyext.d_up = 0;
+	}
+	if (!(btn & 2)) {
+		tmp += mousedelta[keyext.d_dn];
+	}
+	if (!(acc & 2)) {
+		if (keyext.d_dn < MOUSESTEPMAX) {
+			keyext.d_dn++;
+		}
+	}
+	else {
+		keyext.d_dn = 0;
+	}
+	*y += tmp;
+
+	tmp = 0;
+	if (!(btn & 4)) {
+		tmp -= mousedelta[keyext.d_lt];
+	}
+	if (!(acc & 4)) {
+		if (keyext.d_lt < MOUSESTEPMAX) {
+			keyext.d_lt++;
+		}
+	}
+	else {
+		keyext.d_lt = 0;
+	}
+	if (!(btn & 8)) {
+		tmp += mousedelta[keyext.d_rt];
+	}
+	if (!(acc & 8)) {
+		if (keyext.d_rt < MOUSESTEPMAX) {
+			keyext.d_rt++;
+		}
+	}
+	else {
+		keyext.d_rt = 0;
+	}
+	*x += tmp;
+
+	ret = 0x5f;
+	ret += (btn & 0x10) << 3;
+	ret += (btn & 0x20);
 	return(ret);
 }
 
@@ -288,6 +406,7 @@ void rs232c_callback(void) {
 
 	BOOL	interrupt;
 
+	interrupt = FALSE;
 	if ((cm_rs232c) && (cm_rs232c->read(cm_rs232c, &rs232c.data))) {
 		rs232c.result |= 2;
 		if (sysport.c & 1) {