Always render svg pieces anew on size change

[xboard.git] / draw.c

diff --git a/draw.c b/draw.c
index 3807516..da0c4d2 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -55,6 +55,8 @@
 #include <math.h>
 #include <cairo/cairo.h>
 #include <cairo/cairo-xlib.h>
+#include <librsvg/rsvg.h>
+#include <librsvg/rsvg-cairo.h>
 
 #if STDC_HEADERS
 # include <stdlib.h>
@@ -261,9 +263,35 @@ ScaleOnePiece (char *name, int color, int piece)
 {
   float w, h;
   char buf[MSG_SIZ];
+  RsvgHandle *svg=NULL;
+  RsvgDimensionData svg_dimensions;
+  GError **svgerror=NULL;
   cairo_surface_t *img, *cs;
   cairo_t *cr;
 
+  g_type_init ();
+
+  if(*appData.svgDirectory) { // try to freshly render svg pieces first, always from file, to supply the source bitmap
+    snprintf(buf, MSG_SIZ, "%s/%s%s.svg", appData.svgDirectory, color ? "Black" : "White", pngPieceNames[piece]);
+
+    if(svg = rsvg_handle_new_from_file(buf,svgerror)) {
+
+      rsvg_handle_get_dimensions(svg, &svg_dimensions);
+      img = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, squareSize,  squareSize);
+
+      cr = cairo_create(img);
+      cairo_scale(cr, squareSize/(double) svg_dimensions.width, squareSize/(double) svg_dimensions.height);
+      rsvg_handle_render_cairo(svg, cr);
+      if(cairo_surface_status(img) == CAIRO_STATUS_SUCCESS) {
+        if(pngPieceImages[color][piece]) cairo_surface_destroy(pngPieceImages[color][piece]);
+        pngPieceImages[color][piece] = img;
+      }
+      cairo_destroy(cr);
+
+      rsvg_handle_close (svg,NULL);
+    }
+  }
+
   if((img = pngPieceImages[color][piece]) == NULL) { // if PNG file for this piece was not yet read, read it now and store it
     if(!*appData.pngDirectory) img = ConvertPixmap(color, piece); else {
       snprintf(buf, MSG_SIZ, "%s/%s%s.png", appData.pngDirectory, color ? "Black" : "White", pngPieceNames[piece]);
@@ -272,10 +300,13 @@ ScaleOnePiece (char *name, int color, int piece)
     }
   }
   pngPieceImages[color][piece] = img;
+
+
   // create new bitmap to hold scaled piece image (and remove any old)
   if(pngPieceBitmaps2[color][piece]) cairo_surface_destroy (pngPieceBitmaps2[color][piece]);
   pngPieceBitmaps2[color][piece] = cs = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, squareSize, squareSize);
   if(piece <= WhiteKing) pngPieceBitmaps[color][piece] = cs;
+
   // scaled copying of the raw png image
   cr = cairo_create(cs);
   w = cairo_image_surface_get_width (img);
@@ -284,6 +315,7 @@ ScaleOnePiece (char *name, int color, int piece)
   cairo_set_source_surface (cr, img, 0, 0);
   cairo_paint (cr);
   cairo_destroy (cr);
+
   { // operate on bitmap to color it (king-size hack...)
     int stride = cairo_image_surface_get_stride(cs)/4;
     int *buf = (int *) cairo_image_surface_get_data(cs);