--- np2/win9x/np2.cpp 2003/11/15 07:10:03 1.30 +++ np2/win9x/np2.cpp 2004/01/05 07:22:02 1.34 @@ -46,6 +46,7 @@ #include "statsave.h" #include "debugsub.h" #include "keydisp.h" +#include "kdispwin.h" #include "viewer.h" @@ -65,7 +66,7 @@ static char szClassName[] = "NP2-MainWi NP2OSCFG np2oscfg = { "Neko Project II", "NP2", - CW_USEDEFAULT, CW_USEDEFAULT, 1, 1, 0, 1, 0, 2, + CW_USEDEFAULT, CW_USEDEFAULT, 1, 1, 0, 1, 0, 0, 0, 0, KEY_UNKNOWN, 0, 0, 0, 0, {1, 2, 2, 1}, {5, 0, 0x3e, 19200, "", "", "", ""}, // ver0.34 @@ -73,7 +74,7 @@ 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, 0, 0}; // ver0.38 + 0, 1, 0, 9801, 0, 0, 0, 0, 0, 0, 0, 0, 0}; // ver0.73 char fddfolder[MAX_PATH]; char hddfolder[MAX_PATH]; @@ -92,8 +93,6 @@ static WINLOCEX smwlex; static const char np2help[] = "np2.chm"; static const char np2flagext[] = "S%02d"; -static const char np2resumeext[] = "sav"; - static void winuienter(void) { @@ -117,7 +116,7 @@ WINLOCEX np2_winlocexallwin(HWND base) { list[0] = hWndMain; list[1] = toolwin_gethwnd(); - list[2] = keydisp_gethwnd(); + list[2] = kdispwin_gethwnd(); for (i=0; i<3; i++) { if (list[i] == base) { list[i] = NULL; @@ -147,7 +146,7 @@ static void changescreen(BYTE newmode) { if (renewal) { if (renewal & SCRNMODE_FULLSCREEN) { toolwin_destroy(); - keydisp_destroy(); + kdispwin_destroy(); } else if (renewal & SCRNMODE_ROTATEMASK) { wlex = np2_winlocexallwin(hWndMain); @@ -172,7 +171,7 @@ static void changescreen(BYTE newmode) { toolwin_create(); } if (np2oscfg.keydisp) { - keydisp_create(); + kdispwin_create(); } } } @@ -357,10 +356,10 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT case IDM_KEYDISP: sysmenu_setkeydisp(np2oscfg.keydisp ^ 1); if (np2oscfg.keydisp) { - keydisp_create(); + kdispwin_create(); } else { - keydisp_destroy(); + kdispwin_destroy(); } break; @@ -422,7 +421,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT if (subwin) { ShowWindow(subwin, SW_SHOWNOACTIVATE); } - subwin = keydisp_gethwnd(); + subwin = kdispwin_gethwnd(); if (subwin) { ShowWindow(subwin, SW_SHOWNOACTIVATE); } @@ -740,10 +739,9 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT update |= SYS_UPDATECFG; break; - case IDM_SNDOPT: - winuienter(); - dialog_sndopt(hWnd); - winuileave(); + case IDM_JASTSOUND: + xmenu_setjastsound(np2oscfg.jastsnd ^ 1); + update |= SYS_UPDATEOSCFG; break; case IDM_SEEKSND: @@ -796,6 +794,12 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT pc9861k_midipanic(); break; + case IDM_SNDOPT: + winuienter(); + dialog_sndopt(hWnd); + winuileave(); + break; + case IDM_BMPSAVE: winuienter(); dialog_writebmp(hWnd); @@ -1134,7 +1138,6 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT winuileave(); } if (b) { - keydisp_destroy(); viewer_allclose(); DestroyWindow(hWnd); } @@ -1209,7 +1212,7 @@ static void framereset(UINT cnt) { framecnt = 0; scrnmng_dispclock(); - keydisp_draw((BYTE)cnt); + kdispwin_draw((BYTE)cnt); toolwin_draw((BYTE)cnt); viewer_allreload(FALSE); if (np2oscfg.DISPCLK & 3) { @@ -1228,6 +1231,7 @@ static void processwait(UINT cnt) { else { Sleep(1); } + soundmng_sync(); } @@ -1236,7 +1240,7 @@ int WINAPI WinMain(HINSTANCE hInstance, WNDCLASS wc; MSG msg; HMENU hMenu; - HWND hwndorg; + HWND hWnd; UINT i; #ifdef OPENING_WAIT UINT32 tick; @@ -1250,16 +1254,16 @@ int WINAPI WinMain(HINSTANCE hInstance, np2arg_analize(lpszCmdLine); initload(); toolwin_readini(); - keydisp_readini(); + kdispwin_readini(); rand_setseed((unsigned)time(NULL)); CopyMemory(szClassName, np2oscfg.winid, 3); - if ((hwndorg = FindWindow(szClassName, NULL)) != NULL) { + if ((hWnd = FindWindow(szClassName, NULL)) != NULL) { sstpmsg_running(); - ShowWindow(hwndorg, SW_RESTORE); - SetForegroundWindow(hwndorg); + ShowWindow(hWnd, SW_RESTORE); + SetForegroundWindow(hWnd); dosio_term(); return(FALSE); } @@ -1301,7 +1305,7 @@ int WINAPI WinMain(HINSTANCE hInstance, } } toolwin_initapp(hInstance); - keydisp_initialize(hPreInst); + kdispwin_initialize(hPreInst); viewer_init(hPreInst); // ver0.30 hWndMain = CreateWindow(szClassName, np2oscfg.titles, @@ -1309,31 +1313,35 @@ int WINAPI WinMain(HINSTANCE hInstance, WS_THICKFRAME | WS_MINIMIZEBOX, np2oscfg.winx, np2oscfg.winy, 640, 400, NULL, NULL, hInstance, NULL); + hWnd = hWndMain; scrnmng_initialize(); - xmenu_setsound(np2cfg.SOUND_SW); - xmenu_setbeepvol(np2cfg.BEEP_VOL); - xmenu_setkey(0); - xmenu_setbtnrapid(np2cfg.BTN_RAPID); - xmenu_setbtnmode(np2cfg.BTN_MODE); - xmenu_setmsrapid(np2cfg.MOUSERAPID); + xmenu_setroltate(0); + xmenu_setdispmode(np2cfg.DISPSYNC); + xmenu_setraster(np2cfg.RASTER); xmenu_setwaitflg(np2oscfg.NOWAIT); xmenu_setframe(np2oscfg.DRAW_SKIP); - xmenu_setdispmode(np2cfg.DISPSYNC); - xmenu_setdispclk(np2oscfg.DISPCLK); - xmenu_seti286save(np2oscfg.I286SAVE); - xmenu_setmotorflg(np2cfg.MOTOR); - xmenu_setroltate(0); + + xmenu_setkey(0); xmenu_setxshift(0); xmenu_setf12copy(np2oscfg.F12COPY); + xmenu_setbeepvol(np2cfg.BEEP_VOL); + xmenu_setsound(np2cfg.SOUND_SW); + xmenu_setjastsound(np2oscfg.jastsnd); + xmenu_setmotorflg(np2cfg.MOTOR); xmenu_setextmem(np2cfg.EXTMEM); - xmenu_setraster(np2cfg.RASTER); - xmenu_setshortcut(np2oscfg.shortcut); // ver0.30 - xmenu_setsstp(np2oscfg.sstp); xmenu_setmouse(np2oscfg.MOUSE_SW); - ShowWindow(hWndMain, nCmdShow); - UpdateWindow(hWndMain); + xmenu_setshortcut(np2oscfg.shortcut); + xmenu_setdispclk(np2oscfg.DISPCLK); + xmenu_setbtnmode(np2cfg.BTN_MODE); + xmenu_setbtnrapid(np2cfg.BTN_RAPID); + xmenu_setmsrapid(np2cfg.MOUSERAPID); + xmenu_setsstp(np2oscfg.sstp); + xmenu_seti286save(np2oscfg.I286SAVE); + + ShowWindow(hWnd, nCmdShow); + UpdateWindow(hWnd); #ifdef OPENING_WAIT tick = GetTickCount(); @@ -1342,7 +1350,7 @@ int WINAPI WinMain(HINSTANCE hInstance, // めにゅー追加 if (np2oscfg.statsave) { char buf[16]; - hMenu = GetMenu(hWndMain); + hMenu = GetMenu(hWnd); hStat = CreatePopupMenu(); for (i=0; i