--- np2/macosx/toolwin.cpp	2003/11/05 16:08:59	1.4
+++ np2/macosx/toolwin.cpp	2003/11/11 16:33:50	1.9
@@ -109,19 +109,23 @@ static const OSType subcommand[11] ={	'-
 
 static const ControlID popup[2] = { {'pop1', 1}, {'pop2', 2} };
 
+static DragReceiveHandlerUPP	dr;
+static bool	isPUMA;
+
 static void openpopup(HIPoint location);
 static void skinchange(void);
-static DragReceiveHandlerUPP	dr;
 
 // ----
 
-static bool isPuma(void) {
+static void checkOSVersion(void) {
     long	res;
     Gestalt(gestaltSystemVersion, &res);
     if (res<0x1020) {
-        return(true);
+        isPUMA = true;
+    }
+    else {
+        isPUMA = false;
     }
-    return(false);
 }
 
 
@@ -161,7 +165,7 @@ static PicHandle skinload(const char *pa
 			return(ret);
 		}
 	}
-	return(getBMPfromResource("np2tool", bounds));
+	return(getBMPfromResource("np2tool", bounds, CFSTR("bmp")));
 }
 
 // ----
@@ -519,12 +523,25 @@ static pascal OSStatus cfWinproc(EventHa
                     }
                 }
                 break;
-
+                
+            case kEventWindowFocusAcquired:
+                SelectWindow(hWndMain);
+                break;
+                
                 
             default:
                 break;
         }
     }
+    else if (GetEventClass(event)==kEventClassKeyboard && GetEventKind(event)==kEventRawKeyDown) {
+        UInt32 modif;
+        GetEventParameter (event, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modif);
+        if (modif & cmdKey) {
+            EventRecord	eve;
+            ConvertEventRefToEventRecord( event,&eve );
+            recieveCommand(MenuEvent(&eve));
+        }
+    }
 
 	(void)myHandler;
     return err;
@@ -609,7 +626,7 @@ static WindowRef makeNibWindow (IBNibRef
     OSStatus	err;
     WindowRef	win = NULL;
 
-    if (isPuma()) {
+    if (isPUMA) {
         Rect	bounds;
         SetRect(&bounds, 0, 0, 100, 100);
         err = CreateNewWindow(kFloatingWindowClass, kWindowStandardHandlerAttribute, &bounds, &win);
@@ -620,10 +637,12 @@ static WindowRef makeNibWindow (IBNibRef
     if (err == noErr) {
         InstallStandardEventHandler(GetWindowEventTarget(win));
         EventTypeSpec	list[]={ 
-            { kEventClassCommand, kEventCommandProcess },
-            { kEventClassWindow, kEventWindowClose }, 
-            { kEventClassWindow, kEventWindowShown }, 
-            { kEventClassWindow, kEventWindowDrawContent }, 
+            { kEventClassCommand, 	kEventCommandProcess },
+            { kEventClassWindow,	kEventWindowClose }, 
+            { kEventClassWindow,	kEventWindowShown }, 
+            { kEventClassWindow,	kEventWindowDrawContent }, 
+            { kEventClassWindow, 	kEventWindowFocusAcquired }, 
+            { kEventClassKeyboard,	kEventRawKeyDown},
         };
         EventHandlerRef	ref;
         InstallWindowEventHandler (win, NewEventHandlerUPP(cfWinproc), GetEventTypeCount(list), list, (void *)win, &ref);
@@ -656,24 +675,23 @@ const char	*base;
 	UINT	j;
 	UINT	id[SKINMRU_MAX];
 const char	*file[SKINMRU_MAX];
-    Str255	seltext, deftext;
+    char	longname[256];
 
-    mkstr255(seltext, str_skinsel);
-	AppendMenu(ret, seltext);
+	AppendMenuItemTextWithCFString(ret, CFCopyLocalizedString(CFSTR("Select Skin..."),"Slect Skin"), kMenuItemAttrIconDisabled, NULL,NULL);
 	AppendMenu(ret, "\p-");
 
 	base = np2tool.skin;
-    mkstr255(deftext, str_skindef);
-	AppendMenu(ret, deftext);
-	if (base[0] != '\0') {
-        EnableMenuItem(ret, 3);
+	AppendMenuItemTextWithCFString(ret, CFCopyLocalizedString(CFSTR("<Base Skin>"),"Base Skin"), kMenuItemAttrIconDisabled, NULL,NULL);
+	if (base[0] == '\0') {
+        DisableMenuItem(ret, 3);
     }
 	for (cnt=0; cnt<SKINMRU_MAX; cnt++) {
 		p = np2tool.skinmru[cnt];
 		if (p[0] == '\0') {
 			break;
 		}
-		p = file_getname(p);
+		getLongFileName(longname, p);
+        p = longname;
 		for (i=0; i<cnt; i++) {
 			if (file_cmpname(p, file[id[i]]) < 0) {
 				break;
@@ -687,16 +705,15 @@ const char	*file[SKINMRU_MAX];
 	}
 	for (i=0; i<cnt; i++) {
 		j = id[i];
-        if (file[j][0] == '\0') {
-            AppendMenu(ret, "\pN/A");
-        }
-        else {
-            Str255	initext;
-            mkstr255(initext, file[j]);
-            AppendMenu(ret, initext);
-        }
-        if (!file_cmpname(base, np2tool.skinmru[j])) {
-            EnableMenuItem(ret, 4+i);
+        if (file[j][0] != '\0') {
+            UInt32	attr = kMenuItemAttrIconDisabled;
+            if (!file_cmpname(base, np2tool.skinmru[j])) {
+                attr |= kMenuItemAttrDisabled;
+            }
+            else if (file_attr(np2tool.skinmru[j]) == -1) {
+                attr |= kMenuItemAttrDisabled;
+            }
+            AppendMenuItemTextWithCFString(ret, CFStringCreateWithCString(NULL, file[j], kCFStringEncodingUTF8), attr, NULL, NULL);
         }
 	}
 	return;
@@ -732,16 +749,14 @@ static void openpopup(HIPoint location) 
 
 	MenuRef	hMenu;
 	short	sel;
-    Str255	closetext;
     UInt16	selectclose;
     char	fname[MAX_PATH];
 
-    hMenu = NewMenu(222, "\pskin");
+    hMenu = NewMenu(222, "\pSkin");
     InsertMenu(hMenu, -1);
 	createskinmenu(hMenu);
 	AppendMenu(hMenu, "\p-");
-    mkstr255(closetext, str_toolclose);
-	AppendMenu(hMenu, closetext);
+    AppendMenuItemTextWithCFString(hMenu, CFCopyLocalizedString(CFSTR("Close"),"ToolWin Close"), kMenuItemAttrIconDisabled, NULL, NULL);
 
     DeleteMenu(222);
     selectclose = CountMenuItems(hMenu);
@@ -793,6 +808,8 @@ void toolwin_open(void) {
         toolwin_close();
 		return;
 	}
+    
+    checkOSVersion();
 	ZeroMemory(&toolwin, sizeof(toolwin));
 
 	hbmp = skinload(np2tool.skin, &bounds);
@@ -806,7 +823,7 @@ void toolwin_open(void) {
 		goto twope_err2;
 	}
     
-    if (isPuma()) {
+    if (isPUMA) {
         toolwincreate(hWnd);
     }
     SizeWindow(hWnd, bounds.right-bounds.left, bounds.bottom-bounds.top, true);
@@ -815,23 +832,30 @@ void toolwin_open(void) {
     info.u.picture = hbmp;
     CreatePictureControl(hWnd, &bounds, &info, true, &image);
     InstallControlEventHandler (image, NewEventHandlerUPP(cfControlproc), GetEventTypeCount(list), list, (void *)hWnd, &ref);
-    if (!isPuma()) {
+    if (!isPUMA) {
         toolwincreate(hWnd);
     }
-
-    if (isPuma()) {
+#ifndef AVAILABLE_MAC_OS_X_VERSION_10_2_AND_LATER
+    if (np2tool.posy < 35) np2tool.posy = 35;
+    if (np2tool.posx < 5 ) np2tool.posx = 5;
+    MoveWindow(hWnd, np2tool.posx, np2tool.posy, true);
+    ShowWindow(hWnd);
+#else
+    if (isPUMA) {
         if (np2tool.posy < 35) np2tool.posy = 35;
         if (np2tool.posx < 5 ) np2tool.posx = 5;
         MoveWindow(hWnd, np2tool.posx, np2tool.posy, true);
         ShowWindow(hWnd);
     }
-    else{
+    else {
         SetDrawerParent(hWnd, hWndMain);
         SetDrawerOffsets(hWnd, (640-(bounds.right-bounds.left))/2-11, (640-(bounds.right-bounds.left))/2-11);
         SetDrawerPreferredEdge(hWnd, kWindowEdgeTop);
         OpenDrawer(hWnd, kWindowEdgeDefault, 1);
     }
+#endif
 
+    np2oscfg.toolwin = 1;
 	return;
 
 twope_err2:
@@ -845,16 +869,21 @@ twope_err1:
 void toolwin_close(void) {
 
     if (toolwin.hwnd) {
-        if (!isPuma()) {
-            CloseDrawer(toolwin.hwnd, 0);
+#ifndef AVAILABLE_MAC_OS_X_VERSION_10_2_AND_LATER
+        HideWindow(toolwin.hwnd);
+#else
+        if (isPUMA) {
+            HideWindow(toolwin.hwnd);
         }
-        else{
-            DisposeWindow(toolwin.hwnd);
+        else {
+            CloseDrawer(toolwin.hwnd, 0);
         }
+#endif
         RemoveReceiveHandler(dr, toolwin.hwnd);
         toolwindestroy();
         DisposeWindow(toolwin.hwnd);
         toolwin.hwnd = NULL;
+        np2oscfg.toolwin = 0;
     }
 }
 
@@ -971,6 +1000,7 @@ const DISKACC	*accterm;
 // ----
 
 static const char ini_title[] = "NP2 tool";
+static const char inifile[] = "np2.cfg";			// same file name..
 
 static const INITBL iniitem[] = {
 	{"WindposX", INITYPE_SINT32,	&np2tool.posx,			0},
@@ -998,12 +1028,6 @@ static const INITBL iniitem[] = {
 	{"FD2NAME7", INITYPE_STR,		np2tool.fdd[1].name[7],	MAX_PATH}};
 
 
-void initgetfile(char *path, UINT size) {
-
-	file_cpyname(path, file_getcd("np2"), size);
-    file_catname(path, ".ini", size);
-}
-
 void toolwin_readini(void) {
 
 	char	path[MAX_PATH];
@@ -1011,7 +1035,7 @@ void toolwin_readini(void) {
 	ZeroMemory(&np2tool, sizeof(np2tool));
 	np2tool.posx = 0;
 	np2tool.posy = 0;
-	initgetfile(path, sizeof(path));
+	file_cpyname(path, file_getcd(inifile), sizeof(path));
 	ini_read(path, ini_title, iniitem, sizeof(iniitem)/sizeof(INITBL));
 }
 
@@ -1019,6 +1043,7 @@ void toolwin_writeini(void) {
 
 	char	path[MAX_PATH];
 
-	initgetfile(path, sizeof(path));
-	ini_write(path, ini_title, iniitem, sizeof(iniitem)/sizeof(INITBL));
+	file_cpyname(path, file_getcd(inifile), sizeof(path));
+	ini_write(path, ini_title, iniitem, sizeof(iniitem)/sizeof(INITBL), FALSE);
 }
+