Make inscriptions somewhat smaller and non-bold

[xboard.git] / draw.c

diff --git a/draw.c b/draw.c
index a3edf78..fccfeb6 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -57,6 +57,7 @@
 #include <cairo/cairo-xlib.h>
 #include <librsvg/rsvg.h>
 #include <librsvg/rsvg-cairo.h>
+#include <pango/pangocairo.h>
 
 #if STDC_HEADERS
 # include <stdlib.h>
@@ -310,8 +311,15 @@ LoadSVG (char *dir, int color, int piece, int retry)
 
     snprintf(buf, MSG_SIZ, "%s/%s%s.svg", dir, color ? "Black" : "White", name);
 
-    if(svg || *dir && (svg = rsvg_handle_new_from_file(buf, &svgerror))) {
+    if(!svg && *dir) {
+      svg = rsvg_handle_new_from_file(buf, &svgerror);
+      if(!svg && *appData.inscriptions) { // if there is no piece-specific SVG, but we make inscriptions, try general background
+       snprintf(buf, MSG_SIZ, "%s/%sTile.svg", dir, color ? "Black" : "White");
+       svg = rsvg_handle_new_from_file(buf, &svgerror);
+      }
+    }
 
+    if(svg) {
       rsvg_handle_get_dimensions(svg, &svg_dimensions);
       img = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, squareSize,  squareSize);
 
@@ -738,11 +746,38 @@ DrawDot (int marker, int x, int y, int r)
 }
 
 static void
+DrawUnicode (cairo_surface_t *canvas, char *string, int x, int y, char id, int flip)
+{
+//     cairo_text_extents_t te;
+       cairo_t *cr;
+       int s = 1 - 2*flip;
+       PangoLayout *layout;
+       PangoFontDescription *desc;
+       PangoRectangle r;
+       char fontName[MSG_SIZ];
+
+       cr = cairo_create (canvas);
+       layout = pango_cairo_create_layout(cr);
+       pango_layout_set_text(layout, string, -1);
+       snprintf(fontName, MSG_SIZ, "Sans Normal %dpx", 5*squareSize/8);
+       desc = pango_font_description_from_string(fontName);
+       pango_layout_set_font_description(layout, desc);
+       pango_font_description_free(desc);
+        pango_layout_get_pixel_extents(layout, NULL, &r);
+       cairo_translate(cr, x + squareSize/2 - s*r.width/2, y + (8+s)*squareSize/16 - s*r.height/2);
+       if(s < 0) cairo_rotate(cr, G_PI);
+       cairo_set_source_rgb(cr, (id == '+' ? 1.0 : 0.0), 0.0, 0.0);
+       pango_cairo_update_layout(cr, layout);
+       pango_cairo_show_layout(cr, layout);
+       g_object_unref(layout);
+       cairo_destroy(cr);
+}
+
+static void
 DrawText (char *string, int x, int y, int align)
 {
        int xx = x, yy = y;
        cairo_text_extents_t te;
-       cairo_matrix_t m;
        cairo_t *cr;
 
        cr = cairo_create (csBoardWindow);
@@ -753,7 +788,6 @@ DrawText (char *string, int x, int y, int align)
        cairo_set_font_size (cr, align < 0 ? 2*squareSize/3 : squareSize/4);
        // calculate where it goes
        cairo_text_extents (cr, string, &te);
-       cairo_get_font_matrix(cr, &m);
 
        if (align == 1) {
            xx += squareSize - te.width - te.x_bearing - 1;
@@ -765,16 +799,9 @@ DrawText (char *string, int x, int y, int align)
            yy += -te.y_bearing + 3;
        } else if (align == 4) {
            xx += te.x_bearing + 1, yy += -te.y_bearing + 3;
-       } else if (align < 0) {
-           int s = 1;
-           if(align < -2) align += 2, s = -1;
-           xx += squareSize/2 - s*te.width/2 - s + 1, yy += (8+s)*squareSize/16 - s*te.y_bearing/2;
-           m.xx = -m.xx, m.yy = -m.yy;
-           if(s < 0) cairo_set_font_matrix(cr, &m);
        }
 
        cairo_move_to (cr, xx-1, yy);
-       if(align == -2) cairo_set_source_rgb (cr, 1.0, 0.0, 0.0); else
        if(align < 3) cairo_set_source_rgb (cr, 0.0, 0.0, 0.0);
        else          cairo_set_source_rgb (cr, 1.0, 1.0, 1.0);
        cairo_show_text (cr, string);
@@ -782,12 +809,12 @@ DrawText (char *string, int x, int y, int align)
 }
 
 void
-InscribeKanji (ChessSquare piece, int x, int y)
+InscribeKanji (cairo_surface_t *canvas, ChessSquare piece, int x, int y)
 {
     char *p, *q, buf[10];
-    int n, black = 2*(appData.upsideDown && flipView);
+    int n, flip = appData.upsideDown && flipView == (piece < BlackPawn);
     if(piece == EmptySquare) return;
-    if(piece >= BlackPawn) piece = BLACK_TO_WHITE piece, black = 2 - black;
+    if(piece >= BlackPawn) piece = BLACK_TO_WHITE piece;
     p = appData.inscriptions;
     n = piece;
     while(piece > WhitePawn) {
@@ -803,7 +830,7 @@ InscribeKanji (ChessSquare piece, int x, int y)
     strncpy(buf, p, 10);
     for(q=buf; (*++q & 0xC0) == 0x80;);
     *q = NULLCHAR;
-    DrawText(buf, x, y, (n > WhiteLion ? -2 : -1) - black);
+    DrawUnicode(canvas, buf, x, y, PieceToChar(n), flip);
 }
 
 void
@@ -815,7 +842,7 @@ DrawOneSquare (int x, int y, ChessSquare piece, int square_color, int marker, ch
        BlankSquare(csBoardWindow, x, y, square_color, piece, 1);
     } else {
        pngDrawPiece(csBoardWindow, piece, square_color, x, y);
-        if(appData.inscriptions[0]) InscribeKanji(piece, x, y);
+        if(appData.inscriptions[0]) InscribeKanji(csBoardWindow, piece, x, y);
     }
 
     if(align) { // square carries inscription (coord or piece count)
@@ -864,6 +891,7 @@ CairoOverlayPiece (ChessSquare piece, cairo_surface_t *dest)
   if(doubleClick) cairo_paint_with_alpha (pieceSource, 0.6);
   else cairo_paint(pieceSource);
   cairo_destroy (pieceSource);
+  if(appData.inscriptions[0]) InscribeKanji(dest, piece, 0, 0);
 }
 
 void