--- np2/macosx/np2.cpp 2003/11/12 19:56:50 1.36 +++ np2/macosx/np2.cpp 2004/01/31 19:45:25 1.50 @@ -26,7 +26,6 @@ #include "s98.h" #include "diskdrv.h" #include "fddfile.h" -#include "statsave.h" #include "mousemng.h" #include "configure.h" #include "screenopt.h" @@ -46,7 +45,7 @@ // #define OPENING_WAIT 1500 - NP2OSCFG np2oscfg = {0, 2, 0, 0, 0, 0, 1, 0}; + NP2OSCFG np2oscfg = {"Neko Project IIx", -1, -1, 0, 0, 0, 0, 0, 0, 0, 1, 0}; WindowPtr hWndMain; BOOL np2running; @@ -93,18 +92,19 @@ pascal OSErr OpenAppleEventHandler(const DescType rtype; AEKeyword key; AEDescList dlist; + OSErr err = noErr; 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); + err = setDropFile(fsc, i-1); } } AEDisposeDesc( &dlist ); } - return( 0 ); + return(err); } @@ -135,14 +135,18 @@ static void MenuBarInit(void) { } InsertMenu(GetMenu(IDM_SASI1), -1); InsertMenu(GetMenu(IDM_SASI2), -1); + InsertMenu(GetMenu(IDM_SCSI0), -1); + InsertMenu(GetMenu(IDM_SCSI1), -1); + InsertMenu(GetMenu(IDM_SCSI2), -1); + InsertMenu(GetMenu(IDM_SCSI3), -1); InsertMenu(GetMenu(IDM_KEYBOARD), -1); InsertMenu(GetMenu(IDM_SOUND), -1); InsertMenu(GetMenu(IDM_MEMORY), -1); ChangeMenuAttributes(GetMenuRef(IDM_EDIT), kMenuAttrAutoDisable, 0); DisableAllMenuItems(GetMenuHandle(IDM_EDIT)); - SetMenuItemModifiers(GetMenuRef(IDM_FDD2), IDM_FDD2OPEN, kMenuOptionModifier); - SetMenuItemModifiers(GetMenuRef(IDM_FDD2), IDM_FDD2EJECT, kMenuOptionModifier); - SetMenuItemModifiers(GetMenuRef(IDM_SASI2), IDM_SASI2OPEN, kMenuOptionModifier); + SetMenuItemModifiers(GetMenuRef(IDM_FDD2), IDM_FDD2OPEN, kMenuShiftModifier); + SetMenuItemModifiers(GetMenuRef(IDM_FDD2), IDM_FDD2EJECT, kMenuShiftModifier); + SetMenuItemModifiers(GetMenuRef(IDM_SASI2), IDM_SASI2OPEN, kMenuShiftModifier); DrawMenuBar(); #else OSStatus err; @@ -169,13 +173,11 @@ static void changescreen(BYTE mode) { } if (renewal) { soundmng_stop(); - mousemng_disable(MOUSEPROC_SYSTEM); scrnmng_destroy(); if (scrnmng_create(mode) == SUCCESS) { scrnmode = mode; } scrndraw_redraw(); - mousemng_enable(MOUSEPROC_SYSTEM); soundmng_play(); } else { @@ -251,6 +253,38 @@ static void HandleMenuChoice(long wParam diskdrv_sethdd(1, NULL); break; + case IDM_SCSI0OPEN: + dialog_changehdd(0x20); + break; + + case IDM_SCSI0REMOVE: + diskdrv_sethdd(0x20, NULL); + break; + + case IDM_SCSI1OPEN: + dialog_changehdd(0x21); + break; + + case IDM_SCSI1REMOVE: + diskdrv_sethdd(0x21, NULL); + break; + + case IDM_SCSI2OPEN: + dialog_changehdd(0x22); + break; + + case IDM_SCSI2REMOVE: + diskdrv_sethdd(0x22, NULL); + break; + + case IDM_SCSI3OPEN: + dialog_changehdd(0x23); + break; + + case IDM_SCSI3REMOVE: + diskdrv_sethdd(0x23, NULL); + break; + case IDM_FULLSCREEN: toggleFullscreen(); break; @@ -339,66 +373,91 @@ static void HandleMenuChoice(long wParam case IDM_KEY: menu_setkey(0); keystat_resetjoykey(); + update |= SYS_UPDATECFG; break; case IDM_JOY1: menu_setkey(1); keystat_resetjoykey(); + update |= SYS_UPDATECFG; break; case IDM_JOY2: menu_setkey(2); keystat_resetjoykey(); + update |= SYS_UPDATECFG; break; case IDM_MOUSEKEY: menu_setkey(3); keystat_resetjoykey(); + update |= SYS_UPDATECFG; break; case IDM_XSHIFT: menu_setxshift(np2cfg.XSHIFT ^ 1); keystat_forcerelease(0x70); + update |= SYS_UPDATECFG; break; case IDM_XCTRL: menu_setxshift(np2cfg.XSHIFT ^ 2); keystat_forcerelease(0x74); + update |= SYS_UPDATECFG; break; case IDM_XGRPH: menu_setxshift(np2cfg.XSHIFT ^ 4); keystat_forcerelease(0x73); + update |= SYS_UPDATECFG; break; - case IDM_F12MOUSE: - menu_setf12copy(0); - mackbd_resetf12(); - update |= SYS_UPDATECFG; + case IDM_F11KANA: + menu_setf11key(0); + mackbd_resetf11(); + update |= SYS_UPDATEOSCFG; break; - case IDM_F12COPY: - menu_setf12copy(1); - mackbd_resetf12(); - update |= SYS_UPDATECFG; + case IDM_F11STOP: + menu_setf11key(1); + mackbd_resetf11(); + update |= SYS_UPDATEOSCFG; break; - case IDM_F12STOP: - menu_setf12copy(2); + case IDM_F11EQU: + menu_setf11key(2); + mackbd_resetf11(); + update |= SYS_UPDATEOSCFG; + break; + + case IDM_F11NFER: + menu_setf11key(3); + mackbd_resetf11(); + update |= SYS_UPDATEOSCFG; + break; + + case IDM_F12MOUSE: + menu_setf12key(0); mackbd_resetf12(); - update |= SYS_UPDATECFG; + update |= SYS_UPDATEOSCFG; break; - case IDM_F12EQU: - menu_setf12copy(3); + case IDM_F12COPY: + menu_setf12key(1); mackbd_resetf12(); - update |= SYS_UPDATECFG; + update |= SYS_UPDATEOSCFG; break; case IDM_F12COMMA: - menu_setf12copy(4); + menu_setf12key(2); mackbd_resetf12(); - update |= SYS_UPDATECFG; + update |= SYS_UPDATEOSCFG; + break; + + case IDM_F12XFER: + menu_setf12key(3); + mackbd_resetf12(); + update |= SYS_UPDATEOSCFG; break; case IDM_BEEPOFF: @@ -475,6 +534,11 @@ static void HandleMenuChoice(long wParam update |= SYS_UPDATECFG; break; + case IDM_JASTSOUND: + menu_setjastsound(np2oscfg.jastsnd ^ 1); + update |= SYS_UPDATEOSCFG; + break; + case IDM_SEEKSND: menu_setmotorflg(np2cfg.MOTOR ^ 1); update |= SYS_UPDATECFG; @@ -545,7 +609,7 @@ static void HandleMenuChoice(long wParam { ICInstance inst; long start, fin; - const char urlStr[] = "http://retropc.net/tk800/np2x/help.html"; + const char urlStr[] = "http://retropc.net/tk800/np2x/help/help.html"; ICStart(&inst, 'SMil'); start = 0; @@ -650,6 +714,7 @@ int main(int argc, char *argv[]) { EventRef theEvent; EventTargetRef theTarget; + Rect bounds; #ifdef OPENING_WAIT UINT32 tick; #endif @@ -683,9 +748,11 @@ int main(int argc, char *argv[]) { menu_setframe(np2oscfg.DRAW_SKIP); menu_setkey(0); menu_setxshift(0); - menu_setf12copy(np2oscfg.F12COPY); + menu_setf11key(np2oscfg.F11KEY); + menu_setf12key(np2oscfg.F12KEY); menu_setbeepvol(np2cfg.BEEP_VOL); menu_setsound(np2cfg.SOUND_SW); + menu_setjastsound(np2oscfg.jastsnd); menu_setmotorflg(np2cfg.MOTOR); menu_setextmem(np2cfg.EXTMEM); menu_setdispclk(np2oscfg.DISPCLK); @@ -711,10 +778,12 @@ int main(int argc, char *argv[]) { S98_init(); hid_init(); +#ifndef SUPPORT_WAVEMIX if (soundmng_initialize() == SUCCESS) { soundmng_pcmvolume(SOUND_PCMSEEK, np2cfg.MOTORVOL); soundmng_pcmvolume(SOUND_PCMSEEK1, np2cfg.MOTORVOL); } +#endif #if defined(NP2GCC) mousemng_initialize(); @@ -732,9 +801,6 @@ int main(int argc, char *argv[]) { flagload(np2resume); } #endif - if (np2oscfg.toolwin) { - toolwin_open(); - } theTarget = GetEventDispatcherTarget(); @@ -803,6 +869,7 @@ int main(int argc, char *argv[]) { } } } + np2running = FALSE; menu_setrecording(true); @@ -810,6 +877,13 @@ int main(int argc, char *argv[]) { toggleFullscreen(); } + GetWindowBounds(hWndMain, kWindowGlobalPortRgn, &bounds); + if ((np2oscfg.winx != bounds.left) || (np2oscfg.winy != bounds.top)) { + np2oscfg.winx = bounds.left; + np2oscfg.winy = bounds.top; + sysmng_update(SYS_UPDATEOSCFG); + } + pccore_cfgupdate(); #if defined(USE_RESUME) @@ -828,8 +902,9 @@ int main(int argc, char *argv[]) { #if defined(NP2GCC) mousemng_disable(MOUSEPROC_SYSTEM); #endif - +#ifndef SUPPORT_WAVEMIX soundmng_deinitialize(); +#endif scrnmng_destroy(); if (sys_updates & (SYS_UPDATECFG | SYS_UPDATEOSCFG)) { @@ -880,7 +955,7 @@ static pascal OSStatus np2appevent (Even if (cmd.commandID == kHICommandAppHelp) { ICInstance inst; long start, fin; - const char urlStr[] = "http://retropc.net/tk800/np2x/help.html"; + const char urlStr[] = "http://retropc.net/tk800/np2x/help/help.html"; ICStart(&inst, 'SMil'); start = 0; @@ -907,7 +982,7 @@ static pascal OSStatus np2appevent (Even result = noErr; break; case kEventMouseDown: - if (buttonKind == kEventMouseButtonSecondary | modif & controlKey) { + if (buttonKind == kEventMouseButtonSecondary || modif & cmdKey) { mousemng_buttonevent(MOUSEMNG_RIGHTDOWN); } else { @@ -916,7 +991,7 @@ static pascal OSStatus np2appevent (Even result=noErr; break; case kEventMouseUp: - if (buttonKind == kEventMouseButtonSecondary | modif & controlKey) { + if (buttonKind == kEventMouseButtonSecondary || modif & cmdKey) { mousemng_buttonevent(MOUSEMNG_RIGHTUP); } else if (buttonKind == kEventMouseButtonTertiary) { @@ -936,6 +1011,22 @@ static pascal OSStatus np2appevent (Even } #endif break; + case kEventClassKeyboard: + if (GetEventKind(event)==kEventRawKeyModifiersChanged) { + static UInt32 backup = 0; + 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; } @@ -957,7 +1048,6 @@ static pascal OSStatus np2windowevent(Ev eventClass = GetEventClass(event); whatHappened = GetEventKind(event); - static UInt32 backup = 0; switch (eventClass) { case kEventClassKeyboard: @@ -988,19 +1078,6 @@ static pascal OSStatus np2windowevent(Ev } 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; } @@ -1047,6 +1124,7 @@ static const EventTypeSpec appEventList[ {kEventClassMouse, kEventMouseMoved}, {kEventClassMouse, kEventMouseUp}, #endif + {kEventClassKeyboard, kEventRawKeyModifiersChanged}, }; static const EventTypeSpec windEventList[] = { @@ -1059,7 +1137,6 @@ static const EventTypeSpec windEventList {kEventClassKeyboard, kEventRawKeyDown}, {kEventClassKeyboard, kEventRawKeyUp}, {kEventClassKeyboard, kEventRawKeyRepeat}, - {kEventClassKeyboard, kEventRawKeyModifiersChanged}, }; @@ -1104,10 +1181,17 @@ static bool setupMainWindow(void) { } SizeWindow(hWndMain, 640, 400, TRUE); #endif - + if (np2oscfg.winx != -1 && np2oscfg.winy != -1) { + MoveWindow(hWndMain, np2oscfg.winx, np2oscfg.winy, false); + } setUpCarbonEvent(); if (backupwidth) scrnmng_setwidth(0, backupwidth); if (backupheight) scrnmng_setheight(0, backupheight); + CFStringRef title = CFStringCreateWithCString(NULL, np2oscfg.titles, kCFStringEncodingUTF8); + if (title) { + SetWindowTitleWithCFString(hWndMain, title); + CFRelease(title); + } ShowWindow(hWndMain); return(true); } @@ -1115,6 +1199,7 @@ static bool setupMainWindow(void) { static void toggleFullscreen(void) { static Ptr bkfullscreen; static BYTE mouse = 0; + static bool toolwin = false; MenuRef menu = GetMenuRef(IDM_SCREEN); Rect bounds; short w = 640, h = 480; @@ -1125,9 +1210,12 @@ static void toggleFullscreen(void) { GetWindowBounds(hWndMain, kWindowContentRgn, &bounds); backupwidth = bounds.right - bounds.left; backupheight = bounds.bottom - bounds.top; + toolwin = np2oscfg.toolwin; toolwin_close(); + np2oscfg.winx = bounds.left; + np2oscfg.winy = bounds.top; DisposeWindow(hWndMain); - BeginFullScreen(&bkfullscreen,0,&w,&h,&hWndMain,NULL,(fullScreenAllowEvents | fullScreenDontChangeMenuBar)); + BeginFullScreen(&bkfullscreen, 0, &w, &h, &hWndMain, NULL, fullScreenAllowEvents | fullScreenCaptureDisplay); DisableMenuItem(menu, IDM_ROLNORMAL); DisableMenuItem(menu, IDM_ROLLEFT); DisableMenuItem(menu, IDM_ROLRIGHT); @@ -1153,7 +1241,7 @@ static void toggleFullscreen(void) { EnableMenuItem(menu, IDM_ROLLEFT); EnableMenuItem(menu, IDM_ROLRIGHT); ShowMenuBar(); - if (np2oscfg.toolwin) { + if (toolwin) { toolwin_open(); } }