--- np2/macosx/toolwin.cpp	2003/11/11 16:33:50	1.9
+++ np2/macosx/toolwin.cpp	2003/11/21 16:01:41	1.12
@@ -11,6 +11,10 @@
 #include	"dialog.h"
 #include	"soundmng.h"
 #include	"fdefine.h"
+#include	"mackbd.h"
+#include	"mousemng.h"
+#include	"pccore.h"
+#include	"iocore.h"
 
 
 enum {
@@ -107,24 +111,27 @@ static const OSType subcommand[11] ={	'-
                                         'exit',
                                     };
 
+#define	BASENUMBER	4
 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 void skinchange(bool remake);
 
 // ----
 
 static void checkOSVersion(void) {
-    long	res;
-    Gestalt(gestaltSystemVersion, &res);
-    if (res<0x1020) {
-        isPUMA = true;
-    }
-    else {
-        isPUMA = false;
+    static	long	res = 0;
+    if (!res) {
+        Gestalt(gestaltSystemVersion, &res);
+        if (res<0x1020) {
+            isPUMA = true;
+        }
+        else {
+            isPUMA = false;
+        }
     }
 }
 
@@ -165,7 +172,7 @@ static PicHandle skinload(const char *pa
 			return(ret);
 		}
 	}
-	return(getBMPfromResource("np2tool", bounds, CFSTR("bmp")));
+	return(getBMPfromResource("np2tool.bmp", bounds));
 }
 
 // ----
@@ -522,10 +529,12 @@ static pascal OSStatus cfWinproc(EventHa
                         Draw1Control(sub);
                     }
                 }
+                err=noErr;
                 break;
                 
             case kEventWindowFocusAcquired:
-                SelectWindow(hWndMain);
+                BringToFront(hWndMain);
+                err = noErr;
                 break;
                 
                 
@@ -533,13 +542,51 @@ static pascal OSStatus cfWinproc(EventHa
                 break;
         }
     }
-    else if (GetEventClass(event)==kEventClassKeyboard && GetEventKind(event)==kEventRawKeyDown) {
+    else if (GetEventClass(event)==kEventClassKeyboard) {
+        static	UInt32	backup = 0;
+        UInt32	whatHappened = GetEventKind(event);
+        UInt32 key;
+        GetEventParameter (event, kEventParamKeyCode, typeUInt32, NULL, sizeof(UInt32), NULL, &key);
         UInt32 modif;
         GetEventParameter (event, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modif);
-        if (modif & cmdKey) {
-            EventRecord	eve;
-            ConvertEventRefToEventRecord( event,&eve );
-            recieveCommand(MenuEvent(&eve));
+        switch (whatHappened)
+        {
+            case kEventRawKeyUp:
+                mackbd_keyup(key);
+                err = noErr;
+                break;
+            case kEventRawKeyRepeat:
+                mackbd_keydown(key);
+                err = noErr;
+                break;
+            case kEventRawKeyDown:
+                if (modif & cmdKey) {
+                    EventRecord	eve;
+                    ConvertEventRefToEventRecord( event,&eve );
+                    mousemng_disable(MOUSEPROC_MACUI);
+                    recieveCommand(MenuEvent(&eve));
+                    mousemng_enable(MOUSEPROC_MACUI);
+                }
+                else {
+                    mackbd_keydown(key);
+                }
+                err = noErr;
+                break;
+            case kEventRawKeyModifiersChanged:
+                if (modif & shiftKey) keystat_senddata(0x70);
+                else keystat_senddata(0x70 | 0x80);
+                if (modif & optionKey) keystat_senddata(0x73);
+                else keystat_senddata(0x73 | 0x80);
+                if (modif & controlKey) keystat_senddata(0x74);
+                else keystat_senddata(0x74 | 0x80);
+                if ((modif & alphaLock) != (backup & alphaLock)) {
+                    keystat_senddata(0x71);
+                    backup = modif;
+                }
+                err = noErr;
+                break;
+            default: 
+                break;             
         }
     }
 
@@ -565,7 +612,7 @@ OSErr setDropFile(FSSpec spec, int drv) 
             
         case FTYPE_TEXT:
             strcpy(np2tool.skin, fname);
-            skinchange();
+            skinchange(true);
             break;
         
         case FTYPE_THD:
@@ -672,9 +719,6 @@ static void createskinmenu(MenuRef ret) 
 const char	*base;
 	char	*p;
 	UINT	i;
-	UINT	j;
-	UINT	id[SKINMRU_MAX];
-const char	*file[SKINMRU_MAX];
     char	longname[256];
 
 	AppendMenuItemTextWithCFString(ret, CFCopyLocalizedString(CFSTR("Select Skin..."),"Slect Skin"), kMenuItemAttrIconDisabled, NULL,NULL);
@@ -683,50 +727,40 @@ const char	*file[SKINMRU_MAX];
 	base = np2tool.skin;
 	AppendMenuItemTextWithCFString(ret, CFCopyLocalizedString(CFSTR("<Base Skin>"),"Base Skin"), kMenuItemAttrIconDisabled, NULL,NULL);
 	if (base[0] == '\0') {
-        DisableMenuItem(ret, 3);
+        CheckMenuItem(ret, BASENUMBER-1, true);
     }
 	for (cnt=0; cnt<SKINMRU_MAX; cnt++) {
 		p = np2tool.skinmru[cnt];
 		if (p[0] == '\0') {
 			break;
 		}
-		getLongFileName(longname, p);
-        p = longname;
-		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;
+        UInt32	attr = kMenuItemAttrIconDisabled;
+        if (file_attr(p) != FILEATTR_ARCHIVE) {
+            attr |= kMenuItemAttrDisabled;
+        }
+        ZeroMemory(longname, sizeof(longname));
+		if (!getLongFileName(longname, p)) {
+            strcpy(longname, file_getname(p));
+        }
+        AppendMenuItemTextWithCFString(ret, CFStringCreateWithCString(NULL, longname, kCFStringEncodingUTF8), attr, NULL, NULL);
 	}
 	for (i=0; i<cnt; i++) {
-		j = id[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);
+        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;
@@ -757,7 +791,6 @@ static void openpopup(HIPoint location) 
 	createskinmenu(hMenu);
 	AppendMenu(hMenu, "\p-");
     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));
@@ -768,23 +801,27 @@ static void openpopup(HIPoint location) 
     else {
         switch (sel) {
             case 1:
-                if(dialog_fileselect(fname, sizeof(fname), hWndMain)) {
+                if(dialog_fileselect(fname, sizeof(fname), hWndMain, OPEN_INI)) {
                     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;
@@ -848,8 +885,16 @@ void toolwin_open(void) {
         ShowWindow(hWnd);
     }
     else {
+        Rect	mainbounds;
+        int		width;
         SetDrawerParent(hWnd, hWndMain);
-        SetDrawerOffsets(hWnd, (640-(bounds.right-bounds.left))/2-11, (640-(bounds.right-bounds.left))/2-11);
+        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);
     }