--- np2/win9x/scrnmng.cpp 2003/11/01 22:23:04 1.8 +++ np2/win9x/scrnmng.cpp 2006/12/24 00:52:29 1.22 @@ -5,36 +5,44 @@ #endif #include "resource.h" #include "np2.h" +#include "winloc.h" #include "mousemng.h" #include "scrnmng.h" #include "sysmng.h" -#include "dclock.h" #include "menu.h" +#include "np2class.h" #include "pccore.h" #include "scrndraw.h" #include "palettes.h" +#if defined(SUPPORT_DCLOCK) +#include "dclock.h" +#endif + +extern WINLOCEX np2_winlocexallwin(HWND base); + typedef struct { LPDIRECTDRAW ddraw1; LPDIRECTDRAW2 ddraw2; LPDIRECTDRAWSURFACE primsurf; LPDIRECTDRAWSURFACE backsurf; +#if defined(SUPPORT_DCLOCK) LPDIRECTDRAWSURFACE clocksurf; +#endif LPDIRECTDRAWCLIPPER clipper; LPDIRECTDRAWPALETTE palette; - BYTE scrnmode; + UINT scrnmode; int width; int height; int extend; int cliping; RGB32 pal16mask; - BYTE r16b; - BYTE l16r; - BYTE l16g; - BYTE menudisp; + UINT8 r16b; + UINT8 l16r; + UINT8 l16g; + UINT8 menudisp; int menusize; - HMENU menuhdl; RECT scrn; RECT rect; PALETTEENTRY pal[256]; @@ -116,14 +124,15 @@ static void setwindowsize(HWND hWnd, int } while(--cnt); } -static void renewalclientsize(void) { +static void renewalclientsize(BOOL winloc) { - int width; - int height; - int extend; - int multiple; - int scrnwidth; - int scrnheight; + int width; + int height; + int extend; + int multiple; + int scrnwidth; + int scrnheight; + WINLOCEX wlex; width = min(scrnstat.width, ddraw.width); height = min(scrnstat.height, ddraw.height); @@ -164,7 +173,14 @@ static void renewalclientsize(void) { } ddraw.scrn.right = np2oscfg.paddingx + scrnwidth; ddraw.scrn.bottom = np2oscfg.paddingy + scrnheight; + wlex = NULL; + if (winloc) { + wlex = np2_winlocexallwin(hWndMain); + } + winlocex_setholdwnd(wlex, hWndMain); setwindowsize(hWndMain, scrnwidth, scrnheight); + winlocex_move(wlex); + winlocex_destroy(wlex); } scrnsurf.width = width; scrnsurf.height = height; @@ -237,14 +253,16 @@ static void clearoutscreen(void) { static void clearoutfullscreen(void) { - RECT r; + RECT base; - r.left = 0; - r.top = (ddraw.menuhdl)?0:ddraw.menusize; - r.right = ddraw.width; // (+ ddraw.extend) - r.bottom = ddraw.height; - clearoutofrect(&ddraw.scrn, &r); + base.left = 0; + base.top = (GetWindowLong(hWndMain, NP2GWL_HMENU))?0:ddraw.menusize; + base.right = ddraw.width; // (+ ddraw.extend) + base.bottom = ddraw.height; + clearoutofrect(&ddraw.scrn, &base); +#if defined(SUPPORT_DCLOCK) dclock_redraw(); +#endif } static void paletteinit(void) { @@ -255,12 +273,14 @@ static void paletteinit(void) { hdc = GetDC(hWndMain); GetSystemPaletteEntries(hdc, 0, 256, ddraw.pal); ReleaseDC(hWndMain, hdc); +#if defined(SUPPORT_DCLOCK) for (i=0; i<4; i++) { ddraw.pal[i+START_PALORG].peBlue = dclockpal.pal32[i].p.b; ddraw.pal[i+START_PALORG].peRed = dclockpal.pal32[i].p.r; ddraw.pal[i+START_PALORG].peGreen = dclockpal.pal32[i].p.g; ddraw.pal[i+START_PALORG].peFlags = PC_RESERVED | PC_NOCOLLAPSE; } +#endif for (i=0; i>= 1; sft++; } - ddraw.pal16mask.p.r = (BYTE)rmask; + ddraw.pal16mask.p.r = (UINT8)rmask; ddraw.l16r = sft; sft = 0; @@ -308,7 +328,7 @@ static void make16mask(DWORD bmask, DWOR gmask >>= 1; sft++; } - ddraw.pal16mask.p.g = (BYTE)gmask; + ddraw.pal16mask.p.g = (UINT8)gmask; ddraw.l16g = sft; } @@ -324,7 +344,7 @@ void scrnmng_initialize(void) { setwindowsize(hWndMain, 640, 400); } -BOOL scrnmng_create(BYTE scrnmode) { +BRESULT scrnmng_create(UINT8 scrnmode) { DWORD winstyle; DWORD winstyleex; @@ -342,19 +362,24 @@ BOOL scrnmng_create(BYTE scrnmode) { if (scrnmode & SCRNMODE_FULLSCREEN) { scrnmode &= ~SCRNMODE_ROTATEMASK; scrnmng.flag = SCRNFLAG_FULLSCREEN; - winstyle &= ~(WS_CAPTION | WS_OVERLAPPED | WS_SYSMENU); + winstyle &= ~(WS_CAPTION | WS_SYSMENU | WS_THICKFRAME); winstyle |= WS_POPUP; winstyleex |= WS_EX_TOPMOST; CheckMenuItem(hmenu, IDM_WINDOW, MF_UNCHECKED); CheckMenuItem(hmenu, IDM_FULLSCREEN, MF_CHECKED); ddraw.menudisp = 0; ddraw.menusize = GetSystemMetrics(SM_CYMENU); - ddraw.menuhdl = GetMenu(hWndMain); - SetMenu(hWndMain, NULL); + np2class_enablemenu(hWndMain, FALSE); } else { scrnmng.flag = SCRNFLAG_HAVEEXTEND; - winstyle |= WS_CAPTION | WS_OVERLAPPED | WS_SYSMENU; + winstyle |= WS_SYSMENU; + if (np2oscfg.thickframe) { + winstyle |= WS_THICKFRAME; + } + if (np2oscfg.wintype < 2) { + winstyle |= WS_CAPTION; + } winstyle &= ~WS_POPUP; winstyleex &= ~WS_EX_TOPMOST; CheckMenuItem(hmenu, IDM_WINDOW, MF_CHECKED); @@ -370,16 +395,20 @@ BOOL scrnmng_create(BYTE scrnmode) { ddraw.ddraw2 = ddraw2; if (scrnmode & SCRNMODE_FULLSCREEN) { +#if defined(SUPPORT_DCLOCK) dclock_init(); -#if 1 +#endif ddraw2->SetCooperativeLevel(hWndMain, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + height = (np2oscfg.force400)?400:480; + bitcolor = np2oscfg.fscrnbpp; + if (bitcolor == 0) { +#if !defined(SUPPORT_PC9821) + bitcolor = (scrnmode & SCRNMODE_HIGHCOLOR)?16:8; #else - ddraw2->SetCooperativeLevel(hWndMain, - DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN | DDSCL_ALLOWREBOOT); + bitcolor = 16; #endif - height = (np2oscfg.force400)?400:480; - bitcolor = (scrnmode & SCRNMODE_HIGHCOLOR)?16:8; + } if (ddraw2->SetDisplayMode(640, height, bitcolor, 0, 0) != DD_OK) { goto scre_err; } @@ -412,22 +441,28 @@ BOOL scrnmng_create(BYTE scrnmode) { } if (bitcolor == 8) { paletteinit(); - dclock_init8(); + } + else if (bitcolor == 16) { + make16mask(ddpf.dwBBitMask, ddpf.dwRBitMask, ddpf.dwGBitMask); + } + else if (bitcolor == 24) { + } + else if (bitcolor == 32) { } else { - make16mask(ddpf.dwBBitMask, ddpf.dwRBitMask, - ddpf.dwGBitMask); - dclock_init16(); + goto scre_err; } - +#if defined(SUPPORT_DCLOCK) + dclock_palset(bitcolor); ZeroMemory(&ddsd, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; - ddsd.dwWidth = DCLOCK_X; - ddsd.dwHeight = DCLOCK_Y; + ddsd.dwWidth = DCLOCK_WIDTH; + ddsd.dwHeight = DCLOCK_HEIGHT; ddraw2->CreateSurface(&ddsd, &ddraw.clocksurf, NULL); dclock_reset(); +#endif } else { ddraw2->SetCooperativeLevel(hWndMain, DDSCL_NORMAL); @@ -483,13 +518,13 @@ BOOL scrnmng_create(BYTE scrnmode) { } ddraw.extend = 1; } - scrnmng.bpp = (BYTE)bitcolor; + scrnmng.bpp = (UINT8)bitcolor; scrnsurf.bpp = bitcolor; ddraw.scrnmode = scrnmode; ddraw.width = 640; ddraw.height = height; ddraw.cliping = 0; - renewalclientsize(); + renewalclientsize(FALSE); screenupdate = 3; // update! return(SUCCESS); @@ -500,11 +535,15 @@ scre_err: void scrnmng_destroy(void) { - scrnmng_enablemenubar(); + if (scrnmng.flag & SCRNFLAG_FULLSCREEN) { + np2class_enablemenu(hWndMain, (!np2oscfg.wintype)); + } +#if defined(SUPPORT_DCLOCK) if (ddraw.clocksurf) { ddraw.clocksurf->Release(); ddraw.clocksurf = NULL; } +#endif if (ddraw.backsurf) { ddraw.backsurf->Release(); ddraw.backsurf = NULL; @@ -551,36 +590,19 @@ RGB16 scrnmng_makepal16(RGB32 pal32) { (pal.p.r << ddraw.l16r) + (pal.p.b >> ddraw.r16b))); } -void scrnmng_enablemenubar(void) { - - if (ddraw.menuhdl) { - SetMenu(hWndMain, ddraw.menuhdl); - ddraw.menuhdl = NULL; - DrawMenuBar(hWndMain); - } -} - -void scrnmng_disablemenubar(void) { - - if (ddraw.menuhdl == NULL) { - ddraw.menuhdl = GetMenu(hWndMain); - SetMenu(hWndMain, NULL); - } -} - void scrnmng_fullscrnmenu(int y) { - BYTE menudisp; + UINT8 menudisp; if (scrnmng.flag & SCRNFLAG_FULLSCREEN) { menudisp = ((y >= 0) && (y < ddraw.menusize))?1:0; if (ddraw.menudisp != menudisp) { ddraw.menudisp = menudisp; if (menudisp == 1) { - scrnmng_enablemenubar(); + np2class_enablemenu(hWndMain, TRUE); } else { - scrnmng_disablemenubar(); + np2class_enablemenu(hWndMain, FALSE); clearoutfullscreen(); } } @@ -589,7 +611,7 @@ void scrnmng_fullscrnmenu(int y) { void scrnmng_topwinui(void) { - mouse_running(MOUSE_STOP); + mousemng_disable(MOUSEPROC_WINUI); if (!ddraw.cliping++) { // ver0.28 if (scrnmng.flag & SCRNFLAG_FULLSCREEN) { ddraw.primsurf->SetClipper(ddraw.clipper); @@ -611,29 +633,36 @@ void scrnmng_clearwinui(void) { } } if (scrnmng.flag & SCRNFLAG_FULLSCREEN) { - scrnmng_disablemenubar(); + np2class_enablemenu(hWndMain, FALSE); clearoutfullscreen(); ddraw.menudisp = 0; } - mouse_running(MOUSE_CONT); + else { + if (np2oscfg.wintype) { + np2class_enablemenu(hWndMain, FALSE); + InvalidateRect(hWndMain, NULL, TRUE); + } + } + mousemng_enable(MOUSEPROC_WINUI); } void scrnmng_setwidth(int posx, int width) { scrnstat.width = width; - renewalclientsize(); + renewalclientsize(TRUE); } void scrnmng_setextend(int extend) { scrnstat.extend = extend; - renewalclientsize(); + scrnmng.allflash = TRUE; + renewalclientsize(TRUE); } void scrnmng_setheight(int posy, int height) { scrnstat.height = height; - renewalclientsize(); + renewalclientsize(TRUE); } const SCRNSURF *scrnmng_surflock(void) { @@ -656,18 +685,18 @@ const SCRNSURF *scrnmng_surflock(void) { return(NULL); } if (!(ddraw.scrnmode & SCRNMODE_ROTATE)) { - scrnsurf.ptr = (BYTE *)destscrn.lpSurface; + scrnsurf.ptr = (UINT8 *)destscrn.lpSurface; scrnsurf.xalign = scrnsurf.bpp >> 3; scrnsurf.yalign = destscrn.lPitch; } else if (!(ddraw.scrnmode & SCRNMODE_ROTATEDIR)) { - scrnsurf.ptr = (BYTE *)destscrn.lpSurface; + scrnsurf.ptr = (UINT8 *)destscrn.lpSurface; scrnsurf.ptr += (scrnsurf.width - 1) * destscrn.lPitch; scrnsurf.xalign = 0 - destscrn.lPitch; scrnsurf.yalign = scrnsurf.bpp >> 3; } else { - scrnsurf.ptr = (BYTE *)destscrn.lpSurface; + scrnsurf.ptr = (UINT8 *)destscrn.lpSurface; scrnsurf.ptr += (scrnsurf.height - 1) * (scrnsurf.bpp >> 3); scrnsurf.xalign = destscrn.lPitch; scrnsurf.yalign = 0 - (scrnsurf.bpp >> 3); @@ -737,18 +766,22 @@ void scrnmng_setmultiple(int multiple) { if (scrnstat.multiple != multiple) { scrnstat.multiple = multiple; - renewalclientsize(); + renewalclientsize(TRUE); } } -static const RECT rectclk = {0, 0, DCLOCK_X, DCLOCK_Y}; + +// ---- + +#if defined(SUPPORT_DCLOCK) +static const RECT rectclk = {0, 0, DCLOCK_WIDTH, DCLOCK_HEIGHT}; void scrnmng_dispclock(void) { DDSURFACEDESC dest; // ver0.26 if ((ddraw.clocksurf) && - (ddraw.scrn.top >= DCLOCK_Y) && (dclock_disp())) { + (ddraw.scrn.top >= DCLOCK_HEIGHT) && (dclock_disp())) { dclock_make(); ZeroMemory(&dest, sizeof(dest)); dest.dwSize = sizeof(dest); @@ -756,13 +789,19 @@ void scrnmng_dispclock(void) { if (scrnmng.bpp == 8) { dclock_out8(dest.lpSurface, dest.lPitch); } - else { + else if (scrnmng.bpp == 16) { dclock_out16(dest.lpSurface, dest.lPitch); } + else if (scrnmng.bpp == 24) { + dclock_out24(dest.lpSurface, dest.lPitch); + } + else if (scrnmng.bpp == 32) { + dclock_out32(dest.lpSurface, dest.lPitch); + } ddraw.clocksurf->Unlock(NULL); } - if (ddraw.primsurf->BltFast(640 - DCLOCK_X - 4, - ddraw.height - DCLOCK_Y, + if (ddraw.primsurf->BltFast(640 - DCLOCK_WIDTH - 4, + ddraw.height - DCLOCK_HEIGHT, ddraw.clocksurf, (RECT *)&rectclk, DDBLTFAST_WAIT) == DDERR_SURFACELOST) { ddraw.primsurf->Restore(); @@ -771,4 +810,124 @@ void scrnmng_dispclock(void) { dclock_cntdown(np2oscfg.DRAW_SKIP); } } +#endif + + +// ---- + +typedef struct { + int bx; + int by; + int cx; + int cy; + int mul; +} SCRNSIZING; + +static SCRNSIZING scrnsizing; + +enum { + SIZING_ADJUST = 12 +}; + +void scrnmng_entersizing(void) { + + RECT rectwindow; + RECT rectclient; + int cx; + int cy; + + GetWindowRect(hWndMain, &rectwindow); + GetClientRect(hWndMain, &rectclient); + scrnsizing.bx = (np2oscfg.paddingx * 2) + + (rectwindow.right - rectwindow.left) - + (rectclient.right - rectclient.left); + scrnsizing.by = (np2oscfg.paddingy * 2) + + (rectwindow.bottom - rectwindow.top) - + (rectclient.bottom - rectclient.top); + cx = min(scrnstat.width, ddraw.width); + cx = (cx + 7) >> 3; + cy = min(scrnstat.height, ddraw.height); + cy = (cy + 7) >> 3; + if (!(ddraw.scrnmode & SCRNMODE_ROTATE)) { + scrnsizing.cx = cx; + scrnsizing.cy = cy; + } + else { + scrnsizing.cx = cy; + scrnsizing.cy = cx; + } + scrnsizing.mul = scrnstat.multiple; +} + +void scrnmng_sizing(UINT side, RECT *rect) { + + int width; + int height; + int mul; + + if ((side != WMSZ_TOP) && (side != WMSZ_BOTTOM)) { + width = rect->right - rect->left - scrnsizing.bx + SIZING_ADJUST; + width /= scrnsizing.cx; + } + else { + width = 16; + } + if ((side != WMSZ_LEFT) && (side != WMSZ_RIGHT)) { + height = rect->bottom - rect->top - scrnsizing.by + SIZING_ADJUST; + height /= scrnsizing.cy; + } + else { + height = 16; + } + mul = min(width, height); + if (mul <= 0) { + mul = 1; + } + else if (mul > 16) { + mul = 16; + } + width = scrnsizing.bx + (scrnsizing.cx * mul); + height = scrnsizing.by + (scrnsizing.cy * mul); + switch(side) { + case WMSZ_LEFT: + case WMSZ_TOPLEFT: + case WMSZ_BOTTOMLEFT: + rect->left = rect->right - width; + break; + + case WMSZ_RIGHT: + case WMSZ_TOP: + case WMSZ_TOPRIGHT: + case WMSZ_BOTTOM: + case WMSZ_BOTTOMRIGHT: + default: + rect->right = rect->left + width; + break; + } + + switch(side) { + case WMSZ_TOP: + case WMSZ_TOPLEFT: + case WMSZ_TOPRIGHT: + rect->top = rect->bottom - height; + break; + + case WMSZ_LEFT: + case WMSZ_RIGHT: + case WMSZ_BOTTOM: + case WMSZ_BOTTOMLEFT: + case WMSZ_BOTTOMRIGHT: + default: + rect->bottom = rect->top + height; + break; + } + scrnsizing.mul = mul; +} + +void scrnmng_exitsizing(void) { + + sysmenu_setscrnmul(scrnsizing.mul); + scrnmng_setmultiple(scrnsizing.mul); + InvalidateRect(hWndMain, NULL, TRUE); // ugh +}