commit 04096fc

Brought changes for the screen device

  1@@ -24,26 +24,13 @@ static Uint8 blending[4][16] = {
  2 	{1, 2, 3, 1, 1, 2, 3, 1, 1, 2, 3, 1, 1, 2, 3, 1},
  3 	{2, 3, 1, 2, 2, 3, 1, 2, 2, 3, 1, 2, 2, 3, 1, 2}};
  4 
  5-static void
  6-screen_pixel(UxnScreen *p, Layer *layer, Uint16 x, Uint16 y, Uint8 color)
  7-{
  8-	if(x >= p->width || y >= p->height)
  9-		return;
 10-	layer->pixels[x + y * p->width] = color;
 11-}
 12-
 13 static void
 14 screen_fill(UxnScreen *p, Layer *layer, Uint16 x1, Uint16 y1, Uint16 x2, Uint16 y2, Uint8 color)
 15 {
 16 	int x, y;
 17-	if(x2 >= p->width) x2 = p->width;
 18-	if(y2 >= p->height) y2 = p->height;
 19-	if(x1 >= x2 || y1 >= y2)
 20-		return;
 21-	for(y = y1; y < y2; y++)
 22-		for(x = x1; x < x2; x++)
 23+	for(y = y1; y < y2 && y < p->height; y++)
 24+		for(x = x1; x < x2 && x < p->width; x++)
 25 			layer->pixels[x + y * p->width] = color;
 26-	layer->changed = 1;
 27 }
 28 
 29 static void
 30@@ -54,15 +41,14 @@ screen_blit(UxnScreen *p, Layer *layer, Uint16 x, Uint16 y, Uint8 *sprite, Uint8
 31 		Uint16 c = sprite[v] | (twobpp ? (sprite[v + 8] << 8) : 0);
 32 		for(h = 7; h >= 0; --h, c >>= 1) {
 33 			Uint8 ch = (c & 1) | ((c >> 7) & 2);
 34-			if(opaque || ch)
 35-				screen_pixel(p,
 36-					layer,
 37-					x + (flipx ? 7 - h : h),
 38-					y + (flipy ? 7 - v : v),
 39-					blending[ch][color]);
 40+			if(opaque || ch) {
 41+				Uint16 xx = x + (flipx ? 7 - h : h);
 42+				Uint16 yy = y + (flipy ? 7 - v : v);
 43+				if(xx < p->width && yy < p->height)
 44+					layer->pixels[xx + yy * p->width] = blending[ch][color];
 45+			}
 46 		}
 47 	}
 48-	layer->changed = 1;
 49 }
 50 
 51 void
 52@@ -135,13 +121,26 @@ screen_deo(Uint8 *ram, Uint8 *d, Uint8 port)
 53 		screen_resize(&uxn_screen, uxn_screen.width, PEEK2(d + 4));
 54 		break;
 55 	case 0xe: {
 56-		Uint16 x = PEEK2(d + 0x8), y = PEEK2(d + 0xa);
 57-		Layer *layer = (d[0xe] & 0x40) ? &uxn_screen.fg : &uxn_screen.bg;
 58-		if(d[0xe] & 0x80) {
 59-			Uint8 xflip = d[0xe] & 0x10, yflip = d[0xe] & 0x20;
 60-			screen_fill(&uxn_screen, layer, xflip ? 0 : x, yflip ? 0 : y, xflip ? x : uxn_screen.width, yflip ? y : uxn_screen.height, d[0xe] & 0x3);
 61-		} else {
 62-			screen_pixel(&uxn_screen, layer, x, y, d[0xe] & 0x3);
 63+		Uint8 ctrl = d[0xe];
 64+		Uint8 color = ctrl & 0x3;
 65+		Uint16 x = PEEK2(d + 0x8);
 66+		Uint16 y = PEEK2(d + 0xa);
 67+		Layer *layer = (ctrl & 0x40) ? &uxn_screen.fg : &uxn_screen.bg;
 68+		/* fill mode */
 69+		if(ctrl & 0x80) {
 70+			Uint16 x2 = uxn_screen.width;
 71+			Uint16 y2 = uxn_screen.height;
 72+			if(ctrl & 0x10) x2 = x, x = 0;
 73+			if(ctrl & 0x20) y2 = y, y = 0;
 74+			screen_fill(&uxn_screen, layer, x, y, x2, y2, color);
 75+			layer->changed = 1;
 76+		}
 77+		/* pixel mode */
 78+		else {
 79+			Uint16 width = uxn_screen.width;
 80+			Uint16 height = uxn_screen.height;
 81+			if(x < width && y < height)
 82+				layer->pixels[x + y * width] = color;
 83 			layer->changed = 1;
 84 			if(d[0x6] & 0x1) POKE2(d + 0x8, x + 1); /* auto x+1 */
 85 			if(d[0x6] & 0x2) POKE2(d + 0xa, y + 1); /* auto y+1 */
 86@@ -149,25 +148,32 @@ screen_deo(Uint8 *ram, Uint8 *d, Uint8 port)
 87 		break;
 88 	}
 89 	case 0xf: {
 90-		Uint16 x = PEEK2(d + 0x8), y = PEEK2(d + 0xa), dx, dy, addr = PEEK2(d + 0xc);
 91-		Uint8 i, n = d[0x6] >> 4, twobpp = !!(d[0xf] & 0x80);
 92-		Layer *layer = (d[0xf] & 0x40) ? &uxn_screen.fg : &uxn_screen.bg;
 93-		dx = (d[0x6] & 0x01) << 3;
 94-		dy = (d[0x6] & 0x02) << 2;
 95-		if(addr > 0x10000 - ((n + 1) << (3 + twobpp)))
 96+		Uint8 i;
 97+		Uint8 ctrl = d[0xf];
 98+		Uint8 move = d[0x6];
 99+		Uint8 length = move >> 4;
100+		Uint8 twobpp = !!(ctrl & 0x80);
101+		Uint16 x = PEEK2(d + 0x8);
102+		Uint16 y = PEEK2(d + 0xa);
103+		Uint16 addr = PEEK2(d + 0xc);
104+		Uint16 dx = (move & 0x1) << 3;
105+		Uint16 dy = (move & 0x2) << 2;
106+		Layer *layer = (ctrl & 0x40) ? &uxn_screen.fg : &uxn_screen.bg;
107+		if(addr > 0x10000 - ((length + 1) << (3 + twobpp)))
108 			return;
109-		for(i = 0; i <= n; i++) {
110-			if(!(d[0xf] & 0xf)) {
111+		for(i = 0; i <= length; i++) {
112+			if(!(ctrl & 0xf)) {
113 				Uint16 ex = x + dy * i, ey = y + dx * i;
114 				screen_fill(&uxn_screen, layer, ex, ey, ex + 8, ey + 8, 0);
115 			} else {
116-				screen_blit(&uxn_screen, layer, x + dy * i, y + dx * i, &ram[addr], d[0xf] & 0xf, d[0xf] & 0x10, d[0xf] & 0x20, twobpp);
117-				addr += (d[0x6] & 0x04) << (1 + twobpp);
118+				screen_blit(&uxn_screen, layer, x + dy * i, y + dx * i, &ram[addr], ctrl & 0xf, ctrl & 0x10, ctrl & 0x20, twobpp);
119+				addr += (move & 0x04) << (1 + twobpp);
120 			}
121 		}
122-		if(d[0x6] & 0x1) POKE2(d + 0x8, x + dx); /* auto x+8 */
123-		if(d[0x6] & 0x2) POKE2(d + 0xa, y + dy); /* auto y+8 */
124-		if(d[0x6] & 0x4) POKE2(d + 0xc, addr);   /* auto addr+length */
125+		layer->changed = 1;
126+		if(move & 0x1) POKE2(d + 0x8, x + dx); /* auto x+8 */
127+		if(move & 0x2) POKE2(d + 0xa, y + dy); /* auto y+8 */
128+		if(move & 0x4) POKE2(d + 0xc, addr);   /* auto addr+length */
129 		break;
130 	}
131 	}