--- xmil/vram/make24.c	2004/08/07 07:19:56	1.1
+++ xmil/vram/make24.c	2004/08/18 09:17:56	1.5
@@ -1,7 +1,6 @@
 #include	"compiler.h"
 #include	"scrnmng.h"
 #include	"pccore.h"
-#include	"iocore.h"
 #include	"vram.h"
 #include	"scrndraw.h"
 #include	"makescrn.h"
@@ -9,10 +8,6 @@
 #include	"font.h"
 
 
-extern	BYTE	dispflg;
-extern	BYTE	*dispp;
-
-
 void width80x25_200h(void) {								// 80x25 200line
 
 	UINT	fontcy;
@@ -23,13 +18,14 @@ void width80x25_200h(void) {								// 8
 	UINT8	*lp;
 	UINT	x;
 	REG8	udtmp;
+	REG8	dirty;
 	UINT8	work[MAKETEXT_STEP * 2];
 const UINT8	*src;
 	UINT	lines;
 	UINT	i;
 
 	fontcy = min(makescrn.fontcy, MAKETEXT_ROW);
-	pos = crtc.s.TXT_TOP;
+	pos = makescrn.vramtop;
 	dst = screenmap;
 	newline = FALSE;
 	y = makescrn.surfcy;
@@ -38,17 +34,25 @@ const UINT8	*src;
 		x = makescrn.surfcx;
 		do {
 			udtmp = updatetmp[pos];
-			if (udtmp & dispflg) {
-				updatetmp[pos] = (UINT8)(udtmp & (~dispflg));
+			dirty = udtmp & makescrn.dispflag;
+			if (dirty) {
+				updatetmp[pos] = (UINT8)(udtmp ^ dirty);
 				newline = TRUE;
-				ZeroMemory(work, sizeof(work));
-				makechr16(work, pos, fontcy, udtmp);
-				src = dispp + (pos << 5);
-				makemix_mix(dst, SURFACE_WIDTH * 2, work, src, fontcy);
-				makemix_mix(dst + SURFACE_WIDTH, SURFACE_WIDTH * 2,
-									work + MAKETEXT_STEP, src, fontcy);
+				if (dirty & UPDATE_TRAM) {
+					ZeroMemory(work, sizeof(work));
+					makechr16(work, pos, fontcy, udtmp);
+					makemix_mixtext(dst, SURFACE_WIDTH * 2, work, fontcy);
+					makemix_mixtext(dst + SURFACE_WIDTH, SURFACE_WIDTH * 2,
+											work + MAKETEXT_STEP, fontcy);
+				}
+				if (dirty & UPDATE_VRAM) {
+					src = makescrn.disp1 + (pos << 5);
+					makemix_mixgrph(dst, SURFACE_WIDTH * 2, src, fontcy);
+					makemix_mixgrph(dst + SURFACE_WIDTH, SURFACE_WIDTH * 2,
+															src, fontcy);
+				}
 				if (fontcy < makescrn.fontcy) {
-					makemix_remcpy(dst, fontcy * 2, makescrn.fontcy * 2);
+					makemix_cpy400(dst, fontcy * 2, makescrn.fontcy * 2);
 				}
 			}
 			pos = LOW11(pos + 1);
@@ -91,7 +95,7 @@ const UINT8	*src;
 	UINT	i;
 
 	fontcy = min(makescrn.fontcy, MAKETEXT_ROW);
-	pos = crtc.s.TXT_TOP;
+	pos = makescrn.vramtop;
 	dst = screenmap;
 	newline = FALSE;
 	y = makescrn.surfcy;
@@ -100,18 +104,28 @@ const UINT8	*src;
 		x = makescrn.surfcx;
 		do {
 			udtmp = updatetmp[pos];
-			if (udtmp & UPDATE_VRAM) {
-				updatetmp[pos] = (UINT8)(udtmp & (~UPDATE_VRAM));
+			if (udtmp & UPDATE_TVRAM) {
+				updatetmp[pos] = (UINT8)(udtmp & (~UPDATE_TVRAM));
 				newline = TRUE;
-				ZeroMemory(work, sizeof(work));
-				makechr16(work, pos, fontcy, udtmp);
-				src = GRP_RAM + (pos << 5);
-				makemix_mix(dst + SURFACE_WIDTH * 0, SURFACE_WIDTH * 2,
-							work, src + GRAM_BANK0, fontcy);
-				makemix_mix(dst + SURFACE_WIDTH * 1, SURFACE_WIDTH * 2,
-							work + MAKETEXT_STEP, src + GRAM_BANK1, fontcy);
+				if (udtmp & UPDATE_TRAM) {
+					ZeroMemory(work, sizeof(work));
+					makechr16(work, pos, fontcy, udtmp);
+					makemix_mixtext(dst + SURFACE_WIDTH * 0, SURFACE_WIDTH * 2,
+												work, fontcy);
+					makemix_mixtext(dst + SURFACE_WIDTH * 1, SURFACE_WIDTH * 2,
+												work + MAKETEXT_STEP, fontcy);
+				}
+				src = gram + (pos << 5);
+				if (udtmp & UPDATE_VRAM0) {
+					makemix_mixgrph(dst + SURFACE_WIDTH * 0, SURFACE_WIDTH * 2,
+												src + GRAM_BANK0, fontcy);
+				}
+				if (udtmp & UPDATE_VRAM1) {
+					makemix_mixgrph(dst + SURFACE_WIDTH * 1, SURFACE_WIDTH * 2,
+												src + GRAM_BANK1, fontcy);
+				}
 				if (fontcy < makescrn.fontcy) {
-					makemix_remcpy(dst, fontcy * 2, makescrn.fontcy * 2);
+					makemix_cpy400(dst, fontcy * 2, makescrn.fontcy * 2);
 				}
 			}
 			pos = LOW11(pos + 1);
@@ -148,13 +162,14 @@ void width80x12_200h(void) {								// 8
 	UINT8	*lp;
 	UINT	x;
 	REG8	udtmp;
+	REG8	dirty;
 	UINT8	work[MAKETEXT_STEP * 2];
 const UINT8	*src;
 	UINT	lines;
 	UINT	i;
 
 	fontcy = min(makescrn.fontcy, MAKETEXT_ROW);
-	pos = crtc.s.TXT_TOP;
+	pos = makescrn.vramtop;
 	dst = screenmap;
 	newline = FALSE;
 	y = makescrn.surfcy;
@@ -163,18 +178,26 @@ const UINT8	*src;
 		x = makescrn.surfcx;
 		do {
 			udtmp = updatetmp[pos];
-			if (udtmp & dispflg) {
-				updatetmp[pos] = (UINT8)(udtmp & (~dispflg));
+			dirty = udtmp & makescrn.dispflag;
+			if (dirty) {
+				updatetmp[pos] = (UINT8)(udtmp ^ dirty);
 				newline = TRUE;
-				ZeroMemory(work, sizeof(work));
-				makechr16(work, pos, fontcy, udtmp);
-				src = dispp + (LOW10(pos) << 5);
-				makemix_mix(dst, SURFACE_WIDTH * 4, work, src, fontcy);
-				makemix_mix(dst + SURFACE_WIDTH * 2, SURFACE_WIDTH * 4,
-						work + MAKETEXT_STEP, src + GRAM_HALFSTEP, fontcy);
-				makemix_doubler(dst, fontcy * 2, 0);
+				if (dirty & UPDATE_TRAM) {
+					ZeroMemory(work, sizeof(work));
+					makechr16(work, pos, fontcy, udtmp);
+					makemix_mixtext(dst, SURFACE_WIDTH * 4, work, fontcy);
+					makemix_mixtext(dst + SURFACE_WIDTH * 2, SURFACE_WIDTH * 4,
+											work + MAKETEXT_STEP, fontcy);
+				}
+				if (dirty & UPDATE_VRAM) {
+					src = makescrn.disp1 + (LOW10(pos) << 5);
+					makemix_mixgrph(dst, SURFACE_WIDTH * 4, src, fontcy);
+					makemix_mixgrph(dst + SURFACE_WIDTH * 2, SURFACE_WIDTH * 4,
+											src + GRAM_HALFSTEP, fontcy);
+				}
+			//	makemix_doubler(dst, fontcy * 2, 0);
 				if (fontcy < makescrn.fontcy) {
-					makemix_remcpy(dst, fontcy * 4, makescrn.fontcy * 4);
+					makemix_cpy200(dst, fontcy * 2, makescrn.fontcy * 2);
 				}
 			}
 			pos = LOW11(pos + 1);
@@ -217,7 +240,7 @@ const UINT8	*src;
 	UINT	i;
 
 	fontcy = min(makescrn.fontcy, MAKETEXT_ROW);
-	pos = crtc.s.TXT_TOP;
+	pos = makescrn.vramtop;
 	dst = screenmap;
 	newline = FALSE;
 	y = makescrn.surfcy;
@@ -226,22 +249,36 @@ const UINT8	*src;
 		x = makescrn.surfcx;
 		do {
 			udtmp = updatetmp[pos];
-			if (udtmp & UPDATE_VRAM) {
-				updatetmp[pos] = (UINT8)(udtmp & (~UPDATE_VRAM));
+			if (udtmp & UPDATE_TVRAM) {
+				updatetmp[pos] = (UINT8)(udtmp & (~UPDATE_TVRAM));
 				newline = TRUE;
-				ZeroMemory(work, sizeof(work));
-				makechr16(work, pos, fontcy, udtmp);
-				src = GRP_RAM + (LOW10(pos) << 5);
-				makemix_mix(dst + SURFACE_WIDTH * 0, SURFACE_WIDTH * 4,
-							work, src + GRAM_BANK0L, fontcy);
-				makemix_mix(dst + SURFACE_WIDTH * 1, SURFACE_WIDTH * 4,
-							work, src + GRAM_BANK1L, fontcy);
-				makemix_mix(dst + SURFACE_WIDTH * 2, SURFACE_WIDTH * 4,
-							work + MAKETEXT_STEP, src + GRAM_BANK0H, fontcy);
-				makemix_mix(dst + SURFACE_WIDTH * 3, SURFACE_WIDTH * 4,
-							work + MAKETEXT_STEP, src + GRAM_BANK1H, fontcy);
+				if (udtmp & UPDATE_TRAM) {
+					ZeroMemory(work, sizeof(work));
+					makechr16(work, pos, fontcy, udtmp);
+					makemix_mixtext(dst + SURFACE_WIDTH * 0, SURFACE_WIDTH * 4,
+											work, fontcy);
+					makemix_mixtext(dst + SURFACE_WIDTH * 1, SURFACE_WIDTH * 4,
+											work, fontcy);
+					makemix_mixtext(dst + SURFACE_WIDTH * 2, SURFACE_WIDTH * 4,
+											work + MAKETEXT_STEP, fontcy);
+					makemix_mixtext(dst + SURFACE_WIDTH * 3, SURFACE_WIDTH * 4,
+											work + MAKETEXT_STEP, fontcy);
+				}
+				src = gram + (LOW10(pos) << 5);
+				if (udtmp & UPDATE_VRAM0) {
+					makemix_mixgrph(dst + SURFACE_WIDTH * 0, SURFACE_WIDTH * 4,
+												src + GRAM_BANK0L, fontcy);
+					makemix_mixgrph(dst + SURFACE_WIDTH * 2, SURFACE_WIDTH * 4,
+												src + GRAM_BANK0H, fontcy);
+				}
+				if (udtmp & UPDATE_VRAM1) {
+					makemix_mixgrph(dst + SURFACE_WIDTH * 1, SURFACE_WIDTH * 4,
+												src + GRAM_BANK1L, fontcy);
+					makemix_mixgrph(dst + SURFACE_WIDTH * 3, SURFACE_WIDTH * 4,
+												src + GRAM_BANK1H, fontcy);
+				}
 				if (fontcy < makescrn.fontcy) {
-					makemix_remcpy(dst, fontcy * 4, makescrn.fontcy * 4);
+					makemix_cpy400(dst, fontcy * 4, makescrn.fontcy * 4);
 				}
 			}
 			pos = LOW11(pos + 1);
@@ -283,7 +320,7 @@ void width80x20h(void) {
 	UINT	i;
 
 	fontcy = min(makescrn.fontcy, MAKETEXT_ROW);
-	pos = crtc.s.TXT_TOP;
+	pos = makescrn.vramtop;
 	dst = screenmap;
 	newline = FALSE;
 	y = makescrn.surfcy;
@@ -297,14 +334,13 @@ void width80x20h(void) {
 				newline = TRUE;
 				ZeroMemory(work, sizeof(work));
 				makechr16(work, pos, fontcy, udtmp);
-				makemix_txt(dst, SURFACE_WIDTH * 2, work, fontcy);
-				makemix_txt(dst + SURFACE_WIDTH, SURFACE_WIDTH * 2,
+				makemix_settext(dst, SURFACE_WIDTH * 2, work, fontcy);
+				makemix_settext(dst + SURFACE_WIDTH, SURFACE_WIDTH * 2,
 												work + MAKETEXT_STEP, fontcy);
 				if (fontcy < makescrn.fontcy) {
-					makemix_remcpy(dst, fontcy * 2, makescrn.fontcy * 2);
+					makemix_cpy400(dst, fontcy * 2, makescrn.fontcy * 2);
 				}
-				makemix_ul20(dst + SURFACE_WIDTH * makescrn.fontcy * 2,
-																	pos, 0);
+				makemix_ul20(dst + SURFACE_WIDTH * makescrn.fontcy * 2, pos);
 			}
 			pos = LOW11(pos + 1);
 			dst += 8;
@@ -345,7 +381,7 @@ void width80x10h(void) {
 	UINT	i;
 
 	fontcy = min(makescrn.fontcy, MAKETEXT_ROW);
-	pos = crtc.s.TXT_TOP;
+	pos = makescrn.vramtop;
 	dst = screenmap;
 	newline = FALSE;
 	y = makescrn.surfcy;
@@ -359,15 +395,13 @@ void width80x10h(void) {
 				newline = TRUE;
 				ZeroMemory(work, sizeof(work));
 				makechr16(work, pos, fontcy, udtmp);
-				makemix_txt(dst, SURFACE_WIDTH * 4, work, fontcy);
-				makemix_txt(dst + SURFACE_WIDTH * 2, SURFACE_WIDTH * 4,
+				makemix_settext(dst, SURFACE_WIDTH * 4, work, fontcy);
+				makemix_settext(dst + SURFACE_WIDTH * 2, SURFACE_WIDTH * 4,
 											work + MAKETEXT_STEP, fontcy);
-				makemix_doubler(dst, fontcy * 2, 0);
 				if (fontcy < makescrn.fontcy) {
-					makemix_remcpy(dst, fontcy * 4, makescrn.fontcy * 4);
+					makemix_cpy200(dst, fontcy * 2, makescrn.fontcy * 2);
 				}
-				makemix_ul10(dst + SURFACE_WIDTH * makescrn.fontcy * 4,
-																	pos, 0);
+				makemix_ul10(dst + SURFACE_WIDTH * makescrn.fontcy * 4, pos);
 			}
 			pos = LOW11(pos + 1);
 			dst += 8;