--- np2/macosx/np2.cpp 2003/10/23 12:58:44 1.13 +++ np2/macosx/np2.cpp 2003/11/03 18:50:25 1.28 @@ -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" @@ -28,19 +29,30 @@ #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" +#include "macalert.h" +#include "np2opening.h" +#include "toolwin.h" - +#include #define USE_RESUME +#define NP2OPENING +// #define OPENING_WAIT 1500 - NP2OSCFG np2oscfg = {0, 2, 0, 0, 0, 0}; + NP2OSCFG np2oscfg = {0, 2, 0, 0, 0, 0, 1, 0}; WindowPtr hWndMain; BOOL np2running; static UINT framecnt = 0; static UINT waitcnt = 0; static UINT framemax = 1; -static BYTE scrnmode; + BYTE scrnmode; #define DRAG_THRESHOLD 5 @@ -58,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) { @@ -75,30 +84,42 @@ 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)) { + setDropFile(fsc, i-1); + } + } + 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; @@ -116,26 +137,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(); -#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: @@ -143,24 +192,28 @@ static void HandleMenuChoice(long wParam break; case IDM_RESET: - pccore_cfgupdate(); - pccore_reset(); + if (ResetWarningDialogProc()) { + 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; @@ -171,6 +224,7 @@ static void HandleMenuChoice(long wParam case IDM_FDD1EJECT: diskdrv_setfdd(0, NULL, 0); + toolwin_setfdd(0, NULL); break; case IDM_FDD2OPEN: @@ -179,6 +233,7 @@ static void HandleMenuChoice(long wParam case IDM_FDD2EJECT: diskdrv_setfdd(1, NULL, 0); + toolwin_setfdd(1, NULL); break; case IDM_SASI1OPEN: @@ -197,6 +252,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)); @@ -254,13 +313,29 @@ static void HandleMenuChoice(long wParam update |= SYS_UPDATECFG; break; -#if defined(NP2GCC) + case IDM_SCREENOPT: + initScreenOpt(); + break; + case IDM_MOUSE: mouse_running(MOUSE_XOR); menu_setmouse(np2oscfg.MOUSE_SW ^ 1); sysmng_update(SYS_UPDATECFG); break; -#endif + + 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); @@ -409,6 +484,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; @@ -429,125 +512,47 @@ 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); } -#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; - - case inGoAway: - if (TrackGoAway(hWnd, pevent->where)) { } - np2running = FALSE; - break; } } -#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); + toolwin_draw((BYTE)waitcnt); if (np2oscfg.DISPCLK & 3) { if (sysmng_workclockrenewal()) { sysmng_updatecaption(3); @@ -571,27 +576,45 @@ 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]; char buf[1024]; - int ret; + int ret, r; + ret = IDOK; getstatfilename(path, ext, sizeof(path)); - ret = statsave_check(path, buf, sizeof(buf)); - if (ret == NP2FLAG_SUCCESS) { + r = statsave_check(path, buf, sizeof(buf)); + if (r & (~NP2FLAG_DISKCHG)) { + ResumeErrorDialogProc(); + ret = IDCANCEL; + } + else if (r & NP2FLAG_DISKCHG) { + ret = ResumeWarningDialogProc(buf); + } + if (ret == IDOK) { statsave_load(path); + toolwin_setfdd(0, fdd_diskname(0)); + toolwin_setfdd(1, fdd_diskname(1)); } + return; } int main(int argc, char *argv[]) { - Rect wRect; -#if 0 - EventRecord event; -#endif EventRef theEvent; EventTargetRef theTarget; +#ifdef OPENING_WAIT + UINT32 tick; +#endif dosio_init(); file_setcd(target); @@ -603,20 +626,18 @@ int main(int argc, char *argv[]) { initload(); TRACEINIT(); + + toolwin_readini(); + if (!(setupMainWindow())) { + return(0); + } - 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); +#ifdef NP2OPENING + openingNP2(); +#endif +#ifdef OPENING_WAIT + tick = GETTICK(); +#endif menu_setrotate(0); menu_setdispmode(np2cfg.DISPSYNC); @@ -642,26 +663,34 @@ int main(int argc, char *argv[]) { return(0); } + commng_initialize(); sysmng_initialize(); mackbd_initialize(); 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); } #endif - scrndraw_redraw(); +#ifdef OPENING_WAIT + while((GETTICK() - tick) < OPENING_WAIT); +#endif pccore_reset(); #if defined(USE_RESUME) - flagload(np2resume); + if (np2oscfg.resume) { + flagload(np2resume); + } #endif -#if 0 - SetEventMask(everyEvent); -#endif theTarget = GetEventDispatcherTarget(); np2running = TRUE; @@ -671,19 +700,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 defined(NP2GCC) && 0 - mouse_callback(); -#endif -#if 1 - mackbd_callback(); -#endif pccore_exec(framecnt == 0); if (np2oscfg.DRAW_SKIP) { // nowait frame skip framecnt++; @@ -700,12 +719,6 @@ int main(int argc, char *argv[]) { } else if (np2oscfg.DRAW_SKIP) { // frame skip if (framecnt < np2oscfg.DRAW_SKIP) { -#if defined(NP2GCC) && 0 - mouse_callback(); -#endif -#if 1 - mackbd_callback(); -#endif pccore_exec(framecnt == 0); framecnt++; } @@ -716,12 +729,6 @@ int main(int argc, char *argv[]) { else { // auto skip if (!waitcnt) { UINT cnt; -#if defined(NP2GCC) && 0 - mouse_callback(); -#endif -#if 1 - mackbd_callback(); -#endif pccore_exec(framecnt == 0); framecnt++; cnt = timing_getcount(); @@ -741,7 +748,7 @@ int main(int argc, char *argv[]) { else { timing_setcount(cnt - framecnt); } - framecnt = 0; + processwait(0); } } else { @@ -752,20 +759,33 @@ int main(int argc, char *argv[]) { } } np2running = FALSE; + menu_setrecording(true); + if (scrnmode & SCRNMODE_FULLSCREEN) { + toggleFullscreen(); + } + + toolwin_writeini(); 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)) { @@ -776,6 +796,7 @@ int main(int argc, char *argv[]) { dosio_term(); DisposeWindow(hWndMain); + toolwin_close(); (void)argc; (void)argv; @@ -802,6 +823,7 @@ static pascal OSStatus np2appevent (Even 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); @@ -821,23 +843,10 @@ static pascal OSStatus np2appevent (Even switch (whatHappened) { case kEventMouseMoved: -#if 0 - if (isFullScreen) - { - HIPoint delta; - Point pt; - GetEventParameter (event, kEventParamMouseDelta, typeHIPoint, NULL, sizeof(HIPoint), NULL, &delta); - pt.h=(short)delta.x; - pt.v=(short)delta.y; - mouse_callback(pt); - } - else { - mouse_callback(eve.where); - } -#endif - mouse_callback(); - result = noErr; - break; + 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); @@ -848,16 +857,19 @@ static pascal OSStatus np2appevent (Even result=noErr; break; case kEventMouseUp: - { - if (buttonKind == kEventMouseButtonSecondary | modif & cmdKey) { - ret=mouse_btn(MOUSE_RIGHTUP); - } - else { - ret=mouse_btn(MOUSE_LEFTUP); - } - result=noErr; - break; - } + 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) { @@ -880,6 +892,7 @@ static pascal OSStatus np2windowevent(Ev UInt32 whatHappened; OSStatus result = eventNotHandledErr; long eventClass; + static UInt32 backup = 0; GetEventParameter(event, kEventParamDirectObject, typeWindowRef, NULL, sizeof(window), NULL, &window); @@ -888,10 +901,25 @@ 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 kEventWindowActivated: + DisableAllMenuItems(GetMenuHandle(IDM_EDIT)); + break; + case kEventWindowToolbarSwitchMode: + toolwin_open(); + break; + case kEventWindowDragStarted: + soundmng_stop(); + break; + case kEventWindowDragCompleted: + soundmng_play(); + break; } break; case kEventClassKeyboard: @@ -902,26 +930,21 @@ static pascal OSStatus np2windowevent(Ev switch (whatHappened) { case kEventRawKeyUp: - //mackeyup((int)key); mackbd_f12up(key); result = noErr; break; case kEventRawKeyRepeat: - //mackeydown(0, (int)key); mackbd_f12down(key); result = noErr; break; case kEventRawKeyDown: - mackbd_f12down(key); if (modif & cmdKey) { - //if (!mackeydown(1, (int)key)) { - char para; - GetEventParameter (event, kEventParamKeyMacCharCodes, typeChar, NULL, sizeof(char), NULL, ¶); - HandleMenuChoice(MenuKey(para)); - //} + EventRecord eve; + ConvertEventRefToEventRecord( event,&eve ); + HandleMenuChoice(MenuEvent(&eve)); } else { - //mackeydown(0, (int)key); + mackbd_f12down(key); } result = noErr; break; @@ -932,8 +955,10 @@ static pascal OSStatus np2windowevent(Ev else keystat_senddata(0x73 | 0x80); if (modif & controlKey) keystat_senddata(0x74); else keystat_senddata(0x74 | 0x80); - if (modif & alphaLock) keystat_senddata(0x79); - else keystat_senddata(0x79 | 0x80); + if ((modif & alphaLock) != (backup & alphaLock)) { + keystat_senddata(0x71); + backup = modif; + } result = noErr; break; default: @@ -959,6 +984,10 @@ static const EventTypeSpec appEventList[ static const EventTypeSpec windEventList[] = { {kEventClassWindow, kEventWindowClose}, + {kEventClassWindow, kEventWindowActivated}, + {kEventClassWindow, kEventWindowToolbarSwitchMode}, + {kEventClassWindow, kEventWindowDragStarted}, + {kEventClassWindow, kEventWindowDragCompleted}, {kEventClassKeyboard, kEventRawKeyDown}, {kEventClassKeyboard, kEventRawKeyUp}, {kEventClassKeyboard, kEventRawKeyRepeat}, @@ -970,10 +999,82 @@ static void setUpCarbonEvent(void) { InstallStandardEventHandler(GetWindowEventTarget(hWndMain)); InstallApplicationEventHandler(NewEventHandlerUPP(np2appevent), - sizeof(appEventList)/sizeof(EventTypeSpec), + GetEventTypeCount(appEventList), appEventList, 0, NULL); InstallWindowEventHandler(hWndMain, NewEventHandlerUPP(np2windowevent), - sizeof(windEventList)/sizeof(EventTypeSpec), + GetEventTypeCount(windEventList), windEventList, 0, NULL); + InstallStandardEventHandler(GetWindowEventTarget(hWndMain)); } +static bool setupMainWindow(void) { +#if defined(NP2GCC) + OSStatus err; + IBNibRef nibRef; + + err = CreateNibReference(CFSTR("np2"), &nibRef); + if (err ==noErr ) { + CreateWindowFromNib(nibRef, CFSTR("MainWindow"), &hWndMain); + DisposeNibReference ( nibRef); + } + else { + return(false); + } + +#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 recieveCommand(long param) { + HandleMenuChoice(param); +}