--- np2/macos9/np2.cpp	2003/11/09 23:42:06	1.12
+++ np2/macos9/np2.cpp	2003/12/01 21:15:13	1.18
@@ -34,7 +34,7 @@
 #define	USE_RESUME
 
 
-		NP2OSCFG	np2oscfg = {0, 2, 0, 0,  0, 0, 0};
+		NP2OSCFG	np2oscfg = {100, 100, 0, 2, 0, 0,  0, 0, 0};
 
 		WindowPtr	hWndMain;
 		BOOL		np2running;
@@ -262,10 +262,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:
@@ -277,54 +277,61 @@ 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_F12MOUSE:
 			menu_setf12copy(0);
 			keystat_resetcopyhelp();
-			update |= SYS_UPDATECFG;
+			update |= SYS_UPDATEOSCFG;
 			break;
 
 		case IDM_F12COPY:
 			menu_setf12copy(1);
 			keystat_resetcopyhelp();
-			update |= SYS_UPDATECFG;
+			update |= SYS_UPDATEOSCFG;
 			break;
 
 		case IDM_F12STOP:
 			menu_setf12copy(2);
 			keystat_resetcopyhelp();
-			update |= SYS_UPDATECFG;
+			update |= SYS_UPDATEOSCFG;
 			break;
 
 		case IDM_BEEPOFF:
@@ -396,6 +403,11 @@ static void HandleMenuChoice(long wParam
 			update |= SYS_UPDATECFG;
 			break;
 
+		case IDM_AMD98:
+			menu_setsound(0x80);
+			update |= SYS_UPDATECFG;
+			break;
+
 		case IDM_SEEKSND:
 			menu_setmotorflg(np2cfg.MOTOR ^ 1);
 			update |= SYS_UPDATECFG;
@@ -555,7 +567,7 @@ static void eventproc(EventRecord *event
 				soundmng_play();
 			}
 			else {
-				mackbd_keydown(keycode);
+				mackbd_keydown(keycode, FALSE);
 			}
 			break;
 
@@ -567,6 +579,10 @@ static void eventproc(EventRecord *event
 			mousemng_buttonevent(MOUSEMNG_LEFTUP);
 			mousemng_buttonevent(MOUSEMNG_RIGHTUP);
 			break;
+
+		case activateEvt:
+			mackbd_activate((event->modifiers & activeFlag)?TRUE:FALSE);
+			break;
 	}
 }
 
@@ -642,6 +658,8 @@ int main(int argc, char *argv[]) {
 	Rect		wRect;
 	EventRecord	event;
 	UINT		t;
+	GrafPtr		saveport;
+	Point		pt;
 
 	dosio_init();
 	file_setcd(target);
@@ -654,7 +672,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) {
@@ -786,6 +804,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();