--- np2/macosx/toolwin.cpp	2003/11/03 10:19:43	1.1
+++ np2/macosx/toolwin.cpp	2003/11/12 19:06:33	1.10
@@ -5,13 +5,14 @@
 #include	"dosio.h"
 #include	"ini.h"
 #include	"resource.h"
-#include	"toolmac.h"
+#include	"toolwin.h"
 #include	"np2opening.h"
 #include	"dialogutils.h"
 #include	"dialog.h"
 #include	"soundmng.h"
 #include	"fdefine.h"
 
+
 enum {
 	IDC_TOOLHDDACC			= 0,
 	IDC_TOOLFDD1ACC,
@@ -106,14 +107,31 @@ static const OSType subcommand[11] ={	'-
                                         'exit',
                                     };
 
+#define	BASENUMBER	4
 static const ControlID popup[2] = { {'pop1', 1}, {'pop2', 2} };
 
-static void openpopup(HIPoint location);
-static void skinchange(void);
 static DragReceiveHandlerUPP	dr;
+static bool	isPUMA;
+
+static void openpopup(HIPoint location);
+static void skinchange(bool remake);
 
 // ----
 
+static void checkOSVersion(void) {
+    static	long	res = 0;
+    if (!res) {
+        Gestalt(gestaltSystemVersion, &res);
+        if (res<0x1020) {
+            isPUMA = true;
+        }
+        else {
+            isPUMA = false;
+        }
+    }
+}
+
+
 static PicHandle skinload(const char *path, Rect* bounds) {
 
 	char		fname[MAX_PATH];
@@ -150,7 +168,7 @@ static PicHandle skinload(const char *pa
 			return(ret);
 		}
 	}
-	return(getBMPfromResource("np2tool", bounds));
+	return(getBMPfromResource("np2tool", bounds, CFSTR("bmp")));
 }
 
 // ----
@@ -441,6 +459,8 @@ static void toolwindestroy(void) {
 static pascal OSStatus cfWinproc(EventHandlerCallRef myHandler, EventRef event, void* userData) {
     OSStatus	err = eventNotHandledErr;
     HICommand	cmd;
+    ControlRef	sub;
+    int			i;
 
     if (GetEventClass(event)==kEventClassCommand && GetEventKind(event)==kEventCommandProcess ) {
         GetEventParameter(event, kEventParamDirectObject, typeHICommand, NULL, sizeof(HICommand), NULL, &cmd);
@@ -497,10 +517,34 @@ static pascal OSStatus cfWinproc(EventHa
                 err=noErr;
                 break;
                 
+            case kEventWindowDrawContent:
+            case kEventWindowShown:
+                for (i=0; i<IDC_MAXITEMS; i++) {
+                    sub = toolwin.sub[i];
+                    if (sub) {
+                        Draw1Control(sub);
+                    }
+                }
+                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;
@@ -524,7 +568,7 @@ OSErr setDropFile(FSSpec spec, int drv) 
             
         case FTYPE_TEXT:
             strcpy(np2tool.skin, fname);
-            skinchange();
+            skinchange(true);
             break;
         
         case FTYPE_THD:
@@ -557,28 +601,23 @@ static pascal OSErr DragReceiver( Window
         }
     }
 
-	// アイテムは１つだけか？
 	UInt16 numItems;
     CountDragItems( theDrag, &numItems );
 	if ( numItems != 1 )
-	{							// 複数ある
-		return( -1 );			// 取り扱わない
-	}
+	{
+		return( -1 );
+    }
 
-	// アイテムリファレンスを取り出す
 	DragItemRef ItemRef;
 	GetDragItemReferenceNumber( theDrag, 1, &ItemRef );
     
-	// フレーバタイプを調べる
 	FlavorType Type;
 	GetFlavorType( theDrag, ItemRef, 1, &Type );
-	// ファイルか？
 	if ( Type != flavorTypeHFS )
-	{							// ファイルではない
-		return( -1 );			// 取り扱わない
-	}
+	{
+        return( -1 );
+    }
 
-	// FSSpecを得る
 	HFSFlavor aHFSFlavor;
 	Size dataSize = sizeof(aHFSFlavor);
 	GetFlavorData( theDrag, ItemRef, flavorTypeHFS, &aHFSFlavor, &dataSize, 0 );
@@ -589,17 +628,24 @@ static pascal OSErr DragReceiver( Window
 static WindowRef makeNibWindow (IBNibRef nibRef) {
     OSStatus	err;
     WindowRef	win = NULL;
-#if 0
-    Rect	bounds;
-    SetRect(&bounds, 0, 0, 100, 100);
-    err = CreateNewWindow(kOverlayWindowClass, kWindowStandardHandlerAttribute, &bounds, &win);
-#else
-    err = CreateWindowFromNib(nibRef, CFSTR("ToolWindow"), &win);
-#endif
+
+    if (isPUMA) {
+        Rect	bounds;
+        SetRect(&bounds, 0, 0, 100, 100);
+        err = CreateNewWindow(kFloatingWindowClass, kWindowStandardHandlerAttribute, &bounds, &win);
+    }
+    else {
+        err = CreateWindowFromNib(nibRef, CFSTR("ToolWindow"), &win);
+    }
     if (err == noErr) {
+        InstallStandardEventHandler(GetWindowEventTarget(win));
         EventTypeSpec	list[]={ 
-            { kEventClassCommand, kEventCommandProcess },
-            { kEventClassWindow, kEventWindowClose }, 
+            { kEventClassCommand, 	kEventCommandProcess },
+            { kEventClassWindow,	kEventWindowClose }, 
+            { kEventClassWindow,	kEventWindowShown }, 
+            { kEventClassWindow,	kEventWindowDrawContent }, 
+            { kEventClassWindow, 	kEventWindowFocusAcquired }, 
+            { kEventClassKeyboard,	kEventRawKeyDown},
         };
         EventHandlerRef	ref;
         InstallWindowEventHandler (win, NewEventHandlerUPP(cfWinproc), GetEventTypeCount(list), list, (void *)win, &ref);
@@ -629,63 +675,48 @@ static void createskinmenu(MenuRef ret) 
 const char	*base;
 	char	*p;
 	UINT	i;
-	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') {
+        CheckMenuItem(ret, BASENUMBER-1, true);
     }
 	for (cnt=0; cnt<SKINMRU_MAX; cnt++) {
 		p = np2tool.skinmru[cnt];
 		if (p[0] == '\0') {
 			break;
 		}
-		p = file_getname(p);
-		for (i=0; i<cnt; i++) {
-			if (file_cmpname(p, file[id[i]]) < 0) {
-				break;
-			}
-		}
-		for (j=cnt; j>i; j--) {
-			id[j] = id[j-1];
-		}
-		id[i] = cnt;
-		file[cnt] = p;
-	}
-	for (i=0; i<cnt; i++) {
-		j = id[i];
-        if (file[j][0] == '\0') {
-            AppendMenu(ret, "\pN/A");
+        UInt32	attr = kMenuItemAttrIconDisabled;
+        if (file_attr(p) != FILEATTR_ARCHIVE) {
+            attr |= kMenuItemAttrDisabled;
         }
-        else {
-            Str255	initext;
-            mkstr255(initext, file[j]);
-            AppendMenu(ret, initext);
+        ZeroMemory(longname, sizeof(longname));
+		if (!getLongFileName(longname, p)) {
+            strcpy(longname, file_getname(p));
         }
-        if (!file_cmpname(base, np2tool.skinmru[j])) {
-            EnableMenuItem(ret, 4+i);
+        AppendMenuItemTextWithCFString(ret, CFStringCreateWithCString(NULL, longname, kCFStringEncodingUTF8), attr, NULL, NULL);
+	}
+	for (i=0; i<cnt; i++) {
+        if (!file_cmpname(base, np2tool.skinmru[i])) {
+            CheckMenuItem(ret, i+BASENUMBER, true);
+            break;
         }
 	}
 	return;
 }
 
-static void skinchange(void) {
+static void skinchange(bool remake) {
 
 const char		*p;
 	UINT		i;
 
     toolwin_close();
 	p = np2tool.skin;
-	if (p[0]) {
+	if (p[0] && remake) {
 		for (i=0; i<(SKINMRU_MAX - 1); i++) {
 			if (!file_cmpname(p, np2tool.skinmru[i])) {
 				break;
@@ -708,17 +739,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);
     sel = LoWord(PopUpMenuSelect(hMenu, (short)location.y, (short)location.x, 0));
@@ -732,20 +760,24 @@ static void openpopup(HIPoint location) 
                 if(dialog_fileselect(fname, sizeof(fname), hWndMain)) {
                     if (file_getftype(fname)==FTYPE_TEXT) {
                         strcpy(np2tool.skin, fname);
-                        skinchange();
+                        skinchange(true);
                     }
                 }
                 break;
             case 3:
-                np2tool.skin[0] = '\0';
-                skinchange();
+                if (np2tool.skin[0]) {
+                    np2tool.skin[0] = '\0';
+                    skinchange(false);
+                }
                 break;
             case 4:
             case 5:
             case 6:
             case 7:
-                file_cpyname(np2tool.skin, np2tool.skinmru[sel - 4], sizeof(np2tool.skin));
-                skinchange();
+                if (file_cmpname(np2tool.skin, np2tool.skinmru[sel - BASENUMBER])) {
+                    file_cpyname(np2tool.skin, np2tool.skinmru[sel - BASENUMBER], sizeof(np2tool.skin));
+                    skinchange(false);
+                }
                 break;
             default:
                 break;
@@ -769,6 +801,8 @@ void toolwin_open(void) {
         toolwin_close();
 		return;
 	}
+    
+    checkOSVersion();
 	ZeroMemory(&toolwin, sizeof(toolwin));
 
 	hbmp = skinload(np2tool.skin, &bounds);
@@ -782,27 +816,47 @@ void toolwin_open(void) {
 		goto twope_err2;
 	}
     
+    if (isPUMA) {
+        toolwincreate(hWnd);
+    }
     SizeWindow(hWnd, bounds.right-bounds.left, bounds.bottom-bounds.top, true);
     ControlButtonContentInfo	info;
     info.contentType = kControlContentPictHandle;
     info.u.picture = hbmp;
     CreatePictureControl(hWnd, &bounds, &info, true, &image);
     InstallControlEventHandler (image, NewEventHandlerUPP(cfControlproc), GetEventTypeCount(list), list, (void *)hWnd, &ref);
-
-    toolwincreate(hWnd);
-
-#if 0
-    if (np2tool.posy < 30) np2tool.posy = 30;
+    if (!isPUMA) {
+        toolwincreate(hWnd);
+    }
+#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
-    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);
+    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 {
+        Rect	mainbounds;
+        int		width;
+        SetDrawerParent(hWnd, hWndMain);
+        GetWindowBounds(hWndMain, kWindowContentRgn, &mainbounds);
+        width = (mainbounds.right-mainbounds.left)-(bounds.right-bounds.left);
+        if (width/2-11<0) {
+            toolwin_close();
+            return;
+        }
+        SetDrawerOffsets(hWnd, width/2-11, width/2-11);
+        SetDrawerPreferredEdge(hWnd, kWindowEdgeTop);
+        OpenDrawer(hWnd, kWindowEdgeDefault, 1);
+    }
 #endif
 
+    np2oscfg.toolwin = 1;
 	return;
 
 twope_err2:
@@ -816,11 +870,21 @@ twope_err1:
 void toolwin_close(void) {
 
     if (toolwin.hwnd) {
-        CloseDrawer(toolwin.hwnd, 0);
+#ifndef AVAILABLE_MAC_OS_X_VERSION_10_2_AND_LATER
+        HideWindow(toolwin.hwnd);
+#else
+        if (isPUMA) {
+            HideWindow(toolwin.hwnd);
+        }
+        else {
+            CloseDrawer(toolwin.hwnd, 0);
+        }
+#endif
         RemoveReceiveHandler(dr, toolwin.hwnd);
         toolwindestroy();
         DisposeWindow(toolwin.hwnd);
         toolwin.hwnd = NULL;
+        np2oscfg.toolwin = 0;
     }
 }
 
@@ -937,6 +1001,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},
@@ -964,12 +1029,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];
@@ -977,7 +1036,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));
 }
 
@@ -985,6 +1044,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);
 }
+