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

diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index 2d4c0024..602e07e2 100755
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -187,7 +187,8 @@ modexDefaultPage(page_t *p)
 	page.tilesh=page.height/TILEWH;
 	page.tilemidposscreenx = page.tw/2;
 	page.tilemidposscreeny = (page.th/2)+1;
-	page.pagesize = (sdiword)(page.width/4)*page.height;
+	page.stridew=page.width/4;
+	page.pagesize = (word)(page.width/4)*page.height;
 	page.id = 0;
 
     return page;
@@ -203,6 +204,8 @@ modexNextPage(page_t *p) {
     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->tw;
@@ -210,6 +213,7 @@ modexNextPage(page_t *p) {
 	result.tilesw = p->tilesw;
 	result.tilesh = p->tilesh;
 	result.id = p->id+1;
+	result.stridew=p->stridew;
 	result.pagesize = p->pagesize;
 
 	return result;
@@ -224,6 +228,8 @@ modexNextPageFlexibleSize(page_t *p, word x, word y)
 	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 = result.sw/TILEWH;
@@ -231,7 +237,8 @@ modexNextPageFlexibleSize(page_t *p, word x, word y)
 	result.tilesw=result.width/TILEWH;
 	result.tilesh=result.height/TILEWH;
 	result.id = p->id+1;
-	result.pagesize = (sdiword)(result.width/4)*result.height;
+	result.stridew=result.width/4;
+	result.pagesize = (word)(result.width/4)*result.height;
 
 	return result;
 }
@@ -239,24 +246,25 @@ modexNextPageFlexibleSize(page_t *p, word x, word y)
 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++)
+	//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[i].pagesize=%ld\n", i, video->page[i].pagesize);
-		//printf("		[%u], vmem_remain=%ld\n", i, video->vmem_remain);
+		//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=262144L;
+	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[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++;
+	(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].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;
 }
@@ -311,8 +319,8 @@ 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];
@@ -388,11 +396,11 @@ 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 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;
-    word nextSrcRow = src->width/4 - scans - 1;
-    word nextDestRow = dest->width/4 - scans - 1;
+    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 left = lclip[sx&0x03];
@@ -1112,9 +1120,9 @@ modexWaitBorder() {
 	// spin
     }
 
-    while(!(inp(INPUT_STATUS_1)  & 8))  {
-	// spin
-    }
+//     while(!(inp(INPUT_STATUS_1)  & 8))  {
+// 	// spin
+//     }
 }
 
 void bios_cls() {
@@ -1143,3 +1151,19 @@ void bios_cls() {
 		printf("WARNING: bios cls no ptr\n");
 	}
 }
+
+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(" sw=%lu  sh=%lu ", (unsigned long)v->page[i].sw, (unsigned long)v->page[i].sh);
+		printf(" width=%lu  height=%lu", (unsigned long)v->page[i].width, (unsigned long)v->page[i].height);
+		printf("\n");
+	}
+}