X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fmodex16.c;h=94386cad2b154d27d6a0e60faa0ce27bfed23704;hb=f316394371b48430c9e1b375640b87f1d6f267ab;hp=cb4c53123337f7fffa4e57b33c392c25571483d5;hpb=8e9c24c25f7496303be4d3e8e3c6aac38a652e99;p=16.git

diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index cb4c5312..94386cad 100755
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -62,11 +62,12 @@ void VGAmodeX(sword vq, boolean cmem, global_game_variables_t *gv)
 static void
 vgaSetMode(byte mode)
 {
-  union REGS regs;
+	union REGS regs;
 
-  regs.h.ah = SET_MODE;
-  regs.h.al = mode;
-  int86(VIDEO_INT, &regs, &regs);
+	regs.h.ah = SET_MODE;
+	regs.h.al = mode;
+	int86(VIDEO_INT, &regs, &regs);
+  //int10_setmode(mode);
 }
 
 //---------------------------------------------------
@@ -74,155 +75,105 @@ 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, 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);
-	vga_enable_256color_modex(); // VGA mode X
+
+	vgaSetMode(VGA_256_COLOR_MODE);
+	vga_enable_256color_modex();
+
 	update_state_from_vga();
+	vga_read_crtc_mode(&cm);
+
+	/* reprogram the CRT controller */
+	//outp(CRTC_INDEX, 0x11); /* VSync End reg contains register write prot */
+	//outp(CRTC_DATA, 0x7f);  /* get current write protect on varios regs */
 
 	switch(vq)
 	{
 		case 1:
 			//CRTParmCount = sizeof(ModeX_320x240regs) / sizeof(ModeX_320x240regs[0]);
-			/* width and height */
-			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
-
-			/* send the CRTParms */
 			/*for(i=0; i<CRTParmCount; i++) {
 				outpw(CRTC_INDEX, ModeX_320x240regs[i]);
 			}*/
-			{
-			struct vga_mode_params cm;
-			vga_read_crtc_mode(&cm);
-
+			/* width and height */
+			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.vertical_total = 525;
+			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 *///skewing ^^;
+			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 = 489;
-			cm.vertical_blank_end = 517;
-
-			vga_write_crtc_mode(&cm,0);
-			}
-		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]);
-			}
-		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]);
-			}
-		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;
-
-			/* send the CRTParms */
-			for(i=0; i<CRTParmCount; i++) {
-				outpw(CRTC_INDEX, ModeX_192x144regs[i]);
-			}
-		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]);
-			}
-		break;
+			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;
 	}
 
+	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;
+		case 1: {
+			/* clear video memory */
+			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;
 	}
-	gv->video.page[0].tilesw = gv->video.page[0].sw/TILEWH;
-	gv->video.page[0].tilesh = gv->video.page[0].sh/TILEWH;
+
+//	gv->video.page[0].tw = gv->video.page[0].sw/TILEWH;
+//	gv->video.page[0].th = 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
@@ -231,20 +182,24 @@ 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.stridew=page.width/4;
+	page.pagesize = (word)(page.width/4)*page.height;
+	page.pi=page.width*4;
 	page.id = 0;
 
     return page;
@@ -257,17 +212,23 @@ 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.sw = p->sw;
+	result.sh = p->sh;
     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.stridew=p->stridew;
+	result.pagesize = p->pagesize;
+	result.pi=result.width*4;
 	result.id = p->id+1;
 
 	return result;
-// 	return modexNextPageFlexibleSize(&p, p->width, p->height);
 }
 
 //next page with defined dimentions~
@@ -276,18 +237,62 @@ 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.sw = x;
+	result.sh = y;
 	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.stridew=p->sw/4;//result.width/4;
+	result.pagesize = (word)(result.width/4)*result.height;
+	switch(result.id)
+	{
+		case 2:
+			result.pi=p->width*4;
+		break;
+		case 3:
+			result.pi=p->pi;
+		break;
+	}
 
 	return result;
 }
 
+void modexCalcVmemRemain(video_t *video)
+{
+	byte i;
+	//printf("\n\n	1st vmem_remain=%u\n", video->vmem_remain);
+	for(i=0; i<video->num_of_pages; i++)
+	{
+		video->vmem_remain-=video->page[i].pagesize;
+		//printf("		[%u], video->page[%u].pagesize=%u\n", i, i, video->page[i].pagesize);
+		//printf("		[%u], vmem_remain=%u\n", i, video->vmem_remain);
+	}
+}
+
+void modexHiganbanaPageSetup(video_t *video)
+{
+	video->vmem_remain=65535U;
+	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++;
+//0000	(video->page[2]) = modexNextPageFlexibleSize(&(video->page[1]), (video->page[0]).width, TILEWH*4);		video->num_of_pages++;
+//0000	(video->page[3]) = (video->page[2]);		video->num_of_pages++;
+	(video->page[2]) = modexNextPageFlexibleSize(&(video->page[1]), TILEWH*4, TILEWH*4);		video->num_of_pages++;
+//	(video->page[3]) = modexNextPageFlexibleSize(&(video->page[2]), video->page[0].width, 176);	video->num_of_pages++;
+	(video->page[3]) = modexNextPageFlexibleSize(&(video->page[2]), video->page[0].sw, 208);	video->num_of_pages++;
+// 	(video->page[2]) = modexNextPageFlexibleSize(&(video->page[1]), video->page[0].width, 172);	video->num_of_pages++;
+// 	(video->page[3]) = modexNextPageFlexibleSize(&(video->page[2]), 72, 128);		video->num_of_pages++;
+	modexCalcVmemRemain(video);
+	video->p=0;
+	video->r=1;
+}
 
 void
 modexShowPage(page_t *page) {
@@ -308,42 +313,39 @@ modexShowPage(page_t *page) {
     low_address  = LOW_ADDRESS  | (offset << 8);
 
     /* wait for appropriate timing and then program CRTC */
-    while ((inp(INPUT_STATUS_1) & DISPLAY_ENABLE));
+    //while ((inp(INPUT_STATUS_1) & DISPLAY_ENABLE));
     outpw(CRTC_INDEX, high_address);
     outpw(CRTC_INDEX, low_address);
     outp(CRTC_INDEX, 0x13);
     outp(CRTC_DATA, crtcOffset);
 
     /*  wait for one retrace */
-    while (!(inp(INPUT_STATUS_1) & VRETRACE));
+    //while (!(inp(INPUT_STATUS_1) & VRETRACE));
 
     /* do PEL panning here */
     outp(AC_INDEX, 0x33);
     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;
     word xoff=x/4;       /* xoffset that begins each row */
     word scanCount=w/4;  /* number of iterations per row (excluding right clip)*/
-    word poffset = pageOff + y*(page->width/4) + xoff; /* starting offset */
-    word nextRow = page->width/4-scanCount-1;  /* loc of next row */
+    word poffset = pageOff + y*(page->stridew) + xoff; /* starting offset */
+    word nextRow = page->stridew-scanCount-1;  /* loc of next row */
     byte lclip[] = {0x0f, 0x0e, 0x0c, 0x08};  /* clips for rectangles not on 4s */
     byte rclip[] = {0x00, 0x01, 0x03, 0x07};
     byte left = lclip[x&0x03];
@@ -354,7 +356,17 @@ modexClearRegion(page_t *page, int x, int y, int w, int h, byte  color) {
       right=0x0f;
     }
 
+	//printf("modexClearRegion(x=%u, y=%u, w=%u, h=%u, left=%u, right=%u)\n", x, y, w, h, left, right);
+
     __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
@@ -388,6 +400,14 @@ 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
     }
 }
 
@@ -403,17 +423,33 @@ modexCopyPageRegion(page_t *dest, page_t *src,
 		    word dx, word dy,
 		    word width, word height)
 {
-    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 nextSrcRow = src->width/4 - scans - 1;
-    word nextDestRow = dest->width/4 - scans - 1;
+    word doffset = (word)dest->data + dy*(dest->stridew) + dx/4;
+    word soffset = (word)src->data + sy*(src->stridew) + sx/4;
+    word scans   = vga_state.vga_stride;				//++++0000 the quick and dirty fix of the major issue with p16 video display wwww
+    word nextSrcRow = src->stridew - scans - 1;
+    word nextDestRow = dest->stridew - scans - 1;
     byte lclip[] = {0x0f, 0x0e, 0x0c, 0x08};  /* clips for rectangles not on 4s */
-    byte rclip[] = {0x0f, 0x01, 0x03, 0x07};
+    byte rclip[] = {0x00, 0x01, 0x03, 0x07};
     byte left = lclip[sx&0x03];
     byte right = rclip[(sx+width)&0x03];
 
+	/* handle the case which requires an extra group */
+	if((sx & 0x03) && !((sx+width) & 0x03)) {
+		right=0x0f;
+	}
+
+//	printf("modexCopyPageRegion(src->stridew=%u, dest->stridew=%u, sx=%u, sy=%u, dx=%u, dy=%u, width=%u, height=%u, left=%u, right=%u)\n", src->stridew, dest->stridew, sx, sy, dx, dy, width, height, left, right);
+
     __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	 ;
@@ -462,6 +498,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
     }
 }
 
@@ -617,7 +662,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));
@@ -667,7 +713,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)++)
@@ -706,7 +753,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;
@@ -778,13 +825,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)]);
@@ -795,13 +844,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());
@@ -809,16 +860,17 @@ modexPalUpdate0(byte *p)
 }
 
 void
-modexPalOverscan(byte *p, word col)
+modexPalOverscan(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;
@@ -936,23 +988,13 @@ 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, boolean q)
+void modexprint(page_t *page, word x, word y, word t, word col, word bgcol, const byte *str)
 {
 	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;
 
 	s=romFonts[t].seg;
@@ -963,35 +1005,23 @@ void modexprint(page_t *page, word x, word y, word t, word col, word bgcol, cons
 	for(; *str != '\0'; str++)
 	{
 	c = (*str);
-	if((c=='\n'/* || c=="\
-"*/) || romFontsData.chw
->=page->width)
+	if(c=='\n')
 	{
-		romFontsData.chw=0;
-		y+=romFonts[t].charSize;
+		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
-	}
-//TODO: OPTIMIZE THIS!!!!
-		modexDrawCharPBuf(page, x, y, t, col, bgcol, q);
 
-		//if(!q) getch();
+	// 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) */
 	}
 }
 
@@ -1038,6 +1068,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
@@ -1052,6 +1091,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++)
@@ -1071,7 +1119,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;
@@ -1091,7 +1139,7 @@ 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 */
@@ -1102,11 +1150,28 @@ void cls(page_t *page, byte color, byte *Where)
 
 void
 modexWaitBorder() {
-    while(inp(INPUT_STATUS_1)  & 8)  {
-	/* spin */
-    }
+	while(inp(INPUT_STATUS_1)  & 8)  {
+	// spin
+	}
 
-    while(!(inp(INPUT_STATUS_1)  & 8))  {
-	/* spin */
-    }
+	while(!(inp(INPUT_STATUS_1)  & 8))  {
+	//spin
+	}
+}
+
+void modexprintmeminfo(video_t *v)
+{
+	byte i;
+	printf("video memory remaining: %u\n", v->vmem_remain);
+	printf("page ");
+	for(i=0; i<v->num_of_pages;i++)
+	{
+		printf("	[%u]=", i);
+		printf("(%Fp)", (v->page[i].data));
+		printf(" size=%u	", v->page[i].pagesize);
+		printf("w=%lu  h=%lu ", (unsigned long)v->page[i].width, (unsigned long)v->page[i].height);
+		printf("sw=%lu  sh=%lu ", (unsigned long)v->page[i].sw, (unsigned long)v->page[i].sh);
+		printf("pi=%u", v->page[i].pi);
+		printf("\n");
+	}
 }