--- xmil/vram/makescrn.c 2004/08/12 20:23:31 1.10 +++ xmil/vram/makescrn.c 2005/02/13 22:27:53 1.17 @@ -1,5 +1,6 @@ #include "compiler.h" #include "scrnmng.h" +#include "sysmng.h" #include "pccore.h" #include "iocore.h" #include "vram.h" @@ -9,23 +10,16 @@ #include "makesub.h" - MAKESCRN makescrn; - - BYTE scrnallflash; -static BYTE lastdisp = 0; -static BYTE blinktime = 1; - UINT drawtime = 0; + MAKESCRN makescrn; + UINT drawtime = 0; static void fillupdatetmp(void) { - UINT32 *p; UINT i; - p = (UINT32 *)updatetmp; - for (i=0; i<0x200; i++) { - p[i] |= (UPDATE_TVRAM << 24) | (UPDATE_TVRAM << 16) | - (UPDATE_TVRAM << 8) | UPDATE_TVRAM; + for (i=0; i<0x800; i++) { + TRAMUPDATE(i) |= UPDATE_TVRAM; } } @@ -48,7 +42,7 @@ static void flashupdatetmp(void) { y = crtc.e.yl; do { for (x=0; x> 1; do { posr = LOW11(posl + 1); - atr = (tram[TRAM_ATR + posl] << 8) | tram[TRAM_ATR + posr]; + atr = (TRAM_ATR(posl) << 8) | TRAM_ATR(posr); udt = udtbase; if (!y2) { if (atr & (TRAMATR_Yx2 << 8)) { @@ -81,11 +75,11 @@ static void flashupdatetmp(void) { if (atr & (TRAMATR_Xx2 << 0)) { // 右側倍角? udt |= 0x0008; } - if ((updatetmp[posl] ^ (udt >> 8)) & 0x1f) { - updatetmp[posl] = (UINT8)((udt >> 8) | UPDATE_TVRAM); + if ((TRAMUPDATE(posl) ^ (udt >> 8)) & 0x1f) { + TRAMUPDATE(posl) = (UINT8)((udt >> 8) | UPDATE_TRAM); } - if ((updatetmp[posr] ^ (udt >> 0)) & 0x1f) { - updatetmp[posr] = (UINT8)((udt >> 0) | UPDATE_TVRAM); + if ((TRAMUPDATE(posr) ^ (udt >> 0)) & 0x1f) { + TRAMUPDATE(posr) = (UINT8)((udt >> 0) | UPDATE_TRAM); } posl = LOW11(posl + 2); } while(--r); @@ -101,52 +95,104 @@ static BRESULT updateblink(void) { REG8 update; UINT r; - if (blinktime) { - blinktime--; - return(FALSE); + pos = makescrn.vramtop; + makescrn.blinktest ^= 0x10; + update = 0; + r = makescrn.vramsize; + while(r) { + r--; + if (TRAM_ATR(pos) & 0x10) { + TRAMUPDATE(pos) |= UPDATE_TRAM; + update = UPDATE_TRAM; + } + pos = LOW11(pos + 1); + } + if (update) { + return(TRUE); } else { - blinktime = 30 - 1; - pos = makescrn.vramtop; - makescrn.blinktest ^= 0x10; - update = 0; - r = makescrn.vramsize; - while(r) { - r--; - if (tram[TRAM_ATR + pos] & 0x10) { - updatetmp[pos] |= UPDATE_TRAM; - update = UPDATE_TRAM; - } - pos = LOW11(pos + 1); - } - if (update) { - makescrn.existblink = 1; - return(TRUE); - } - else { - return(FALSE); - } + return(FALSE); } } // ---- +typedef void (*MAKEFN)(void); + +static void width_dummy(void) { } + +static const UINT8 screendraw[] = { + MAKESCRN_320x200S, MAKESCRN_320x400, + MAKESCRN_320x200S, MAKESCRN_320x400, + MAKESCRN_320x200S, MAKESCRN_320x400, + MAKESCRN_320x200S, MAKESCRN_320x200H, + + MAKESCRN_320x200S, MAKESCRN_320x400, + MAKESCRN_320x200S, MAKESCRN_320x400, + MAKESCRN_320x200S, MAKESCRN_320x200H, + MAKESCRN_320x200S, MAKESCRN_320x200H, + +#if defined(SUPPORT_TURBOZ) + MAKESCRN_320x200H, MAKESCRN_320x200H, + MAKESCRN_320x200H, MAKESCRN_320x200H, + MAKESCRN_320x200H, MAKESCRN_320x200H, + MAKESCRN_320x200H, MAKESCRN_320x200H, + + MAKESCRN_320x200H, MAKESCRN_320x200H, + MAKESCRN_320x200H, MAKESCRN_320x200H, + MAKESCRN_320x200H, MAKESCRN_320x200H, + MAKESCRN_320x200H, MAKESCRN_320x200H, +#endif +}; + +static const MAKEFN screenmake[] = { + width80x25_200l, width80x25_400h, + width80x25_200l, width80x25_200h, + width80x12_200l, width80x12_400h, + width80x12_200l, width80x12_200h, + + width80x20l, width80x20h, + width80x20l, width80x20h, + width80x10l, width80x10h, + width80x10l, width80x10h, + +#if defined(SUPPORT_TURBOZ) + width_dummy, width_dummy, + width_dummy, width_dummy, + width_dummy, width_dummy, + width_dummy, width_dummy, + + width_dummy, width_dummy, + width_dummy, width_dummy, + width_dummy, width_dummy, + width_dummy, width_dummy, +#endif +}; + + static void changemodes(void) { - lastdisp = crtc.e.dispmode; - if (!(lastdisp & SCRN_BANK1)) { + REG8 dispmode; + + dispmode = crtc.e.dispmode; + makescrn.dispmode = dispmode; + makescrn.drawmode = screendraw[dispmode & DISPMODE_MASKMODE]; + if (dispmode & DISPMODE_WIDTH80) { + makescrn.drawmode |= 1; + } + sysmng_scrnwidth((REG8)((dispmode & DISPMODE_WIDTH80) == 0)); + + if (!(dispmode & DISPMODE_BANK1)) { makescrn.disp1 = gram + GRAM_BANK0; makescrn.disp2 = gram + GRAM_BANK1; - makescrn.dispflag = UPDATE_TRAM | UPDATE_VRAM0; + makescrn.dispflag = UPDATE_TRAM + UPDATE_VRAM0; } else { makescrn.disp1 = gram + GRAM_BANK1; makescrn.disp2 = gram + GRAM_BANK0; - makescrn.dispflag = UPDATE_TRAM | UPDATE_VRAM1; + makescrn.dispflag = UPDATE_TRAM + UPDATE_VRAM1; } - scrnallflash = 1; - makescrn.palandply = 1; } static void changecrtc(void) { @@ -155,7 +201,6 @@ static void changecrtc(void) { UINT scrnymax; UINT textxl; UINT surfcx; - REG8 widthmode; UINT fontcy; UINT underlines; REG8 y2; @@ -168,33 +213,21 @@ static void changecrtc(void) { makescrn.vramtop = crtc.e.pos; - scrnxmax = (crtc.s.reg[CRTCREG_HDISP] <= 40)?40:80; + scrnxmax = (makescrn.dispmode & DISPMODE_WIDTH80)?80:40; scrnymax = 200; - if (crtc.s.reg[CRTCREG_HDISP] <= 40) { - if (lastdisp & SCRN_DRAW4096) { - widthmode = SCRNWIDTHMODE_4096; - } - else { - widthmode = SCRNWIDTHMODE_WIDTH40; - } - } - else { - widthmode = SCRNWIDTHMODE_WIDTH80; - } - scrndraw_changewidth(widthmode); textxl = crtc.s.reg[CRTCREG_HDISP]; surfcx = min(scrnxmax, textxl); fontcy = crtc.e.fonty; - underlines = (crtc.s.SCRN_BITS & SCRN_UNDERLINE)?2:0; + underlines = (makescrn.dispmode & DISPMODE_UNDERLINE)?2:0; if (fontcy > underlines) { fontcy -= underlines; } else { fontcy = 0; } - y2 = (crtc.s.SCRN_BITS & SCRN_TEXTYx2)?1:0; + y2 = (makescrn.dispmode & DISPMODE_TEXTYx2)?1:0; fontcy >>= y2; #if 0 if (((dispmode & SCRN64_MASK) != SCRN64_INVALID) && (fontcy > 8)) { @@ -217,6 +250,7 @@ static void changecrtc(void) { } surfsy = charcy * surfcy * 2; + // ハイドライド３で画面が消えないのでロジックを修正すべし x = min(scrnxmax, makescrn.surfcx); if (surfcx < x) { // 小さくなった x = (x - surfcx) * 8; @@ -241,64 +275,66 @@ static void changecrtc(void) { // scrnmng_setheight(0, charcy * surfcy * 2); } - -// ------------------------------------------------------------------------- - -typedef void (*DRAWFN)(void); - -static const DRAWFN screendraw[8] = { - width80x25_200l, width80x25_400h, - width80x25_200l, width80x25_200h, - width80x12_200l, width80x12_400h, - width80x12_200l, width80x12_200h}; - -static const DRAWFN screendraw2[8] = { - width80x20l, width80x20h, - width80x20l, width80x20h, - width80x10l, width80x10h, - width80x10l, width80x10h}; - - void scrnupdate(void) { - BRESULT ddrawflash; - BRESULT allflash; + REG8 flag; + REG8 existblink; if (!corestat.drawframe) { return; } corestat.drawframe = 0; - ddrawflash = FALSE; - allflash = FALSE; - if (lastdisp != crtc.e.dispmode) { + flag = makescrn.nextdraw; + if (crtc.e.scrnflash) { + crtc.e.scrnflash = 0; + flag |= SCRNUPD_FLASH; + } + if (crtc.e.scrnallflash) { + crtc.e.scrnallflash = 0; + flag |= SCRNUPD_ALLFLASH; + } + if (crtc.e.palandply) { + crtc.e.palandply = 0; + flag |= SCRNUPD_PALANDPLY; + } + + if (makescrn.dispmode != crtc.e.dispmode) { + TRACEOUT(("change mode!")); changemodes(); + flag |= SCRNUPD_ALLFLASH | SCRNUPD_PALANDPLY; } - if (scrnallflash) { - scrnallflash = 0; - fillupdatetmp(); + if (flag & SCRNUPD_ALLFLASH) { changecrtc(); - ddrawflash = TRUE; - allflash = TRUE; - makescrn.scrnflash = 1; + TRACEOUT(("flash! %dx%d", makescrn.surfcx, makescrn.surfcy)); + fillupdatetmp(); + flag |= SCRNUPD_FLASH; } - if (makescrn.remakeattr) { - makescrn.remakeattr = 0; + if (crtc.e.remakeattr) { + crtc.e.remakeattr = 0; flashupdatetmp(); } - if (makescrn.palandply) { - makescrn.palandply = 0; + if (flag & SCRNUPD_PALANDPLY) { pal_update(); - ddrawflash = TRUE; } - if (makescrn.existblink) { - makescrn.scrnflash |= updateblink(); + + if (crtc.e.blinktime) { + crtc.e.blinktime--; + } + else { + crtc.e.blinktime = 30 - 1; + if (crtc.e.existblink) { + existblink = updateblink(); + crtc.e.existblink = existblink; + flag |= existblink; + } } - if (makescrn.scrnflash) { - makescrn.scrnflash = 0; + if (flag & SCRNUPD_FLASH) { if (makescrn.vramsize) { makescrn.fontycnt = 0; + screenmake[makescrn.dispmode & DISPMODE_MASKMODE](); +#if 0 switch(lastdisp & SCRN64_MASK) { case SCRN64_320x200: // width40x25_64s(); @@ -343,20 +379,19 @@ void scrnupdate(void) { // case SCRN64_INVALID: default: if (!(crtc.s.SCRN_BITS & SCRN_UNDERLINE)) { - screendraw[crtc.s.SCRN_BITS & 7](); + screenmake[(crtc.s.SCRN_BITS & 7) + 0](); } else { - screendraw2[crtc.s.SCRN_BITS & 7](); + screenmake[(crtc.s.SCRN_BITS & 7) + 8](); } break; } - ddrawflash = 1; +#endif } } - if (ddrawflash) { - ddrawflash = 0; - scrndraw_draw(allflash); + if (flag) { + makescrn.nextdraw = scrndraw_draw((REG8)(flag & SCRNUPD_ALLFLASH)); drawtime++; } }