X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fmodex16.c;h=2d4c00242676ffd4401578c3fb6f024599199c21;hb=e3b220f5349f8282bd426fdca00c64c8c7e831cd;hp=fe358fcee744b89a9eb8bf272d7367271f5376e8;hpb=71e03faf012169d05f67873dacded16f79b6e59e;p=16.git

diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index fe358fce..2d4c0024 100755
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -1,11 +1,11 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669
+ * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669
  *
  * This file is part of Project 16.
  *
  * Project 16 is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
+ * the Free Software Foundation; either verson 3 of the License, or
  * (at your option) any later version.
  *
  * Project 16 is distributed in the hope that it will be useful,
@@ -35,7 +35,7 @@ static byte tmppal[PAL_SIZE];
 // setvideo() - This function Manages the video modes												//
 //																														//
 /////////////////////////////////////////////////////////////////////////////
-void VGAmodeX(sword vq, global_game_variables_t *gv)
+void VGAmodeX(sword vq, boolean cmem, global_game_variables_t *gv)
 {
 	union REGS in, out;
 
@@ -54,7 +54,7 @@ void VGAmodeX(sword vq, global_game_variables_t *gv)
 			//int86(0x10, &in, &out);
 			gv->video.old_mode = vgaGetMode();//out.h.al;
 			// enter mode
-			modexEnter(vq, gv);
+			modexEnter(vq, cmem, gv);
 		break;
 	}
 }
@@ -62,11 +62,7 @@ void VGAmodeX(sword vq, global_game_variables_t *gv)
 static void
 vgaSetMode(byte mode)
 {
-  union REGS regs;
-
-  regs.h.ah = SET_MODE;
-  regs.h.al = mode;
-  int86(VIDEO_INT, &regs, &regs);
+  int10_setmode(mode);
 }
 
 //---------------------------------------------------
@@ -74,158 +70,100 @@ vgaSetMode(byte mode)
 // Use the bios to get the current video mode
 //
 
-long
+byte/*FIXME: why long? "long" is 32-bit datatype, VGA modes are 8-bit numbers. */
 vgaGetMode()
 {
-    union REGS rg;
-
-    rg.h.ah = 0x0f;
-    int86(VIDEO_INT, &rg, &rg);
-
-    return rg.h.al;
+    return int10_getmode();
 }
 
 /* -========================= Entry  Points ==========================- */
-void
-modexEnter(sword vq, global_game_variables_t *gv)
+void modexEnter(sword vq, boolean cmem, global_game_variables_t *gv)
 {
 	word i;
-	dword far*ptr=(dword far*)VGA;      /* used for faster screen clearing */
+	struct vga_mode_params cm;
 	int CRTParmCount;
-	/* common mode X initiation stuff~ */
-	modexsetBaseXMode(gv->video.page);
+
+	vgaSetMode(VGA_256_COLOR_MODE);
+	vga_enable_256color_modex();
+	update_state_from_vga();
+	vga_read_crtc_mode(&cm);
 
 	switch(vq)
 	{
 		case 1:
-			CRTParmCount = sizeof(ModeX_320x240regs) / sizeof(ModeX_320x240regs[0]);
-			/* width and height */
-			gv->video.page[0].sw=320;
-			gv->video.page[0].sh=240;
-
-			/* send the CRTParms */
-			for(i=0; i<CRTParmCount; i++) {
+			//CRTParmCount = sizeof(ModeX_320x240regs) / sizeof(ModeX_320x240regs[0]);
+			/*for(i=0; i<CRTParmCount; i++) {
 				outpw(CRTC_INDEX, ModeX_320x240regs[i]);
-			}
-
-			/* clear video memory */
-			outpw(SC_INDEX, 0x0f02);
-			for(i=0; i<0x8000; i++) {
-				ptr[i] = 0x0000;
-			}
-		break;
-		case 2:
-			CRTParmCount = sizeof(ModeX_160x120regs) / sizeof(ModeX_160x120regs[0]);
-			/* width and height */
-			gv->video.page[0].sw=120;
-			gv->video.page[0].sh=160;
-
-			/* send the CRTParms */
-			for(i=0; i<CRTParmCount; i++) {
-				outpw(CRTC_INDEX, ModeX_160x120regs[i]);
-			}
-
-			/* clear video memory */
-			outpw(SC_INDEX, 0x0f02);
-			for(i=0; i<0x8000; i++) {
-				ptr[i] = 0x0000;
-			}
-		break;
-		case 3:
-			CRTParmCount = sizeof(ModeX_320x200regs) / sizeof(ModeX_320x200regs[0]);
-			/* width and height */
-			gv->video.page[0].sw=320;
-			gv->video.page[0].sh=200;
-
-			/* send the CRTParms */
-			for(i=0; i<CRTParmCount; i++) {
-				outpw(CRTC_INDEX, ModeX_320x200regs[i]);
-			}
-
-			/* clear video memory */
-			outpw(SC_INDEX, 0x0f02);
-			for(i=0; i<0x8000; i++) {
-				ptr[i] = 0x0000;
-			}
-		break;
-		case 4:
-			CRTParmCount = sizeof(ModeX_192x144regs) / sizeof(ModeX_192x144regs[0]);
+			}*/
 			/* width and height */
-			gv->video.page[0].sw=192;
-			gv->video.page[0].sh=144;
+			gv->video.page[0].sw = vga_state.vga_width = 320; // VGA lib currently does not update this
+			gv->video.page[0].sh = vga_state.vga_height = 240; // VGA lib currently does not update this
+			/* virtual width and height. match screen, at first */
+			gv->video.page[0].height = gv->video.page[0].sh;
+			gv->video.page[0].width = gv->video.page[0].sw;
+
+			// mode X BYTE mode
+			cm.word_mode = 0;
+			cm.dword_mode = 0;
+			// 320x240 mode 60Hz
+			cm.horizontal_total=0x5f + 5; /* CRTC[0]             -5 */
+			cm.horizontal_display_end=0x4f + 1; /* CRTC[1]       -1 */
+			cm.horizontal_blank_start=0x50 + 1; /* CRTC[2] */
+			cm.horizontal_blank_end=0x82 + 1;   /* CRTC[3] bit 0-4 & CRTC[5] bit 7 */
+			cm.horizontal_start_retrace=0x54;/* CRTC[4] */
+			cm.horizontal_end_retrace=0x80;	/* CRTC[5] bit 0-4 */
+			//cm.horizontal_start_delay_after_total=0x3e; /* CRTC[3] bit 5-6 */
+			//cm.horizontal_start_delay_after_retrace=0x41; /* CRTC[5] bit 5-6 */
+			cm.vertical_total = 0x20D + 2;
+			cm.vertical_start_retrace = 0x1EA;
+			cm.vertical_end_retrace = 0x1EC;
+			cm.vertical_display_end = 480;
+			cm.vertical_blank_start = 0x1E7 + 1;
+			cm.vertical_blank_end = 0x206 + 1;
+			cm.clock_select = 0; /* misc register = 0xE3  25MHz */
+			cm.vsync_neg = 1;
+			cm.hsync_neg = 1;
+			cm.offset = (vga_state.vga_width / (4 * 2)); // 320 wide (40 x 4 pixel groups x 2)
+			break;
+		case 2: // TODO: 160x120 according to ModeX_160x120regs
+			return;
+		case 3: // TODO: 160x120 according to ModeX_320x200regs
+			return;
+		case 4: // TODO: 160x120 according to ModeX_192x144regs
+			return;
+		case 5: // TODO: 160x120 according to ModeX_256x192regs
+			return;
+		default:
+			return;
+	}
 
-			/* send the CRTParms */
-			for(i=0; i<CRTParmCount; i++) {
-				outpw(CRTC_INDEX, ModeX_192x144regs[i]);
-			}
+	vga_state.vga_stride = cm.offset * 2;
+	vga_write_crtc_mode(&cm,0);
 
+	/* clear video memory */
+	switch (cmem)
+	{
+		case 1: {
 			/* clear video memory */
-			outpw(SC_INDEX, 0x0f02);
-			for(i=0; i<0x8000; i++) {
-				ptr[i] = 0x0000;
-			}
+			dword far*ptr=(dword far*)vga_state.vga_graphics_ram;//VGA;      /* used for faster screen clearing */
+			vga_write_sequencer(2/*map mask register*/,0xf/*all 4 planes*/);
+			for(i = 0;i < 0x4000; i++) ptr[i] = 0x0000; // 0x4000 x dword = 64KB
+		}
 		break;
-		case 5:
-			CRTParmCount = sizeof(ModeX_256x192regs) / sizeof(ModeX_256x192regs[0]);
-			/* width and height */
-			gv->video.page[0].sw=256;
-			gv->video.page[0].sh=192;
+	}
 
-			/* send the CRTParms */
-			for(i=0; i<CRTParmCount; i++) {
-				outpw(CRTC_INDEX, ModeX_256x192regs[i]);
-			}
+//	gv->video.page[0].tw = gv->video.page[0].sw/TILEWH;
+//	gv->video.page[0].th = gv->video.page[0].sh/TILEWH;
 
-			/* clear video memory */
-			outpw(SC_INDEX, 0x0f02);
-			for(i=0; i<0x8000; i++) {
-				ptr[i] = 0x0000;
-			}
-		break;
-	}
-	gv->video.page[0].tilesw = gv->video.page[0].sw/TILEWH;
-	gv->video.page[0].tilesh = gv->video.page[0].sh/TILEWH;
 	//TODO MAKE FLEXIBLE~
-	gv->video.page[0].tilemidposscreenx = gv->video.page[0].tilesw;
-	gv->video.page[0].tilemidposscreeny = (gv->video.page[0].tilesh/2)+1;
-	#define PAGE_SIZE		(word)(gv->video.page[0].sw/4 * gv->video.page[0].sh)
+//	gv->video.page[0].tilemidposscreenx = gv->video.page[0].tilesw;
+//	gv->video.page[0].tilemidposscreeny = (gv->video.page[0].tilesh/2)+1;
 }
 
 void
 modexLeave() {
-    /* TODO restore original mode and palette */
-    vgaSetMode(TEXT_MODE);
-}
-
-//    setBaseXMode() does the initialization to make the VGA ready to
-//    accept any combination of configuration register settings.  This
-//    involves enabling writes to index 0 to 7 of the CRT controller (port
-//    0x3D4), by clearing the most significant bit (bit 7) of index 0x11.
-void
-modexsetBaseXMode(page_t *page)
-{
-	word temp;
-	/* TODO save current video mode and palette */
-	vgaSetMode(VGA_256_COLOR_MODE);
-
-	/* disable chain4 mode */
-	outpw(SC_INDEX, 0x0604);
-
-	/* synchronous reset while setting Misc Output */
-	outpw(SC_INDEX, 0x0100);
-
-	/* select 25 MHz dot clock & 60 Hz scanning rate */
-	outp(MISC_OUTPUT, 0xe3);
-
-	/* undo reset (restart sequencer) */
-	outpw(SC_INDEX, 0x0300);
-
-	/* reprogram the CRT controller */
-	outp(CRTC_INDEX, 0x11); /* VSync End reg contains register write prot */
-//	temp = inp(CRTC_DATA) & 0x7F;
-//	outp(CRTC_INDEX, 0x11);
-	outp(CRTC_DATA, 0x7f);  /* get current write protect on varios regs */
-//	outp(CRTC_DATA, temp);  /* get current write protect on varios regs */
+	/* VGAmodeX restores original mode and palette */
+	vgaSetMode(TEXT_MODE);
 }
 
 page_t
@@ -234,20 +172,22 @@ modexDefaultPage(page_t *p)
     page_t page;
 
     /* default page values */
-    page.data = VGA;
+	//page.data = VGA;
+	//page.data = (byte far *)(vga_state.vga_graphics_ram);
+	page.data = (vga_state.vga_graphics_ram);
     page.dx = 0;
     page.dy = 0;
 	page.sw = p->sw;
 	page.sh = p->sh;
-	page.width = p->sw;
-	page.height = p->sh;
+	page.width = p->sw+TILEWHD;
+	page.height = p->sh+TILEWHD;
 	page.tw = page.sw/TILEWH;
 	page.th = page.sh/TILEWH;
+	page.tilesw=page.width/TILEWH;
+	page.tilesh=page.height/TILEWH;
 	page.tilemidposscreenx = page.tw/2;
 	page.tilemidposscreeny = (page.th/2)+1;
-	page.tilesw=p->tilesw;
-	page.tilesh=p->tilesh;
-	//pageSize = p->sw*p->sh;
+	page.pagesize = (sdiword)(page.width/4)*page.height;
 	page.id = 0;
 
     return page;
@@ -260,17 +200,19 @@ page_t
 modexNextPage(page_t *p) {
     page_t result;
 
-    result.data = p->data + (p->width/4)*p->height;
+    result.data = p->data + (p->pagesize);
     result.dx = 0;
     result.dy = 0;
     result.width = p->width;
     result.height = p->height;
-	result.tw = p->width/TILEWH;
-	result.th = p->height/TILEWH;
+	result.tw = p->tw;
+	result.th = p->th;
+	result.tilesw = p->tilesw;
+	result.tilesh = p->tilesh;
 	result.id = p->id+1;
+	result.pagesize = p->pagesize;
 
 	return result;
-// 	return modexNextPageFlexibleSize(&p, p->width, p->height);
 }
 
 //next page with defined dimentions~
@@ -279,18 +221,45 @@ modexNextPageFlexibleSize(page_t *p, word x, word y)
 {
 	page_t result;
 
-	result.data = p->data + (p->width/4)*p->height;  /* compute the offset */
+	result.data = p->data + (p->pagesize);  /* compute the offset */
 	result.dx = 0;
 	result.dy = 0;
 	result.width = x;
 	result.height = y;
-	result.tw = p->width/TILEWH;
-	result.th = p->height/TILEWH;
+	result.tw = result.sw/TILEWH;
+	result.th = result.sh/TILEWH;
+	result.tilesw=result.width/TILEWH;
+	result.tilesh=result.height/TILEWH;
 	result.id = p->id+1;
+	result.pagesize = (sdiword)(result.width/4)*result.height;
 
 	return result;
 }
 
+void modexCalcVmemRemain(video_t *video)
+{
+	byte i;
+	//printf("\n\n	1st vmem_remain=%ld\n", video->vmem_remain);
+	for(i=0; i<=video->num_of_pages-1; i++)
+	{
+		video->vmem_remain-=video->page[i].pagesize;
+		//printf("		[%u], video->page[i].pagesize=%ld\n", i, video->page[i].pagesize);
+		//printf("		[%u], vmem_remain=%ld\n", i, video->vmem_remain);
+	}
+}
+
+void modexHiganbanaPageSetup(video_t *video)
+{
+	video->vmem_remain=262144L;
+	video->num_of_pages=0;
+	(video->page[0]) = modexDefaultPage(&(video->page[0]));	video->num_of_pages++;
+	//video->page[0].width += (TILEWHD); video->page[0].height += (TILEWHD);
+	(video->page[1]) = modexNextPage(&(video->page[0]));	video->num_of_pages++;
+	//(video->page[2]) = modexNextPageFlexibleSize(&(video->page[1]), video->page[0].width, video->page[0].sh-40);	video->num_of_pages++;
+	//(video->page[3]) = modexNextPageFlexibleSize(&(video->page[2]), TILEWH, TILEWH);	video->num_of_pages++;
+	modexCalcVmemRemain(video);
+	video->p=0;
+}
 
 void
 modexShowPage(page_t *page) {
@@ -325,21 +294,18 @@ modexShowPage(page_t *page) {
     outp(AC_INDEX, (page->dx & 0x03) << 1);
 }
 
-
 void
 modexPanPage(page_t *page, int dx, int dy) {
     page->dx = dx;
     page->dy = dy;
 }
 
-
 void
 modexSelectPlane(byte plane) {
     outp(SC_INDEX, MAP_MASK);	  /* select plane */
     outp(SC_DATA,  plane);
 }
 
-
 void
 modexClearRegion(page_t *page, int x, int y, int w, int h, byte  color) {
     word pageOff = (word) page->data;
@@ -358,6 +324,14 @@ modexClearRegion(page_t *page, int x, int y, int w, int h, byte  color) {
     }
 
     __asm {
+	    PUSHF
+	    PUSH ES
+	    PUSH AX
+	    PUSH BX
+	    PUSH CX
+	    PUSH DX
+	    PUSH SI
+	    PUSH DI
 		MOV AX, SCREEN_SEG      ; go to the VGA memory
 		MOV ES, AX
 		MOV DI, poffset	 ; go to the first pixel
@@ -391,250 +365,18 @@ modexClearRegion(page_t *page, int x, int y, int w, int h, byte  color) {
 		ADD DI, nextRow	 ; go to the next row
 		DEC h
 		JNZ SCAN_START
+	    POP DI
+	    POP SI
+	    POP DX
+	    POP CX
+	    POP BX
+	    POP AX
+	    POP ES
+	    POPF
     }
 }
 
-//TODO! ADD CLIPPING!!
-//memory management needs to be added
-//void
-//modexDrawBmpRegion	(page_t *page, int x, int y, int rx, int ry, int rw, int rh, bitmap_t *bmp)
-void modexDrawPBufRegion	(page_t *page, int x, int y, int rx, int ry, int rw, int rh, planar_buf_t *p, boolean sprite)
-{
-	int plane;
-	int px, py, i;
-	px=x;
-	py=y;
-	for(plane=0; plane < 4; plane++) {
-		i=(rx/4)+((rx/4)*ry);
-		modexSelectPlane(PLANE(plane+x));
-		for(; y < py+rh; y++) {
-			//for(px=0; px < p->width; px++) {
-				//printf("%02X ", (int) p->plane[plane][i++]);
-//			      _fmemcpy(buff, &(p->plane[plane][i+=p->pwidth]), p->pwidth);
-//			      printf("buff %u==%s\n", y, *buff);
-				_fmemcpy(page->data + (((page->width/4) * (y+page->dy)) + ((x+page->dx) / 4)), &(p->plane[plane][i+=rw]), rw/4);
-			//}
-		}
-		x=px;
-		y=py;
-		}
-}
-
-
-/*temp*/
-void
-DrawPBuf(page_t *page, int x, int y, planar_buf_t *p, boolean sprite)
-{
-	int plane;
-	int px, py, i;
-// 	byte near *buff;
-	px=x;
-	py=y;
-// 	buff = _nmalloc(p->pwidth+1);
-	// TODO Make this fast.  It's SLOOOOOOW
-// 	for(plane=0; plane < 4; plane++) {
-// 		i=0;
-// 		modexSelectPlane(PLANE(plane+x));
-// 		for(px = plane; px < p->width; px+=4) {
-// 			offset=px;
-// 			for(py=0; py<p->height/2; py++) {
-// 				//SELECT_ALL_PLANES();
-// 				if(!sprite || p->plane[offset])
-// 					page->data = &(p->plane[offset][i++]);
-// 				offset+=p->width;
-// 				offset++;
-// 			}
-// 		}
-// 	}
-	for(plane=0; plane < 4; plane++) {
-		i=0;
-		modexSelectPlane(PLANE(plane+x));
-		for(; y < py+p->height; y++) {
-			//for(px=0; px < p->width; px++) {
-				//printf("%02X ", (int) p->plane[plane][i++]);
-// 				_fmemcpy(buff, &(p->plane[plane][i+=p->pwidth]), p->pwidth);
-// 				printf("buff %u==%s\n", y, *buff);
-// 				_fmemcpy(page->data + (((page->width/4) * (y+page->dy)) + ((x+page->dx) / 4)), buff, p->pwidth);
-				_fmemcpy(page->data + (((page->width/4) * (y+page->dy)) + ((x+page->dx) / 4)), &(p->plane[plane][i+=p->pwidth]), p->pwidth);
-			//}
-		}
-		x=px;
-		y=py;
-	}
-// 	_nfree(buff);
-}
-
-void
-oldDrawBmp(byte far* page, int x, int y, bitmap_t *bmp, byte sprite)
-{
-	byte plane;
-	word px, py;
-	word offset;
-
-	/* TODO Make this fast.  It's SLOOOOOOW */
-	for(plane=0; plane < 4; plane++) {
-		modexSelectPlane(PLANE(plane+x));
-		for(px = plane; px < bmp->width; px+=4) {
-			offset=px;
-			for(py=0; py<bmp->height; py++) {
-			if(!sprite || bmp->data[offset])
-				page[PAGE_OFFSET(x+px, y+py)] = bmp->data[offset];
-			offset+=bmp->width;
-			}
-		}
-	}
-}
-
-void
-modexDrawBmp(page_t *page, int x, int y, bitmap_t *bmp) {
-    /* draw the region (the entire freakin bitmap) */
-    modexDrawBmpRegion(page, x, y, 0, 0, bmp->width, bmp->height, bmp);
-}
-
-void
-modexDrawBmpRegion(page_t *page, int x, int y,
-		   int rx, int ry, int rw, int rh, bitmap_t *bmp) {
-    word poffset = (word) page->data  + y*(page->width/4) + x/4;
-    byte far *data = bmp->data;//+bmp->offset;
-    word bmpOffset = (word) data + ry * bmp->width + rx;
-    word width = rw;
-    word height = rh;
-    byte plane = 1 << ((byte) x & 0x03);
-    word scanCount = width/4 + (width%4 ? 1 :0);
-    word nextPageRow = page->width/4 - scanCount;
-    word nextBmpRow = (word) bmp->width - width;
-    word rowCounter;
-    byte planeCounter = 4;
-
-/*	printf("bmp->data=%Fp\n",bmp->data);
-	printf("*bmp->data=%Fp\n",*(bmp->data));
-	printf("&bmp->data=%Fp\n",&(bmp->data));*/
-
-	//code is a bit slow here
-    __asm {
-		MOV AX, SCREEN_SEG      ; go to the VGA memory
-		MOV ES, AX
-
-		MOV DX, SC_INDEX	; point at the map mask register
-		MOV AL, MAP_MASK	;
-		OUT DX, AL	      ;
-
-	PLANE_LOOP:
-		MOV DX, SC_DATA	 ; select the current plane
-		MOV AL, plane	   ;
-		OUT DX, AL	      ;
-
-		;-- begin plane painting
-		MOV AX, height	  ; start the row counter
-		MOV rowCounter, AX      ;
-		MOV DI, poffset	 ; go to the first pixel
-		MOV SI, bmpOffset       ; go to the bmp pixel
-	ROW_LOOP:
-		MOV CX, width	   ; count the columns
-	SCAN_LOOP:
-		MOVSB		   ; copy the pixel
-		SUB CX, 3	       ; we skip the next 3
-		ADD SI, 3	       ; skip the bmp pixels
-		LOOP SCAN_LOOP	  ; finish the scan
-
-		MOV AX, nextPageRow
-		ADD DI, AX	      ; go to the next row on screen
-		MOV AX, nextBmpRow
-		ADD SI, AX	      ; go to the next row on bmp
-
-		DEC rowCounter
-		JNZ ROW_LOOP	    ; do all the rows
-		;-- end plane painting
-
-		MOV AL, plane	   ; advance to the next plane
-		SHL AL, 1	       ;
-		AND AL, 0x0f	    ; mask the plane properly
-		MOV plane, AL	   ; store the plane
-
-		INC bmpOffset	   ; start bmp at the right spot
-
-		DEC planeCounter
-		JNZ PLANE_LOOP	  ; do all 4 planes
-    }
-}
-
-void
-modexDrawSprite(page_t *page, int x, int y, bitmap_t *bmp) {
-    /* draw the whole sprite */
-    modexDrawSpriteRegion(page, x, y, 0, 0, bmp->width, bmp->height, bmp);
-}
-
-void
-modexDrawSpriteRegion(page_t *page, int x, int y,
-		      int rx, int ry, int rw, int rh, bitmap_t *bmp) {
-    word poffset = (word)page->data + y*(page->width/4) + x/4;
-    byte *data = bmp->data;//+bmp->offset;
-    word bmpOffset = (word) data + ry * bmp->width + rx;
-    word width = rw;
-    word height = rh;
-    byte plane = 1 << ((byte) x & 0x03);
-    word scanCount = width/4 + (width%4 ? 1 :0);
-    word nextPageRow = page->width/4 - scanCount;
-    word nextBmpRow = (word) bmp->width - width;
-    word rowCounter;
-    byte planeCounter = 4;
-
-    __asm {
-		MOV AX, SCREEN_SEG      ; go to the VGA memory
-		MOV ES, AX
-
-		MOV DX, SC_INDEX	; point at the map mask register
-		MOV AL, MAP_MASK	;
-		OUT DX, AL	      ;
-
-	PLANE_LOOP:
-		MOV DX, SC_DATA	 ; select the current plane
-		MOV AL, plane	   ;
-		OUT DX, AL	      ;
-
-		;-- begin plane painting
-		MOV AX, height	  ; start the row counter
-		MOV rowCounter, AX      ;
-		MOV DI, poffset	 ; go to the first pixel
-		MOV SI, bmpOffset       ; go to the bmp pixel
-	ROW_LOOP:
-		MOV CX, width	   ; count the columns
-	SCAN_LOOP:
-		LODSB
-		DEC SI
-		CMP AL, 0
-		JNE DRAW_PIXEL	  ; draw non-zero pixels
-
-		INC DI		  ; skip the transparent pixel
-		ADD SI, 1
-		JMP NEXT_PIXEL
-	DRAW_PIXEL:
-		MOVSB		   ; copy the pixel
-	NEXT_PIXEL:
-		SUB CX, 3	       ; we skip the next 3
-		ADD SI, 3	       ; skip the bmp pixels
-		LOOP SCAN_LOOP	  ; finish the scan
-
-		MOV AX, nextPageRow
-		ADD DI, AX	      ; go to the next row on screen
-		MOV AX, nextBmpRow
-		ADD SI, AX	      ; go to the next row on bmp
-
-		DEC rowCounter
-		JNZ ROW_LOOP	    ; do all the rows
-		;-- end plane painting
-
-		MOV AL, plane	   ; advance to the next plane
-		SHL AL, 1	       ;
-		AND AL, 0x0f	    ; mask the plane properly
-		MOV plane, AL	   ; store the plane
-
-		INC bmpOffset	   ; start bmp at the right spot
-
-		DEC planeCounter
-		JNZ PLANE_LOOP	  ; do all 4 planes
-    }
-}
+/* moved to src/lib/modex16/16render.c */
 
 /* copy a region of video memory from one page to another.
  * It assumes that the left edge of the tile is the same on both
@@ -648,7 +390,7 @@ modexCopyPageRegion(page_t *dest, page_t *src,
 {
     word doffset = (word)dest->data + dy*(dest->width/4) + dx/4;
     word soffset = (word)src->data + sy*(src->width/4) + sx/4;
-    word scans   = width/4;
+    word scans   = vga_state.vga_stride;
     word nextSrcRow = src->width/4 - scans - 1;
     word nextDestRow = dest->width/4 - scans - 1;
     byte lclip[] = {0x0f, 0x0e, 0x0c, 0x08};  /* clips for rectangles not on 4s */
@@ -657,6 +399,15 @@ modexCopyPageRegion(page_t *dest, page_t *src,
     byte right = rclip[(sx+width)&0x03];
 
     __asm {
+	    PUSHF
+	    PUSH ES
+	    PUSH AX
+	    PUSH BX
+	    PUSH CX
+	    PUSH DX
+	    PUSH SI
+	    PUSH DI
+
 		MOV AX, SCREEN_SEG      ; work in the vga space
 		MOV ES, AX	      ;
 		MOV DI, doffset	 ;
@@ -705,6 +456,15 @@ modexCopyPageRegion(page_t *dest, page_t *src,
 		MOV DX, GC_INDEX+1      ; go back to CPU data
 		MOV AL, 0ffh	    ; none from latches
 		OUT DX, AL	      ;
+
+	    POP DI
+	    POP SI
+	    POP DX
+	    POP CX
+	    POP BX
+	    POP AX
+	    POP ES
+	    POPF
     }
 }
 
@@ -860,7 +620,8 @@ modexPalUpdate(bitmap_t *bmp, word *i, word qp, word aqoffset)
 	static word a[PAL_SIZE];	//palette array of change values!
 	word z=0, aq=0, aa=0, pp=0;
 
-	modexWaitBorder();
+	//modexWaitBorder();
+	vga_wait_for_vsync();
 	if((*i)==0)
 	{
 		memset(a, -1, sizeof(a));
@@ -910,7 +671,8 @@ modexPalUpdate(bitmap_t *bmp, word *i, word qp, word aqoffset)
 		//if(qp>0) printf("qp=%d\n", qp);
 		//if(qp>0) printf("					     (*i)=%d\n", (*i)/3);
 	}
-	modexWaitBorder();	  /* waits one retrace -- less flicker */
+	//modexWaitBorder();	  /* waits one retrace -- less flicker */
+	vga_wait_for_vsync();
 	if((*i)>=PAL_SIZE/2 && w==0)
 	{
 		for(; (*i)<PAL_SIZE; (*i)++)
@@ -949,7 +711,7 @@ printf("\nqqqqqqqq\n\n");
 		pp = q;
 		//printf("1(*i)=%02d\n", (*i)/3);
 		//printf("1z=%02d\n", z/3);
-		chkcolor(bmp, &q, &a, &aa, &z, i);
+		modexchkcolor(bmp, &q, &a, &aa, &z, i);
 		//printf("2(*i)=%02d\n", (*i)/3);
 		//printf("2z=%02d\n", z/3);
 		aq=0;
@@ -1021,13 +783,15 @@ void
 modexPalUpdate1(byte *p)
 {
 	int i;
-	modexWaitBorder();
+	//modexWaitBorder();
+	vga_wait_for_vsync();
 	outp(PAL_WRITE_REG, 0);  /* start at the beginning of palette */
 	for(i=0; i<PAL_SIZE/2; i++)
 	{
 		outp(PAL_DATA_REG, p[i]);
 	}
-	modexWaitBorder();	  /* waits one retrace -- less flicker */
+	//modexWaitBorder();	  /* waits one retrace -- less flicker */
+	vga_wait_for_vsync();
 	for(; i<PAL_SIZE; i++)
 	{
 		outp(PAL_DATA_REG, p[(i)]);
@@ -1038,13 +802,15 @@ void
 modexPalUpdate0(byte *p)
 {
 	int i;
-	modexWaitBorder();
+	//modexWaitBorder();
+	vga_wait_for_vsync();
 	outp(PAL_WRITE_REG, 0);  /* start at the beginning of palette */
 	for(i=0; i<PAL_SIZE/2; i++)
 	{
 		outp(PAL_DATA_REG, rand());
 	}
-	modexWaitBorder();	  /* waits one retrace -- less flicker */
+	//modexWaitBorder();	  /* waits one retrace -- less flicker */
+	vga_wait_for_vsync();
 	for(; i<PAL_SIZE; i++)
 	{
 		outp(PAL_DATA_REG, rand());
@@ -1054,14 +820,15 @@ modexPalUpdate0(byte *p)
 void
 modexPalOverscan(byte *p, word col)
 {
-	modexWaitBorder();
+	//modexWaitBorder();
+	vga_wait_for_vsync();
 	outp(PAL_WRITE_REG, 0);  /* start at the beginning of palette */
 	outp(PAL_DATA_REG, col);
 }
 
 //color checker~
 //i want to make another vesion that checks the palette when the palette is being appened~
-void chkcolor(bitmap_t *bmp, word *q, word *a, word *aa, word *z, word *i/*, word *offset*/)
+void modexchkcolor(bitmap_t *bmp, word *q, word *a, word *aa, word *z, word *i/*, word *offset*/)
 {
 		byte *pal;
 		word zz=0;
@@ -1179,99 +946,41 @@ byte modexgetPixel(page_t *page, int x, int y)
 
 }
 
-void modexhlin(page_t *page, word xl, word xh, word y, word color)
-{
-	word x;
-	word yy=0;
-
-	for(x=0;x<xh*4;x+=4)
-	{
-		if(x+4>=page[0].sw-1){ x=0; yy+=4; }
-		modexClearRegion(page, x+xl, y+yy, 4, 4, color);
-	}
-	//modexputPixel(page, x+xl, y, color);
-}
-
 void modexprint(page_t *page, word x, word y, word t, word col, word bgcol, const byte *str)
 {
-	word i, s, o, w, j, xp;
-	byte l[1024];
-	word addr = (word) l;
-	word chw=0;
+	word s, o, w;
+	word x_draw = x;
+	word addr = (word) romFontsData.l;
+	word addrq = (page->width/4) * y + (x / 4) + ((word)page->data);
+	word addrr = addrq;
 	byte c;
-	//byte near *bakapee;
-
-	switch(t)
-	{
-		case 0:
-			w=14;
-		break;
-		case 1:
-			w=8;
-		break;
-		case 2:
-			w=8;
-		break;
-		case 3:
-			w=16;
-		break;
-		default:
-			t=3;
-			w=16;
-		break;
-	}
 
 	s=romFonts[t].seg;
 	o=romFonts[t].off;
+	w=romFonts[t].charSize;
+	romFontsData.chw=0;
 
 	for(; *str != '\0'; str++)
 	{
 	c = (*str);
-	if((c=='\n'/* || c=="\
-"*/) || chw
->=page->width)
+	if(c=='\n')
 	{
-		chw=0;
-		y+=w;
+		x = x_draw;
+		romFontsData.chw = 0;
+		addrq += (page->width / 4) * 8;
+		addrr = addrq;
+		y += 8;
 		continue;
 	}
-	//load the letter 'A'
-	__asm {
-		MOV DI, addr
-		MOV SI, o
-		MOV ES, s
-		SUB AH, AH
-		MOV AL, c	; the letter
-		MOV CX, w
-		MUL CX
-		ADD SI, AX	;the address of charcter
-	L1:	MOV AX, ES:SI
-		MOV DS:DI, AX
-		INC SI
-		INC DI
-		DEC CX
-		JNZ L1
-	}
-	//bakapee = _nmalloc(sizeof(byte)*8);
-//TODO: OPTIMIZE THIS!!!!
-		for(i=0; i<w; i++)
-		{
-			/*modexSelectPlane(PLANE(x));
-			j=1<<8;
-			*bakapee=(l[i] & j ? col:bgcol);
-			_fmemcpy(page->data + (((page->width/4) * (y+page->dy+i)) + ((x+page->dx+chw) / 4)), bakapee, 8);*/
-			j=1<<8;
-			xp=0;
-			while(j)
-			{
-				modexputPixel(page, x+xp+chw, y+i, l[i] & j ? col:bgcol);
-				xp++;
-				j>>=1;
-			}
-		}
-		chw += xp;
+
+	// load the character into romFontsData.l
+	// no need for inline assembly!
+	// NTS: It might even be faster to just let the modexDrawChar point directly at ROM font than to copy per char! --J.C.
+		_fmemcpy(romFontsData.l,MK_FP(s,o+(w*c))/*ROM font location*/,w/*char size*/);
+		modexDrawChar(page, x_draw/*for mode X planar use*/, t, col, bgcol, addrr);
+		x_draw += 8; /* track X for edge of screen */
+		addrr += 2; /* move 8 pixels over (2 x 4 planar pixels per byte) */
 	}
-	//_nfree(bakapee);
 }
 
 void modexprintbig(page_t *page, word x, word y, word t, word col, word bgcol, const byte *str)
@@ -1317,6 +1026,15 @@ void modexprintbig(page_t *page, word x, word y, word t, word col, word bgcol, c
 	}
 	//load the letter 'A'
 	__asm {
+	    PUSHF
+	    PUSH ES
+	    PUSH AX
+	    PUSH BX
+	    PUSH CX
+	    PUSH DX
+	    PUSH SI
+	    PUSH DI
+
 		MOV DI, addr
 		MOV SI, o
 		MOV ES, s
@@ -1331,6 +1049,15 @@ void modexprintbig(page_t *page, word x, word y, word t, word col, word bgcol, c
 		INC DI
 		DEC CX
 		JNZ L1
+
+	    POP DI
+	    POP SI
+	    POP DX
+	    POP CX
+	    POP BX
+	    POP AX
+	    POP ES
+	    POPF
 	}
 
 		for(i=0; i<w; i++)
@@ -1350,7 +1077,7 @@ void modexprintbig(page_t *page, word x, word y, word t, word col, word bgcol, c
 }
 
 /* palette dump on display! */
-void pdump(page_t *pee)
+void modexpdump(page_t *pee)
 {
 	int mult=(QUADWH);
 	int palq=(mult)*TILEWH;
@@ -1370,22 +1097,49 @@ void pdump(page_t *pee)
 //		 the Virtual screen.											 //
 //																		 //
 /////////////////////////////////////////////////////////////////////////////
-void cls(page_t *page, byte color, byte *Where)
+void modexcls(page_t *page, byte color, byte *Where)
 {
 	//modexClearRegion(page, 0, 0, page->width, page->height, color);
 	/* set map mask to all 4 planes */
 	outpw(SC_INDEX, 0xff02);
 	//_fmemset(VGA, color, 16000);
-	_fmemset(Where, color, page->width*(page->height));
+	_fmemset(Where, color, page->width*(page->height)/4);
 }
 
 void
 modexWaitBorder() {
     while(inp(INPUT_STATUS_1)  & 8)  {
-	/* spin */
+	// spin
     }
 
     while(!(inp(INPUT_STATUS_1)  & 8))  {
-	/* spin */
+	// spin
     }
 }
+
+void bios_cls() {
+	VGA_ALPHA_PTR ap;
+	VGA_RAM_PTR rp;
+	unsigned char m;
+
+	m = int10_getmode();
+	if ((rp=vga_state.vga_graphics_ram) != NULL && !(m <= 3 || m == 7)) {
+		unsigned int i,im;
+
+		im = (FP_SEG(vga_state.vga_graphics_ram_fence) - FP_SEG(vga_state.vga_graphics_ram));
+		if (im > 0xFFE) im = 0xFFE;
+		im <<= 4;
+		for (i=0;i < im;i++) vga_state.vga_graphics_ram[i] = 0;
+	}
+	else if ((ap=vga_state.vga_alpha_ram) != NULL) {
+		unsigned int i,im;
+
+		im = (FP_SEG(vga_state.vga_alpha_ram_fence) - FP_SEG(vga_state.vga_alpha_ram));
+		if (im > 0x7FE) im = 0x7FE;
+		im <<= 4 - 1; /* because ptr is type uint16_t */
+		for (i=0;i < im;i++) vga_state.vga_alpha_ram[i] = 0x0720;
+	}
+	else {
+		printf("WARNING: bios cls no ptr\n");
+	}
+}