--- np2/win9x/np2.cpp	2004/02/21 17:52:04	1.42
+++ np2/win9x/np2.cpp	2004/06/02 11:02:54	1.54
@@ -43,8 +43,7 @@
 #include	"timing.h"
 #include	"keystat.h"
 #include	"debugsub.h"
-#include	"keydisp.h"
-#include	"kdispwin.h"
+#include	"subwind.h"
 #include	"viewer.h"
 
 
@@ -61,7 +60,12 @@ static	char		szClassName[] = "NP2-MainWi
 		BOOL		winui_en;
 
 		NP2OSCFG	np2oscfg = {
-						"Neko Project II", "NP2",
+#if !defined(SUPPORT_PC9821)
+						"Neko Project II",
+#else
+						"Neko Project 21",
+#endif
+						"NP2",
 						CW_USEDEFAULT, CW_USEDEFAULT, 1, 1, 0, 1, 0, 0,
 						0, 0, KEY_UNKNOWN, 0,
 						0, 0, 0, {1, 2, 2, 1},
@@ -70,7 +74,7 @@ static	char		szClassName[] = "NP2-MainWi
 						{0, 0, 0x3e, 19200, "", "", "", ""},		// ver0.34
 						{0, 0, 0x3e, 19200, "", "", "", ""},		// ver0.34
 						0xffffff, 0xffbf6a, 0, 0,
-						0, 1, 0, 9801, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+						0, 1, 0, 9801, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 
 		char		fddfolder[MAX_PATH];
 		char		hddfolder[MAX_PATH];
@@ -107,13 +111,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;
 		}
@@ -121,7 +129,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) {
@@ -143,6 +151,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);
@@ -204,7 +214,7 @@ static void wincentering(HWND hWnd) {
 	MoveWindow(hWndMain, np2oscfg.winx, np2oscfg.winy, width, height, TRUE);
 }
 
-void np2active_renewal(void) {									// ver0.30
+void np2active_renewal(void) {										// ver0.30
 
 	if (np2break & (~NP2BREAK_MAIN)) {
 		np2stopemulate = 2;
@@ -320,8 +330,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;
@@ -355,6 +363,18 @@ static void np2cmd(HWND hWnd, UINT16 cmd
 			sstpmsg_config();
 			DialogBox(hInst, MAKEINTRESOURCE(IDD_CONFIG),
 									hWnd, (DLGPROC)CfgDialogProc);
+			if (!scrnmng_isfullscreen()) {
+				BYTE thick;
+				thick = (GetWindowLong(hWnd, GWL_STYLE) & WS_THICKFRAME)?1:0;
+				if (thick != np2oscfg.thickframe) {
+					WINLOCEX wlex;
+					wlex = np2_winlocexallwin(hWnd);
+					winlocex_setholdwnd(wlex, hWnd);
+					np2class_frametype(hWnd, np2oscfg.thickframe);
+					winlocex_move(wlex);
+					winlocex_destroy(wlex);
+				}
+			}
 			winuileave();
 			break;
 
@@ -396,6 +416,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);
@@ -572,42 +614,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;
 
@@ -715,6 +764,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);
@@ -734,7 +793,7 @@ static void np2cmd(HWND hWnd, UINT16 cmd
 			winuileave();
 			break;
 
-		case IDM_MIDIPANIC:									// ver0.29
+		case IDM_MIDIPANIC:
 			rs232c_midipanic();
 			mpu98ii_midipanic();
 			pc9861k_midipanic();
@@ -751,13 +810,20 @@ static void np2cmd(HWND hWnd, UINT16 cmd
 			dialog_writebmp(hWnd);
 			winuileave();
 			break;
-
+#if defined(SUPPORT_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;
@@ -878,6 +944,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) {
@@ -887,7 +954,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) &
@@ -922,7 +999,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT
 					viewer_open();
 					break;
 
-				case IDM_SCRNMUL4:								// ver0.26
+				case IDM_SCRNMUL4:
 				case IDM_SCRNMUL6:
 				case IDM_SCRNMUL8:
 				case IDM_SCRNMUL10:
@@ -950,6 +1027,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:
@@ -1142,7 +1227,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT
 			}
 			break;
 
-		case WM_MBUTTONDOWN:									// ver0.26
+		case WM_MBUTTONDOWN:
 			mousemng_toggle(MOUSEPROC_SYSTEM);
 			xmenu_setmouse(np2oscfg.MOUSE_SW ^ 1);
 			sysmng_update(SYS_UPDATECFG);
@@ -1277,6 +1362,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) {
@@ -1305,6 +1392,7 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 	MSG			msg;
 	HWND		hWnd;
 	UINT		i;
+	DWORD		style;
 #ifdef OPENING_WAIT
 	UINT32		tick;
 #endif
@@ -1318,6 +1406,8 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 	initload();
 	toolwin_readini();
 	kdispwin_readini();
+	skbdwin_readini();
+	mdbgwin_readini();
 
 	rand_setseed((unsigned)time(NULL));
 
@@ -1337,7 +1427,7 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 	mmxflag += (np2oscfg.disablemmx)?MMXFLAG_DISABLE:0;
 	TRACEINIT();
 
-	if (np2oscfg.KEYBOARD >= KEY_TYPEMAX) {							// ver0.28
+	if (np2oscfg.KEYBOARD >= KEY_TYPEMAX) {
 		int keytype = GetKeyboardType(1);
 		if ((keytype & 0xff00) == 0x0d00) {
 			np2oscfg.KEYBOARD = KEY_PC98;
@@ -1349,6 +1439,8 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 			np2oscfg.KEYBOARD = KEY_KEY106;
 		}
 	}
+	winkbd_roll(np2oscfg.KEYBOARD != KEY_PC98);
+	winkbd_setf12(np2oscfg.F12COPY);
 	keystat_initialize();
 
 	np2class_initialize(hInstance);
@@ -1369,13 +1461,17 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 	}
 	toolwin_initapp(hInstance);
 	kdispwin_initialize(hPreInst);
+	skbdwin_initialize(hPreInst);
+	mdbgwin_initialize(hPreInst);
 	viewer_init(hPreInst);
 
 	mousemng_initialize();
 
-	hWnd = CreateWindowEx(0, szClassName, np2oscfg.titles,
-						WS_OVERLAPPED | WS_SYSMENU | WS_CAPTION |
-						WS_THICKFRAME | WS_MINIMIZEBOX,
+	style = WS_OVERLAPPED | WS_SYSMENU | WS_CAPTION | WS_MINIMIZEBOX;
+	if (np2oscfg.thickframe) {
+		style |= WS_THICKFRAME;
+	}
+	hWnd = CreateWindowEx(0, szClassName, np2oscfg.titles, style,
 						np2oscfg.winx, np2oscfg.winy, 640, 400,
 						NULL, NULL, hInstance, NULL);
 	hWndMain = hWnd;
@@ -1415,8 +1511,7 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 	xmenu_initialize();
 	DrawMenuBar(hWnd);
 
-	// ver0.30
-	if (file_attr_c(np2help) == (short)-1) {
+	if (file_attr_c(np2help) == (short)-1) {						// ver0.30
 		EnableMenuItem(GetMenu(hWnd), IDM_HELP, MF_GRAYED);
 	}
 
@@ -1425,7 +1520,7 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 	sysmenu_setwinsnap(np2oscfg.WINSNAP);
 	sysmenu_setbackground(np2oscfg.background);
 	sysmenu_setbgsound(np2oscfg.background);
-	sysmenu_setscrnmul(8);										// ver0.26
+	sysmenu_setscrnmul(8);
 
 	scrnmode = 0;
 	if (np2arg.fullscreen) {
@@ -1504,7 +1599,7 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 	}
 #endif
 
-//	リセットしてから… コマンドラインのディスク挿入。				// ver0.29
+//	リセットしてから… コマンドラインのディスク挿入。
 	for (i=0; i<4; i++) {
 		if (np2arg.disk[i]) {
 			milstr_ncpy(diskdrv_fname[i], np2arg.disk[i], MAX_PATH);
@@ -1611,6 +1706,8 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 	}
 	toolwin_destroy();
 	kdispwin_destroy();
+	skbdwin_destroy();
+	mdbgwin_destroy();
 
 	pccore_cfgupdate();
 
@@ -1640,13 +1737,16 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 		initsave();
 		toolwin_writeini();
 		kdispwin_writeini();
+		skbdwin_writeini();
+		mdbgwin_writeini();
 	}
+	skbdwin_deinitialize();
 
 	TRACETERM();
 	_MEM_USED("report.txt");
 	dosio_term();
 
-	viewer_term();												// ver0.30
+	viewer_term();													// ver0.30
 
 	return(msg.wParam);
 }