--- np2/keystat.tbl	2004/02/18 18:29:29	1.2
+++ np2/keystat.tbl	2004/03/28 10:50:16	1.4
@@ -91,7 +91,7 @@ static const KEYNAME keyname[] = {
 		{0x4a, "[1]"},
 		{0x4b, "[2]"},
 		{0x4c, "[3]"},
-		{0x4d, "[=]"},
+		{0x4d, "[=]"},	{0x4d, "[EQU]"},
 		{0x4e, "[0]"},
 		{0x4f, "[,]"},
 
@@ -121,7 +121,13 @@ static const KEYNAME keyname[] = {
 		{0x71, "CAPS"},
 		{0x72, "KANA"},
 		{0x73, "GRPH"}, {0x73, "ALT"},
-		{0x74, "CTRL"}};
+		{0x74, "CTRL"},
+		{0x77, "LWIN"},
+
+		{0x78, "RWIN"},
+		{0x79, "APP"},
+		{0x7d, "RSHIFT"}};
+
 
 
 // ----
@@ -134,7 +140,12 @@ static const UINT8 joykeytable[12] = {
 				0x3d,	0x4b,
 				0x3a,	0x43};
 
-static const UINT8 kbexflag[0x80] = {
+enum {
+	KBEX_JOYKEY		= 0x40,
+	KBEX_NONREP		= 0x80
+};
+
+static const UINT8 kbexflag[NKEY_SYSTEM] = {
 		//	 ESC,  £±,  £²,  £³,  £´,  £µ,  £¶,  £·		; 00h
 			   0,   0,   0,   0,   0,   0,   0,   0,
 		//	  £¸,  £¹,  £°,  ¡Ý,  ¡°,  ¡ï,  BS, TAB		; 08h
@@ -142,30 +153,34 @@ static const UINT8 kbexflag[0x80] = {
 		//	  £Ñ,  £×,  £Å,  £Ò,  £Ô,  £Ù,  £Õ,  £É		; 10h
 			   0,   0,   0,   0,   0,   0,   0,   0,
 		//	  £Ï,  £Ð,  ¡÷,  ¡Î, Ret,  £Á,  £Ó,  £Ä		; 18h
-			   0,   0,   0,   0,   1,   0,   0,   0,
+			   0,   0,   0,   0,0x44,   0,   0,   0,
 		//	  £Æ,  £Ç,  £È,  £Ê,  £Ë,  £Ì,  ¡¨,  ¡§		; 20h
 			   0,   0,   0,   0,   0,   0,   0,   0,
 		//    ¡Ï,  £Ú,  £Ø,  £Ã,  £Ö,  £Â,  £Î,  £Í		; 28h
-			   0,   1,   1,   0,   0,   0,   0,   0,
+			   0,0x44,0x45,   0,   0,   0,   0,   0,
 		//    ¡¤,  ¡¥,  ¡¿,  ¡², SPC,XFER,RLUP,RLDN		; 30h
-			   0,   0,   0,   0,   1,   0,   0,   0,
+			   0,   0,   0,   0,0x45,   0,   0,   0,
 		//	 INS, DEL,  ¢¬,  ¢«,  ¢ª,  ¢­,HMCR,HELP		; 38h
-			   2,   0,   1,   1,   1,   1,   0,   0,
+			   2,   0,0x40,0x42,0x43,0x41,   0,   0,
 		//	<¡Ý>,<¡¿>,<£·>,<£¸>,<£¹>,<¡ö>,<£´>,<£µ>		; 40h
-			   0,   0,   0,   1,   0,   0,   1,   0,
+			   0,   0,   0,0x40,   0,   0,0x42,   0,
 		//	<£¶>,<¡Ü>,<£±>,<£²>,<£³>,<¡á>,<£°>,<¡¤>		; 48h
-			   1,   0,   0,   1,   0,   0,   0,   0,
+			0x43,   0,   0,0x41,   0,   0,   0,   0,
 		//	<¡¥>,NFER,vf.1,vf.2,vf.3,vf.4,vf.5,   		; 50h
-			   0,   0,   2,   2,   2,   2,   2,   0,
+			   0,   0,0x80,0x80,0x80,0x80,0x80,   0,
 		//	    ,    ,    ,    ,    ,    ,HOME,   		; 58h
 			   0,   0,   0,   0,   0,   0,   0,   0,
 		//	STOP,COPY, f.1, f.2, f.3, f.4, f.5, f.6		; 60h
-			   0,   0,   2,   2,   2,   2,   2,   2,
+			   0,   0,0x80,0x80,0x80,0x80,0x80,0x80,
 		//	 f.7, f.8, f.9, f10,    ,    ,    ,   		; 68h
-			   2,   2,   2,   2,   0,   0,   0,   0,
+			0x80,0x80,0x80,0x80,   0,   0,   0,   0,
 		//	 SFT,CAPS,KANA,GRPH,CTRL,    ,    ,   		; 70h
-			   2,   2,   2,   2,   2,   0,   0,   0,
+			0x80,0x80,0x80,0x80,0x80,   0,   0,   0,
 		//	    ,    ,    ,    ,    ,    ,    ,   		; 78h
+			   0,   0,   0,   0,   0,   0,   0,   0,
+		//	    ,    ,    ,    ,    ,    ,    ,   		; 80h
+			   0,   0,   0,   0,   0,   0,   0,   0,
+		//	    ,    ,    ,    ,    ,    ,    ,   		; 88h
 			   0,   0,   0,   0,   0,   0,   0,   0};