--- np2/macosx/toolwin.cpp	2003/11/03 10:19:43	1.1
+++ np2/macosx/toolwin.cpp	2003/11/05 17:58:01	1.7
@@ -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,
@@ -112,8 +113,22 @@ static void openpopup(HIPoint location);
 static void skinchange(void);
 static DragReceiveHandlerUPP	dr;
 
+static bool	isPUMA;
+
 // ----
 
+static void checkOSVersion(void) {
+    long	res;
+    Gestalt(gestaltSystemVersion, &res);
+    if (res<0x1020) {
+        isPUMA = true;
+    }
+    else {
+        isPUMA = false;
+    }
+}
+
+
 static PicHandle skinload(const char *path, Rect* bounds) {
 
 	char		fname[MAX_PATH];
@@ -441,6 +456,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,6 +514,17 @@ 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;
+
+                
             default:
                 break;
         }
@@ -557,28 +585,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 +612,22 @@ 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 }, 
+            { kEventClassWindow, kEventWindowShown }, 
+            { kEventClassWindow, kEventWindowDrawContent }, 
         };
         EventHandlerRef	ref;
         InstallWindowEventHandler (win, NewEventHandlerUPP(cfWinproc), GetEventTypeCount(list), list, (void *)win, &ref);
@@ -769,6 +797,8 @@ void toolwin_open(void) {
         toolwin_close();
 		return;
 	}
+    
+    checkOSVersion();
 	ZeroMemory(&toolwin, sizeof(toolwin));
 
 	hbmp = skinload(np2tool.skin, &bounds);
@@ -782,25 +812,36 @@ 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 {
+        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
 
 	return;
@@ -816,7 +857,16 @@ 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);
@@ -937,6 +987,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 +1015,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 +1022,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 +1030,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);
 }
+