--- np2/macos9/np2.cpp	2004/01/12 08:01:00	1.24
+++ np2/macos9/np2.cpp	2004/05/21 14:30:32	1.35
@@ -20,6 +20,7 @@
 #include	"pc9861k.h"
 #include	"mpu98ii.h"
 #include	"timing.h"
+#include	"keystat.h"
 #include	"debugsub.h"
 #include	"bios.h"
 #include	"scrndraw.h"
@@ -28,7 +29,6 @@
 #include	"s98.h"
 #include	"diskdrv.h"
 #include	"fddfile.h"
-#include	"statsave.h"
 
 
 #define	USE_RESUME
@@ -53,6 +53,11 @@ static	BYTE		scrnmode;
 #endif
 static	char	target[MAX_PATH] = DEFAULTPATH;
 
+#if !defined(SUPPORT_PC9821)
+static const char np2app[] = "np2";
+#else
+static const char np2app[] = "np21";
+#endif
 
 static const char np2resume[] = "sav";
 
@@ -110,8 +115,30 @@ static void MenuBarInit(void) {
 	if (hmenu) {
 		AppendResMenu(hmenu, 'DRVR');
 	}
+#if !defined(SUPPORT_SCSI)
+	hmenu = GetMenuHandle(IDM_HARDDISK);
+	if (hmenu) {
+		DeleteMenuItem(hmenu, 7);
+		DeleteMenuItem(hmenu, 6);
+		DeleteMenuItem(hmenu, 5);
+		DeleteMenuItem(hmenu, 4);
+		DeleteMenuItem(hmenu, 3);
+	}
+#endif
+	if (!np2oscfg.I286SAVE) {
+		hmenu = GetMenuHandle(IDM_OTHER);
+		if (hmenu) {
+			DeleteMenuItem(hmenu, 9);
+		}
+	}
 	InsertMenu(GetMenu(IDM_SASI1), -1);
 	InsertMenu(GetMenu(IDM_SASI2), -1);
+#if defined(SUPPORT_SCSI)
+	InsertMenu(GetMenu(IDM_SCSI0), -1);
+	InsertMenu(GetMenu(IDM_SCSI1), -1);
+	InsertMenu(GetMenu(IDM_SCSI2), -1);
+	InsertMenu(GetMenu(IDM_SCSI3), -1);
+#endif
 	InsertMenu(GetMenu(IDM_KEYBOARD), -1);
 	InsertMenu(GetMenu(IDM_SOUND), -1);
 	InsertMenu(GetMenu(IDM_MEMORY), -1);
@@ -129,6 +156,20 @@ static void MenuBarInit(void) {
 	EnableItem(GetMenuHandle(IDM_DEVICE), LoWord(IDM_MOUSE));
 	EnableItem(GetMenuHandle(IDM_KEYBOARD), LoWord(IDM_F12MOUSE));
 #endif
+
+	if (!(np2cfg.fddequip & 1)) {
+		DeleteMenu(IDM_FDD1);
+	}
+	if (!(np2cfg.fddequip & 2)) {
+		DeleteMenu(IDM_FDD2);
+	}
+	if (!(np2cfg.fddequip & 4)) {
+		DeleteMenu(IDM_FDD3);
+	}
+	if (!(np2cfg.fddequip & 8)) {
+		DeleteMenu(IDM_FDD4);
+	}
+
 	DrawMenuBar();
 }
 
@@ -185,20 +226,68 @@ static void HandleMenuChoice(long wParam
 			diskdrv_setfdd(1, NULL, 0);
 			break;
 
+		case IDM_FDD3OPEN:
+			dialog_changefdd(2);
+			break;
+
+		case IDM_FDD3EJECT:
+			diskdrv_setfdd(2, NULL, 0);
+			break;
+
+		case IDM_FDD4OPEN:
+			dialog_changefdd(3);
+			break;
+
+		case IDM_FDD4EJECT:
+			diskdrv_setfdd(3, NULL, 0);
+			break;
+
 		case IDM_SASI1OPEN:
-			dialog_changehdd(0);
+			dialog_changehdd(0x00);
 			break;
 
 		case IDM_SASI1REMOVE:
-			diskdrv_sethdd(0, NULL);
+			diskdrv_sethdd(0x00, NULL);
 			break;
 
 		case IDM_SASI2OPEN:
-			dialog_changehdd(1);
+			dialog_changehdd(0x01);
 			break;
 
 		case IDM_SASI2REMOVE:
-			diskdrv_sethdd(1, NULL);
+			diskdrv_sethdd(0x01, NULL);
+			break;
+
+		case IDM_SCSI0OPEN:
+			dialog_changehdd(0x20);
+			break;
+
+		case IDM_SCSI0REMOVE:
+			diskdrv_sethdd(0x20, NULL);
+			break;
+
+		case IDM_SCSI1OPEN:
+			dialog_changehdd(0x21);
+			break;
+
+		case IDM_SCSI1REMOVE:
+			diskdrv_sethdd(0x21, NULL);
+			break;
+
+		case IDM_SCSI2OPEN:
+			dialog_changehdd(0x22);
+			break;
+
+		case IDM_SCSI2REMOVE:
+			diskdrv_sethdd(0x22, NULL);
+			break;
+
+		case IDM_SCSI3OPEN:
+			dialog_changehdd(0x23);
+			break;
+
+		case IDM_SCSI3REMOVE:
+			diskdrv_sethdd(0x23, NULL);
 			break;
 
 		case IDM_ROLNORMAL:
@@ -268,6 +357,10 @@ static void HandleMenuChoice(long wParam
 			update |= SYS_UPDATECFG;
 			break;
 
+		case IDM_MIDIOPT:
+			MPU98DialogProc();
+			break;
+
 		case IDM_MIDIPANIC:
 			rs232c_midipanic();
 			mpu98ii_midipanic();
@@ -334,6 +427,12 @@ static void HandleMenuChoice(long wParam
 			update |= SYS_UPDATEOSCFG;
 			break;
 
+		case IDM_F11USER:
+			menu_setf11key(4);
+			mackbd_resetf11();
+			update |= SYS_UPDATEOSCFG;
+			break;
+
 		case IDM_F12MOUSE:
 			menu_setf12key(0);
 			mackbd_resetf12();
@@ -352,6 +451,12 @@ static void HandleMenuChoice(long wParam
 			update |= SYS_UPDATEOSCFG;
 			break;
 
+		case IDM_F12USER:
+			menu_setf12key(4);
+			mackbd_resetf12();
+			update |= SYS_UPDATEOSCFG;
+			break;
+
 		case IDM_BEEPOFF:
 			menu_setbeepvol(0);
 			beep_setvol(0);
@@ -460,6 +565,10 @@ static void HandleMenuChoice(long wParam
 			dialog_writebmp();
 			break;
 
+		case IDM_CALENDAR:
+			CalendarDialogProc();
+			break;
+
 		case IDM_DISPCLOCK:
 			menu_setdispclk(np2oscfg.DISPCLK ^ 1);
 			update |= SYS_UPDATECFG;
@@ -641,7 +750,7 @@ static void processwait(UINT waitcnt) {
 
 static void getstatfilename(char *path, const char *ext, int size) {
 
-	file_cpyname(path, file_getcd("np2"), size);
+	file_cpyname(path, file_getcd(np2app), size);
 	file_catname(path, str_dot, size);
 	file_catname(path, ext, size);
 }
@@ -672,11 +781,11 @@ static int flagload(const char *ext) {
 	ret = IDOK;
 	getstatfilename(path, ext, sizeof(path));
 	r = statsave_check(path, buf, sizeof(buf));
-	if (r & (~NP2FLAG_DISKCHG)) {
+	if (r & (~STATFLAG_DISKCHG)) {
 		ResumeErrorDialogProc();
 		ret = IDCANCEL;
 	}
-	else if (r & NP2FLAG_DISKCHG) {
+	else if (r & STATFLAG_DISKCHG) {
 		ret = ResumeWarningDialogProc(buf);
 	}
 	if (ret == IDOK) {
@@ -698,15 +807,22 @@ int main(int argc, char *argv[]) {
 
 	InitToolBox();
 	macossub_init();
-	MenuBarInit();
-
 	initload();
 
+	MenuBarInit();
+
 	TRACEINIT();
 
+	keystat_initialize();
+
 	SetRect(&wRect, np2oscfg.posx, np2oscfg.posy, 100, 100);
+#if !defined(SUPPORT_PC9821)
 	hWndMain = NewWindow(0, &wRect, "\pNeko Project II", FALSE,
 								noGrowDocProc, (WindowPtr)-1, TRUE, 0);
+#else
+	hWndMain = NewWindow(0, &wRect, "\pNeko Project 21", FALSE,
+								noGrowDocProc, (WindowPtr)-1, TRUE, 0);
+#endif
 	if (!hWndMain) {
 		TRACETERM();
 		macossub_term();