commit 575acff

(screen) Cleanup

 1@@ -17,8 +17,8 @@ WITH REGARD TO THIS SOFTWARE.
 2 
 3 UxnScreen uxn_screen;
 4 
 5+#define MAR(x) (x + 0x08)
 6 #define MAR2(x) (x + 0x10)
 7-#define MARGIN 0x8
 8 
 9 /* c = !ch ? (color % 5 ? color >> 2 : 0) : color % 4 + ch == 1 ? 0 : (ch - 2 + (color & 3)) % 3 + 1; */
10 
11@@ -177,7 +177,7 @@ screen_redraw(void)
12 		palette[i] = uxn_screen.palette[(i >> 2) ? (i >> 2) : (i & 3)];
13 	for(y = y1; y < y2; y++) {
14 		int ys = y * s;
15-		for(x = x1, i = (x + MARGIN) + (y + MARGIN) * MAR2(w); x < x2; x++, i++) {
16+		for(x = x1, i = MAR(x) + MAR(y) * MAR2(w); x < x2; x++, i++) {
17 			int c = palette[fg[i] << 2 | bg[i]];
18 			for(k = 0; k < s; k++) {
19 				int oo = ((ys + k) * w + x) * s;
20@@ -238,14 +238,14 @@ screen_deo(Uxn *u, Uint8 addr)
21 				y1 = 0, y2 = rY;
22 			else
23 				y1 = rY, y2 = uxn_screen.height;
24-			screen_rect(layer, x1 + MARGIN, y1 + MARGIN, x2 + MARGIN, y2 + MARGIN, color);
25+			screen_rect(layer, MAR(x1), MAR(y1), MAR(x2), MAR(y2), color);
26 			screen_change(x1, y1, x2, y2);
27 		}
28 		/* pixel mode */
29 		else {
30 			Uint16 w = MAR2(uxn_screen.width);
31 			if(rX >= 0 && rY >= 0 && rX < w && rY < uxn_screen.height)
32-				layer[rX + MARGIN + (rY + MARGIN) * w] = color;
33+				layer[MAR(rX) + MAR(rY) * w] = color;
34 			screen_change(rX, rY, rX + 1, rY + 1);
35 			if(rMX) rX++;
36 			if(rMY) rY++;
37@@ -263,17 +263,17 @@ screen_deo(Uxn *u, Uint8 addr)
38 		int dxy = rDX * fy, dyx = rDY * fx, addr_incr = rMA << (1 + twobpp);
39 		if(twobpp)
40 			for(i = 0; i <= rML; i++, x += dyx, y += dxy, rA += addr_incr) {
41-				Uint16 xx = x + MARGIN;
42-				Uint16 yy = y + MARGIN;
43-				if(xx < uxn_screen.width + MARGIN && yy + MARGIN < MAR2(uxn_screen.height))
44+				Uint16 xx = MAR(x);
45+				Uint16 yy = MAR(y);
46+				if(xx < MAR(uxn_screen.width) && MAR(yy) < MAR2(uxn_screen.height))
47 					screen_2bpp(layer, &u->ram[rA], xx, yy, color, fx, fy);
48 			}
49 		else
50 			for(i = 0; i <= rML; i++, x += dyx, y += dxy, rA += addr_incr) {
51-				Uint16 xx = x + MARGIN;
52-				Uint16 yy = y + MARGIN;
53-				if(xx < uxn_screen.width + MARGIN && yy + MARGIN < MAR2(uxn_screen.height))
54-					screen_1bpp(layer, &u->ram[rA], x + MARGIN, y + MARGIN, color, fx, fy);
55+				Uint16 xx = MAR(x);
56+				Uint16 yy = MAR(y);
57+				if(xx < MAR(uxn_screen.width) && MAR(yy) < MAR2(uxn_screen.height))
58+					screen_1bpp(layer, &u->ram[rA], MAR(x), MAR(y), color, fx, fy);
59 			}
60 		if(fx < 0)
61 			x1 = x, x2 = rX;