--- np2/win9x/np2.cpp 2003/10/30 12:45:38 1.17 +++ np2/win9x/np2.cpp 2003/11/06 01:58:36 1.26 @@ -60,6 +60,8 @@ static char szClassName[] = "NP2-MainWi HINSTANCE hInst; HINSTANCE hPrev; int mmxflag; + BYTE np2break = 0; // ver0.30 + BOOL winui_en; NP2OSCFG np2oscfg = { "Neko Project II", "NP2", @@ -71,31 +73,32 @@ static char szClassName[] = "NP2-MainWi {0, 0, 0x3e, 19200, "", "", "", ""}, // ver0.34 {0, 0, 0x3e, 19200, "", "", "", ""}, // ver0.34 0xffffff, 0xffbf6a, 0, 0, - 0, 1, 0, 9801, 0, 0, 0, 0, 0, 0}; // ver0.38 + 0, 1, 0, 9801, 0, 0, 0, 0, 0, 0, 0, 0}; // ver0.38 - char fddfolder[MAX_PATH]; - char hddfolder[MAX_PATH]; - char bmpfilefolder[MAX_PATH]; - char modulefile[MAX_PATH]; - -static UINT framecnt = 0; -static UINT waitcnt = 0; -static UINT framemax = 1; - BYTE np2break = 0; // ver0.30 -static BYTE np2stopemulate = 0; -static int np2opening = 1; -static int np2quitmsg = 0; - HMENU hStat = NULL; + char fddfolder[MAX_PATH]; + char hddfolder[MAX_PATH]; + char bmpfilefolder[MAX_PATH]; + char modulefile[MAX_PATH]; + +static UINT framecnt = 0; +static UINT waitcnt = 0; +static UINT framemax = 1; +static BYTE np2stopemulate = 0; +static int np2opening = 1; +static int np2quitmsg = 0; +static HMENU hStat = NULL; +static BYTE scrnmode; +static WINLOCEX smwlex; + +static const char np2help[] = "np2.chm"; +static const char np2flagext[] = "S%02d"; +static const char np2resumeext[] = "sav"; -static const char np2help[] = "np2.hlp"; -static const char np2resume[] = "sav"; - - -static BYTE scrnmode; static void winuienter(void) { + winui_en = TRUE; soundmng_disable(SNDPROC_MAIN); scrnmng_topwinui(); } @@ -104,15 +107,37 @@ static void winuileave(void) { scrnmng_clearwinui(); soundmng_enable(SNDPROC_MAIN); + winui_en = FALSE; +} + +WINLOCEX np2_winlocexallwin(HWND base) { + + HWND list[3]; + UINT i; + + list[0] = hWndMain; + list[1] = toolwin_gethwnd(); + list[2] = keydisp_gethwnd(); + for (i=0; i<3; i++) { + if (list[i] == base) { + list[i] = NULL; + } + } + if (base != hWndMain) { // hWndMainのみ全体移動 + base = NULL; + } + return(winlocex_create(base, list, 3)); } static void changescreen(BYTE newmode) { - BYTE change; - BYTE renewal; + BYTE change; + BYTE renewal; + WINLOCEX wlex; change = scrnmode ^ newmode; renewal = (change & SCRNMODE_FULLSCREEN); + wlex = NULL; if (newmode & SCRNMODE_FULLSCREEN) { renewal |= (change & SCRNMODE_HIGHCOLOR); } @@ -121,14 +146,15 @@ static void changescreen(BYTE newmode) { } if (renewal) { if (renewal & SCRNMODE_FULLSCREEN) { - toolwin_close(); + toolwin_destroy(); + keydisp_destroy(); } else if (renewal & SCRNMODE_ROTATEMASK) { - toolwin_movingstart(); + wlex = np2_winlocexallwin(hWndMain); + winlocex_setholdwnd(wlex, hWndMain); } soundmng_stop(); - mouse_running(MOUSE_STOP); - keydisp_destroy(); + mousemng_disable(MOUSEPROC_WINUI); scrnmng_destroy(); if (scrnmng_create(newmode) == SUCCESS) { scrnmode = newmode; @@ -140,14 +166,21 @@ static void changescreen(BYTE newmode) { } } scrndraw_redraw(); - if ((renewal & SCRNMODE_FULLSCREEN) && - (!scrnmng_isfullscreen()) && (np2oscfg.toolwin)) { - toolwin_open(); + if (renewal & SCRNMODE_FULLSCREEN) { + if (!scrnmng_isfullscreen()) { + if (np2oscfg.toolwin) { + toolwin_create(); + } + if (np2oscfg.keydisp) { + keydisp_create(); + } + } } else if (renewal & SCRNMODE_ROTATEMASK) { - toolwin_movingend(); + winlocex_move(wlex); + winlocex_destroy(wlex); } - mouse_running(MOUSE_CONT); + mousemng_enable(MOUSEPROC_WINUI); soundmng_play(); } else { @@ -268,6 +301,25 @@ static int flagload(const char *ext, con // ---- proc +static void np2popup(HWND hWnd, LPARAM lp) { + + HMENU mainmenu; + HMENU hMenu; + POINT pt; + + mainmenu = (HMENU)GetWindowLong(hWnd, NP2GWL_HMENU); + if (mainmenu == NULL) { + return; + } + hMenu = CreatePopupMenu(); + menu_addmenubar(hMenu, mainmenu); + pt.x = LOWORD(lp); + pt.y = HIWORD(lp); + ClientToScreen(hWnd, &pt); + TrackPopupMenu(hMenu, TPM_LEFTALIGN, pt.x, pt.y, 0, hWnd, NULL); + DestroyMenu(hMenu); +} + LRESULT CALLBACK WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { PAINTSTRUCT ps; @@ -275,9 +327,13 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT HDC hdc; BOOL b; UINT update; + HWND subwin; + WINLOCEX wlex; switch (msg) { case WM_CREATE: + np2class_wmcreate(hWnd); + np2class_windowtype(hWnd, np2oscfg.wintype); sstp_construct(hWnd); #ifndef __GNUC__ WINNLSEnableIME(hWnd, FALSE); @@ -288,45 +344,52 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT update = 0; switch(wParam) { case IDM_TOOLWIN: - xmenu_settoolwin(np2oscfg.toolwin ^ 1); + sysmenu_settoolwin(np2oscfg.toolwin ^ 1); if (np2oscfg.toolwin) { - toolwin_open(); + toolwin_create(); } else { - toolwin_close(); + toolwin_destroy(); } update |= SYS_UPDATEOSCFG; break; + case IDM_KEYDISP: + sysmenu_setkeydisp(np2oscfg.keydisp ^ 1); + if (np2oscfg.keydisp) { + keydisp_create(); + } + else { + keydisp_destroy(); + } + break; + case IDM_SCREENCENTER: if ((!scrnmng_isfullscreen()) && (!(GetWindowLong(hWnd, GWL_STYLE) & (WS_MAXIMIZE | WS_MINIMIZE)))) { - toolwin_movingstart(); + wlex = np2_winlocexallwin(hWnd); wincentering(hWnd); - toolwin_movingend(); + winlocex_move(wlex); + winlocex_destroy(wlex); } break; case IDM_SNAPENABLE: - xmenu_setwinsnap(np2oscfg.WINSNAP ^ 1); + sysmenu_setwinsnap(np2oscfg.WINSNAP ^ 1); update |= SYS_UPDATEOSCFG; break; case IDM_BACKGROUND: - xmenu_setbackground(np2oscfg.background ^ 1); + sysmenu_setbackground(np2oscfg.background ^ 1); update |= SYS_UPDATEOSCFG; break; case IDM_BGSOUND: - xmenu_setbgsound(np2oscfg.background ^ 2); + sysmenu_setbgsound(np2oscfg.background ^ 2); update |= SYS_UPDATEOSCFG; break; - case IDM_KEYDISP: - keydisp_create(); - break; - case IDM_MEMORYDUMP: debugsub_memorydump(); break; @@ -343,11 +406,28 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT case IDM_SCRNMUL16: if ((!scrnmng_isfullscreen()) && !(GetWindowLong(hWndMain, GWL_STYLE) & WS_MINIMIZE)) { - xmenu_setscrnmul(wParam - IDM_SCRNMUL); + sysmenu_setscrnmul(wParam - IDM_SCRNMUL); scrnmng_setmultiple(wParam - IDM_SCRNMUL); } break; + case SC_MINIMIZE: + wlex = np2_winlocexallwin(hWnd); + winlocex_close(wlex); + winlocex_destroy(wlex); + return(DefWindowProc(hWnd, msg, wParam, lParam)); + + case SC_RESTORE: + subwin = toolwin_gethwnd(); + if (subwin) { + ShowWindow(subwin, SW_SHOWNOACTIVATE); + } + subwin = keydisp_gethwnd(); + if (subwin) { + ShowWindow(subwin, SW_SHOWNOACTIVATE); + } + return(DefWindowProc(hWnd, msg, wParam, lParam)); + default: return(DefWindowProc(hWnd, msg, wParam, lParam)); } @@ -552,19 +632,31 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT case IDM_F12MOUSE: xmenu_setf12copy(0); - keystat_resetcopyhelp(); + winkbd_resetf12(); update |= SYS_UPDATECFG; break; case IDM_F12COPY: xmenu_setf12copy(1); - keystat_resetcopyhelp(); + winkbd_resetf12(); update |= SYS_UPDATECFG; break; case IDM_F12STOP: xmenu_setf12copy(2); - keystat_resetcopyhelp(); + winkbd_resetf12(); + update |= SYS_UPDATECFG; + break; + + case IDM_F12EQU: + xmenu_setf12copy(3); + winkbd_resetf12(); + update |= SYS_UPDATECFG; + break; + + case IDM_F12COMMA: + xmenu_setf12copy(4); + winkbd_resetf12(); update |= SYS_UPDATECFG; break; @@ -702,7 +794,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT break; case IDM_MOUSE: - mouse_running(MOUSE_XOR); + mousemng_toggle(MOUSEPROC_SYSTEM); xmenu_setmouse(np2oscfg.MOUSE_SW ^ 1); update |= SYS_UPDATECFG; break; @@ -808,14 +900,14 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT if ((LOWORD(wParam) >= IDM_FLAGSAVE) && (LOWORD(wParam) < IDM_FLAGSAVE + STATSAVEMAX)) { char ext[4]; - wsprintf(ext, "S%02d", + wsprintf(ext, np2flagext, (LOWORD(wParam) - IDM_FLAGSAVE) % 100); flagsave(ext); } if ((LOWORD(wParam) >= IDM_FLAGLOAD) && (LOWORD(wParam) < IDM_FLAGLOAD + STATSAVEMAX)) { char ext[4]; - wsprintf(ext, "S%02d", + wsprintf(ext, np2flagext, (LOWORD(wParam) - IDM_FLAGLOAD) % 100); flagload(ext, "Status Load", TRUE); } @@ -829,11 +921,11 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT np2break &= ~NP2BREAK_MAIN; scrnmng_update(); keystat_allrelease(); - mouse_running(MOUSE_CONT_M); + mousemng_enable(MOUSEPROC_BG); } else { np2break |= NP2BREAK_MAIN; - mouse_running(MOUSE_STOP_M); + mousemng_disable(MOUSEPROC_BG); } np2active_renewal(); break; @@ -887,12 +979,6 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT np2oscfg.winy = rc.top; sysmng_update(SYS_UPDATEOSCFG); } - if (GetWindowLong(hWnd, GWL_STYLE) & WS_MINIMIZE) { - toolwin_close(); - } - else if (np2oscfg.toolwin) { - toolwin_open(); - } } break; @@ -909,35 +995,43 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT case WM_ENTERSIZEMOVE: soundmng_disable(SNDPROC_MAIN); - mouse_running(MOUSE_STOP); - winloc_movingstart(); - toolwin_movingstart(); - break; - - case WM_EXITSIZEMOVE: - toolwin_movingend(); - mouse_running(MOUSE_CONT); - soundmng_enable(SNDPROC_MAIN); + mousemng_disable(MOUSEPROC_WINUI); + winlocex_destroy(smwlex); + smwlex = np2_winlocexallwin(hWnd); + scrnmng_entersizing(); break; case WM_MOVING: if (np2oscfg.WINSNAP) { - winloc_movingproc((RECT *)lParam); + winlocex_moving(smwlex, (RECT *)lParam); } break; + case WM_SIZING: + scrnmng_sizing((UINT)wParam, (RECT *)lParam); + break; + + case WM_EXITSIZEMOVE: + scrnmng_exitsizing(); + winlocex_move(smwlex); + winlocex_destroy(smwlex); + smwlex = NULL; + mousemng_enable(MOUSEPROC_WINUI); + soundmng_enable(SNDPROC_MAIN); + break; + case WM_KEYDOWN: if (wParam == VK_F11) { - scrnmng_enablemenubar(); + np2class_enablemenu(hWndMain, TRUE); return(DefWindowProc(hWnd, WM_SYSKEYDOWN, VK_F10, lParam)); } if ((wParam == VK_F12) && (!np2oscfg.F12COPY)) { - mouse_running(MOUSE_XOR); + mousemng_toggle(MOUSEPROC_SYSTEM); xmenu_setmouse(np2oscfg.MOUSE_SW ^ 1); sysmng_update(SYS_UPDATECFG); } else { - winkeydown106(wParam, lParam); + winkbd_keydown(wParam, lParam); } break; @@ -946,7 +1040,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT return(DefWindowProc(hWnd, WM_SYSKEYUP, VK_F10, lParam)); } if ((wParam != VK_F12) || (np2oscfg.F12COPY)) { - winkeyup106(wParam, lParam); + winkbd_keyup(wParam, lParam); } break; @@ -961,11 +1055,11 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT break; } } - winkeydown106(wParam, lParam); + winkbd_keydown(wParam, lParam); break; case WM_SYSKEYUP: - winkeyup106(wParam, lParam); + winkbd_keyup(wParam, lParam); break; case WM_MOUSEMOVE: @@ -978,8 +1072,14 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT break; case WM_LBUTTONDOWN: - if (!mouse_btn(MOUSE_LEFTDOWN)) { - if (scrnmng_isfullscreen()) { + if (!mousemng_buttonevent(MOUSEMNG_LEFTDOWN)) { + if (!scrnmng_isfullscreen()) { + if (np2oscfg.wintype == 2) { + return(SendMessage(hWnd, WM_NCLBUTTONDOWN, + HTCAPTION, 0L)); + } + } + else { POINT p; if ((GetCursorPos(&p)) && (p.y >= 466)) { np2oscfg.clk_x++; @@ -992,21 +1092,24 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT break; case WM_LBUTTONUP: - if (!mouse_btn(MOUSE_LEFTUP)) { + if (!mousemng_buttonevent(MOUSEMNG_LEFTUP)) { return(DefWindowProc(hWnd, msg, wParam, lParam)); } break; case WM_MBUTTONDOWN: // ver0.26 - mouse_running(MOUSE_XOR); + mousemng_toggle(MOUSEPROC_SYSTEM); xmenu_setmouse(np2oscfg.MOUSE_SW ^ 1); sysmng_update(SYS_UPDATECFG); break; case WM_RBUTTONDOWN: - if (!mouse_btn(MOUSE_RIGHTDOWN)) { - if (scrnmng_isfullscreen()) { - POINT p; + if (!mousemng_buttonevent(MOUSEMNG_RIGHTDOWN)) { + if (!scrnmng_isfullscreen()) { + np2popup(hWnd, lParam); + } + else { + POINT p; if ((GetCursorPos(&p)) && (p.y >= 466) && (np2oscfg.clk_x)) { np2oscfg.clk_fnt++; @@ -1019,11 +1122,26 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT break; case WM_RBUTTONUP: - if (!mouse_btn(MOUSE_RIGHTUP)) { + if (!mousemng_buttonevent(MOUSEMNG_RIGHTUP)) { return(DefWindowProc(hWnd, msg, wParam, lParam)); } break; + case WM_LBUTTONDBLCLK: + if (!scrnmng_isfullscreen()) { + np2oscfg.wintype++; + if (np2oscfg.wintype >= 3) { + np2oscfg.wintype = 0; + } + wlex = np2_winlocexallwin(hWnd); + winlocex_setholdwnd(wlex, hWnd); + np2class_windowtype(hWnd, np2oscfg.wintype); + winlocex_move(wlex); + winlocex_destroy(wlex); + sysmng_update(SYS_UPDATEOSCFG); + } + break; + case WM_CLOSE: b = FALSE; if (!np2oscfg.comfirm) { @@ -1046,6 +1164,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT case WM_DESTROY: DestroyMenu(hStat); + np2class_wmdestroy(hWnd); PostQuitMessage(0); break; @@ -1108,20 +1227,25 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT } +static void framereset(UINT cnt) { + + framecnt = 0; + scrnmng_dispclock(); + keydisp_draw((BYTE)cnt); + toolwin_draw((BYTE)cnt); + viewer_allreload(FALSE); + if (np2oscfg.DISPCLK & 3) { + if (sysmng_workclockrenewal()) { + sysmng_updatecaption(3); + } + } +} + static void processwait(UINT cnt) { if (timing_getcount() >= cnt) { timing_setcount(0); - framecnt = 0; - scrnmng_dispclock(); - keydisp_draw((BYTE)cnt); - toolwin_draw((BYTE)cnt); - viewer_allreload(FALSE); - if (np2oscfg.DISPCLK & 3) { - if (sysmng_workclockrenewal()) { - sysmng_updatecaption(3); - } - } + framereset(cnt); } else { Sleep(1); @@ -1131,7 +1255,7 @@ static void processwait(UINT cnt) { int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPreInst, LPSTR lpszCmdLine, int nCmdShow) { - WNDCLASS np2; + WNDCLASS wc; MSG msg; HMENU hMenu; HWND hwndorg; @@ -1146,6 +1270,7 @@ int WINAPI WinMain(HINSTANCE hInstance, np2arg_analize(lpszCmdLine); initload(); toolwin_readini(); + keydisp_readini(); rand_setseed((unsigned)time(NULL)); @@ -1181,17 +1306,17 @@ int WINAPI WinMain(HINSTANCE hInstance, np2class_initialize(hInstance); if (!hPreInst) { - np2.style = CS_BYTEALIGNCLIENT | CS_HREDRAW | CS_VREDRAW; - np2.lpfnWndProc = WndProc; - np2.cbClsExtra = 0; - np2.cbWndExtra = 0; - np2.hInstance = hInstance; - np2.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_ICON1)); - np2.hCursor = LoadCursor(NULL, IDC_ARROW); - np2.hbrBackground = (HBRUSH)GetStockObject(NULL_BRUSH); - np2.lpszMenuName = MAKEINTRESOURCE(IDM_MAIN); - np2.lpszClassName = szClassName; - if (!RegisterClass(&np2)) { + wc.style = CS_BYTEALIGNCLIENT | CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS; + wc.lpfnWndProc = WndProc; + wc.cbClsExtra = 0; + wc.cbWndExtra = NP2GWL_SIZE; + wc.hInstance = hInstance; + wc.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_ICON1)); + wc.hCursor = LoadCursor(NULL, IDC_ARROW); + wc.hbrBackground = (HBRUSH)GetStockObject(NULL_BRUSH); + wc.lpszMenuName = MAKEINTRESOURCE(IDR_MAIN); + wc.lpszClassName = szClassName; + if (!RegisterClass(&wc)) { return(FALSE); } } @@ -1199,9 +1324,9 @@ int WINAPI WinMain(HINSTANCE hInstance, keydisp_initialize(hPreInst); viewer_init(hPreInst); // ver0.30 - hWndMain = CreateWindowEx(0, szClassName, np2oscfg.titles, + hWndMain = CreateWindow(szClassName, np2oscfg.titles, WS_OVERLAPPED | WS_SYSMENU | WS_CAPTION | - WS_MINIMIZEBOX, + WS_THICKFRAME | WS_MINIMIZEBOX, np2oscfg.winx, np2oscfg.winy, 640, 400, NULL, NULL, hInstance, NULL); scrnmng_initialize(); @@ -1250,7 +1375,7 @@ int WINAPI WinMain(HINSTANCE hInstance, } InsertMenu(hMenu, 1, MF_BYPOSITION | MF_POPUP, (UINT)hStat, "S&tat"); } - sysmenu_init(); + sysmenu_initialize(); DrawMenuBar(hWndMain); // ver0.30 @@ -1258,15 +1383,12 @@ int WINAPI WinMain(HINSTANCE hInstance, EnableMenuItem(GetMenu(hWndMain), IDM_HELP, MF_GRAYED); } - xmenu_settoolwin(np2oscfg.toolwin); - xmenu_setwinsnap(np2oscfg.WINSNAP); - xmenu_setbackground(np2oscfg.background); - xmenu_setbgsound(np2oscfg.background); - xmenu_setscrnmul(8); // ver0.26 - - if (np2oscfg.toolwin) { - toolwin_open(); - } + sysmenu_settoolwin(np2oscfg.toolwin); + sysmenu_setkeydisp(np2oscfg.keydisp); + sysmenu_setwinsnap(np2oscfg.WINSNAP); + sysmenu_setbackground(np2oscfg.background); + sysmenu_setbgsound(np2oscfg.background); + sysmenu_setscrnmul(8); // ver0.26 scrnmode = 0; if (np2arg.fullscreen) { @@ -1298,8 +1420,9 @@ int WINAPI WinMain(HINSTANCE hInstance, juliet_prepare(); #endif + mousemng_initialize(); if (np2oscfg.MOUSE_SW) { // ver0.30 - mouse_running(MOUSE_ON); + mousemng_enable(MOUSEPROC_SYSTEM); } commng_initialize(); @@ -1309,7 +1432,6 @@ int WINAPI WinMain(HINSTANCE hInstance, pccore_init(); S98_init(); - sstpmsg_welcome(); #ifdef OPENING_WAIT @@ -1320,19 +1442,28 @@ int WINAPI WinMain(HINSTANCE hInstance, pccore_reset(); + if (!(scrnmode & SCRNMODE_FULLSCREEN)) { + if (np2oscfg.toolwin) { + toolwin_create(); + } + if (np2oscfg.keydisp) { + keydisp_create(); + } + } + np2opening = 0; // れじうむ if (np2oscfg.resume) { int id; - id = flagload(np2resume, "Resume", FALSE); + id = flagload(np2resumeext, "Resume", FALSE); if (id == IDYES) { for (i=0; i<4; i++) np2arg.disk[i] = NULL; } else if (id == IDCANCEL) { DestroyWindow(hWndMain); - mouse_running(MOUSE_OFF); + mousemng_disable(MOUSEPROC_WINUI); S98_trash(); pccore_term(); sstp_destruct(); @@ -1359,8 +1490,9 @@ int WINAPI WinMain(HINSTANCE hInstance, if (!GetMessage(&msg, NULL, 0, 0)) { break; } - if ((msg.message != WM_SYSKEYDOWN) && - (msg.message != WM_SYSKEYUP)) { + if ((msg.hwnd != hWndMain) || + ((msg.message != WM_SYSKEYDOWN) && + (msg.message != WM_SYSKEYUP))) { TranslateMessage(&msg); } DispatchMessage(&msg); @@ -1368,7 +1500,7 @@ int WINAPI WinMain(HINSTANCE hInstance, else { if (np2oscfg.NOWAIT) { joy_flash(); - mouse_callback(); + mousemng_callback(); pccore_exec(framecnt == 0); dclock_callback(); if (np2oscfg.DRAW_SKIP) { // nowait frame skip @@ -1387,7 +1519,7 @@ int WINAPI WinMain(HINSTANCE hInstance, else if (np2oscfg.DRAW_SKIP) { // frame skip if (framecnt < np2oscfg.DRAW_SKIP) { joy_flash(); - mouse_callback(); + mousemng_callback(); pccore_exec(framecnt == 0); dclock_callback(); framecnt++; @@ -1400,7 +1532,7 @@ int WINAPI WinMain(HINSTANCE hInstance, if (!waitcnt) { UINT cnt; joy_flash(); - mouse_callback(); + mousemng_callback(); pccore_exec(framecnt == 0); dclock_callback(); framecnt++; @@ -1421,7 +1553,7 @@ int WINAPI WinMain(HINSTANCE hInstance, else { timing_setcount(cnt - framecnt); } - processwait(0); + framereset(0); } } else { @@ -1440,18 +1572,18 @@ int WINAPI WinMain(HINSTANCE hInstance, DispatchMessage(&msg); } } - toolwin_close(); + toolwin_destroy(); pccore_cfgupdate(); - mouse_running(MOUSE_OFF); + mousemng_disable(MOUSEPROC_WINUI); S98_trash(); if (np2oscfg.resume) { - flagsave(np2resume); + flagsave(np2resumeext); } else { - flagdelete(np2resume); + flagdelete(np2resumeext); } #ifdef USE_ROMEO @@ -1471,6 +1603,7 @@ int WINAPI WinMain(HINSTANCE hInstance, if (sys_updates & (SYS_UPDATECFG | SYS_UPDATEOSCFG)) { initsave(); toolwin_writeini(); + keydisp_writeini(); } TRACETERM();