--- np2/win9x/np2.cpp 2003/10/28 22:05:46 1.15 +++ np2/win9x/np2.cpp 2003/11/24 07:40:02 1.32 @@ -28,6 +28,7 @@ #ifdef USE_ROMEO #include "juliet.h" #endif +#include "np2class.h" #include "dialog.h" #include "memory.h" #include "pccore.h" @@ -45,6 +46,7 @@ #include "statsave.h" #include "debugsub.h" #include "keydisp.h" +#include "kdispwin.h" #include "viewer.h" @@ -59,6 +61,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", @@ -70,36 +74,69 @@ 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 mimpideffile[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.hlp"; -static const char np2resume[] = "sav"; +static const char np2help[] = "np2.chm"; +static const char np2flagext[] = "S%02d"; -static BYTE scrnmode; +static void winuienter(void) { + + winui_en = TRUE; + soundmng_disable(SNDPROC_MAIN); + scrnmng_topwinui(); +} + +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] = kdispwin_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); } @@ -108,11 +145,15 @@ static void changescreen(BYTE newmode) { } if (renewal) { if (renewal & SCRNMODE_FULLSCREEN) { - toolwin_close(); + toolwin_destroy(); + kdispwin_destroy(); + } + else if (renewal & SCRNMODE_ROTATEMASK) { + 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; @@ -124,11 +165,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) { + kdispwin_create(); + } + } + } + else if (renewal & SCRNMODE_ROTATEMASK) { + winlocex_move(wlex); + winlocex_destroy(wlex); } - mouse_running(MOUSE_CONT); + mousemng_enable(MOUSEPROC_WINUI); soundmng_play(); } else { @@ -161,7 +212,7 @@ void np2active_renewal(void) { / if (np2break & (~NP2BREAK_MAIN)) { np2stopemulate = 2; - soundmng_disable(); + soundmng_disable(SNDPROC_MASTER); } else if (np2break & NP2BREAK_MAIN) { if (np2oscfg.background & 1) { @@ -171,15 +222,15 @@ void np2active_renewal(void) { / np2stopemulate = 0; } if (np2oscfg.background) { - soundmng_disable(); + soundmng_disable(SNDPROC_MASTER); } else { - soundmng_enable(); + soundmng_enable(SNDPROC_MASTER); } } else { np2stopemulate = 0; - soundmng_enable(); + soundmng_enable(SNDPROC_MASTER); } } @@ -222,8 +273,7 @@ static int flagload(const char *ext, con char buf[1024]; getstatfilename(path, ext, sizeof(path)); - soundmng_stop(); - scrnmng_topwinui(); + winuienter(); id = IDYES; ret = statsave_check(path, buf, sizeof(buf)); if (ret & (~NP2FLAG_DISKCHG)) { @@ -243,24 +293,30 @@ static int flagload(const char *ext, con } sysmng_workclockreset(); sysmng_updatecaption(1); - scrnmng_clearwinui(); - soundmng_play(); + winuileave(); return(id); } // ---- proc -static void winuienter(void) { - - soundmng_stop(); - scrnmng_topwinui(); -} - -static void winuileave(void) { +static void np2popup(HWND hWnd, LPARAM lp) { - scrnmng_clearwinui(); - soundmng_play(); + 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) { @@ -270,9 +326,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); @@ -283,45 +343,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) { + kdispwin_create(); + } + else { + kdispwin_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; @@ -338,11 +405,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 = kdispwin_gethwnd(); + if (subwin) { + ShowWindow(subwin, SW_SHOWNOACTIVATE); + } + return(DefWindowProc(hWnd, msg, wParam, lParam)); + default: return(DefWindowProc(hWnd, msg, wParam, lParam)); } @@ -518,49 +602,67 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT case IDM_KEY: xmenu_setkey(0); keystat_resetjoykey(); + update |= SYS_UPDATECFG; break; case IDM_JOY1: xmenu_setkey(1); keystat_resetjoykey(); + update |= SYS_UPDATECFG; break; case IDM_JOY2: xmenu_setkey(2); keystat_resetjoykey(); + update |= SYS_UPDATECFG; break; case IDM_XSHIFT: xmenu_setxshift(np2cfg.XSHIFT ^ 1); keystat_forcerelease(0x70); + update |= SYS_UPDATECFG; break; case IDM_XCTRL: xmenu_setxshift(np2cfg.XSHIFT ^ 2); keystat_forcerelease(0x74); + update |= SYS_UPDATECFG; break; case IDM_XGRPH: xmenu_setxshift(np2cfg.XSHIFT ^ 4); keystat_forcerelease(0x73); + update |= SYS_UPDATECFG; break; case IDM_F12MOUSE: xmenu_setf12copy(0); - keystat_resetcopyhelp(); - update |= SYS_UPDATECFG; + winkbd_resetf12(); + update |= SYS_UPDATEOSCFG; break; case IDM_F12COPY: xmenu_setf12copy(1); - keystat_resetcopyhelp(); - update |= SYS_UPDATECFG; + winkbd_resetf12(); + update |= SYS_UPDATEOSCFG; break; case IDM_F12STOP: xmenu_setf12copy(2); - keystat_resetcopyhelp(); - update |= SYS_UPDATECFG; + winkbd_resetf12(); + update |= SYS_UPDATEOSCFG; + break; + + case IDM_F12EQU: + xmenu_setf12copy(3); + winkbd_resetf12(); + update |= SYS_UPDATEOSCFG; + break; + + case IDM_F12COMMA: + xmenu_setf12copy(4); + winkbd_resetf12(); + update |= SYS_UPDATEOSCFG; break; case IDM_BEEPOFF: @@ -588,66 +690,38 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT break; case IDM_NOSOUND: - xmenu_setsound(0); + xmenu_setsound(0x00); update |= SYS_UPDATECFG; break; case IDM_PC9801_14: - xmenu_setsound(1); + xmenu_setsound(0x01); update |= SYS_UPDATECFG; break; case IDM_PC9801_26K: - { - BYTE sw; - sw = np2cfg.SOUND_SW; - if (sw & 4) { - sw &= 6; - sw ^= 2; - } - else { - sw = 2; - } - xmenu_setsound(sw); - update |= SYS_UPDATECFG; - } + xmenu_setsound(0x02); + update |= SYS_UPDATECFG; break; case IDM_PC9801_86: - { - BYTE sw; - sw = np2cfg.SOUND_SW; - if (sw & 2) { - sw &= 6; - sw ^= 4; - } - else if (!(sw & 4)) { - sw = 4; - } - xmenu_setsound(sw); - update |= SYS_UPDATECFG; - } + xmenu_setsound(0x04); + update |= SYS_UPDATECFG; break; - case IDM_PC9801_118: - xmenu_setsound(8); + case IDM_PC9801_26_86: + xmenu_setsound(0x06); update |= SYS_UPDATECFG; break; - case IDM_CHIBIOTO: - { - BYTE sw; - sw = np2cfg.SOUND_SW; - if (sw & 4) { - sw &= 0x14; - sw ^= 0x10; - } - else { - sw = 0x14; - } - xmenu_setsound(sw); - update |= SYS_UPDATECFG; - } + case IDM_PC9801_86_CB: + xmenu_setsound(0x14); + update |= SYS_UPDATECFG; + break; + + case IDM_PC9801_118: + xmenu_setsound(0x08); + update |= SYS_UPDATECFG; break; case IDM_SPEAKBOARD: @@ -697,7 +771,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; @@ -803,14 +877,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); } @@ -824,11 +898,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; @@ -882,12 +956,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; @@ -903,36 +971,44 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT break; case WM_ENTERSIZEMOVE: - soundmng_stop(); - mouse_running(MOUSE_STOP); - winloc_movingstart(); - toolwin_movingstart(); - break; - - case WM_EXITSIZEMOVE: - toolwin_movingend(); - mouse_running(MOUSE_CONT); - soundmng_play(); + soundmng_disable(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; @@ -941,7 +1017,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; @@ -956,11 +1032,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: @@ -973,8 +1049,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++; @@ -987,21 +1069,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++; @@ -1014,11 +1099,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) { @@ -1033,7 +1133,6 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT winuileave(); } if (b) { - keydisp_destroy(); viewer_allclose(); DestroyWindow(hWnd); } @@ -1041,6 +1140,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT case WM_DESTROY: DestroyMenu(hStat); + np2class_wmdestroy(hWnd); PostQuitMessage(0); break; @@ -1103,53 +1203,62 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT } +static void framereset(UINT cnt) { + + framecnt = 0; + scrnmng_dispclock(); + kdispwin_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); } + soundmng_sync(); } int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPreInst, LPSTR lpszCmdLine, int nCmdShow) { - WNDCLASS np2; + WNDCLASS wc; MSG msg; HMENU hMenu; - HWND hwndorg; + HWND hWnd; UINT i; #ifdef OPENING_WAIT UINT32 tick; #endif + _MEM_INIT(); + GetModuleFileName(NULL, modulefile, sizeof(modulefile)); dosio_init(); file_setcd(modulefile); np2arg_analize(lpszCmdLine); initload(); toolwin_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); } @@ -1174,30 +1283,32 @@ int WINAPI WinMain(HINSTANCE hInstance, } keystat_reset(); + 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); } - toolwin_initapp(hInstance); } - keydisp_initialize(hPreInst); + toolwin_initapp(hInstance); + kdispwin_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); + hWnd = hWndMain; scrnmng_initialize(); xmenu_setsound(np2cfg.SOUND_SW); @@ -1221,8 +1332,8 @@ int WINAPI WinMain(HINSTANCE hInstance, xmenu_setsstp(np2oscfg.sstp); xmenu_setmouse(np2oscfg.MOUSE_SW); - ShowWindow(hWndMain, nCmdShow); - UpdateWindow(hWndMain); + ShowWindow(hWnd, nCmdShow); + UpdateWindow(hWnd); #ifdef OPENING_WAIT tick = GetTickCount(); @@ -1231,7 +1342,7 @@ int WINAPI WinMain(HINSTANCE hInstance, // めにゅー追加 if (np2oscfg.statsave) { char buf[16]; - hMenu = GetMenu(hWndMain); + hMenu = GetMenu(hWnd); hStat = CreatePopupMenu(); for (i=0; i