--- np2/macosx/np2.cpp	2003/11/11 16:33:50	1.34
+++ np2/macosx/np2.cpp	2003/11/24 20:44:14	1.40
@@ -46,14 +46,14 @@
 // #define	OPENING_WAIT	1500
 
 
-		NP2OSCFG	np2oscfg = {0, 2, 0, 0, 0, 0, 1, 0};
+		NP2OSCFG	np2oscfg = {"Neko Project IIx", 0, 2, 0, 0, 0, 0, 1, 0};
 
 		WindowPtr	hWndMain;
 		BOOL		np2running;
 static	UINT		framecnt = 0;
 static	UINT		waitcnt = 0;
 static	UINT		framemax = 1;
-        BYTE		scrnmode;
+        BYTE		scrnmode = 0;
 
 
 #define DRAG_THRESHOLD		5
@@ -93,18 +93,19 @@ pascal OSErr OpenAppleEventHandler(const
 	DescType	rtype;
 	AEKeyword	key;
 	AEDescList	dlist;
+    OSErr		err = noErr;
         
 	if(!AEGetParamDesc(event,keyDirectObject,typeAEList,&dlist))	{
 		AECountItems( &dlist,&ct );
 		for( i=1;i<=ct;i++ )	{
             pp=&fsc;
 			if (!AEGetNthPtr( &dlist,i,typeFSS,&key,&rtype,(Ptr)pp,(long)sizeof(FSSpec),&len))	{
-                setDropFile(fsc, i-1);
+                err = setDropFile(fsc, i-1);
 			}
 		}
 		AEDisposeDesc( &dlist );
 	}
-	return( 0 );
+	return(err);
 }
 
 
@@ -169,13 +170,11 @@ static void changescreen(BYTE mode) {
 	}
 	if (renewal) {
 		soundmng_stop();
-		mouse_running(MOUSE_STOP);
 		scrnmng_destroy();
 		if (scrnmng_create(mode) == SUCCESS) {
 			scrnmode = mode;
 		}
 		scrndraw_redraw();
-		mouse_running(MOUSE_CONT);
 		soundmng_play();
 	}
 	else {
@@ -317,7 +316,7 @@ static void HandleMenuChoice(long wParam
 			break;
 
         case IDM_MOUSE:
-            mouse_running(MOUSE_XOR);
+			mousemng_toggle(MOUSEPROC_SYSTEM);
             menu_setmouse(np2oscfg.MOUSE_SW ^ 1);
             sysmng_update(SYS_UPDATECFG);
 			break;
@@ -339,66 +338,73 @@ 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);
 			mackbd_resetf12();
-			update |= SYS_UPDATECFG;
+			update |= SYS_UPDATEOSCFG;
 			break;
 
 		case IDM_F12COPY:
 			menu_setf12copy(1);
 			mackbd_resetf12();
-			update |= SYS_UPDATECFG;
+			update |= SYS_UPDATEOSCFG;
 			break;
 
 		case IDM_F12STOP:
 			menu_setf12copy(2);
 			mackbd_resetf12();
-			update |= SYS_UPDATECFG;
+			update |= SYS_UPDATEOSCFG;
 			break;
 
 		case IDM_F12EQU:
 			menu_setf12copy(3);
 			mackbd_resetf12();
-			update |= SYS_UPDATECFG;
+			update |= SYS_UPDATEOSCFG;
 			break;
 
 		case IDM_F12COMMA:
 			menu_setf12copy(4);
 			mackbd_resetf12();
-			update |= SYS_UPDATECFG;
+			update |= SYS_UPDATEOSCFG;
 			break;
 
 		case IDM_BEEPOFF:
@@ -545,7 +551,7 @@ static void HandleMenuChoice(long wParam
             {
                 ICInstance inst;
                 long start, fin;
-                const char	urlStr[] = "http://retropc.net/tk800/np2x/help.html";
+                const char	urlStr[] = "http://retropc.net/tk800/np2x/help/help.html";
 
                 ICStart(&inst, 'SMil');
                 start = 0;
@@ -565,14 +571,15 @@ static void HandleMenuChoice(long wParam
 static void HandleMouseDown(EventRecord *pevent) {
 
 	WindowPtr	hWnd;
-    BYTE		ret;
 
 	if (FindWindow(pevent->where, &hWnd) == inMenuBar) {
         soundmng_stop();
+        mousemng_disable(MOUSEPROC_MACUI);
         HandleMenuChoice(MenuSelect(pevent->where));
+        mousemng_enable(MOUSEPROC_MACUI);
     }
     else {
-        ret=mouse_btn(MOUSE_LEFTDOWN);
+        mousemng_buttonevent(MOUSEMNG_LEFTDOWN);
     }
 }
 
@@ -694,7 +701,7 @@ int main(int argc, char *argv[]) {
         AppendMenuItemTextWithCFString(GetMenuRef(IDM_OTHER), CFCopyLocalizedString(CFSTR("i286 save"),"i286"), kMenuItemAttrIconDisabled, NULL,NULL);
     }
 
-	scrnmode = 0;
+	scrnmng_initialize();
 	if (scrnmng_create(scrnmode) != SUCCESS) {
 		TRACETERM();
 		macossub_term();
@@ -716,8 +723,9 @@ int main(int argc, char *argv[]) {
 	}
 
 #if defined(NP2GCC)
+	mousemng_initialize();
 	if (np2oscfg.MOUSE_SW) {										// ver0.30
-		mouse_running(MOUSE_ON);
+		mousemng_enable(MOUSEPROC_SYSTEM);
 	}
 #endif
 #ifdef OPENING_WAIT
@@ -730,9 +738,6 @@ int main(int argc, char *argv[]) {
         flagload(np2resume);
     }
 #endif
-    if (np2oscfg.toolwin) {
-        toolwin_open();
-    }
 
     theTarget = GetEventDispatcherTarget();
     
@@ -824,7 +829,7 @@ int main(int argc, char *argv[]) {
 
     hid_clear();
 #if defined(NP2GCC)
-	mouse_running(MOUSE_OFF);
+	mousemng_disable(MOUSEPROC_SYSTEM);
 #endif
 
 	soundmng_deinitialize();
@@ -867,8 +872,6 @@ static pascal OSStatus np2appevent (Even
     HIPoint		delta;
     EventMouseButton buttonKind;
     GetEventParameter (event, kEventParamMouseButton, typeMouseButton, NULL, sizeof(EventMouseButton), NULL, &buttonKind);
-
-	BYTE ret;
 #endif
         
     switch (eventClass)
@@ -880,9 +883,9 @@ static pascal OSStatus np2appevent (Even
                 if (cmd.commandID == kHICommandAppHelp) {
                     ICInstance inst;
                     long start, fin;
-                    const char	urlStr[] = "http://retropc.net/tk800/np2x/help.html";
+                    const char	urlStr[] = "http://retropc.net/tk800/np2x/help/help.html";
 
-                    ICStart(&inst, '????');
+                    ICStart(&inst, 'SMil');
                     start = 0;
                     fin = strlen(urlStr);
                     ICLaunchURL(inst, "\p", urlStr, strlen(urlStr), &start, &fin);
@@ -903,12 +906,12 @@ static pascal OSStatus np2appevent (Even
             {
                 case kEventMouseMoved:
                     GetEventParameter (event, kEventParamMouseDelta, typeHIPoint, NULL, sizeof(HIPoint), NULL, &delta);
-                    mouse_callback(delta);
+                    mousemng_callback(delta);
                     result = noErr;
                     break;
                 case kEventMouseDown:
                     if (buttonKind == kEventMouseButtonSecondary | modif & controlKey) {
-                        ret=mouse_btn(MOUSE_RIGHTDOWN);
+                        mousemng_buttonevent(MOUSEMNG_RIGHTDOWN);
                     }
                     else {
                         HandleMouseDown(&eve);
@@ -917,15 +920,15 @@ static pascal OSStatus np2appevent (Even
                     break;
                 case kEventMouseUp:
                     if (buttonKind == kEventMouseButtonSecondary | modif & controlKey) {
-                        ret=mouse_btn(MOUSE_RIGHTUP);
+                        mousemng_buttonevent(MOUSEMNG_RIGHTUP);
                     }
                     else if (buttonKind == kEventMouseButtonTertiary) {
-                        mouse_running(MOUSE_XOR);
+                        mousemng_toggle(MOUSEPROC_SYSTEM);
                         menu_setmouse(np2oscfg.MOUSE_SW ^ 1);
                         sysmng_update(SYS_UPDATECFG);
                     }
                     else {
-                        ret=mouse_btn(MOUSE_LEFTUP);
+                        mousemng_buttonevent(MOUSEMNG_LEFTUP);
                     }
                     result=noErr;
                     break;    
@@ -979,7 +982,9 @@ static pascal OSStatus np2windowevent(Ev
                     if (modif & cmdKey) {
                         EventRecord	eve;
                         ConvertEventRefToEventRecord( event,&eve );
+                        mousemng_disable(MOUSEPROC_MACUI);
                         HandleMenuChoice(MenuEvent(&eve));
+                        mousemng_enable(MOUSEPROC_MACUI);
                     }
                     else {
                         mackbd_keydown(key);
@@ -1072,6 +1077,8 @@ static void setUpCarbonEvent(void) {
 								windEventList, 0, NULL);
 }
 
+static short	backupwidth=0, backupheight=0;
+
 static bool setupMainWindow(void) {
 #if defined(NP2GCC)
     OSStatus	err;
@@ -1100,8 +1107,11 @@ static bool setupMainWindow(void) {
 	}
 	SizeWindow(hWndMain, 640, 400, TRUE);
 #endif
-	scrnmng_initialize();
+
     setUpCarbonEvent();
+    if (backupwidth) scrnmng_setwidth(0, backupwidth);
+    if (backupheight) scrnmng_setheight(0, backupheight);
+    SetWindowTitleWithCFString(hWndMain, CFStringCreateWithCString(NULL, np2oscfg.titles, kCFStringEncodingUTF8));
 	ShowWindow(hWndMain);
     return(true);
 }
@@ -1109,18 +1119,29 @@ static bool setupMainWindow(void) {
 static void toggleFullscreen(void) {
     static Ptr 	bkfullscreen;
     static BYTE mouse = 0;
+    static bool toolwin = false;
+    MenuRef	menu = GetMenuRef(IDM_SCREEN);
+    Rect	bounds;
+    short	w = 640, h = 480;
 
     soundmng_stop();
-    if (!scrnmode & SCRNMODE_FULLSCREEN) {
-        RGBColor col = {0, 0, 0};
-        short	w=640, h=480;
+    if (!(scrnmode & SCRNMODE_FULLSCREEN)) {
+        HandleMenuChoice(IDM_ROLNORMAL);
+        GetWindowBounds(hWndMain, kWindowContentRgn, &bounds);
+        backupwidth = bounds.right - bounds.left;
+        backupheight = bounds.bottom - bounds.top;
+        toolwin = np2oscfg.toolwin;
+        toolwin_close();
         DisposeWindow(hWndMain);
-        BeginFullScreen(&bkfullscreen,0,&w,&h,&hWndMain,&col,(fullScreenAllowEvents | fullScreenDontChangeMenuBar));	
+        BeginFullScreen(&bkfullscreen, 0, &w, &h, &hWndMain, NULL, fullScreenAllowEvents);	
+        DisableMenuItem(menu, IDM_ROLNORMAL);
+        DisableMenuItem(menu, IDM_ROLLEFT);
+        DisableMenuItem(menu, IDM_ROLRIGHT);
         HideMenuBar();
         setUpCarbonEvent();
         if (!np2oscfg.MOUSE_SW) {
             mouse = np2oscfg.MOUSE_SW;
-            mouse_running(MOUSE_ON);
+            mousemng_enable(MOUSEPROC_SYSTEM);
             menu_setmouse(1);
         }
         changescreen(scrnmode | SCRNMODE_FULLSCREEN);
@@ -1131,10 +1152,16 @@ static void toggleFullscreen(void) {
         setupMainWindow();
         changescreen(scrnmode & (~SCRNMODE_FULLSCREEN));
         if (!mouse) {
-            mouse_running(MOUSE_OFF);
+            mousemng_disable(MOUSEPROC_SYSTEM);
             menu_setmouse(0);
         }
+        EnableMenuItem(menu, IDM_ROLNORMAL);
+        EnableMenuItem(menu, IDM_ROLLEFT);
+        EnableMenuItem(menu, IDM_ROLRIGHT);
         ShowMenuBar();
+        if (toolwin) {
+            toolwin_open();
+        }
     }
     CheckMenuItem(GetMenuHandle(IDM_SCREEN), LoWord(IDM_FULLSCREEN), scrnmode & SCRNMODE_FULLSCREEN);
     soundmng_play();