X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=draw.c;h=193f65ce030f191d833230e55bf3066d81f2f71d;hb=ee187f36388670ebf4e2666c8118d7344d670ed9;hp=da0c4d2ca69bfe74190812cc39164c856523449d;hpb=ac9d48038a86a672579abbcbbc53b17e2515ba13;p=xboard.git

diff --git a/draw.c b/draw.c
index da0c4d2..193f65c 100644
--- a/draw.c
+++ b/draw.c
@@ -78,12 +78,6 @@ extern char *getenv();
 // [HGM] bitmaps: put before incuding the bitmaps / pixmaps, to know how many piece types there are.
 #include "common.h"
 
-#if HAVE_LIBXPM
-#include "pixmaps/pixmaps.h"
-#else
-#include "bitmaps/bitmaps.h"
-#endif
-
 #include "frontend.h"
 #include "backend.h"
 #include "xevalgraph.h"
@@ -117,6 +111,7 @@ cairo_surface_t *csBoardWindow;
 static cairo_surface_t *pngPieceImages[2][(int)BlackPawn+4];   // png 256 x 256 images
 static cairo_surface_t *pngPieceBitmaps[2][(int)BlackPawn];    // scaled pieces as used
 static cairo_surface_t *pngPieceBitmaps2[2][(int)BlackPawn+4]; // scaled pieces in store
+static RsvgHandle *svgPieces[2][(int)BlackPawn+4]; // vector pieces in store
 static cairo_surface_t *pngBoardBitmap[2];
 int useTexture, textureW[2], textureH[2];
 
@@ -225,56 +220,19 @@ char *pngPieceNames[] = // must be in same order as internal piece encoding
   "GoldKnight", "GoldLance", "GoldPawn", "GoldSilver", NULL
 };
 
-cairo_surface_t *
-ConvertPixmap (int color, int piece)
-{
-  int i, j, stride, f, colcode[10], w, b;
-  char ch[10];
-  cairo_surface_t *res;
-  XpmPieces *p = builtInXpms + 10;
-  char **pixels = p->xpm[piece % BlackPawn][2*color];
-  int *buf;
-  sscanf(pixels[0], "%*d %*d %d", &f);
-  sscanf(appData.whitePieceColor+1, "%x", &w);
-  sscanf(appData.blackPieceColor+1, "%x", &b);
-  res = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, p->size, p->size);
-  stride = cairo_image_surface_get_stride(res);
-  buf = (int *) cairo_image_surface_get_data(res);
-  for(i=0; i<f; i++) {
-    ch[i] = pixels[i+1][0];
-    colcode[i] = 0;
-    if(strstr(pixels[i+1], "black")) colcode[i] = 0xFF000000; // 0xFF000000 + (color ? b : 0);
-    if(strstr(pixels[i+1], "white")) colcode[i] = 0xFFFFFFCC; // 0xFF000000 + w;
-  }
-  for(i=0; i<p->size; i++) {
-    for(j=0; j<p->size; j++) {
-      char c = pixels[i+f+1][j];
-      int k;
-      for(k=0; ch[k] != c && k < f; k++);
-      buf[i*p->size + j] = colcode[k];
-    }
-  }
-  cairo_surface_mark_dirty(res);
-  return res;
-}
-
-static void
-ScaleOnePiece (char *name, int color, int piece)
+RsvgHandle *
+LoadSVG (char *dir, int color, int piece)
 {
-  float w, h;
-  char buf[MSG_SIZ];
-  RsvgHandle *svg=NULL;
+    char buf[MSG_SIZ];
+  RsvgHandle *svg=svgPieces[color][piece];
   RsvgDimensionData svg_dimensions;
   GError **svgerror=NULL;
-  cairo_surface_t *img, *cs;
+  cairo_surface_t *img;
   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]);
+    snprintf(buf, MSG_SIZ, "%s/%s%s.svg", dir, color ? "Black" : "White", pngPieceNames[piece]);
 
-    if(svg = rsvg_handle_new_from_file(buf,svgerror)) {
+    if(svg || *dir && (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);
@@ -288,19 +246,41 @@ ScaleOnePiece (char *name, int color, int piece)
       }
       cairo_destroy(cr);
 
-      rsvg_handle_close (svg,NULL);
+      return svg;
     }
+    return NULL;
+}
+
+static void
+ScaleOnePiece (int color, int piece)
+{
+  float w, h;
+  char buf[MSG_SIZ];
+  cairo_surface_t *img, *cs;
+  cairo_t *cr;
+
+  g_type_init ();
+
+  if(!svgPieces[color][piece]) { // try to freshly render cached svg pieces first, to supply the source bitmap
+    svgPieces[color][piece] = LoadSVG("", color, piece); // this fills pngPieceImages if we had cached svg with bitmap of wanted size
   }
 
-  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]);
-      img = cairo_image_surface_create_from_png (buf);
-      if(cairo_surface_status(img) != CAIRO_STATUS_SUCCESS) img = ConvertPixmap(color, piece);
+  if(!pngPieceImages[color][piece]) { // we don't have cached bitmap (implying we did not have cached svg)
+    if(*appData.pieceDirectory) { // user specified piece directory
+      snprintf(buf, MSG_SIZ, "%s/%s%s.png", appData.pieceDirectory, color ? "Black" : "White", pngPieceNames[piece]);
+      pngPieceImages[color][piece] = img = cairo_image_surface_create_from_png (buf); // try if there are png pieces there
+      if(cairo_surface_status(img) != CAIRO_STATUS_SUCCESS) { // there were not
+	svgPieces[color][piece] = LoadSVG(appData.pieceDirectory, color, piece); // so try if he has svg there
+      }
     }
   }
-  pngPieceImages[color][piece] = img;
 
+  if(!pngPieceImages[color][piece]) { // we still did not manage to acquire a piece bitmap
+    if(!(svgPieces[color][piece] = LoadSVG(appData.svgDirectory, color, piece))) // try to fall back on installed svg
+      DisplayError(_("No default pieces installed\nSelect your own -pieceImageDirectory"), 0); // give up
+  }
+
+  img = pngPieceImages[color][piece];
 
   // create new bitmap to hold scaled piece image (and remove any old)
   if(pngPieceBitmaps2[color][piece]) cairo_surface_destroy (pngPieceBitmaps2[color][piece]);
@@ -316,7 +296,7 @@ ScaleOnePiece (char *name, int color, int piece)
   cairo_paint (cr);
   cairo_destroy (cr);
 
-  { // operate on bitmap to color it (king-size hack...)
+  if(!appData.trueColors || !*appData.pieceDirectory && !appData.svgDirectory) { // 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);
     int i, j, p;
@@ -331,6 +311,11 @@ ScaleOnePiece (char *name, int color, int piece)
 	buf[i*stride + j] = c & 0xFF000000; // alpha channel is kept at same opacity
 	buf[i*stride + j] += ((int)(f*(p&0xFF0000)) & 0xFF0000) + ((int)(f*(p&0xFF00)) & 0xFF00) + (int)(f*(p&0xFF)); // add desired fraction of new color
 	if(color) buf[i*stride + j] += r | r << 8 | r << 16; // details on black pieces get their weight added in pure white
+	if(appData.monoMode) {
+	    if(a < 64) buf[i*stride + j] = 0; // if not opaque enough, totally transparent
+	    else if(2*r < a) buf[i*stride + j] = 0xFF000000; // if not light enough, totally black
+            else buf[i*stride + j] = 0xFFFFFFFF; // otherwise white
+	}
     }
     cairo_surface_mark_dirty(cs);
   }
@@ -342,8 +327,8 @@ CreatePNGPieces ()
   int p;
 
   for(p=0; pngPieceNames[p]; p++) {
-    ScaleOnePiece(pngPieceNames[p], 0, p);
-    ScaleOnePiece(pngPieceNames[p], 1, p);
+    ScaleOnePiece(0, p);
+    ScaleOnePiece(1, p);
   }
 }
 
@@ -364,6 +349,8 @@ InitDrawingParams (int reloadPieces)
     for(i=0; i<2; i++) for(p=0; p<BlackPawn+4; p++) {
 	if(pngPieceImages[i][p]) cairo_surface_destroy(pngPieceImages[i][p]);
 	pngPieceImages[i][p] = NULL;
+	if(svgPieces[i][p]) rsvg_handle_close(svgPieces[i][p], NULL);
+	svgPieces[i][p] = NULL;
     }
     CreateAnyPieces();
 }
@@ -502,6 +489,7 @@ DrawGrid()
 {
   /* draws a grid starting around Nx, Ny squares starting at x,y */
   int i;
+  float odd = (lineGap & 1)/2.;
   cairo_t *cr;
 
   /* get a cairo_t */
@@ -513,8 +501,8 @@ DrawGrid()
   /* lines in X */
   for (i = 0; i < BOARD_WIDTH + BOARD_HEIGHT + 2; i++)
     {
-      cairo_move_to (cr, gridSegments[i].x1, gridSegments[i].y1);
-      cairo_line_to (cr, gridSegments[i].x2, gridSegments[i].y2);
+      cairo_move_to (cr, gridSegments[i].x1 + odd, gridSegments[i].y1 + odd);
+      cairo_line_to (cr, gridSegments[i].x2 + odd, gridSegments[i].y2 + odd);
       cairo_stroke (cr);
     }
 
@@ -525,7 +513,7 @@ DrawGrid()
 }
 
 void
-DrawBorder (int x, int y, int type)
+DrawBorder (int x, int y, int type, int odd)
 {
     cairo_t *cr;
     char *col;
@@ -537,11 +525,11 @@ DrawBorder (int x, int y, int type)
     }
     cr = cairo_create(csBoardWindow);
     cairo_set_antialias(cr, CAIRO_ANTIALIAS_NONE);
-    cairo_rectangle(cr, x, y, squareSize+lineGap, squareSize+lineGap);
+    cairo_rectangle(cr, x+odd/2., y+odd/2., squareSize+lineGap, squareSize+lineGap);
     SetPen(cr, lineGap, col, 0);
     cairo_stroke(cr);
     cairo_destroy(cr);
-    GraphExpose(currBoard, x - lineGap/2, y - lineGap/2, squareSize+2*lineGap, squareSize+2*lineGap);
+    GraphExpose(currBoard, x - lineGap/2, y - lineGap/2, squareSize+2*lineGap+odd, squareSize+2*lineGap+odd);
 }
 
 static int
@@ -604,7 +592,8 @@ BlankSquare (cairo_surface_t *dest, int x, int y, int color, ChessSquare piece,
 	  case 2: col = "#000000"; break;
 	}
 	SetPen(cr, 2.0, col, 0);
-	cairo_rectangle (cr, x, y, squareSize, squareSize);
+	cairo_rectangle (cr, fac*x, fac*y, squareSize, squareSize);
+	cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE);
 	cairo_fill (cr);
 	cairo_destroy (cr);
     }
@@ -653,6 +642,7 @@ void
 DrawDot (int marker, int x, int y, int r)
 { // used for atomic captures; no need to draw on backup
   DoDrawDot(csBoardWindow, marker, x, y, r);
+  GraphExpose(currBoard, x-r, y-r, 2*r, 2*r);
 }
 
 void