--- np2/win9x/scrnmng.cpp 2005/05/14 19:38:59 1.21 +++ np2/win9x/scrnmng.cpp 2007/01/08 07:52:01 1.24 @@ -9,13 +9,15 @@ #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); @@ -25,7 +27,9 @@ typedef struct { LPDIRECTDRAW2 ddraw2; LPDIRECTDRAWSURFACE primsurf; LPDIRECTDRAWSURFACE backsurf; +#if defined(SUPPORT_DCLOCK) LPDIRECTDRAWSURFACE clocksurf; +#endif LPDIRECTDRAWCLIPPER clipper; LPDIRECTDRAWPALETTE palette; UINT scrnmode; @@ -41,6 +45,8 @@ typedef struct { int menusize; RECT scrn; RECT rect; + RECT scrnclip; + RECT rectclip; PALETTEENTRY pal[256]; } DDRAW; @@ -125,9 +131,11 @@ static void renewalclientsize(BOOL winlo int width; int height; int extend; + UINT fscrnmod; int multiple; int scrnwidth; int scrnheight; + int tmpcy; WINLOCEX wlex; width = min(scrnstat.width, ddraw.width); @@ -138,10 +146,66 @@ static void renewalclientsize(BOOL winlo if (ddraw.scrnmode & SCRNMODE_FULLSCREEN) { ddraw.rect.right = width; ddraw.rect.bottom = height; - ddraw.scrn.left = (ddraw.width - width) / 2; - ddraw.scrn.top = (ddraw.height - height) / 2; - ddraw.scrn.right = ddraw.scrn.left + width; - ddraw.scrn.bottom = ddraw.scrn.top + height; + scrnwidth = width; + scrnheight = height; + fscrnmod = np2oscfg.fscrnmod & FSCRNMOD_ASPECTMASK; + switch(fscrnmod) { + default: + case FSCRNMOD_NORESIZE: + break; + + case FSCRNMOD_ASPECTFIX8: + scrnwidth = (ddraw.width << 3) / width; + scrnheight = (ddraw.height << 3) / height; + multiple = min(scrnwidth, scrnheight); + scrnwidth = (width * multiple) >> 3; + scrnheight = (height * multiple) >> 3; + break; + + case FSCRNMOD_ASPECTFIX: + scrnwidth = ddraw.width; + scrnheight = (scrnwidth * height) / width; + if (scrnheight >= ddraw.height) { + scrnheight = ddraw.height; + scrnwidth = (scrnheight * width) / height; + } + break; + + case FSCRNMOD_LARGE: + scrnwidth = ddraw.width; + scrnheight = ddraw.height; + break; + } + ddraw.scrn.left = (ddraw.width - scrnwidth) / 2; + ddraw.scrn.top = (ddraw.height - scrnheight) / 2; + ddraw.scrn.right = ddraw.scrn.left + scrnwidth; + ddraw.scrn.bottom = ddraw.scrn.top + scrnheight; + + // メニュー表示時の描画領域 + ddraw.rectclip = ddraw.rect; + ddraw.scrnclip = ddraw.scrn; + if (ddraw.scrnclip.top < ddraw.menusize) { + ddraw.scrnclip.top = ddraw.menusize; + tmpcy = ddraw.height - ddraw.menusize; + if (scrnheight > tmpcy) { + switch(fscrnmod) { + default: + case FSCRNMOD_NORESIZE: + tmpcy = min(tmpcy, height); + ddraw.rectclip.bottom = tmpcy; + break; + + case FSCRNMOD_ASPECTFIX8: + case FSCRNMOD_ASPECTFIX: + ddraw.rectclip.bottom = (tmpcy * height) / scrnheight; + break; + + case FSCRNMOD_LARGE: + break; + } + } + ddraw.scrnclip.bottom = ddraw.menusize + tmpcy; + } } else { multiple = scrnstat.multiple; @@ -169,6 +233,7 @@ static void renewalclientsize(BOOL winlo } ddraw.scrn.right = np2oscfg.paddingx + scrnwidth; ddraw.scrn.bottom = np2oscfg.paddingy + scrnheight; + wlex = NULL; if (winloc) { wlex = np2_winlocexallwin(hWndMain); @@ -250,13 +315,24 @@ static void clearoutscreen(void) { static void clearoutfullscreen(void) { RECT base; +const RECT *scrn; base.left = 0; - base.top = (GetWindowLong(hWndMain, NP2GWL_HMENU))?0:ddraw.menusize; - base.right = ddraw.width; // (+ ddraw.extend) + base.top = 0; + base.right = ddraw.width; base.bottom = ddraw.height; - clearoutofrect(&ddraw.scrn, &base); + if (GetWindowLongPtr(hWndMain, NP2GWLP_HMENU)) { + scrn = &ddraw.scrn; + base.top = 0; + } + else { + scrn = &ddraw.scrnclip; + base.top = ddraw.menusize; + } + clearoutofrect(scrn, &base); +#if defined(SUPPORT_DCLOCK) dclock_redraw(); +#endif } static void paletteinit(void) { @@ -267,12 +343,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; iSetCooperativeLevel(hWndMain, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); - height = (np2oscfg.force400)?400:480; + width = np2oscfg.fscrn_cx; + height = np2oscfg.fscrn_cy; bitcolor = np2oscfg.fscrnbpp; + fscrnmod = np2oscfg.fscrnmod; + if ((fscrnmod & (FSCRNMOD_SAMERES | FSCRNMOD_SAMEBPP)) && + (EnumDisplaySettings(NULL, ENUM_REGISTRY_SETTINGS, &devmode))) { + if (fscrnmod & FSCRNMOD_SAMERES) { + width = devmode.dmPelsWidth; + height = devmode.dmPelsHeight; + } + if (fscrnmod & FSCRNMOD_SAMEBPP) { + bitcolor = devmode.dmBitsPerPel; + } + } + if ((width == 0) || (height == 0)) { + width = 640; + height = (np2oscfg.force400)?400:480; + } if (bitcolor == 0) { #if !defined(SUPPORT_PC9821) bitcolor = (scrnmode & SCRNMODE_HIGHCOLOR)?16:8; @@ -399,7 +498,7 @@ BRESULT scrnmng_create(UINT8 scrnmode) { bitcolor = 16; #endif } - if (ddraw2->SetDisplayMode(640, height, bitcolor, 0, 0) != DD_OK) { + if (ddraw2->SetDisplayMode(width, height, bitcolor, 0, 0) != DD_OK) { goto scre_err; } ddraw2->CreateClipper(0, &ddraw.clipper, NULL); @@ -425,7 +524,7 @@ BRESULT scrnmng_create(UINT8 scrnmode) { ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; ddsd.dwWidth = 640; - ddsd.dwHeight = height; + ddsd.dwHeight = 480; if (ddraw2->CreateSurface(&ddsd, &ddraw.backsurf, NULL) != DD_OK) { goto scre_err; } @@ -442,8 +541,8 @@ BRESULT scrnmng_create(UINT8 scrnmode) { else { 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; @@ -452,6 +551,7 @@ BRESULT scrnmng_create(UINT8 scrnmode) { ddsd.dwHeight = DCLOCK_HEIGHT; ddraw2->CreateSurface(&ddsd, &ddraw.clocksurf, NULL); dclock_reset(); +#endif } else { ddraw2->SetCooperativeLevel(hWndMain, DDSCL_NORMAL); @@ -479,13 +579,14 @@ BRESULT scrnmng_create(UINT8 scrnmode) { ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; if (!(scrnmode & SCRNMODE_ROTATE)) { - ddsd.dwWidth = 641; + ddsd.dwWidth = 640 + 1; ddsd.dwHeight = 480; } else { ddsd.dwWidth = 480; - ddsd.dwHeight = 641; + ddsd.dwHeight = 640 + 1; } + width = 640; height = 480; if (ddraw2->CreateSurface(&ddsd, &ddraw.backsurf, NULL) != DD_OK) { @@ -510,7 +611,7 @@ BRESULT scrnmng_create(UINT8 scrnmode) { scrnmng.bpp = (UINT8)bitcolor; scrnsurf.bpp = bitcolor; ddraw.scrnmode = scrnmode; - ddraw.width = 640; + ddraw.width = width; ddraw.height = height; ddraw.cliping = 0; renewalclientsize(FALSE); @@ -527,10 +628,12 @@ void scrnmng_destroy(void) { 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; @@ -701,6 +804,8 @@ void scrnmng_update(void) { POINT clip; RECT dst; + RECT *rect; + RECT *scrn; HRESULT r; if (scrnmng.palchanged) { @@ -713,12 +818,20 @@ void scrnmng_update(void) { scrnmng.allflash = 0; clearoutfullscreen(); } - r = ddraw.primsurf->Blt(&ddraw.scrn, ddraw.backsurf, &ddraw.rect, + if (GetWindowLongPtr(hWndMain, NP2GWLP_HMENU)) { + rect = &ddraw.rect; + scrn = &ddraw.scrn; + } + else { + rect = &ddraw.rectclip; + scrn = &ddraw.scrnclip; + } + r = ddraw.primsurf->Blt(scrn, ddraw.backsurf, rect, DDBLT_WAIT, NULL); if (r == DDERR_SURFACELOST) { ddraw.backsurf->Restore(); ddraw.primsurf->Restore(); - ddraw.primsurf->Blt(&ddraw.scrn, ddraw.backsurf, &ddraw.rect, + ddraw.primsurf->Blt(scrn, ddraw.backsurf, rect, DDBLT_WAIT, NULL); } } @@ -757,42 +870,70 @@ void scrnmng_setmultiple(int multiple) { } } + +// ---- + +#if defined(SUPPORT_DCLOCK) static const RECT rectclk = {0, 0, DCLOCK_WIDTH, DCLOCK_HEIGHT}; +BOOL scrnmng_isdispclockclick(const POINT *pt) { + + if (pt->y >= (ddraw.height - DCLOCK_HEIGHT)) { + return(TRUE); + } + else { + return(FALSE); + } +} + void scrnmng_dispclock(void) { DDSURFACEDESC dest; +const RECT *scrn; // ver0.26 - if ((ddraw.clocksurf) && - (ddraw.scrn.top >= DCLOCK_HEIGHT) && (dclock_disp())) { - dclock_make(); - ZeroMemory(&dest, sizeof(dest)); - dest.dwSize = sizeof(dest); - if (ddraw.clocksurf->Lock(NULL, &dest, DDLOCK_WAIT, NULL) == DD_OK) { - if (scrnmng.bpp == 8) { - dclock_out8(dest.lpSurface, dest.lPitch); - } - 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.clocksurf) { + return; + } + if (!dclock_disp()) { + return; + } + if (GetWindowLongPtr(hWndMain, NP2GWLP_HMENU)) { + scrn = &ddraw.scrn; + } + else { + scrn = &ddraw.scrnclip; + } + if ((scrn->bottom + DCLOCK_HEIGHT) > ddraw.height) { + return; + } + dclock_make(); + ZeroMemory(&dest, sizeof(dest)); + dest.dwSize = sizeof(dest); + if (ddraw.clocksurf->Lock(NULL, &dest, DDLOCK_WAIT, NULL) == DD_OK) { + if (scrnmng.bpp == 8) { + dclock_out8(dest.lpSurface, dest.lPitch); } - if (ddraw.primsurf->BltFast(640 - DCLOCK_WIDTH - 4, + 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(ddraw.width - DCLOCK_WIDTH - 4, ddraw.height - DCLOCK_HEIGHT, ddraw.clocksurf, (RECT *)&rectclk, DDBLTFAST_WAIT) == DDERR_SURFACELOST) { - ddraw.primsurf->Restore(); - ddraw.clocksurf->Restore(); - } - dclock_cntdown(np2oscfg.DRAW_SKIP); + ddraw.primsurf->Restore(); + ddraw.clocksurf->Restore(); } + dclock_cntdown(np2oscfg.DRAW_SKIP); } +#endif // ----