X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=draw.c;h=d0b3eda72922740d8893b232f7334d1524a382c6;hb=17662b1df7d74e5b445a84603cda00852ebc582b;hp=9e0fae3316c61aa323da910fc06679a52c9d439e;hpb=58829f360dca7d929444d8f3748bae8a37be7ad0;p=xboard.git

diff --git a/draw.c b/draw.c
index 9e0fae3..d0b3eda 100644
--- a/draw.c
+++ b/draw.c
@@ -141,7 +141,7 @@ SelectPieces(VariantClass v)
 	int p;
 	for(p=0; p<=(int)WhiteKing; p++)
 	   pngPieceBitmaps[i][p] = pngPieceBitmaps2[i][p]; // defaults
-	if(v == VariantShogi) {
+	if(v == VariantShogi && BOARD_HEIGHT != 7) { // no exceptions in Tori Shogi
 	   pngPieceBitmaps[i][(int)WhiteCannon] = pngPieceBitmaps2[i][(int)WhiteTokin];
 	   pngPieceBitmaps[i][(int)WhiteNightrider] = pngPieceBitmaps2[i][(int)WhiteKing+2];
 	   pngPieceBitmaps[i][(int)WhiteGrasshopper] = pngPieceBitmaps2[i][(int)WhiteKing+3];
@@ -239,28 +239,39 @@ static void
 CreatePNGBoard (char *s, int kind)
 {
     float w, h;
-    static float n=1.;
+    static float n[2] = { 1., 1. };
     if(!appData.useBitmaps || s == NULL || *s == 0 || *s == '*') { useTexture &= ~(kind+1); return; }
+    textureW[kind] = 0; // prevents bitmap from being used if not succesfully loaded
     if(strstr(s, ".png")) {
 	cairo_surface_t *img = cairo_image_surface_create_from_png (s);
 	if(img) {
+	    char c, *p = s, *q;
+	    int r, f;
 	    if(pngOriginalBoardBitmap[kind]) cairo_surface_destroy(pngOriginalBoardBitmap[kind]);
-	    if(n != 1.) cairo_surface_destroy(pngBoardBitmap[kind]);
+	    if(n[kind] != 1.) cairo_surface_destroy(pngBoardBitmap[kind]);
 	    useTexture |= kind + 1; pngOriginalBoardBitmap[kind] = img;
 	    w = textureW[kind] = cairo_image_surface_get_width (img);
 	    h = textureH[kind] = cairo_image_surface_get_height (img);
-	    n = 1;
-	    if(w > 256 & h > 256) { // full-board image?
-		while(squareSize*9 > n*w || squareSize*10 > n*h) n++;
+	    n[kind] = 1.;
+	    while((q = strchr(p+1, '-'))) p = q; // find last '-'
+	    if(strlen(p) < 11 && sscanf(p, "-%dx%d.pn%c", &f, &r, &c) == 3 && c == 'g') {
+		if(f == 0 || r == 0) f = BOARD_WIDTH, r = BOARD_HEIGHT; // 0x0 means 'fits any', so make it fit
+		textureW[kind] = (w*BOARD_WIDTH)/f; // sync cutting locations with square pattern
+		textureH[kind] = (h*BOARD_HEIGHT)/r;
+		n[kind] = r*squareSize/h; // scale to make it fit exactly vertically
+	    } else
+	    if((p = strstr(s, "xq")) && (p == s || p[-1] == '/')) { // assume full-board image for Xiangqi
+		while(0.8*squareSize*BOARD_WIDTH > n[kind]*w || 0.8*squareSize*BOARD_HEIGHT > n[kind]*h) n[kind]++;
 	    } else {
-		while(squareSize > n*w || squareSize > n*h) n++;
+		while(squareSize > n[kind]*w || squareSize > n[kind]*h) n[kind]++;
 	    }
-	    if(n == 1.) pngBoardBitmap[kind] = img; else {
+	    if(n[kind] == 1.) pngBoardBitmap[kind] = img; else {
 		// create scaled-up copy of the raw png image when it was too small
-		cairo_surface_t *cs = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, n*w, n*h);
+		cairo_surface_t *cs = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, n[kind]*w, n[kind]*h);
 		cairo_t *cr = cairo_create(cs);
-		pngBoardBitmap[kind] = cs; textureW[kind] *= n; textureH[kind] *= n;
-		cairo_scale(cr, n, n);
+		pngBoardBitmap[kind] = cs; textureW[kind] *= n[kind]; textureH[kind] *= n[kind];
+//		cairo_set_antialias(cr, CAIRO_ANTIALIAS_NONE);
+		cairo_scale(cr, n[kind], n[kind]);
 		cairo_set_source_surface (cr, img, 0, 0);
 		cairo_paint (cr);
 		cairo_destroy (cr);