--- np2/win9x/np2.cpp	2004/02/03 08:24:40	1.37
+++ np2/win9x/np2.cpp	2004/04/16 06:14:57	1.51
@@ -28,7 +28,7 @@
 #include	"juliet.h"
 #include	"np2class.h"
 #include	"dialog.h"
-#include	"memory.h"
+#include	"cpucore.h"
 #include	"pccore.h"
 #include	"iocore.h"
 #include	"pc9861k.h"
@@ -41,9 +41,9 @@
 #include	"diskdrv.h"
 #include	"fddfile.h"
 #include	"timing.h"
+#include	"keystat.h"
 #include	"debugsub.h"
-#include	"keydisp.h"
-#include	"kdispwin.h"
+#include	"subwind.h"
 #include	"viewer.h"
 
 
@@ -106,13 +106,17 @@ static void winuileave(void) {
 
 WINLOCEX np2_winlocexallwin(HWND base) {
 
-	HWND	list[3];
 	UINT	i;
+	UINT	cnt;
+	HWND	list[5];
 
-	list[0] = hWndMain;
-	list[1] = toolwin_gethwnd();
-	list[2] = kdispwin_gethwnd();
-	for (i=0; i<3; i++) {
+	cnt = 0;
+	list[cnt++] = hWndMain;
+	list[cnt++] = toolwin_gethwnd();
+	list[cnt++] = kdispwin_gethwnd();
+	list[cnt++] = skbdwin_gethwnd();
+	list[cnt++] = mdbgwin_gethwnd();
+	for (i=0; i<cnt; i++) {
 		if (list[i] == base) {
 			list[i] = NULL;
 		}
@@ -120,7 +124,7 @@ WINLOCEX np2_winlocexallwin(HWND base) {
 	if (base != hWndMain) {		// hWndMainのみ全体移動
 		base = NULL;
 	}
-	return(winlocex_create(base, list, 3));
+	return(winlocex_create(base, list, cnt));
 }
 
 static void changescreen(BYTE newmode) {
@@ -142,6 +146,8 @@ static void changescreen(BYTE newmode) {
 		if (renewal & SCRNMODE_FULLSCREEN) {
 			toolwin_destroy();
 			kdispwin_destroy();
+			skbdwin_destroy();
+			mdbgwin_destroy();
 		}
 		else if (renewal & SCRNMODE_ROTATEMASK) {
 			wlex = np2_winlocexallwin(hWndMain);
@@ -229,6 +235,10 @@ void np2active_renewal(void) {									/
 	}
 }
 
+
+// ---- resume and statsave
+
+#if defined(SUPPORT_RESUME) || defined(SUPPORT_STATSAVE)
 static void getstatfilename(char *path, const char *ext, int size) {
 
 	file_cpyname(path, modulefile, size);
@@ -271,11 +281,11 @@ static int flagload(const char *ext, con
 	winuienter();
 	id = IDYES;
 	ret = statsave_check(path, buf, sizeof(buf));
-	if (ret & (~NP2FLAG_DISKCHG)) {
+	if (ret & (~STATFLAG_DISKCHG)) {
 		MessageBox(hWndMain, "Couldn't restart", title, MB_OK | MB_ICONSTOP);
 		id = IDNO;
 	}
-	else if ((!force) && (ret & NP2FLAG_DISKCHG)) {
+	else if ((!force) && (ret & STATFLAG_DISKCHG)) {
 		char buf2[1024 + 256];
 		wsprintf(buf2, "Conflict!\n\n%s\nContinue?", buf);
 		id = MessageBox(hWndMain, buf2, title,
@@ -291,6 +301,7 @@ static int flagload(const char *ext, con
 	winuileave();
 	return(id);
 }
+#endif
 
 
 // ---- proc
@@ -314,8 +325,6 @@ static void np2popup(HWND hWnd, LPARAM l
 	DestroyMenu(hMenu);
 }
 
-// extern "C" void iptrace_out(void);
-
 static void np2cmd(HWND hWnd, UINT16 cmd) {
 
 	UINT	update;
@@ -390,6 +399,28 @@ static void np2cmd(HWND hWnd, UINT16 cmd
 			toolwin_setfdd(1, NULL);
 			break;
 
+		case IDM_FDD3OPEN:
+			winuienter();
+			dialog_changefdd(hWnd, 2);
+			winuileave();
+			break;
+
+		case IDM_FDD3EJECT:
+			diskdrv_setfdd(2, NULL, 0);
+			toolwin_setfdd(2, NULL);
+			break;
+
+		case IDM_FDD4OPEN:
+			winuienter();
+			dialog_changefdd(hWnd, 3);
+			winuileave();
+			break;
+
+		case IDM_FDD4EJECT:
+			diskdrv_setfdd(3, NULL, 0);
+			toolwin_setfdd(3, NULL);
+			break;
+
 		case IDM_SASI1OPEN:
 			winuienter();
 			dialog_changehdd(hWnd, 0x00);
@@ -566,30 +597,49 @@ static void np2cmd(HWND hWnd, UINT16 cmd
 		case IDM_F12MOUSE:
 			xmenu_setf12copy(0);
 			winkbd_resetf12();
+			winkbd_setf12(0);
 			update |= SYS_UPDATEOSCFG;
 			break;
 
 		case IDM_F12COPY:
 			xmenu_setf12copy(1);
 			winkbd_resetf12();
+			winkbd_setf12(1);
 			update |= SYS_UPDATEOSCFG;
 			break;
 
 		case IDM_F12STOP:
 			xmenu_setf12copy(2);
 			winkbd_resetf12();
+			winkbd_setf12(2);
 			update |= SYS_UPDATEOSCFG;
 			break;
 
 		case IDM_F12EQU:
 			xmenu_setf12copy(3);
 			winkbd_resetf12();
+			winkbd_setf12(3);
 			update |= SYS_UPDATEOSCFG;
 			break;
 
 		case IDM_F12COMMA:
 			xmenu_setf12copy(4);
 			winkbd_resetf12();
+			winkbd_setf12(4);
+			update |= SYS_UPDATEOSCFG;
+			break;
+
+		case IDM_USERKEY1:
+			xmenu_setf12copy(5);
+			winkbd_resetf12();
+			winkbd_setf12(5);
+			update |= SYS_UPDATEOSCFG;
+			break;
+
+		case IDM_USERKEY2:
+			xmenu_setf12copy(6);
+			winkbd_resetf12();
+			winkbd_setf12(6);
 			update |= SYS_UPDATEOSCFG;
 			break;
 
@@ -697,6 +747,16 @@ static void np2cmd(HWND hWnd, UINT16 cmd
 			update |= SYS_UPDATECFG;
 			break;
 
+		case IDM_MEM116:
+			xmenu_setextmem(11);
+			update |= SYS_UPDATECFG;
+			break;
+
+		case IDM_MEM136:
+			xmenu_setextmem(13);
+			update |= SYS_UPDATECFG;
+			break;
+
 		case IDM_MOUSE:
 			mousemng_toggle(MOUSEPROC_SYSTEM);
 			xmenu_setmouse(np2oscfg.MOUSE_SW ^ 1);
@@ -733,13 +793,20 @@ static void np2cmd(HWND hWnd, UINT16 cmd
 			dialog_writebmp(hWnd);
 			winuileave();
 			break;
-
+#if defined(SUPPPORT_S98)
 		case IDM_S98LOGGING:
 			winuienter();
 			dialog_s98(hWnd);
 			winuileave();
 			break;
-
+#endif
+#if defined(SUPPORT_WAVEREC)
+		case IDM_WAVEREC:
+			winuienter();
+			dialog_waverec(hWnd);
+			winuileave();
+			break;
+#endif
 		case IDM_DISPCLOCK:
 			xmenu_setdispclk(np2oscfg.DISPCLK ^ 1);
 			update |= SYS_UPDATECFG;
@@ -807,18 +874,20 @@ static void np2cmd(HWND hWnd, UINT16 cmd
 			break;
 
 		default:
+#if defined(SUPPORT_STATSAVE)
 			if ((cmd >= IDM_FLAGSAVE) &&
-				(cmd < (IDM_FLAGSAVE + STATSAVEMAX))) {
+				(cmd < (IDM_FLAGSAVE + SUPPORT_STATSAVE))) {
 				char ext[4];
-				wsprintf(ext, np2flagext, cmd - IDM_FLAGSAVE);
+				SPRINTF(ext, np2flagext, cmd - IDM_FLAGSAVE);
 				flagsave(ext);
 			}
-			if ((cmd >= IDM_FLAGLOAD) &&
-				(cmd < (IDM_FLAGLOAD + STATSAVEMAX))) {
+			else if ((cmd >= IDM_FLAGLOAD) &&
+				(cmd < (IDM_FLAGLOAD + SUPPORT_STATSAVE))) {
 				char ext[4];
-				wsprintf(ext, np2flagext, cmd - IDM_FLAGLOAD);
+				SPRINTF(ext, np2flagext, cmd - IDM_FLAGLOAD);
 				flagload(ext, "Status Load", TRUE);
 			}
+#endif
 			break;
 	}
 	sysmng_update(update);
@@ -858,6 +927,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT
 					update |= SYS_UPDATEOSCFG;
 					break;
 
+#if defined(SUPPORT_KEYDISP)
 				case IDM_KEYDISP:
 					sysmenu_setkeydisp(np2oscfg.keydisp ^ 1);
 					if (np2oscfg.keydisp) {
@@ -867,7 +937,17 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT
 						kdispwin_destroy();
 					}
 					break;
-
+#endif
+#if defined(SUPPORT_SOFTKBD)
+				case IDM_SOFTKBD:
+					skbdwin_create();
+					break;
+#endif
+#if defined(CPUCORE_IA32) && defined(SUPPORT_MEMDBG32)
+				case IDM_MEMDBG32:
+					mdbgwin_create();
+					break;
+#endif
 				case IDM_SCREENCENTER:
 					if ((!scrnmng_isfullscreen()) &&
 						(!(GetWindowLong(hWnd, GWL_STYLE) &
@@ -930,6 +1010,14 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT
 					if (subwin) {
 						ShowWindow(subwin, SW_SHOWNOACTIVATE);
 					}
+					subwin = skbdwin_gethwnd();
+					if (subwin) {
+						ShowWindow(subwin, SW_SHOWNOACTIVATE);
+					}
+					subwin = mdbgwin_gethwnd();
+					if (subwin) {
+						ShowWindow(subwin, SW_SHOWNOACTIVATE);
+					}
 					return(DefWindowProc(hWnd, msg, wParam, lParam));
 
 				default:
@@ -997,14 +1085,13 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT
 			break;
 
 		case WM_MOVE:
-			if (!scrnmng_isfullscreen()) {
-				if (!(GetWindowLong(hWnd, GWL_STYLE) &
-											(WS_MAXIMIZE | WS_MINIMIZE))) {
-					GetWindowRect(hWnd, &rc);
-					np2oscfg.winx = rc.left;
-					np2oscfg.winy = rc.top;
-					sysmng_update(SYS_UPDATEOSCFG);
-				}
+			if ((!scrnmng_isfullscreen()) &&
+				(!(GetWindowLong(hWnd, GWL_STYLE) &
+									(WS_MAXIMIZE | WS_MINIMIZE)))) {
+				GetWindowRect(hWnd, &rc);
+				np2oscfg.winx = rc.left;
+				np2oscfg.winy = rc.top;
+				sysmng_update(SYS_UPDATEOSCFG);
 			}
 			break;
 
@@ -1258,6 +1345,8 @@ static void framereset(UINT cnt) {
 	framecnt = 0;
 	scrnmng_dispclock();
 	kdispwin_draw((BYTE)cnt);
+	skbdwin_process();
+	mdbgwin_process();
 	toolwin_draw((BYTE)cnt);
 	viewer_allreload(FALSE);
 	if (np2oscfg.DISPCLK & 3) {
@@ -1299,6 +1388,8 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 	initload();
 	toolwin_readini();
 	kdispwin_readini();
+	skbdwin_readini();
+	mdbgwin_readini();
 
 	rand_setseed((unsigned)time(NULL));
 
@@ -1330,7 +1421,9 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 			np2oscfg.KEYBOARD = KEY_KEY106;
 		}
 	}
-	keystat_reset();
+	winkbd_roll(np2oscfg.KEYBOARD != KEY_PC98);
+	winkbd_setf12(np2oscfg.F12COPY);
+	keystat_initialize();
 
 	np2class_initialize(hInstance);
 	if (!hPreInst) {
@@ -1350,24 +1443,18 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 	}
 	toolwin_initapp(hInstance);
 	kdispwin_initialize(hPreInst);
+	skbdwin_initialize(hPreInst);
+	mdbgwin_initialize(hPreInst);
 	viewer_init(hPreInst);
 
-#if 1
-	hWndMain = CreateWindowEx(0,
-						szClassName, np2oscfg.titles,
+	mousemng_initialize();
+
+	hWnd = CreateWindowEx(0, szClassName, np2oscfg.titles,
 						WS_OVERLAPPED | WS_SYSMENU | WS_CAPTION |
 						WS_THICKFRAME | WS_MINIMIZEBOX,
 						np2oscfg.winx, np2oscfg.winy, 640, 400,
 						NULL, NULL, hInstance, NULL);
-#else	// テスト
-	hWndMain = CreateWindowEx(0,
-						szClassName, np2oscfg.titles,
-						WS_OVERLAPPED | WS_SYSMENU | WS_CAPTION |
-						WS_MINIMIZEBOX,
-						np2oscfg.winx, np2oscfg.winy, 640, 400,
-						NULL, NULL, hInstance, NULL);
-#endif
-	hWnd = hWndMain;
+	hWndMain = hWnd;
 	scrnmng_initialize();
 
 	xmenu_setroltate(0);
@@ -1392,7 +1479,6 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 	xmenu_setbtnrapid(np2cfg.BTN_RAPID);
 	xmenu_setmsrapid(np2cfg.MOUSERAPID);
 	xmenu_setsstp(np2oscfg.sstp);
-	xmenu_seti286save(np2oscfg.I286SAVE);
 
 	ShowWindow(hWnd, nCmdShow);
 	UpdateWindow(hWnd);
@@ -1446,17 +1532,14 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 		juliet_initialize();
 	}
 
-	mousemng_initialize();
 	if (np2oscfg.MOUSE_SW) {										// ver0.30
 		mousemng_enable(MOUSEPROC_SYSTEM);
 	}
-//	mousemng_enable(MOUSEPROC_WINUI);
-//	mousemng_enable(MOUSEPROC_BG);
 
 	commng_initialize();
 	sysmng_initialize();
 
-	joy_init();
+	joymng_initialize();
 	pccore_init();
 	S98_init();
 
@@ -1473,6 +1556,7 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 	np2opening = 0;
 
 	// れじうむ
+#if defined(SUPPORT_RESUME)
 	if (np2oscfg.resume) {
 		int		id;
 
@@ -1494,6 +1578,7 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 			return(0);
 		}
 	}
+#endif
 
 //	リセットしてから… コマンドラインのディスク挿入。				// ver0.29
 	for (i=0; i<4; i++) {
@@ -1527,8 +1612,8 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 			}
 			else {
 				if (np2oscfg.NOWAIT) {
-					joy_flash();
-					mousemng_callback();
+					joymng_sync();
+					mousemng_sync();
 					pccore_exec(framecnt == 0);
 					dclock_callback();
 					if (np2oscfg.DRAW_SKIP) {		// nowait frame skip
@@ -1546,8 +1631,8 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 				}
 				else if (np2oscfg.DRAW_SKIP) {		// frame skip
 					if (framecnt < np2oscfg.DRAW_SKIP) {
-						joy_flash();
-						mousemng_callback();
+						joymng_sync();
+						mousemng_sync();
 						pccore_exec(framecnt == 0);
 						dclock_callback();
 						framecnt++;
@@ -1559,8 +1644,8 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 				else {								// auto skip
 					if (!waitcnt) {
 						UINT cnt;
-						joy_flash();
-						mousemng_callback();
+						joymng_sync();
+						mousemng_sync();
 						pccore_exec(framecnt == 0);
 						dclock_callback();
 						framecnt++;
@@ -1602,18 +1687,22 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 	}
 	toolwin_destroy();
 	kdispwin_destroy();
+	skbdwin_destroy();
+	mdbgwin_destroy();
 
 	pccore_cfgupdate();
 
 	mousemng_disable(MOUSEPROC_WINUI);
 	S98_trash();
 
+#if defined(SUPPORT_RESUME)
 	if (np2oscfg.resume) {
 		flagsave(str_sav);
 	}
 	else {
 		flagdelete(str_sav);
 	}
+#endif
 
 	juliet_YMF288Reset();
 	pccore_term();
@@ -1629,7 +1718,10 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 		initsave();
 		toolwin_writeini();
 		kdispwin_writeini();
+		skbdwin_writeini();
+		mdbgwin_writeini();
 	}
+	skbdwin_deinitialize();
 
 	TRACETERM();
 	_MEM_USED("report.txt");