--- np2/macosx/np2.cpp 2003/10/25 09:08:24 1.18 +++ np2/macosx/np2.cpp 2003/10/28 16:44:44 1.23 @@ -30,14 +30,17 @@ #include "mousemng.h" #include "configure.h" #include "screenopt.h" - +#include "soundopt.h" +#include "macnewdisk.h" +#include "fdefine.h" +#include "hid.h" #define USE_RESUME #define NP2OPENING #ifdef NP2OPENING #include -#define OPENING_WAIT 1500 +// #define OPENING_WAIT 1500 #endif @@ -67,15 +70,12 @@ static const char np2resume[] = "sav"; // ---- おまじない -#if TARGET_CARBON #define AEProc(fn) NewAEEventHandlerUPP((AEEventHandlerProcPtr)(fn)) -#else -#define AEProc(fn) NewAEEventHandlerProc(fn) -#endif static void setUpCarbonEvent(void); +static bool setupMainWindow(void); +static void toggleFullscreen(void); -#ifdef TARGET_API_MAC_CARBON static pascal OSErr handleQuitApp(const AppleEvent *event, AppleEvent *reply, long refcon) { @@ -84,30 +84,51 @@ static pascal OSErr handleQuitApp(const (void)event, (void)reply, (void)refcon; return(noErr); } -#endif + +pascal OSErr OpenAppleEventHandler(const AppleEvent *event, AppleEvent *reply,long print) +{ + long i,ct,len; + FSSpec fsc,*pp; + DescType rtype; + AEKeyword key; + AEDescList dlist; + + if( ! AEGetParamDesc( event,keyDirectObject,typeAEList,&dlist ) ) { + AECountItems( &dlist,&ct ); + for( i=1;i<=ct;i++ ) { + pp=&fsc; + if( ! AEGetNthPtr( &dlist,i,typeFSS,&key,&rtype,(Ptr)pp,(long)sizeof(FSSpec),&len ) ) { + char fname[MAX_PATH]; + int ftype; + fsspec2path(&fsc, fname, MAX_PATH); + ftype = file_getftype(fname); + if ((ftype != FTYPE_D88) && (ftype != FTYPE_BETA)) { + diskdrv_sethdd(0, fname); + } + else { + diskdrv_setfdd(i-1, fname, 0); + } + } + } + AEDisposeDesc( &dlist ); + } + return( 0 ); +} + static void InitToolBox(void) { -#if !TARGET_CARBON - MaxApplZone(); - InitGraf(&qd.thePort); - InitFonts(); - InitWindows(); - InitMenus(); - TEInit(); - InitDialogs(0); -#endif FlushEvents(everyEvent, 0); InitCursor(); -#ifdef TARGET_API_MAC_CARBON AEInstallEventHandler(kCoreEventClass, kAEQuitApplication, AEProc(handleQuitApp), 0L, false); -#endif + AEInstallEventHandler(kCoreEventClass, kAEOpenDocuments, + AEProc(OpenAppleEventHandler), 0L, false); } static void MenuBarInit(void) { -#if 0 +#if 1 Handle hMenu; MenuHandle happlemenu; @@ -126,25 +147,50 @@ static void MenuBarInit(void) { InsertMenu(GetMenu(IDM_SOUND), -1); InsertMenu(GetMenu(IDM_MEMORY), -1); DrawMenuBar(); -#endif +#else OSStatus err; IBNibRef nibRef; err = CreateNibReference(CFSTR("np2"), &nibRef); if (err!=noErr) return; err = SetMenuBarFromNib(nibRef, CFSTR("MainMenu")); DisposeNibReference(nibRef); +#endif } static void changescreen(BYTE mode) { - (void)mode; + BYTE change; + BYTE renewal; + + change = scrnmode ^ mode; + renewal = (change & SCRNMODE_FULLSCREEN); + if (mode & SCRNMODE_FULLSCREEN) { + renewal |= (change & SCRNMODE_HIGHCOLOR); + } + else { + renewal |= (change & SCRNMODE_ROTATEMASK); + } + if (renewal) { + soundmng_stop(); + mouse_running(MOUSE_STOP); + scrnmng_destroy(); + if (scrnmng_create(mode) == SUCCESS) { + scrnmode = mode; + } + scrndraw_redraw(); + mouse_running(MOUSE_CONT); + soundmng_play(); + } + else { + scrnmode = mode; + } } static void HandleMenuChoice(long wParam) { UINT update; - Str255 applname; + soundmng_stop(); update = 0; switch(wParam) { case IDM_ABOUT: @@ -160,17 +206,14 @@ static void HandleMenuChoice(long wParam initConfig(); break; -#if 0 - case IDM_NEWFDD: - newdisk(); + case IDM_NEWDISK: + newdisk(); break; -#endif #if 0 case IDM_NEWHDD: newhdddisk(); break; #endif - case IDM_FONT: dialog_font(); break; @@ -211,6 +254,10 @@ static void HandleMenuChoice(long wParam diskdrv_sethdd(1, NULL); break; + case IDM_FULLSCREEN: + toggleFullscreen(); + break; + case IDM_ROLNORMAL: menu_setrotate(0); changescreen(scrnmode & (~SCRNMODE_ROTATEMASK)); @@ -268,7 +315,6 @@ static void HandleMenuChoice(long wParam update |= SYS_UPDATECFG; break; -#if defined(NP2GCC) case IDM_SCREENOPT: initScreenOpt(); break; @@ -277,8 +323,18 @@ static void HandleMenuChoice(long wParam mouse_running(MOUSE_XOR); menu_setmouse(np2oscfg.MOUSE_SW ^ 1); sysmng_update(SYS_UPDATECFG); + toggleMenubar(); break; -#endif + + case IDM_MIDIPANIC: + rs232c_midipanic(); + mpu98ii_midipanic(); + pc9861k_midipanic(); + break; + + case IDM_SNDOPT: + initSoundOpt(); + break; case IDM_KEY: menu_setkey(0); @@ -427,6 +483,16 @@ static void HandleMenuChoice(long wParam update |= SYS_UPDATECFG; break; + case IDM_BMPSAVE: + dialog_writebmp(); + break; + +#if 0 + case IDM_S98LOGGING: + menu_sets98logging(S98_logging()); + break; +#endif + case IDM_DISPCLOCK: menu_setdispclk(np2oscfg.DISPCLK ^ 1); update |= SYS_UPDATECFG; @@ -451,125 +517,37 @@ static void HandleMenuChoice(long wParam debugsub_status(); break; + case IDM_RECORDING: + menu_setrecording(false); + break; + default: - if (HiWord(wParam) == IDM_APPLE) { - GetMenuItemText(GetMenuHandle(IDM_APPLE), - LoWord(wParam), applname); -#if !TARGET_API_MAC_CARBON - (void)OpenDeskAcc(applname); -#endif - } break; } sysmng_update(update); HiliteMenu(0); } -#if 0 -static void HandleUpdateEvent(EventRecord *pevent) { - - WindowPtr hWnd; - - hWnd = (WindowPtr)pevent->message; - BeginUpdate(hWnd); - scrndraw_redraw(); - EndUpdate(hWnd); -} -#endif - static void HandleMouseDown(EventRecord *pevent) { WindowPtr hWnd; - Rect rDrag; soundmng_stop(); switch(FindWindow(pevent->where, &hWnd)) { case inMenuBar: HandleMenuChoice(MenuSelect(pevent->where)); break; - - case inDrag: -#if TARGET_API_MAC_CARBON - { - BitMap gscreenBits; - GetQDGlobalsScreenBits(&gscreenBits); - rDrag = gscreenBits.bounds; - InsetRect(&rDrag, DRAG_THRESHOLD, DRAG_THRESHOLD); - DragWindow(hWnd, pevent->where, &rDrag); - } -#else - rDrag = qd.screenBits.bounds; - InsetRect(&rDrag, DRAG_THRESHOLD, DRAG_THRESHOLD); - DragWindow(hWnd, pevent->where, &rDrag); -#endif - break; - - case inContent: -#if defined(NP2GCC) - if (controlKey & GetCurrentKeyModifiers() ) { - mouse_btn(MOUSE_RIGHTDOWN); - } - else { - mouse_btn(MOUSE_LEFTDOWN); - } -#endif - break; - -#ifndef NP2GCC - case inGoAway: - if (TrackGoAway(hWnd, pevent->where)) { } - np2running = FALSE; - break; -#endif } - soundmng_play(); } -#if 0 -static void eventproc(EventRecord *event) { - - switch(event->what) { - case mouseDown: - HandleMouseDown(event); - break; - - case updateEvt: - HandleUpdateEvent(event); - break; - - case keyDown: - case autoKey: - mackbd_f12down(((event->message) & keyCodeMask) >> 8); - if (event->modifiers & cmdKey) { - HandleMenuChoice(MenuKey(event->message & charCodeMask)); - } - break; - - case keyUp: - mackbd_f12up(((event->message) & keyCodeMask) >> 8); - break; - -#if defined(NP2GCC) - case mouseUp: - if (controlKey & GetCurrentKeyModifiers()) { - mouse_btn(MOUSE_RIGHTUP); - } - else { - mouse_btn(MOUSE_LEFTUP); - } - break; -#endif - } -} -#endif // ---- static void processwait(UINT waitcnt) { if (timing_getcount() >= waitcnt) { - timing_setcount(0); framecnt = 0; + timing_setcount(0); if (np2oscfg.DISPCLK & 3) { if (sysmng_workclockrenewal()) { sysmng_updatecaption(3); @@ -593,6 +571,14 @@ static void flagsave(const char *ext) { statsave_save(path); } +static void flagdelete(const char *ext) { + + char path[MAX_PATH]; + + getstatfilename(path, ext, sizeof(path)); + file_delete(path); +} + static void flagload(const char *ext) { char path[MAX_PATH]; @@ -611,7 +597,6 @@ static void openingNP2(void) { Rect srt, bounds; GrafPtr port; CFURLRef openingURL; - CFStringRef path; char buffer[1024]; FSRef fsr; FSSpec fsc; @@ -625,30 +610,25 @@ static void openingNP2(void) { RGBBackColor(&col); EraseRect(&bounds); - openingURL=CFURLCopyAbsoluteURL(CFBundleCopyResourcesDirectoryURL(CFBundleGetMainBundle())); + openingURL=CFBundleCopyResourceURL(CFBundleGetMainBundle(), CFSTR("nekop2"), CFSTR("bmp"), NULL); if (openingURL) { - path = CFURLCopyFileSystemPath(openingURL, kCFURLPOSIXPathStyle); - if (path) { - if (CFStringGetCString(path, buffer, 1024, CFStringGetSystemEncoding())) { - strcat(buffer, "/nekop2.bmp"); - FSPathMakeRef((const UInt8*)buffer, &fsr, NULL); - FSGetCatalogInfo(&fsr, kFSCatInfoNone, NULL, NULL, &fsc, NULL); - if (!GetGraphicsImporterForFile(&fsc, &gi)) { - if (!GraphicsImportGetNaturalBounds(gi, &srt)) { - OffsetRect( &srt, -srt.left, -srt.top); - GraphicsImportSetBoundsRect(gi, &srt); - GraphicsImportGetAsPicture(gi, &pict); - OffsetRect(&srt, (640-srt.right)/2, (400-srt.bottom)/2); - DrawPicture(pict,&srt); - QDFlushPortBuffer(GetWindowPort(hWndMain), NULL); - KillPicture(pict); - } - CloseComponent(gi); + if (CFURLGetFSRef(openingURL, &fsr)) { + FSPathMakeRef((const UInt8*)buffer, &fsr, NULL); + FSGetCatalogInfo(&fsr, kFSCatInfoNone, NULL, NULL, &fsc, NULL); + if (!GetGraphicsImporterForFile(&fsc, &gi)) { + if (!GraphicsImportGetNaturalBounds(gi, &srt)) { + OffsetRect( &srt, -srt.left, -srt.top); + GraphicsImportSetBoundsRect(gi, &srt); + GraphicsImportGetAsPicture(gi, &pict); + OffsetRect(&srt, (640-srt.right)/2, (400-srt.bottom)/2); + DrawPicture(pict,&srt); + QDFlushPortBuffer(GetWindowPort(hWndMain), NULL); + KillPicture(pict); } + CloseComponent(gi); } - if (path) CFRelease(path); } - if (openingURL) CFRelease(openingURL); + CFRelease(openingURL); } SetPort(port); } @@ -657,10 +637,6 @@ static void openingNP2(void) { int main(int argc, char *argv[]) { - Rect wRect; -#if 0 - EventRecord event; -#endif EventRef theEvent; EventTargetRef theTarget; #ifdef OPENING_WAIT @@ -678,19 +654,10 @@ int main(int argc, char *argv[]) { TRACEINIT(); - SetRect(&wRect, 100, 100, 100, 100); - hWndMain = NewWindow(0, &wRect, "\pNeko Project II", FALSE, - noGrowDocProc, (WindowPtr)-1, TRUE, 0); - if (!hWndMain) { - TRACETERM(); - macossub_term(); - dosio_term(); - return(0); - } - scrnmng_initialize(); - SizeWindow(hWndMain, 640, 400, TRUE); - setUpCarbonEvent(); - ShowWindow(hWndMain); + if (!(setupMainWindow())) { + return(0); + } + #ifdef NP2OPENING openingNP2(); #endif @@ -728,6 +695,12 @@ int main(int argc, char *argv[]) { pccore_init(); S98_init(); + hid_init(); + if (soundmng_initialize() == SUCCESS) { + soundmng_pcmvolume(SOUND_PCMSEEK, np2cfg.MOTORVOL); + soundmng_pcmvolume(SOUND_PCMSEEK1, np2cfg.MOTORVOL); + } + #if defined(NP2GCC) if (np2oscfg.MOUSE_SW) { // ver0.30 mouse_running(MOUSE_ON); @@ -736,7 +709,6 @@ int main(int argc, char *argv[]) { #ifdef OPENING_WAIT while((GETTICK() - tick) < OPENING_WAIT); #endif - scrndraw_redraw(); pccore_reset(); #if defined(USE_RESUME) @@ -745,9 +717,6 @@ int main(int argc, char *argv[]) { } #endif -#if 0 - SetEventMask(everyEvent); -#endif theTarget = GetEventDispatcherTarget(); np2running = TRUE; @@ -757,16 +726,9 @@ int main(int argc, char *argv[]) { SendEventToEventTarget (theEvent, theTarget); ReleaseEvent(theEvent); } -#if 0 - if (WaitNextEvent(everyEvent, &event, 0, 0)) { - eventproc(&event); - } -#endif else { + soundmng_play(); if (np2oscfg.NOWAIT) { -#if 0 - mackbd_callback(); -#endif pccore_exec(framecnt == 0); if (np2oscfg.DRAW_SKIP) { // nowait frame skip framecnt++; @@ -783,9 +745,6 @@ int main(int argc, char *argv[]) { } else if (np2oscfg.DRAW_SKIP) { // frame skip if (framecnt < np2oscfg.DRAW_SKIP) { -#if 0 - mackbd_callback(); -#endif pccore_exec(framecnt == 0); framecnt++; } @@ -796,9 +755,6 @@ int main(int argc, char *argv[]) { else { // auto skip if (!waitcnt) { UINT cnt; -#if 0 - mackbd_callback(); -#endif pccore_exec(framecnt == 0); framecnt++; cnt = timing_getcount(); @@ -818,7 +774,7 @@ int main(int argc, char *argv[]) { else { timing_setcount(cnt - framecnt); } - framecnt = 0; + processwait(0); } } else { @@ -829,22 +785,32 @@ int main(int argc, char *argv[]) { } } np2running = FALSE; + menu_setrecording(true); + if (scrnmode & SCRNMODE_FULLSCREEN) { + toggleFullscreen(); + } + pccore_cfgupdate(); #if defined(USE_RESUME) if (np2oscfg.resume) { flagsave(np2resume); } + else { + flagdelete(np2resume); + } #endif pccore_term(); S98_trash(); + hid_clear(); #if defined(NP2GCC) mouse_running(MOUSE_OFF); #endif + soundmng_deinitialize(); scrnmng_destroy(); if (sys_updates & (SYS_UPDATECFG | SYS_UPDATEOSCFG)) { @@ -959,10 +925,19 @@ static pascal OSStatus np2windowevent(Ev switch (eventClass) { - case kEventClassWindow: - if (whatHappened == kEventWindowClose) { - np2running = FALSE; - result = noErr; + case kEventClassWindow: + switch (whatHappened) + { + case kEventWindowClose: + np2running = FALSE; + result = noErr; + break; + case kEventWindowShowing: + scrndraw_redraw(); + break; + case kEventWindowActivated: + DisableAllMenuItems(GetMenuHandle(IDM_EDIT)); + break; } break; case kEventClassKeyboard: @@ -1027,6 +1002,8 @@ static const EventTypeSpec appEventList[ static const EventTypeSpec windEventList[] = { {kEventClassWindow, kEventWindowClose}, + {kEventClassWindow, kEventWindowShowing}, + {kEventClassWindow, kEventWindowActivated}, {kEventClassKeyboard, kEventRawKeyDown}, {kEventClassKeyboard, kEventRawKeyUp}, {kEventClassKeyboard, kEventRawKeyRepeat}, @@ -1043,5 +1020,73 @@ static void setUpCarbonEvent(void) { InstallWindowEventHandler(hWndMain, NewEventHandlerUPP(np2windowevent), GetEventTypeCount(windEventList), windEventList, 0, NULL); + InstallStandardEventHandler(GetWindowEventTarget(hWndMain)); +} + +bool setupMainWindow(void) { +#if defined(NP2GCC) && 0 +#else + Rect wRect; + + SetRect(&wRect, 100, 100, 100, 100); + hWndMain = NewWindow(0, &wRect, "\pNeko Project II", FALSE, + noGrowDocProc, (WindowPtr)-1, TRUE, 0); + if (!hWndMain) { + TRACETERM(); + macossub_term(); + dosio_term(); + return(false); + } + SizeWindow(hWndMain, 640, 400, TRUE); +#endif + scrnmng_initialize(); + setUpCarbonEvent(); + ShowWindow(hWndMain); + return(true); +} + +static void toggleFullscreen(void) { + static Ptr bkfullscreen; + static BYTE mouse = 0; + + soundmng_stop(); + if (!scrnmode & SCRNMODE_FULLSCREEN) { + RGBColor col = {0, 0, 0}; + short w=640, h=480; + DisposeWindow(hWndMain); + BeginFullScreen(&bkfullscreen,0,&w,&h,&hWndMain,&col,(fullScreenAllowEvents | fullScreenDontChangeMenuBar)); + HideMenuBar(); + setUpCarbonEvent(); + if (!np2oscfg.MOUSE_SW) { + mouse = np2oscfg.MOUSE_SW; + mouse_running(MOUSE_ON); + menu_setmouse(1); + } + changescreen(scrnmode | SCRNMODE_FULLSCREEN); + } + else { + scrnmng_destroy(); + EndFullScreen(bkfullscreen, 0); + setupMainWindow(); + changescreen(scrnmode & (~SCRNMODE_FULLSCREEN)); + if (!mouse) { + mouse_running(MOUSE_OFF); + menu_setmouse(0); + } + ShowMenuBar(); + } + CheckMenuItem(GetMenuHandle(IDM_SCREEN), LoWord(IDM_FULLSCREEN), scrnmode & SCRNMODE_FULLSCREEN); + soundmng_play(); +} + +void toggleMenubar(void) { + if (scrnmode & SCRNMODE_FULLSCREEN) { + if (!np2oscfg.MOUSE_SW) { + ShowMenuBar(); + } + else { + HideMenuBar(); + } + } }