--- np2/macosx/np2.cpp	2003/11/08 17:54:26	1.33
+++ np2/macosx/np2.cpp	2003/11/12 19:06:33	1.35
@@ -38,6 +38,7 @@
 #include	"macalert.h"
 #include	"np2opening.h"
 #include	"toolwin.h"
+#include	"aboutdlg.h"
 
 #include	<QuickTime/QuickTime.h>
 #define	USE_RESUME
@@ -52,7 +53,7 @@
 static	UINT		framecnt = 0;
 static	UINT		waitcnt = 0;
 static	UINT		framemax = 1;
-        BYTE		scrnmode;
+        BYTE		scrnmode = 0;
 
 
 #define DRAG_THRESHOLD		5
@@ -138,6 +139,7 @@ static void MenuBarInit(void) {
 	InsertMenu(GetMenu(IDM_SOUND), -1);
 	InsertMenu(GetMenu(IDM_MEMORY), -1);
     ChangeMenuAttributes(GetMenuRef(IDM_EDIT), kMenuAttrAutoDisable, 0);
+    DisableAllMenuItems(GetMenuHandle(IDM_EDIT));
     SetMenuItemModifiers(GetMenuRef(IDM_FDD2), IDM_FDD2OPEN, kMenuOptionModifier);
     SetMenuItemModifiers(GetMenuRef(IDM_FDD2), IDM_FDD2EJECT, kMenuOptionModifier);
     SetMenuItemModifiers(GetMenuRef(IDM_SASI2), IDM_SASI2OPEN, kMenuOptionModifier);
@@ -530,13 +532,27 @@ static void HandleMenuChoice(long wParam
             menu_setmsrapid(np2cfg.MOUSERAPID ^ 1);
             update |= SYS_UPDATECFG;
             break;
+        case IDM_RECORDING:
+            menu_setrecording(false);
+            break;
+
 
 		case IDM_I286SAVE:
 			debugsub_status();
 			break;
-
-        case IDM_RECORDING:
-            menu_setrecording(false);
+            
+        case IDM_NP2HELP:
+            {
+                ICInstance inst;
+                long start, fin;
+                const char	urlStr[] = "http://retropc.net/tk800/np2x/help.html";
+
+                ICStart(&inst, 'SMil');
+                start = 0;
+                fin = strlen(urlStr);
+                ICLaunchURL(inst, "\p", urlStr, strlen(urlStr), &start, &fin);
+                ICStop(inst);
+            }
             break;
 
 		default:
@@ -674,8 +690,11 @@ int main(int argc, char *argv[]) {
 	menu_setdispclk(np2oscfg.DISPCLK);
 	menu_setbtnrapid(np2cfg.BTN_RAPID);
 	menu_setbtnmode(np2cfg.BTN_MODE);
+    if (np2oscfg.I286SAVE) {
+        AppendMenuItemTextWithCFString(GetMenuRef(IDM_OTHER), CFCopyLocalizedString(CFSTR("i286 save"),"i286"), kMenuItemAttrIconDisabled, NULL,NULL);
+    }
 
-	scrnmode = 0;
+	scrnmng_initialize();
 	if (scrnmng_create(scrnmode) != SUCCESS) {
 		TRACETERM();
 		macossub_term();
@@ -711,6 +730,9 @@ int main(int argc, char *argv[]) {
         flagload(np2resume);
     }
 #endif
+    if (np2oscfg.toolwin) {
+        toolwin_open();
+    }
 
     theTarget = GetEventDispatcherTarget();
     
@@ -851,6 +873,24 @@ static pascal OSStatus np2appevent (Even
         
     switch (eventClass)
     {
+        case kEventClassCommand:
+            if (GetEventKind(event)==kEventCommandProcess) {
+                HICommand	cmd;
+                GetEventParameter(event, kEventParamDirectObject, typeHICommand, NULL, sizeof(HICommand), NULL, &cmd);
+                if (cmd.commandID == kHICommandAppHelp) {
+                    ICInstance inst;
+                    long start, fin;
+                    const char	urlStr[] = "http://retropc.net/tk800/np2x/help.html";
+
+                    ICStart(&inst, 'SMil');
+                    start = 0;
+                    fin = strlen(urlStr);
+                    ICLaunchURL(inst, "\p", urlStr, strlen(urlStr), &start, &fin);
+                    ICStop(inst);
+                }
+            }
+            break;
+
         case kEventClassAppleEvent:  
             if (whatHappened == kEventAppleEvent) {
                 AEProcessAppleEvent(&eve);
@@ -998,6 +1038,7 @@ static pascal OSStatus np2windowevent(Ev
 }
 
 static const EventTypeSpec appEventList[] = {
+                {kEventClassCommand, 	kEventCommandProcess },
 				{kEventClassAppleEvent,	kEventAppleEvent},
 				{kEventClassMouse,		kEventMouseDown},
 #if defined(NP2GCC)
@@ -1031,6 +1072,8 @@ static void setUpCarbonEvent(void) {
 								windEventList, 0, NULL);
 }
 
+static short	backupwidth=0, backupheight=0;
+
 static bool setupMainWindow(void) {
 #if defined(NP2GCC)
     OSStatus	err;
@@ -1059,8 +1102,10 @@ 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);
 	ShowWindow(hWndMain);
     return(true);
 }
@@ -1068,13 +1113,22 @@ static bool setupMainWindow(void) {
 static void toggleFullscreen(void) {
     static Ptr 	bkfullscreen;
     static BYTE mouse = 0;
+    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_close();
         DisposeWindow(hWndMain);
-        BeginFullScreen(&bkfullscreen,0,&w,&h,&hWndMain,&col,(fullScreenAllowEvents | fullScreenDontChangeMenuBar));	
+        BeginFullScreen(&bkfullscreen,0,&w,&h,&hWndMain,NULL,(fullScreenAllowEvents | fullScreenDontChangeMenuBar));	
+        DisableMenuItem(menu, IDM_ROLNORMAL);
+        DisableMenuItem(menu, IDM_ROLLEFT);
+        DisableMenuItem(menu, IDM_ROLRIGHT);
         HideMenuBar();
         setUpCarbonEvent();
         if (!np2oscfg.MOUSE_SW) {
@@ -1093,7 +1147,13 @@ static void toggleFullscreen(void) {
             mouse_running(MOUSE_OFF);
             menu_setmouse(0);
         }
+        EnableMenuItem(menu, IDM_ROLNORMAL);
+        EnableMenuItem(menu, IDM_ROLLEFT);
+        EnableMenuItem(menu, IDM_ROLRIGHT);
         ShowMenuBar();
+        if (np2oscfg.toolwin) {
+            toolwin_open();
+        }
     }
     CheckMenuItem(GetMenuHandle(IDM_SCREEN), LoWord(IDM_FULLSCREEN), scrnmode & SCRNMODE_FULLSCREEN);
     soundmng_play();