--- np2/macos9/np2.cpp	2003/11/09 21:57:04	1.11
+++ np2/macos9/np2.cpp	2004/02/13 09:07:42	1.28
@@ -28,13 +28,12 @@
 #include	"s98.h"
 #include	"diskdrv.h"
 #include	"fddfile.h"
-#include	"statsave.h"
 
 
 #define	USE_RESUME
 
 
-		NP2OSCFG	np2oscfg = {0, 2, 0, 0,  0, 0, 0};
+		NP2OSCFG	np2oscfg = {100, 100,  0, 0, 0, 0,  0, 0, 0, 0, 0};
 
 		WindowPtr	hWndMain;
 		BOOL		np2running;
@@ -98,32 +97,58 @@ static void InitToolBox(void) {
 
 static void MenuBarInit(void) {
 
-	Handle		hMenu;
-	MenuHandle	happlemenu;
+	Handle		hdl;
+	MenuHandle	hmenu;
 
-	hMenu = GetNewMBar(IDM_MAINMENU);
-	if (!hMenu) {
+	hdl = GetNewMBar(IDM_MAINMENU);
+	if (hdl == NULL) {
 		ExitToShell();
 	}
-	SetMenuBar(hMenu);
-	happlemenu = GetMenuHandle(IDM_APPLE);
-	if (happlemenu) {
-		AppendResMenu(happlemenu, 'DRVR');
+	SetMenuBar(hdl);
+	hmenu = GetMenuHandle(IDM_APPLE);
+	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);
-	SetMenuItemModifiers(GetMenuHandle(IDM_FDD2), LoWord(IDM_FDD2OPEN),
-														kMenuOptionModifier);
-	SetMenuItemModifiers(GetMenuHandle(IDM_FDD2), LoWord(IDM_FDD2EJECT),
-														kMenuOptionModifier);
-	SetMenuItemModifiers(GetMenuHandle(IDM_SASI2), LoWord(IDM_SASI2OPEN),
-														kMenuOptionModifier);
+
 #if TARGET_API_MAC_CARBON
-	DisableMenuItem(GetMenuHandle(IDM_DEVICE), LoWord(IDM_MOUSE));
-	DisableMenuItem(GetMenuHandle(IDM_KEYBOARD), LoWord(IDM_F12MOUSE));
+	hmenu = GetMenuHandle(IDM_FDD2);
+	SetItemCmd(hmenu, LoWord(IDM_FDD2OPEN), 'D');
+	SetMenuItemModifiers(hmenu, LoWord(IDM_FDD2OPEN), kMenuShiftModifier);
+	SetItemCmd(hmenu, LoWord(IDM_FDD2EJECT), 'E');
+	SetMenuItemModifiers(hmenu, LoWord(IDM_FDD2EJECT), kMenuShiftModifier);
+	hmenu = GetMenuHandle(IDM_SASI2);
+	SetItemCmd(hmenu, LoWord(IDM_SASI2OPEN), 'O');
+	SetMenuItemModifiers(hmenu, LoWord(IDM_SASI2OPEN), kMenuShiftModifier);
+#else
+	EnableItem(GetMenuHandle(IDM_DEVICE), LoWord(IDM_MOUSE));
+	EnableItem(GetMenuHandle(IDM_KEYBOARD), LoWord(IDM_F12MOUSE));
 #endif
 	DrawMenuBar();
 }
@@ -182,19 +207,51 @@ static void HandleMenuChoice(long wParam
 			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:
@@ -258,10 +315,10 @@ static void HandleMenuChoice(long wParam
 			dialog_scropt();
 			break;
 
-        case IDM_MOUSE:
+		case IDM_MOUSE:
 			mousemng_toggle(MOUSEPROC_SYSTEM);
-            menu_setmouse(np2oscfg.MOUSE_SW ^ 1);
-            sysmng_update(SYS_UPDATECFG);
+			menu_setmouse(np2oscfg.MOUSE_SW ^ 1);
+			update |= SYS_UPDATECFG;
 			break;
 
 		case IDM_MIDIPANIC:
@@ -273,54 +330,91 @@ static void HandleMenuChoice(long wParam
 		case IDM_KEY:
 			menu_setkey(0);
 			keystat_resetjoykey();
+			update |= SYS_UPDATECFG;
 			break;
 
 		case IDM_JOY1:
 			menu_setkey(1);
 			keystat_resetjoykey();
+			update |= SYS_UPDATECFG;
 			break;
 
 		case IDM_JOY2:
 			menu_setkey(2);
 			keystat_resetjoykey();
+			update |= SYS_UPDATECFG;
 			break;
 
 		case IDM_MOUSEKEY:
 			menu_setkey(3);
 			keystat_resetjoykey();
+			update |= SYS_UPDATECFG;
 			break;
 
 		case IDM_XSHIFT:
 			menu_setxshift(np2cfg.XSHIFT ^ 1);
 			keystat_forcerelease(0x70);
+			update |= SYS_UPDATECFG;
 			break;
 
 		case IDM_XCTRL:
 			menu_setxshift(np2cfg.XSHIFT ^ 2);
 			keystat_forcerelease(0x74);
+			update |= SYS_UPDATECFG;
 			break;
 
 		case IDM_XGRPH:
 			menu_setxshift(np2cfg.XSHIFT ^ 4);
 			keystat_forcerelease(0x73);
+			update |= SYS_UPDATECFG;
+			break;
+
+		case IDM_F11KANA:
+			menu_setf11key(0);
+			mackbd_resetf11();
+			update |= SYS_UPDATEOSCFG;
+			break;
+
+		case IDM_F11STOP:
+			menu_setf11key(1);
+			mackbd_resetf11();
+			update |= SYS_UPDATEOSCFG;
+			break;
+
+		case IDM_F11NFER:
+			menu_setf11key(3);
+			mackbd_resetf11();
+			update |= SYS_UPDATEOSCFG;
+			break;
+
+		case IDM_F11USER:
+			menu_setf11key(4);
+			mackbd_resetf11();
+			update |= SYS_UPDATEOSCFG;
 			break;
 
 		case IDM_F12MOUSE:
-			menu_setf12copy(0);
-			keystat_resetcopyhelp();
-			update |= SYS_UPDATECFG;
+			menu_setf12key(0);
+			mackbd_resetf12();
+			update |= SYS_UPDATEOSCFG;
 			break;
 
 		case IDM_F12COPY:
-			menu_setf12copy(1);
-			keystat_resetcopyhelp();
-			update |= SYS_UPDATECFG;
+			menu_setf12key(1);
+			mackbd_resetf12();
+			update |= SYS_UPDATEOSCFG;
 			break;
 
-		case IDM_F12STOP:
-			menu_setf12copy(2);
-			keystat_resetcopyhelp();
-			update |= SYS_UPDATECFG;
+		case IDM_F12XFER:
+			menu_setf12key(3);
+			mackbd_resetf12();
+			update |= SYS_UPDATEOSCFG;
+			break;
+
+		case IDM_F12USER:
+			menu_setf12key(4);
+			mackbd_resetf12();
+			update |= SYS_UPDATEOSCFG;
 			break;
 
 		case IDM_BEEPOFF:
@@ -392,6 +486,16 @@ static void HandleMenuChoice(long wParam
 			update |= SYS_UPDATECFG;
 			break;
 
+		case IDM_AMD98:
+			menu_setsound(0x80);
+			update |= SYS_UPDATECFG;
+			break;
+
+		case IDM_JASTSND:
+			menu_setjastsnd(np2oscfg.jastsnd ^ 1);
+			update |= SYS_UPDATEOSCFG;
+			break;
+
 		case IDM_SEEKSND:
 			menu_setmotorflg(np2cfg.MOTOR ^ 1);
 			update |= SYS_UPDATECFG;
@@ -421,6 +525,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;
@@ -483,7 +591,9 @@ static void HandleMouseDown(EventRecord 
 		case inMenuBar:
 			if (np2running) {
 				soundmng_stop();
+				mousemng_disable(MOUSEPROC_MACUI);
 				HandleMenuChoice(MenuSelect(pevent->where));
+				mousemng_enable(MOUSEPROC_MACUI);
 				soundmng_play();
 			}
 			break;
@@ -518,6 +628,9 @@ static void HandleMouseDown(EventRecord 
 
 static void eventproc(EventRecord *event) {
 
+	int		keycode;
+
+	keycode = (event->message & keyCodeMask) >> 8;
 	switch(event->what) {
 		case mouseDown:
 			HandleMouseDown(event);
@@ -529,24 +642,48 @@ static void eventproc(EventRecord *event
 
 		case keyDown:
 		case autoKey:
-			if (np2running) {
-				mackbd_f12down(((event->message) & keyCodeMask) >> 8);
-				if (event->modifiers & cmdKey) {
-					soundmng_stop();
-					HandleMenuChoice(MenuKey(event->message & charCodeMask));
-					soundmng_play();
+			if (!np2running) {
+				break;
+			}
+#if !TARGET_API_MAC_CARBON
+			if ((keycode == 0x6f) && (np2oscfg.F12KEY == 0)) {
+				HandleMenuChoice(IDM_MOUSE);
+				break;
+			}
+#endif
+			if (event->modifiers & cmdKey) {
+#if !TARGET_API_MAC_CARBON
+				if (mackbd_keydown(keycode, TRUE)) {
+					break;
 				}
+#endif
+				soundmng_stop();
+				mousemng_disable(MOUSEPROC_MACUI);
+#if TARGET_API_MAC_CARBON
+				HandleMenuChoice(MenuEvent(event));
+#else
+				HandleMenuChoice(MenuKey(event->message & charCodeMask));
+#endif
+				mousemng_enable(MOUSEPROC_MACUI);
+				soundmng_play();
+			}
+			else {
+				mackbd_keydown(keycode, FALSE);
 			}
 			break;
 
 		case keyUp:
-			mackbd_f12up(((event->message) & keyCodeMask) >> 8);
+			mackbd_keyup(keycode);
 			break;
 
 		case mouseUp:
 			mousemng_buttonevent(MOUSEMNG_LEFTUP);
 			mousemng_buttonevent(MOUSEMNG_RIGHTUP);
 			break;
+
+		case activateEvt:
+			mackbd_activate((event->modifiers & activeFlag)?TRUE:FALSE);
+			break;
 	}
 }
 
@@ -622,6 +759,8 @@ int main(int argc, char *argv[]) {
 	Rect		wRect;
 	EventRecord	event;
 	UINT		t;
+	GrafPtr		saveport;
+	Point		pt;
 
 	dosio_init();
 	file_setcd(target);
@@ -634,7 +773,7 @@ int main(int argc, char *argv[]) {
 
 	TRACEINIT();
 
-	SetRect(&wRect, 100, 100, 100, 100);
+	SetRect(&wRect, np2oscfg.posx, np2oscfg.posy, 100, 100);
 	hWndMain = NewWindow(0, &wRect, "\pNeko Project II", FALSE,
 								noGrowDocProc, (WindowPtr)-1, TRUE, 0);
 	if (!hWndMain) {
@@ -653,9 +792,11 @@ int main(int argc, char *argv[]) {
 	menu_setframe(np2oscfg.DRAW_SKIP);
 	menu_setkey(0);
 	menu_setxshift(0);
-	menu_setf12copy(np2oscfg.F12COPY);
+	menu_setf11key(np2oscfg.F11KEY);
+	menu_setf12key(np2oscfg.F12KEY);
 	menu_setbeepvol(np2cfg.BEEP_VOL);
 	menu_setsound(np2cfg.SOUND_SW);
+	menu_setjastsnd(np2oscfg.jastsnd);
 	menu_setmotorflg(np2cfg.MOTOR);
 	menu_setextmem(np2cfg.EXTMEM);
 	menu_setdispclk(np2oscfg.DISPCLK);
@@ -766,6 +907,23 @@ int main(int argc, char *argv[]) {
 			}
 		}
 	}
+
+	GetPort(&saveport);
+#if TARGET_API_MAC_CARBON
+	SetPortWindowPort(hWndMain);
+#else
+	SetPort(hWndMain);
+#endif
+	pt.h = 0;
+	pt.v = 0;
+	LocalToGlobal(&pt);
+	SetPort(saveport);
+	if ((np2oscfg.posx != pt.h) || (np2oscfg.posy != pt.v)) {
+		np2oscfg.posx = pt.h;
+		np2oscfg.posy = pt.v;
+		sysmng_update(SYS_UPDATEOSCFG);
+	}
+
 	np2running = FALSE;
 
 	pccore_cfgupdate();