--- np2/win9x/scrnmng.cpp 2003/11/07 20:07:58 1.11 +++ np2/win9x/scrnmng.cpp 2006/12/24 00:52:29 1.22 @@ -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,19 +27,21 @@ typedef struct { 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; RECT scrn; RECT rect; @@ -256,7 +260,9 @@ static void clearoutfullscreen(void) { 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) { @@ -267,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; @@ -320,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; } @@ -336,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; @@ -365,7 +373,10 @@ BOOL scrnmng_create(BYTE scrnmode) { } else { scrnmng.flag = SCRNFLAG_HAVEEXTEND; - winstyle |= WS_SYSMENU | WS_THICKFRAME; + winstyle |= WS_SYSMENU; + if (np2oscfg.thickframe) { + winstyle |= WS_THICKFRAME; + } if (np2oscfg.wintype < 2) { winstyle |= WS_CAPTION; } @@ -384,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; } @@ -426,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); @@ -497,7 +518,7 @@ 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; @@ -517,10 +538,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; @@ -569,7 +592,7 @@ RGB16 scrnmng_makepal16(RGB32 pal32) { void scrnmng_fullscrnmenu(int y) { - BYTE menudisp; + UINT8 menudisp; if (scrnmng.flag & SCRNFLAG_FULLSCREEN) { menudisp = ((y >= 0) && (y < ddraw.menusize))?1:0; @@ -617,7 +640,7 @@ void scrnmng_clearwinui(void) { else { if (np2oscfg.wintype) { np2class_enablemenu(hWndMain, FALSE); - scrnmng_update(); // °ì±þ¡Ä + InvalidateRect(hWndMain, NULL, TRUE); } } mousemng_enable(MOUSEPROC_WINUI); @@ -632,6 +655,7 @@ void scrnmng_setwidth(int posx, int widt void scrnmng_setextend(int extend) { scrnstat.extend = extend; + scrnmng.allflash = TRUE; renewalclientsize(TRUE); } @@ -661,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); @@ -746,14 +770,18 @@ void scrnmng_setmultiple(int multiple) { } } -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); @@ -761,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(); @@ -776,6 +810,7 @@ void scrnmng_dispclock(void) { dclock_cntdown(np2oscfg.DRAW_SKIP); } } +#endif // ----