X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibem%2Fgraphics.c;h=c9dc1593024e37bd766b73ef8b6f988ff31d58ac;hb=b7c0e8ca1c06e1d54714b382d6b92f4ff2d47af7;hp=0951468fb5edbd3617f60a29099198065c8ac0e7;hpb=bec4e2a1fb71569a3302583f71fbb11aa3f58b63;p=rocksndiamonds.git

diff --git a/src/libem/graphics.c b/src/libem/graphics.c
index 0951468f..c9dc1593 100644
--- a/src/libem/graphics.c
+++ b/src/libem/graphics.c
@@ -1,3 +1,6 @@
+
+#if defined(TARGET_X11)
+
 /* 2000-08-13T14:36:17Z
  *
  * graphics manipulation crap
@@ -16,12 +19,12 @@ unsigned int frame; /* current frame */
 unsigned int screen_x; /* current scroll position */
 unsigned int screen_y;
 
-static unsigned short screen[14][22]; /* tiles currently on screen */
+static unsigned short screentiles[14][22]; /* tiles currently on screen */
 
 static unsigned int colours[8];
 static unsigned int colour_anim;
 
-void xdebug(char *msg)
+static void xdebug(char *msg)
 {
 #if 0
   XSync(display, False);
@@ -32,8 +35,8 @@ void xdebug(char *msg)
 static void colour_shuffle(void)
 {
 	unsigned int i, j, k;
-	for(i = 0; i < 8; i++) colours[i] = i;
-	for(i = 0; i < 8; i++) {
+	for (i = 0; i < 8; i++) colours[i] = i;
+	for (i = 0; i < 8; i++) {
 		Random = Random * 129 + 1;
 		j = (Random >> 10) & 7;
 		k = colours[i];
@@ -57,7 +60,7 @@ void blitscreen(void)
 	printf("::: %d, %d [%d, %d]\n", x, y, TILEX, TILEY);
 #endif
 
-	if(x < 2 * TILEX && y < 2 * TILEY) {
+	if (x < 2 * TILEX && y < 2 * TILEY) {
 
 #if 0
 	  printf("!!! %ld, %ld, %ld, %ld\n",
@@ -65,10 +68,10 @@ void blitscreen(void)
 #endif
 
 		XCopyArea(display, screenPixmap, xwindow, screenGC, x, y, 20 * TILEX, 12 * TILEY, 0, 0);
-	} else if(x < 2 * TILEX && y >= 2 * TILEY) {
+	} else if (x < 2 * TILEX && y >= 2 * TILEY) {
 		XCopyArea(display, screenPixmap, xwindow, screenGC, x, y, 20 * TILEX, 14 * TILEY - y, 0, 0);
 		XCopyArea(display, screenPixmap, xwindow, screenGC, x, 0, 20 * TILEX, y - 2 * TILEY, 0, 14 * TILEY - y);
-	} else if(x >= 2 * TILEX && y < 2 * TILEY) {
+	} else if (x >= 2 * TILEX && y < 2 * TILEY) {
 		XCopyArea(display, screenPixmap, xwindow, screenGC, x, y, 22 * TILEX - x, 12 * TILEY, 0, 0);
 		XCopyArea(display, screenPixmap, xwindow, screenGC, 0, y, x - 2 * TILEX, 12 * TILEY, 22 * TILEX - x, 0);
 	} else {
@@ -99,13 +102,13 @@ static void animscreen(void)
 
 	xdebug("animscreen");
 
-	for(y = top; y < top + 14; y++) {
+	for (y = top; y < top + 14; y++) {
 		dy = y % 14;
-		for(x = left; x < left + 22; x++) {
+		for (x = left; x < left + 22; x++) {
 			dx = x % 22;
 			obj = map_obj[frame][Draw[y][x]];
-			if(screen[dy][dx] != obj) {
-				screen[dy][dx] = obj;
+			if (screentiles[dy][dx] != obj) {
+				screentiles[dy][dx] = obj;
 				XCopyArea(display, objPixmap, screenPixmap, screenGC, (obj / 512) * TILEX, (obj % 512) * TILEY / 16, TILEX, TILEY, dx * TILEX, dy * TILEY);
 			}
 		}
@@ -116,41 +119,119 @@ static void animscreen(void)
  *
  * handles transparency and movement
  */
-static void blitplayer(struct PLAYER *ply) {
-	unsigned int x, y, dx, dy;
-	unsigned short obj, spr;
-
-	xdebug("blitplayer");
-
-	if(ply->alive) {
-		x = (frame * ply->oldx + (8 - frame) * ply->x) * TILEX / 8; dx = x + TILEX - 1;
-		y = (frame * ply->oldy + (8 - frame) * ply->y) * TILEY / 8; dy = y + TILEY - 1;
-		if((unsigned int)(dx - screen_x) < (21 * TILEX - 1) && (unsigned int)(dy - screen_y) < (13 * TILEY - 1)) {
-			spr = map_spr[ply->num][frame][ply->anim];
-			x %= 22 * TILEX; dx %= 22 * TILEX;
-			y %= 14 * TILEY; dy %= 14 * TILEY;
-			if(objmaskBitmap) {
-				obj = screen[y / TILEY][x / TILEX];
-				XCopyArea(display, objmaskBitmap, spriteBitmap, spriteGC, (obj / 512) * TILEX, (obj % 512) * TILEY / 16, TILEX, TILEY, -(x % TILEX), -(y % TILEY));
-				obj = screen[dy / TILEY][dx / TILEX];
-				XCopyArea(display, objmaskBitmap, spriteBitmap, spriteGC, (obj / 512) * TILEX, (obj % 512) * TILEY / 16, TILEX, TILEY, (22 * TILEX - x) % TILEX, (14 * TILEY - y) % TILEY);
-			} else if(sprmaskBitmap) {
-				XCopyArea(display, sprmaskBitmap, spriteBitmap, spriteGC, (spr / 8) * TILEX, (spr % 8) * TILEY, TILEX, TILEY, 0, 0);
-			} else {
-				XFillRectangle(display, spriteBitmap, spriteGC, 0, 0, TILEX, TILEY);
-			}
-			screen[y / TILEY][x / TILEX] = -1; /* mark screen as dirty */
-			screen[dy / TILEY][dx / TILEX] = -1;
-			XSetClipMask(display, screenGC, spriteBitmap);
-			XSetClipOrigin(display, screenGC, x, y);
-			XCopyArea(display, sprPixmap, screenPixmap, screenGC, (spr / 8) * TILEX, (spr % 8) * TILEY, TILEX, TILEY, x, y);
-			XSetClipOrigin(display, screenGC, x - 22 * TILEX, y);
-			XCopyArea(display, sprPixmap, screenPixmap, screenGC, (spr / 8) * TILEX, (spr % 8) * TILEY, TILEX, TILEY, x - 22 * TILEX, y);
-			XSetClipOrigin(display, screenGC, x, y - 14 * TILEY);
-			XCopyArea(display, sprPixmap, screenPixmap, screenGC, (spr / 8) * TILEX, (spr % 8) * TILEY, TILEX, TILEY, x, y - 14 * TILEY);
-			XSetClipMask(display, screenGC, None);
-		}
+static void blitplayer(struct PLAYER *ply)
+{
+  unsigned int x, y, dx, dy;
+  unsigned short obj, spr;
+
+  xdebug("blitplayer");
+
+  if (ply->alive)
+  {
+    x = (frame * ply->oldx + (8 - frame) * ply->x) * TILEX / 8;
+    y = (frame * ply->oldy + (8 - frame) * ply->y) * TILEY / 8;
+    dx = x + TILEX - 1;
+    dy = y + TILEY - 1;
+
+    if ((unsigned int)(dx - screen_x) < (21 * TILEX - 1) &&
+	(unsigned int)(dy - screen_y) < (13 * TILEY - 1))
+    {
+      spr = map_spr[ply->num][frame][ply->anim];
+      x %= 22 * TILEX;
+      y %= 14 * TILEY;
+      dx %= 22 * TILEX;
+      dy %= 14 * TILEY;
+
+      if (objmaskBitmap)
+      {
+	obj = screentiles[y / TILEY][x / TILEX];
+	XCopyArea(display, objmaskBitmap, spriteBitmap, spriteGC,
+		  (obj / 512) * TILEX, (obj % 512) * TILEY / 16, TILEX, TILEY,
+		  -(x % TILEX), -(y % TILEY));
+
+	obj = screentiles[dy / TILEY][dx / TILEX];
+	XCopyArea(display, objmaskBitmap, spriteBitmap, spriteGC,
+		  (obj / 512) * TILEX, (obj % 512) * TILEY / 16, TILEX, TILEY,
+		  (22 * TILEX - x) % TILEX, (14 * TILEY - y) % TILEY);
+      }
+      else if (sprmaskBitmap)
+      {
+	XCopyArea(display, sprmaskBitmap, spriteBitmap, spriteGC,
+		  (spr / 8) * TILEX, (spr % 8) * TILEY, TILEX, TILEY, 0, 0);
+      }
+      else
+      {
+	XFillRectangle(display, spriteBitmap, spriteGC, 0, 0, TILEX, TILEY);
+      }
+
+      screentiles[y / TILEY][x / TILEX] = -1; /* mark screen as dirty */
+      screentiles[dy / TILEY][dx / TILEX] = -1;
+
+      XSetClipMask(display, screenGC, spriteBitmap);
+      XSetClipOrigin(display, screenGC, x, y);
+      XCopyArea(display, sprPixmap, screenPixmap, screenGC,
+		(spr / 8) * TILEX, (spr % 8) * TILEY, TILEX, TILEY,
+		x, y);
+      XSetClipOrigin(display, screenGC, x - 22 * TILEX, y);
+      XCopyArea(display, sprPixmap, screenPixmap, screenGC,
+		(spr / 8) * TILEX, (spr % 8) * TILEY, TILEX, TILEY,
+		x - 22 * TILEX, y);
+      XSetClipOrigin(display, screenGC, x, y - 14 * TILEY);
+      XCopyArea(display, sprPixmap, screenPixmap, screenGC,
+		(spr / 8) * TILEX, (spr % 8) * TILEY, TILEX, TILEY,
+		x, y - 14 * TILEY);
+      XSetClipMask(display, screenGC, None);
+    }
+
+
+#if 0
+
+#if 0
+    printf("::: %ld, %ld\n", objmaskBitmap, sprmaskBitmap);
+#endif
+
+    if (sprmaskBitmap)
+    {
+      int width = 16 * 4;
+      int height = 16 * 4;
+      XImage *src_ximage = XGetImage(display, sprmaskBitmap, 0, 0,
+				     width, height, AllPlanes, ZPixmap);
+      XImage *dst_ximage = XGetImage(display, xwindow, 0, 0,
+				     width, height, AllPlanes, ZPixmap);
+      int x, y;
+
+      if (src_ximage == NULL)
+      {
+	printf("src_ximage failed\n");
+	exit(1);
+      }
+
+      if (dst_ximage == NULL)
+      {
+	printf("dst_ximage failed\n");
+	exit(1);
+      }
+
+      for (x=0; x<width; x++)
+      {
+	for (y=0; y<height; y++)
+	{
+	  unsigned long pixel = XGetPixel(src_ximage, x, y);
+
+	  if (pixel != BlackPixel(display, screen))
+	    pixel = WhitePixel(display, screen);
+
+	  XPutPixel(dst_ximage, x, y, pixel);
 	}
+      }
+
+      XPutImage(display, xwindow, screenGC, dst_ximage, 0, 0, 0, 13 * TILEY,
+		width, height);
+    }
+#endif
+
+
+  }
 }
 
 void game_initscreen(void)
@@ -172,15 +253,15 @@ void game_initscreen(void)
 	printf("--> M5.2: xwindow == %ld\n", xwindow);
 	printf("--> M5.2: &xwindow == %ld\n", &xwindow);
 	printf("--> M5.2: screen == %ld\n", screen);
-	printf("--> M5.2: &screen[0][0] == %ld\n", &screen[0][0]);
+	printf("--> M5.2: &screentiles[0][0] == %ld\n", &screentiles[0][0]);
 #endif
 
-	for(y = 0; y < 14; y++) {
-		for(x = 0; x < 22; x++) {
+	for (y = 0; y < 14; y++) {
+		for (x = 0; x < 22; x++) {
 #if 0
 		  printf("--> M5.2.A: xwindow == %ld [%d,%d]\n", xwindow, x,y);
 #endif
-			screen[y][x] = -1;
+			screentiles[y][x] = -1;
 #if 0
 		  printf("--> M5.2.B: xwindow == %ld [%d,%d]\n", xwindow, x,y);
 #endif
@@ -227,17 +308,17 @@ void game_blitscore(void)
 	XCopyArea(display, botPixmap, scorePixmap, scoreGC, (i % 10) * SCOREX, colours[1] * SCOREY, SCOREX, SCOREY, 38 * SCOREX, 0); i /= 10;
 	XCopyArea(display, botPixmap, scorePixmap, scoreGC, (i % 10) * SCOREX, colours[1] * SCOREY, SCOREX, SCOREY, 37 * SCOREX, 0); i /= 10;
 	XCopyArea(display, botPixmap, scorePixmap, scoreGC, (i % 10) * SCOREX, colours[1] * SCOREY, SCOREX, SCOREY, 36 * SCOREX, 0);
-	if(lev.home == 0) {
+	if (lev.home == 0) {
 		XCopyArea(display, botPixmap, scorePixmap, scoreGC, 12 * SCOREX, 24 * SCOREY, 12 * SCOREX, SCOREY, 14 * SCOREX, 0); /* relax */
 		goto done;
 	}
-	if(ply1.alive + ply2.alive >= lev.home && lev.required == 0) {
+	if (ply1.alive + ply2.alive >= lev.home && lev.required == 0) {
 		XCopyArea(display, botPixmap, scorePixmap, scoreGC, 24 * SCOREX, colours[2] * SCOREY, 12 * SCOREX, SCOREY, 14 * SCOREX, 0); /* find the exit */
 		goto done;
 	}
-	if(ply1.alive + ply2.alive < lev.home) {
-		if(++colour_anim > 11) colour_anim = 0;
-		if(colour_anim < 6) {
+	if (ply1.alive + ply2.alive < lev.home) {
+		if (++colour_anim > 11) colour_anim = 0;
+		if (colour_anim < 6) {
 			XCopyArea(display, botPixmap, scorePixmap, scoreGC, 0, 24 * SCOREY, 12 * SCOREX, SCOREY, 14 * SCOREX, 0); /* forget it */
 			goto done;
 		}
@@ -259,10 +340,10 @@ void game_animscreen(void)
 
 	x = (frame * ply1.oldx + (8 - frame) * ply1.x) * TILEX / 8 + (19 * TILEX) / 2;
 	y = (frame * ply1.oldy + (8 - frame) * ply1.y) * TILEY / 8 + (11 * TILEY) / 2;
-	if(x > lev.width * TILEX) x = lev.width * TILEX;
-	if(y > lev.height * TILEY) y = lev.height * TILEY;
-	if(x < 20 * TILEX) x = 20 * TILEY;
-	if(y < 12 * TILEY) y = 12 * TILEY;
+	if (x > lev.width * TILEX) x = lev.width * TILEX;
+	if (y > lev.height * TILEY) y = lev.height * TILEY;
+	if (x < 20 * TILEX) x = 20 * TILEY;
+	if (y < 12 * TILEY) y = 12 * TILEY;
 	screen_x = x - 19 * TILEX;
 	screen_y = y - 11 * TILEY;
 
@@ -287,13 +368,13 @@ void title_initscreen(void)
 	colour_anim = 0;
 
 	XCopyArea(display, ttlPixmap, screenPixmap, screenGC, 0, 0, 20 * TILEX, 12 * TILEY, 0, 0);
-	if(botmaskBitmap) {
+	if (botmaskBitmap) {
 		XCopyArea(display, botPixmap, scorePixmap, scoreGC, 0, colours[1] * SCOREY, 20 * TILEX, SCOREY, 0, 0);
 		XSetClipMask(display, scoreGC, botmaskBitmap);
 		XSetClipOrigin(display, scoreGC, 0, 0 - colours[0] * SCOREY);
 	}
 	XCopyArea(display, botPixmap, scorePixmap, scoreGC, 0, colours[0] * SCOREY, 20 * TILEX, SCOREY, 0, 0);
-	if(botmaskBitmap) {
+	if (botmaskBitmap) {
 		XSetClipMask(display, scoreGC, None);
 	}
 }
@@ -304,18 +385,18 @@ void title_blitscore(void)
 
 	xdebug("title_blitscore");
 
-	if(++colour_anim > 30) colour_anim = 0;
+	if (++colour_anim > 30) colour_anim = 0;
 	i = colour_anim >= 16 ? 31 - colour_anim : colour_anim;
 	x = (i / 8 + 18) * 2 * SCOREX;
 	y = (i % 8 + 16) * SCOREY;
 
-	if(botmaskBitmap) {
+	if (botmaskBitmap) {
 		XCopyArea(display, botPixmap, scorePixmap, scoreGC, 32 * SCOREX, colours[1] * SCOREY, 2 * SCOREX, SCOREY, 32 * SCOREX, 0);
 		XSetClipMask(display, scoreGC, botmaskBitmap);
 		XSetClipOrigin(display, scoreGC, 32 * SCOREX - x, 0 - y);
 	}
 	XCopyArea(display, botPixmap, scorePixmap, scoreGC, x, y, 2 * SCOREX, SCOREY, 32 * SCOREX, 0);
-	if(botmaskBitmap) {
+	if (botmaskBitmap) {
 		XSetClipMask(display, scoreGC, None);
 	}
 }
@@ -347,20 +428,22 @@ void title_string(unsigned int y, unsigned int left, unsigned int right, char *s
 
 	y *= TILEY; left *= SCOREX; right *= SCOREX;
 	x = (left + right - strlen(string) * 12) / 2;
-	if(x < left || x >= right) x = left;
+	if (x < left || x >= right) x = left;
 
 	XCopyArea(display, ttlPixmap, screenPixmap, screenGC, left, y, right - left, TILEY, left, y);
-	if(ttlmaskBitmap) XSetClipMask(display, screenGC, ttlmaskBitmap);
-	for(i = 0; string[i] && x < right; i++) {
+	if (ttlmaskBitmap) XSetClipMask(display, screenGC, ttlmaskBitmap);
+	for (i = 0; string[i] && x < right; i++) {
 		unsigned short ch_pos, ch_x, ch_y;
 		ch_pos = map_ttl[string[i] & 127];
-		if(ch_pos < 640) {
+		if (ch_pos < 640) {
 			ch_x = (ch_pos % 320);
 			ch_y = (ch_pos / 320 + 12) * TILEY;
-			if(ttlmaskBitmap) XSetClipOrigin(display, screenGC, x - ch_x, y - ch_y);
+			if (ttlmaskBitmap) XSetClipOrigin(display, screenGC, x - ch_x, y - ch_y);
 			XCopyArea(display, ttlPixmap, screenPixmap, screenGC, ch_x, ch_y, 12, TILEY, x, y);
 		}
 		x += 12;
 	}
 	XSetClipMask(display, screenGC, None);
 }
+
+#endif