--- np2/macosx/np2.cpp 2003/10/23 06:26:16 1.12 +++ np2/macosx/np2.cpp 2003/10/25 21:28:14 1.22 @@ -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,12 +29,21 @@ #include "statsave.h" #include "mousemng.h" #include "configure.h" +#include "screenopt.h" +#include "soundopt.h" #define USE_RESUME +#define NP2OPENING + +#ifdef NP2OPENING +#include +// #define OPENING_WAIT 1500 +#endif + - NP2OSCFG np2oscfg = {0, 2, 0, 0, 0, 0}; + NP2OSCFG np2oscfg = {0, 2, 0, 0, 0, 0, 1, 0}; WindowPtr hWndMain; BOOL np2running; @@ -65,6 +75,8 @@ static const char np2resume[] = "sav"; #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, @@ -127,8 +139,35 @@ static void MenuBarInit(void) { } static void changescreen(BYTE mode) { - +#if 0 (void)mode; +#endif + + 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) { @@ -161,6 +200,11 @@ static void HandleMenuChoice(long wParam newhdddisk(); break; #endif + + case IDM_FONT: + dialog_font(); + break; + case IDM_EXIT: np2running = FALSE; break; @@ -197,6 +241,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)); @@ -255,11 +303,20 @@ static void HandleMenuChoice(long wParam 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); + toggleMenubar(); break; + + case IDM_SOUNDOPT: + initSoundOpt(); + break; #endif case IDM_KEY: @@ -464,6 +521,7 @@ static void HandleMouseDown(EventRecord WindowPtr hWnd; Rect rDrag; + soundmng_stop(); switch(FindWindow(pevent->where, &hWnd)) { case inMenuBar: HandleMenuChoice(MenuSelect(pevent->where)); @@ -496,11 +554,14 @@ static void HandleMouseDown(EventRecord #endif break; +#ifndef NP2GCC case inGoAway: if (TrackGoAway(hWnd, pevent->where)) { } np2running = FALSE; break; +#endif } + soundmng_play(); } #if 0 @@ -546,8 +607,8 @@ static void eventproc(EventRecord *event 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); @@ -584,14 +645,66 @@ static void flagload(const char *ext) { } } +#ifdef NP2OPENING +static void openingNP2(void) { + Rect srt, bounds; + GrafPtr port; + CFURLRef openingURL; + CFStringRef path; + 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=CFURLCopyAbsoluteURL(CFBundleCopyResourcesDirectoryURL(CFBundleGetMainBundle())); + 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 (path) CFRelease(path); + } + if (openingURL) CFRelease(openingURL); + } + SetPort(port); +} +#endif + + int main(int argc, char *argv[]) { - Rect wRect; #if 0 + Rect wRect; EventRecord event; #endif EventRef theEvent; EventTargetRef theTarget; +#ifdef OPENING_WAIT + UINT32 tick; +#endif dosio_init(); file_setcd(target); @@ -604,6 +717,7 @@ int main(int argc, char *argv[]) { TRACEINIT(); +#if 0 SetRect(&wRect, 100, 100, 100, 100); hWndMain = NewWindow(0, &wRect, "\pNeko Project II", FALSE, noGrowDocProc, (WindowPtr)-1, TRUE, 0); @@ -617,6 +731,17 @@ int main(int argc, char *argv[]) { SizeWindow(hWndMain, 640, 400, TRUE); setUpCarbonEvent(); ShowWindow(hWndMain); +#endif + if (!(setupMainWindow())) { + return(0); + } + +#ifdef NP2OPENING + openingNP2(); +#endif +#ifdef OPENING_WAIT + tick = GETTICK(); +#endif menu_setrotate(0); menu_setdispmode(np2cfg.DISPSYNC); @@ -642,6 +767,7 @@ int main(int argc, char *argv[]) { return(0); } + commng_initialize(); sysmng_initialize(); mackbd_initialize(); pccore_init(); @@ -652,11 +778,16 @@ int main(int argc, char *argv[]) { mouse_running(MOUSE_ON); } #endif +#ifdef OPENING_WAIT + while((GETTICK() - tick) < OPENING_WAIT); +#endif scrndraw_redraw(); pccore_reset(); #if defined(USE_RESUME) - flagload(np2resume); + if (np2oscfg.resume) { + flagload(np2resume); + } #endif #if 0 @@ -678,10 +809,7 @@ int main(int argc, char *argv[]) { #endif else { if (np2oscfg.NOWAIT) { -#if defined(NP2GCC) && 0 - mouse_callback(); -#endif -#if 1 +#if 0 mackbd_callback(); #endif pccore_exec(framecnt == 0); @@ -700,10 +828,7 @@ 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 +#if 0 mackbd_callback(); #endif pccore_exec(framecnt == 0); @@ -716,15 +841,11 @@ int main(int argc, char *argv[]) { else { // auto skip if (!waitcnt) { UINT cnt; -#if defined(NP2GCC) && 0 - mouse_callback(); -#endif -#if 1 +#if 0 mackbd_callback(); #endif pccore_exec(framecnt == 0); framecnt++; - // ¥Æ¥¹¥È cnt = timing_getcount(); if (framecnt > cnt) { waitcnt = framecnt; @@ -737,12 +858,12 @@ int main(int argc, char *argv[]) { framemax++; } if (cnt >= 12) { - timing_init(); + timing_reset(); } else { timing_setcount(cnt - framecnt); } - framecnt = 0; + processwait(0); } } else { @@ -754,10 +875,16 @@ int main(int argc, char *argv[]) { } np2running = FALSE; + if (scrnmode & SCRNMODE_FULLSCREEN) { + toggleFullscreen(); + } + pccore_cfgupdate(); #if defined(USE_RESUME) - flagsave(np2resume); + if (np2oscfg.resume) { + flagsave(np2resume); + } #endif pccore_term(); @@ -803,6 +930,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); @@ -822,23 +950,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); @@ -849,16 +964,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) { @@ -881,6 +999,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); @@ -894,6 +1013,9 @@ static pascal OSStatus np2windowevent(Ev np2running = FALSE; result = noErr; } + else if (whatHappened == kEventWindowShowing) { + scrndraw_redraw(); + } break; case kEventClassKeyboard: UInt32 key; @@ -903,26 +1025,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; @@ -933,8 +1050,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: @@ -960,6 +1079,7 @@ static const EventTypeSpec appEventList[ static const EventTypeSpec windEventList[] = { {kEventClassWindow, kEventWindowClose}, + {kEventClassWindow, kEventWindowShowing}, {kEventClassKeyboard, kEventRawKeyDown}, {kEventClassKeyboard, kEventRawKeyUp}, {kEventClassKeyboard, kEventRawKeyRepeat}, @@ -971,10 +1091,77 @@ 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); } +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(); + } + } +} +