--- np2/macosx/toolwin.cpp 2003/11/21 16:01:41 1.12 +++ np2/macosx/toolwin.cpp 2004/01/11 16:58:47 1.16 @@ -113,11 +113,13 @@ static const OSType subcommand[11] ={ '- #define BASENUMBER 4 static const ControlID popup[2] = { {'pop1', 1}, {'pop2', 2} }; +static const ControlID imageid = {'back', 0}; static DragReceiveHandlerUPP dr; -static bool isPUMA; +static DragTrackingHandlerUPP tr; +static bool isPUMA, isJaguar; -static void openpopup(HIPoint location); +static void openpopup(Point location); static void skinchange(bool remake); // ---- @@ -128,9 +130,15 @@ static void checkOSVersion(void) { Gestalt(gestaltSystemVersion, &res); if (res<0x1020) { isPUMA = true; + isJaguar = false; } + else if (res<0x1030) { + isPUMA = false; + isJaguar = true; + } else { isPUMA = false; + isJaguar = false; } } } @@ -181,14 +189,17 @@ static void setlist(ControlRef hwnd, con #if 0 Rect rc; int width; -#endif - char basedir[MAX_PATH]; - UINT i; -const char *p; char dir[MAX_PATH]; -const char *q; - char cfname[512]; + char basedir[MAX_PATH]; +#endif MenuHandle menu; + UINT i; + char cfname[512]; +const char *q; +const char *p; + CFStringRef str; + Str255 pname; + bool success = false; GetBevelButtonMenuHandle(hwnd, &menu); while (MenuHasEnabledItems(menu)) { @@ -197,21 +208,30 @@ const char *q; #if 0 GetControlBounds(hwnd, &rc); width = rc.right - rc.left - 6; // border size? -#endif basedir[0] = '\0'; if (sel < fdd->cnt) { milstr_ncpy(basedir, fdd->name[fdd->pos[sel]], sizeof(basedir)); file_cutname(basedir); } +#endif for (i=0; icnt; i++) { + SInt32 attr = kMenuItemAttrIconDisabled; p = fdd->name[fdd->pos[i]]; - if (getLongFileName(cfname, p)) { - q = cfname; + success = getLongFileName(cfname, p); + str = CFStringCreateWithCString(NULL, cfname, CFStringGetSystemEncoding()); + if (str) { + if (success) { + if (file_attr(p) != FILEATTR_ARCHIVE) { + attr |= kMenuItemAttrDisabled; + } + AppendMenuItemTextWithCFString(menu, str, attr, NULL, NULL); + } + CFRelease(str); } else { +#if 0 milstr_ncpy(dir, p, sizeof(dir)); file_cutname(dir); -#if 0 if (!file_cmpname(basedir, dir)) { q = file_getname((char *)p); } @@ -220,13 +240,16 @@ const char *q; q = dir; } #else - q = file_getname((char *)p); + q = file_getname((char *)p); #endif - } - AppendMenu(menu, "\pNot Available"); - SetMenuItemTextWithCFString(menu, i+1, CFStringCreateWithCString(NULL,q,kCFStringEncodingUTF8)); - if (file_attr(p)==FILEATTR_ARCHIVE) { - EnableMenuItem(menu, i+1); + mkstr255(pname, q); + AppendMenu(menu, pname); + if (file_attr(p)==FILEATTR_ARCHIVE) { + EnableMenuItem(menu, i+1); + } + else { + DisableMenuItem(menu, i+1); + } } p += sizeof(fdd->name[0]); } @@ -234,7 +257,10 @@ const char *q; CFStringRef title; SetBevelButtonMenuValue(hwnd, sel+1); CopyMenuItemTextAsCFString(menu, sel+1, &title); - SetControlTitleWithCFString(hwnd, title); + if (title) { + SetControlTitleWithCFString(hwnd, title); + CFRelease(title); + } } else { SetControlTitleWithCFString(hwnd, CFSTR(" ")); @@ -336,9 +362,21 @@ static pascal OSStatus cfControlproc(Eve } else if (GetEventClass(event)==kEventClassControl && GetEventKind(event)==kEventControlContextualMenuClick) { HIPoint location; + Point point; + soundmng_stop(); GetEventParameter (event, kEventParamMouseLocation, typeHIPoint, NULL, sizeof(HIPoint), NULL, &location); - openpopup(location); + point.h = (short)location.x; + point.v = (short)location.y; + if (!isJaguar && !isPUMA) { + GrafPtr port, dst; + bool portchanged; + dst = GetWindowPort(toolwin.hwnd); + portchanged = QDSwapPort(dst, &port); + LocalToGlobal(&point); + if (portchanged) QDSwapPort(port, NULL); + } + openpopup(point); soundmng_play(); } @@ -347,6 +385,22 @@ static pascal OSStatus cfControlproc(Eve return err; } +static PixPatHandle portpat; + +static void setDragColor(GrafPtr window) { + GrafPtr port; + RGBColor color; + bool portchanged; + + portchanged = QDSwapPort(window, &port); + GetThemeBrushAsColor(kThemeBrushDragHilite, 32, true, &color); + portpat = NewPixPat(); + MakeRGBPat(portpat, &color); + PenPixPat(portpat); + PenSize(3, 3); + if (portchanged) QDSwapPort(port, NULL); +} + static void toolwincreate(WindowRef hWnd) { const SUBITEM *p; @@ -355,6 +409,8 @@ const SUBITEM *p; const char *cls; UInt32 style; + setDragColor(GetWindowPort(hWnd)); + ControlButtonContentInfo info; info.contentType = kControlContentPictHandle; info.u.picture = NULL; @@ -454,6 +510,7 @@ static void toolwindestroy(void) { DisposePixPat(toolwin.access[1]); KillPicture(toolwin.hbmp); toolwin.hbmp = NULL; + DisposePixPat(portpat); } } @@ -517,6 +574,9 @@ static pascal OSStatus cfWinproc(EventHa else if (GetEventClass(event)==kEventClassWindow) { switch (GetEventKind(event)) { case kEventWindowClose: +#ifdef AVAILABLE_MAC_OS_X_VERSION_10_2_AND_LATER + case kEventWindowDrawerClosed: +#endif toolwin_close(); err=noErr; break; @@ -532,22 +592,15 @@ static pascal OSStatus cfWinproc(EventHa err=noErr; break; - case kEventWindowFocusAcquired: - BringToFront(hWndMain); - err = noErr; - break; - - default: break; } } else if (GetEventClass(event)==kEventClassKeyboard) { - static UInt32 backup = 0; UInt32 whatHappened = GetEventKind(event); - UInt32 key; + UInt32 key; GetEventParameter (event, kEventParamKeyCode, typeUInt32, NULL, sizeof(UInt32), NULL, &key); - UInt32 modif; + UInt32 modif; GetEventParameter (event, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modif); switch (whatHappened) { @@ -572,19 +625,6 @@ static pascal OSStatus cfWinproc(EventHa } 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; } @@ -594,13 +634,19 @@ static pascal OSStatus cfWinproc(EventHa return err; } -OSErr setDropFile(FSSpec spec, int drv) { - char fname[MAX_PATH]; +static int getTypeFromFSSpec(char* fname, FSSpec* spec) { int ftype; - fsspec2path(&spec, fname, MAX_PATH); + fsspec2path(spec, fname, MAX_PATH); ftype = file_getftype(fname); - switch (ftype) { + + return (ftype); +} + +OSErr setDropFile(FSSpec spec, int drv) { + char fname[MAX_PATH]; + + switch (getTypeFromFSSpec(fname, &spec)) { case FTYPE_D88: case FTYPE_BETA: if (drv == -1) { @@ -610,7 +656,7 @@ OSErr setDropFile(FSSpec spec, int drv) toolwin_setfdd(drv, fname); break; - case FTYPE_TEXT: + case FTYPE_INI: strcpy(np2tool.skin, fname); skinchange(true); break; @@ -626,13 +672,31 @@ OSErr setDropFile(FSSpec spec, int drv) return(noErr); } -static pascal OSErr DragReceiver( WindowRef theWindow, void *handlerRefCon, DragRef theDrag ) -{ +static OSErr getFSSpecFromDragItem(DragRef theDrag, HFSFlavor* aHFSFlavor) { + UInt16 numItems; + DragItemRef ItemRef; + FlavorType Type; + + CountDragItems( theDrag, &numItems ); + if ( numItems != 1 ) { + return( -1 ); + } + GetDragItemReferenceNumber( theDrag, 1, &ItemRef ); + GetFlavorType( theDrag, ItemRef, 1, &Type ); + if ( Type != flavorTypeHFS ) { + return( -1 ); + } + Size dataSize = sizeof(HFSFlavor); + GetFlavorData( theDrag, ItemRef, flavorTypeHFS, aHFSFlavor, &dataSize, 0 ); + return(noErr); +} + +static SInt16 whichControl(DragRef theDrag, WindowRef theWindow) { SInt16 drv = -1; Point pt; + int i; ControlRef popupref[2]; Rect bounds[2]; - int i; GetDragMouse(theDrag, &pt, NULL); GlobalToLocal(&pt); @@ -644,28 +708,92 @@ static pascal OSErr DragReceiver( Window break; } } + return(drv); +} - UInt16 numItems; - CountDragItems( theDrag, &numItems ); - if ( numItems != 1 ) - { - return( -1 ); +static OSErr DragTracker (DragTrackingMessage message, WindowRef theWindow, void * handlerRefCon, DragRef theDrag) { + SInt16 drv = -1; + HFSFlavor aHFSFlavor; + RgnHandle rgn = NULL; + char fname[MAX_PATH]; + ControlRef targetControl; + GrafPtr port; + bool portchanged = false; + static bool hilite = false; + Rect bounds; + ControlRef back; + + if (message == kDragTrackingEnterHandler || message == kDragTrackingLeaveHandler) { + hilite = false; + return (noErr); + } + if (getFSSpecFromDragItem(theDrag, &aHFSFlavor) != noErr) { + if (hilite) { + GetControlByID(theWindow, &imageid, &back); + Draw1Control(back); + hilite = false; + } + return (-1); + } + if (message != kDragTrackingLeaveWindow) { + switch (getTypeFromFSSpec(fname, &aHFSFlavor.fileSpec)) { + case FTYPE_D88: + case FTYPE_BETA: + drv = whichControl(theDrag, theWindow); + if (drv == -1) { + message = kDragTrackingLeaveWindow; + } + else { + GetControlByID(theWindow, &popup[drv], &targetControl); + GetControlBounds(targetControl, &bounds); + } + break; + + case FTYPE_INI: + case FTYPE_THD: + case FTYPE_HDI: + GetWindowBounds(theWindow, kWindowContentRgn, &bounds); + OffsetRect(&bounds, -bounds.left, -bounds.top); + break; + + default: + return(noErr); + } } - - DragItemRef ItemRef; - GetDragItemReferenceNumber( theDrag, 1, &ItemRef ); - FlavorType Type; - GetFlavorType( theDrag, ItemRef, 1, &Type ); - if ( Type != flavorTypeHFS ) - { - return( -1 ); + portchanged = QDSwapPort(GetWindowPort(theWindow), &port); + if (message == kDragTrackingLeaveWindow && hilite) { + GetControlByID(theWindow, &imageid, &back); + Draw1Control(back); + hilite = false; + } + else { + rgn = NewRgn(); + if (rgn) { + RectRgn(rgn, &bounds); + FrameRgn(rgn); + DisposeRgn(rgn); + } + hilite = true; } + if (portchanged) QDSwapPort(port, NULL); + return(noErr); +} + +static pascal OSErr DragReceiver( WindowRef theWindow, void *handlerRefCon, DragRef theDrag ) +{ + SInt16 drv = -1; HFSFlavor aHFSFlavor; - Size dataSize = sizeof(aHFSFlavor); - GetFlavorData( theDrag, ItemRef, flavorTypeHFS, &aHFSFlavor, &dataSize, 0 ); - + ControlRef back; + + GetControlByID(theWindow, &imageid, &back); + Draw1Control(back); + + if (getFSSpecFromDragItem(theDrag, &aHFSFlavor) != noErr) { + return (-1); + } + drv = whichControl(theDrag, theWindow); return( setDropFile(aHFSFlavor.fileSpec, drv) ); } @@ -688,14 +816,20 @@ static WindowRef makeNibWindow (IBNibRef { kEventClassWindow, kEventWindowClose }, { kEventClassWindow, kEventWindowShown }, { kEventClassWindow, kEventWindowDrawContent }, - { kEventClassWindow, kEventWindowFocusAcquired }, + { kEventClassKeyboard, kEventRawKeyUp}, { kEventClassKeyboard, kEventRawKeyDown}, + { kEventClassKeyboard, kEventRawKeyRepeat}, +#ifdef AVAILABLE_MAC_OS_X_VERSION_10_2_AND_LATER + { kEventClassWindow, kEventWindowDrawerClosed }, +#endif }; EventHandlerRef ref; InstallWindowEventHandler (win, NewEventHandlerUPP(cfWinproc), GetEventTypeCount(list), list, (void *)win, &ref); dr = NewDragReceiveHandlerUPP((DragReceiveHandlerProcPtr)DragReceiver); + tr = NewDragTrackingHandlerUPP((DragTrackingHandlerProcPtr)DragTracker); InstallReceiveHandler( dr, win, NULL); + InstallTrackingHandler( tr, win, NULL); } return(win); } @@ -779,7 +913,7 @@ const char *p; // ---- -static void openpopup(HIPoint location) { +static void openpopup(Point location) { MenuRef hMenu; short sel; @@ -793,7 +927,7 @@ static void openpopup(HIPoint location) 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)); + sel = LoWord(PopUpMenuSelect(hMenu, location.v, location.h, 0)); DisposeMenu(hMenu); if (sel == selectclose) { toolwin_close(); @@ -830,16 +964,33 @@ static void openpopup(HIPoint location) } +static void makeskinimage(WindowRef win,PicHandle bmp, Rect* rect) { + ControlButtonContentInfo info; + ControlRef image; + EventHandlerRef ref; + EventTypeSpec list[]={ + { kEventClassControl, kEventControlContextualMenuClick }, + }; + + info.contentType = kControlContentPictHandle; + info.u.picture = bmp; + CreatePictureControl(win, rect, &info, true, &image); + SetControlID(image, &imageid); + InstallControlEventHandler (image, NewEventHandlerUPP(cfControlproc), GetEventTypeCount(list), list, (void *)win, &ref); +} + +static void opentoolwin_puma(WindowRef win) { + if (np2tool.posy < 35) np2tool.posy = 35; + if (np2tool.posx < 5 ) np2tool.posx = 5; + MoveWindow(win, np2tool.posx, np2tool.posy, true); + ShowWindow(win); +} + void toolwin_open(void) { PicHandle hbmp; WindowRef hWnd = NULL; Rect bounds; - ControlRef image; - EventTypeSpec list[]={ - { kEventClassControl, kEventControlContextualMenuClick }, - }; - EventHandlerRef ref; if (toolwin.hwnd) { toolwin_close(); @@ -860,29 +1011,21 @@ void toolwin_open(void) { goto twope_err2; } - if (isPUMA) { + + SetWindowBounds(hWnd, kWindowContentRgn, &bounds); + if (isPUMA) { toolwincreate(hWnd); + makeskinimage(hWnd, hbmp, &bounds); } - 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); - if (!isPUMA) { + else { + makeskinimage(hWnd, hbmp, &bounds); 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); + opentoolwin_puma(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); + opentoolwin_puma(hWnd); } else { Rect mainbounds; @@ -896,6 +1039,8 @@ void toolwin_open(void) { } SetDrawerOffsets(hWnd, width/2-11, width/2-11); SetDrawerPreferredEdge(hWnd, kWindowEdgeTop); + const HISize size = {bounds.right-bounds.left, bounds.bottom-bounds.top}; + SetWindowResizeLimits(hWnd, &size, &size); OpenDrawer(hWnd, kWindowEdgeDefault, 1); } #endif @@ -925,6 +1070,7 @@ void toolwin_close(void) { } #endif RemoveReceiveHandler(dr, toolwin.hwnd); + RemoveTrackingHandler(tr, toolwin.hwnd); toolwindestroy(); DisposeWindow(toolwin.hwnd); toolwin.hwnd = NULL;