X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=pixmaps%2Fconvert.c;h=f2c3afac38777dbb8b457d240c0034a474f26736;hb=ee7ad29e757ab4f99b8b776ce7e8ebee5081767a;hp=dcdcd4711ec4653b4732fcc6cebe4c8cb9ca14ab;hpb=86517e539f33650be656c482020a878fec0723c9;p=xboard.git

diff --git a/pixmaps/convert.c b/pixmaps/convert.c
index dcdcd47..f2c3afa 100644
--- a/pixmaps/convert.c
+++ b/pixmaps/convert.c
@@ -9,8 +9,8 @@
 
 
 int sizeList[] = { 21, 25, 29, 33, 37, 40, 45, 49, 54, 58, 64, 72, 80, 87, 95, 108, 116, 129 };
-char *(pieceList[]) = {"p", "n", "b", "r", "q", "f", "e", "as", "c", "w", "m", 
-		       "o", "h", "a", "dk", "g", "d", "v", "l", "s", "u", "k", 
+char *(pieceList[]) = {"p", "n", "b", "r", "q", "f", "e", "as", "c", "w", "m",
+		       "o", "h", "a", "dk", "g", "d", "v", "l", "s", "u", "k",
 		       "wp", "wl", "wn", "ws", "cv", NULL };
 char kindList[] = "sow";
 
@@ -54,6 +54,19 @@ void Paint(char dest[130][130], char src[130][130], int size, char c)
 	for(i=0; i<size; i++) for(j=0; j<size; j++) if(!src[i][j]) dest[i][j] = c;
 }
 
+FloodFill(char a[130][130], int size, int x, int y)
+{
+	char old = 'X', new = '.';
+	if(a[x][y] != old) return; else {
+		a[x][y] = new;
+		if(x > 0) FloodFill(a, size, x-1, y);
+		if(y > 0) FloodFill(a, size, x, y-1);
+		if(x < size-1) FloodFill(a, size, x+1, y);
+		if(y < size-1) FloodFill(a, size, x, y+1);
+	}
+
+}
+
 void Save(FILE *f, char *name, char data[130][130], int size, char *col, int depth)
 {	// write out data in source format for d x d pixmap with specified square color
 	int i, j;
@@ -79,27 +92,32 @@ char data[130][130], oData[130][130], sData[130][130], wData[130][130];
 
 main(int argc, char **argv)
 {
-	int i, j, k, d, cnt, p, s, t; char c, h, w, *name, buf[80];
+
+#define BUFLEN 80
+
+	int i, j, k, d, cnt, p, s, t; char c, h, w, name[BUFLEN], buf[BUFLEN], transparent;
 	FILE *f;
 
+    transparent = argc > 1 && !strcmp(argv[1], "-t");
+
     for(s=0; s<18; s++) for(p=0; pieceList[p] != NULL; p++) {
 
 	// Load the 3 kinds of Windows monochrome bitmaps (outline, solid, white fill)
 
-	sprintf(buf, "../winboard/bitmaps/%s%d%c.bmp", pieceList[p], sizeList[s], 'o');
+	snprintf(buf, BUFLEN, "../winboard/bitmaps/%s%d%c.bmp", pieceList[p], sizeList[s], 'o');
 	printf("try %s\n", buf);
 	f = fopen(buf, "rb");
 	if(f == NULL) continue;
 	Load(f, oData, buf);
 
-	sprintf(buf, "../winboard/bitmaps/%s%d%c.bmp", pieceList[p], sizeList[s], 's');
+	snprintf(buf, BUFLEN, "../winboard/bitmaps/%s%d%c.bmp", pieceList[p], sizeList[s], 's');
 	f = fopen(buf, "rb");
 	if(f == NULL) continue;
 	Load(f, sData, buf);
 
-	sprintf(buf, "../winboard/bitmaps/%s%d%c.bmp", pieceList[p], sizeList[s], 'w');
+	snprintf(buf, BUFLEN, "../winboard/bitmaps/%s%d%c.bmp", pieceList[p], sizeList[s], 'w');
 	if(pieceList[p][0]=='w')
-	sprintf(buf, "../winboard/bitmaps/%s%d%c.bmp", "w", sizeList[s], 'w');
+	snprintf(buf, BUFLEN, "../winboard/bitmaps/%s%d%c.bmp", "w", sizeList[s], 'w');
 	f = fopen(buf, "rb");
 	if(f == NULL) continue;
 	Load(f, wData, buf);
@@ -107,19 +125,26 @@ main(int argc, char **argv)
 	printf("%s loaded\n", buf);
 	// construct pixmaps as character arrays
 	d = sizeList[s];
-	for(i=0; i<d; i++) { for(j=0; j<d; j++) data[i][j] = '.'; data[i][d] = 0; } // fill square
+	for(i=0; i<d; i++) { for(j=0; j<d; j++) data[i][j] = transparent? '.' : 'X'; data[i][d] = 0; } // fill square
 
 	Paint(data, sData, d, ' '); // overay with solid piece bitmap
 
-	sprintf(buf, "%s%s%d.xpm", pieceList[p], "dd", d);
-	sprintf(name, "%s%s%d", pieceList[p], "dd", d);
+	if(!transparent) { // background was painted same color as piece details; flood-fill it from corners
+	    FloodFill(data, d, 0, 0);
+	    FloodFill(data, d, 0, d-1);
+	    FloodFill(data, d, d-1, 0);
+	    FloodFill(data, d, d-1, d-1);
+	}
+
+	snprintf(buf, BUFLEN, "%s%s%d.xpm", pieceList[p], "dd", d);
+	snprintf(name, BUFLEN, "%s%s%d", pieceList[p], "dd", d);
 	f = fopen(buf, "w");
-	Save(f, name, data, d, "c green s dark_square", 2);
+	Save(f, name, data, d, "c green s dark_square", 3);
 
-	sprintf(buf, "%s%s%d.xpm", pieceList[p], "dl", d);
-	sprintf(name, "%s%s%d", pieceList[p], "dl", d);
+	snprintf(buf, BUFLEN, "%s%s%d.xpm", pieceList[p], "dl", d);
+	snprintf(name, BUFLEN, "%s%s%d", pieceList[p], "dl", d);
 	f = fopen(buf, "w");
-	Save(f, name, data, d, "c gray s light_square", 2); // silly duplication; pixmap is te same, but other color
+	Save(f, name, data, d, "c gray s light_square", 3); // silly duplication; pixmap is te same, but other color
 
 	// now the light piece
 	for(i=0; i<d; i++) { for(j=0; j<d; j++) data[i][j] = '.'; data[i][d] = 0; } // fill square
@@ -127,13 +152,13 @@ main(int argc, char **argv)
 	Paint(data, wData, d, 'X'); // overay with white-filler piece bitmap
 	Paint(data, oData, d, ' '); // overay with outline piece bitmaps
 
-	sprintf(buf, "%s%s%d.xpm", pieceList[p], "ld", d);
-	sprintf(name, "%s%s%d", pieceList[p], "ld", d);
+	snprintf(buf, BUFLEN, "%s%s%d.xpm", pieceList[p], "ld", d);
+	snprintf(name, BUFLEN, "%s%s%d", pieceList[p], "ld", d);
 	f = fopen(buf, "w");
 	Save(f, name, data, d, "c green s dark_square", 3);
 
-	sprintf(buf, "%s%s%d.xpm", pieceList[p], "ll", d);
-	sprintf(name, "%s%s%d", pieceList[p], "ll", d);
+	snprintf(buf, BUFLEN, "%s%s%d.xpm", pieceList[p], "ll", d);
+	snprintf(name, BUFLEN, "%s%s%d", pieceList[p], "ll", d);
 	f = fopen(buf, "w");
 	Save(f, name, data, d, "c gray s light_square", 3);