--- np2/macosx/np2.cpp 2003/10/17 07:17:20 1.4 +++ np2/macosx/np2.cpp 2003/10/30 19:39:52 1.25 @@ -3,6 +3,7 @@ #include "strres.h" #include "np2.h" #include "dosio.h" +#include "commng.h" #include "scrnmng.h" #include "soundmng.h" #include "sysmng.h" @@ -26,12 +27,26 @@ #include "diskdrv.h" #include "fddfile.h" #include "statsave.h" - +#include "mousemng.h" +#include "configure.h" +#include "screenopt.h" +#include "soundopt.h" +#include "macnewdisk.h" +#include "fdefine.h" +#include "hid.h" +#include "midiopt.h" #define USE_RESUME +#define NP2OPENING + +#ifdef NP2OPENING +#include +// #define OPENING_WAIT 1500 +#endif - NP2OSCFG np2oscfg = {0, 2, 0, 0, 0}; + + NP2OSCFG np2oscfg = {0, 2, 0, 0, 0, 0, 1, 0}; WindowPtr hWndMain; BOOL np2running; @@ -56,13 +71,12 @@ static const char np2resume[] = "sav"; // ---- おまじない -#if TARGET_CARBON #define AEProc(fn) NewAEEventHandlerUPP((AEEventHandlerProcPtr)(fn)) -#else -#define AEProc(fn) NewAEEventHandlerProc(fn) -#endif -#ifdef TARGET_API_MAC_CARBON +static void setUpCarbonEvent(void); +static bool setupMainWindow(void); +static void toggleFullscreen(void); + static pascal OSErr handleQuitApp(const AppleEvent *event, AppleEvent *reply, long refcon) { @@ -71,30 +85,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 1 Handle hMenu; MenuHandle happlemenu; @@ -112,21 +147,54 @@ static void MenuBarInit(void) { InsertMenu(GetMenu(IDM_KEYBOARD), -1); InsertMenu(GetMenu(IDM_SOUND), -1); InsertMenu(GetMenu(IDM_MEMORY), -1); + SetMenuItemModifiers(GetMenuRef(IDM_FDD2), IDM_FDD2OPEN, kMenuOptionModifier); + SetMenuItemModifiers(GetMenuRef(IDM_FDD2), IDM_FDD2EJECT, kMenuOptionModifier); + SetMenuItemModifiers(GetMenuRef(IDM_SASI2), IDM_SASI2OPEN, kMenuOptionModifier); DrawMenuBar(); +#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: @@ -137,17 +205,23 @@ static void HandleMenuChoice(long wParam pccore_cfgupdate(); pccore_reset(); break; + + case IDM_CONFIGURE: + 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; + case IDM_EXIT: np2running = FALSE; break; @@ -184,6 +258,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)); @@ -241,6 +319,31 @@ static void HandleMenuChoice(long wParam update |= SYS_UPDATECFG; break; + case IDM_SCREENOPT: + initScreenOpt(); + break; + + case IDM_MOUSE: + mouse_running(MOUSE_XOR); + menu_setmouse(np2oscfg.MOUSE_SW ^ 1); + sysmng_update(SYS_UPDATECFG); + toggleMenubar(); + break; + + case IDM_MIDIOPT: + initMidiOpt(); + break; + + case IDM_MIDIPANIC: + rs232c_midipanic(); + mpu98ii_midipanic(); + pc9861k_midipanic(); + break; + + case IDM_SNDOPT: + initSoundOpt(); + break; + case IDM_KEY: menu_setkey(0); keystat_resetjoykey(); @@ -388,6 +491,14 @@ static void HandleMenuChoice(long wParam update |= SYS_UPDATECFG; break; + case IDM_BMPSAVE: + dialog_writebmp(); + break; + + case IDM_S98LOGGING: + dialog_s98(); + break; + case IDM_DISPCLOCK: menu_setdispclk(np2oscfg.DISPCLK ^ 1); update |= SYS_UPDATECFG; @@ -408,105 +519,46 @@ static void HandleMenuChoice(long wParam update |= SYS_UPDATECFG; break; + case IDM_MSRAPID: + menu_setmsrapid(np2cfg.MOUSERAPID ^ 1); + update |= SYS_UPDATECFG; + break; + case IDM_I286SAVE: 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); } -static void HandleUpdateEvent(EventRecord *pevent) { - - WindowPtr hWnd; - - hWnd = (WindowPtr)pevent->message; - BeginUpdate(hWnd); - scrndraw_redraw(); - EndUpdate(hWnd); -} - 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: - break; - - case inGoAway: - if (TrackGoAway(hWnd, pevent->where)) { } - np2running = FALSE; - break; } } -static void eventproc(EventRecord *event) { - - switch(event->what) { - case mouseDown: - HandleMouseDown(event); - break; - - case updateEvt: - HandleUpdateEvent(event); - break; - - case keyDown: - case autoKey: - if (event->modifiers & cmdKey) { - if (!mackbd_down(1, ((event->message) & keyCodeMask) >> 8)) { - HandleMenuChoice(MenuKey(event->message & charCodeMask)); - } - } - else { - mackbd_down(0, ((event->message) & keyCodeMask) >> 8); - } - break; - - case keyUp: - mackbd_up(((event->message) & keyCodeMask) >> 8); - break; - } -} +// ---- 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); @@ -530,6 +582,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]; @@ -543,10 +603,56 @@ static void flagload(const char *ext) { } } +#ifdef NP2OPENING +static void openingNP2(void) { + Rect srt, bounds; + GrafPtr port; + CFURLRef openingURL; + char buffer[1024]; + FSRef fsr; + FSSpec fsc; + PicHandle pict; + GraphicsImportComponent gi; + + GetPort(&port); + SetPortWindowPort(hWndMain); + const RGBColor col = {0, 0, 0}; + SetRect(&bounds, 0, 0, 640, 400); + RGBBackColor(&col); + EraseRect(&bounds); + + openingURL=CFBundleCopyResourceURL(CFBundleGetMainBundle(), CFSTR("nekop2"), CFSTR("bmp"), NULL); + if (openingURL) { + 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); + } + } + CFRelease(openingURL); + } + SetPort(port); +} +#endif + + int main(int argc, char *argv[]) { - Rect wRect; - EventRecord event; + EventRef theEvent; + EventTargetRef theTarget; +#ifdef OPENING_WAIT + UINT32 tick; +#endif dosio_init(); file_setcd(target); @@ -557,17 +663,18 @@ int main(int argc, char *argv[]) { initload(); - SetRect(&wRect, 100, 100, 100, 100); - hWndMain = NewWindow(0, &wRect, "\pNeko Project II", FALSE, - noGrowDocProc, (WindowPtr)-1, TRUE, 0); - if (!hWndMain) { - macossub_term(); - dosio_term(); - return(0); - } - scrnmng_initialize(); - SizeWindow(hWndMain, 640, 400, TRUE); - ShowWindow(hWndMain); + TRACEINIT(); + + if (!(setupMainWindow())) { + return(0); + } + +#ifdef NP2OPENING + openingNP2(); +#endif +#ifdef OPENING_WAIT + tick = GETTICK(); +#endif menu_setrotate(0); menu_setdispmode(np2cfg.DISPSYNC); @@ -586,33 +693,53 @@ int main(int argc, char *argv[]) { scrnmode = 0; if (scrnmng_create(scrnmode) != SUCCESS) { + TRACETERM(); macossub_term(); dosio_term(); DisposeWindow(hWndMain); return(0); } + commng_initialize(); sysmng_initialize(); + mackbd_initialize(); pccore_init(); S98_init(); - scrndraw_redraw(); + 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); + } +#endif +#ifdef OPENING_WAIT + while((GETTICK() - tick) < OPENING_WAIT); +#endif pccore_reset(); #if defined(USE_RESUME) - flagload(np2resume); + if (np2oscfg.resume) { + flagload(np2resume); + } #endif - SetEventMask(everyEvent); - + theTarget = GetEventDispatcherTarget(); + np2running = TRUE; while(np2running) { - if (WaitNextEvent(everyEvent, &event, 0, 0)) { - eventproc(&event); - } + if (ReceiveNextEvent(0, NULL,kEventDurationNoWait,true, &theEvent)== noErr) + { + SendEventToEventTarget (theEvent, theTarget); + ReleaseEvent(theEvent); + } else { + soundmng_play(); if (np2oscfg.NOWAIT) { - mackbd_callback(); pccore_exec(framecnt == 0); if (np2oscfg.DRAW_SKIP) { // nowait frame skip framecnt++; @@ -629,7 +756,6 @@ int main(int argc, char *argv[]) { } else if (np2oscfg.DRAW_SKIP) { // frame skip if (framecnt < np2oscfg.DRAW_SKIP) { - mackbd_callback(); pccore_exec(framecnt == 0); framecnt++; } @@ -639,20 +765,27 @@ int main(int argc, char *argv[]) { } else { // auto skip if (!waitcnt) { - mackbd_callback(); + UINT cnt; pccore_exec(framecnt == 0); framecnt++; - if (timing_getcount() < framecnt) { + cnt = timing_getcount(); + if (framecnt > cnt) { waitcnt = framecnt; if (framemax > 1) { framemax--; } } else if (framecnt >= framemax) { - waitcnt = framecnt; if (framemax < 12) { framemax++; } + if (cnt >= 12) { + timing_reset(); + } + else { + timing_setcount(cnt - framecnt); + } + processwait(0); } } else { @@ -663,19 +796,35 @@ int main(int argc, char *argv[]) { } } np2running = FALSE; + menu_setrecording(true); + if (scrnmode & SCRNMODE_FULLSCREEN) { + toggleFullscreen(); + } + pccore_cfgupdate(); #if defined(USE_RESUME) - flagsave(np2resume); + 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)) { + if (sys_updates & (SYS_UPDATECFG | SYS_UPDATEOSCFG)) { initsave(); } TRACETERM(); @@ -689,3 +838,266 @@ int main(int argc, char *argv[]) { return(0); } +//以下、ごっそりIIxからマージ +static pascal OSStatus np2appevent (EventHandlerCallRef myHandlerChain, EventRef event, void* userData) +{ + UInt32 whatHappened; + OSStatus result = eventNotHandledErr; + + long eventClass; + + eventClass = GetEventClass(event); + whatHappened = GetEventKind(event); + + EventRecord eve; + ConvertEventRefToEventRecord( event,&eve ); + + if (IsDialogEvent(&eve)) return result; + + UInt32 modif; + GetEventParameter (event, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modif); + +#if defined(NP2GCC) + HIPoint delta; + EventMouseButton buttonKind; + GetEventParameter (event, kEventParamMouseButton, typeMouseButton, NULL, sizeof(EventMouseButton), NULL, &buttonKind); + + BYTE ret; +#endif + + switch (eventClass) + { + case kEventClassAppleEvent: + if (whatHappened == kEventAppleEvent) { + AEProcessAppleEvent(&eve); + } + break; + + case kEventClassMouse: +#if defined(NP2GCC) + switch (whatHappened) + { + case kEventMouseMoved: + GetEventParameter (event, kEventParamMouseDelta, typeHIPoint, NULL, sizeof(HIPoint), NULL, &delta); + mouse_callback(delta); + result = noErr; + break; + case kEventMouseDown: + if (buttonKind == kEventMouseButtonSecondary | modif & controlKey) { + ret=mouse_btn(MOUSE_RIGHTDOWN); + } + else { + HandleMouseDown(&eve); + } + result=noErr; + break; + case kEventMouseUp: + if (buttonKind == kEventMouseButtonSecondary | modif & controlKey) { + ret=mouse_btn(MOUSE_RIGHTUP); + } + else if (buttonKind == kEventMouseButtonTertiary) { + mouse_running(MOUSE_XOR); + menu_setmouse(np2oscfg.MOUSE_SW ^ 1); + sysmng_update(SYS_UPDATECFG); + } + else { + ret=mouse_btn(MOUSE_LEFTUP); + } + result=noErr; + break; + } +#else + if (whatHappened == kEventMouseDown) { + HandleMouseDown(&eve); + } +#endif + break; + default: + break; + } + + (void)myHandlerChain; + (void)userData; + return result; +} + +static pascal OSStatus np2windowevent(EventHandlerCallRef myHandler, EventRef event, void* userData) +{ + WindowRef window; + UInt32 whatHappened; + OSStatus result = eventNotHandledErr; + long eventClass; + static UInt32 backup = 0; + + GetEventParameter(event, kEventParamDirectObject, typeWindowRef, NULL, + sizeof(window), NULL, &window); + eventClass = GetEventClass(event); + whatHappened = GetEventKind(event); + + switch (eventClass) + { + 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: + UInt32 key; + GetEventParameter (event, kEventParamKeyCode, typeUInt32, NULL, sizeof(UInt32), NULL, &key); + UInt32 modif; + GetEventParameter (event, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modif); + switch (whatHappened) + { + case kEventRawKeyUp: + mackbd_f12up(key); + result = noErr; + break; + case kEventRawKeyRepeat: + mackbd_f12down(key); + result = noErr; + break; + case kEventRawKeyDown: + if (modif & cmdKey) { + EventRecord eve; + ConvertEventRefToEventRecord( event,&eve ); + HandleMenuChoice(MenuEvent(&eve)); + } + else { + mackbd_f12down(key); + } + result = 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; + } + result = noErr; + break; + default: + break; + } + default: + break; + } + + (void)myHandler; + (void)userData; + return result; +} + +static const EventTypeSpec appEventList[] = { + {kEventClassAppleEvent, kEventAppleEvent}, + {kEventClassMouse, kEventMouseDown}, +#if defined(NP2GCC) + {kEventClassMouse, kEventMouseMoved}, + {kEventClassMouse, kEventMouseUp}, +#endif + }; + +static const EventTypeSpec windEventList[] = { + {kEventClassWindow, kEventWindowClose}, + {kEventClassWindow, kEventWindowShowing}, + {kEventClassWindow, kEventWindowActivated}, + {kEventClassKeyboard, kEventRawKeyDown}, + {kEventClassKeyboard, kEventRawKeyUp}, + {kEventClassKeyboard, kEventRawKeyRepeat}, + {kEventClassKeyboard, kEventRawKeyModifiersChanged}, + }; + + +static void setUpCarbonEvent(void) { + + InstallStandardEventHandler(GetWindowEventTarget(hWndMain)); + InstallApplicationEventHandler(NewEventHandlerUPP(np2appevent), + GetEventTypeCount(appEventList), + appEventList, 0, NULL); + 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(); + } + } +} +