Take account of glyph size when positioning inscriptions

[xboard.git] / draw.c

diff --git a/draw.c b/draw.c
index 3cf3fb2..40a4393 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -739,24 +739,26 @@ DrawDot (int marker, int x, int y, int r)
 }
 
 static void
-DrawUnicode (char *string, int x, int y, char id, int flip)
+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 (csBoardWindow);
-       cairo_translate(cr, x + s*squareSize/6 + (1-s)*squareSize/2, y + s*squareSize/5 + (1-s)*squareSize/2);
-       if(s < 0) cairo_rotate(cr, G_PI);
+       cr = cairo_create (canvas);
        layout = pango_cairo_create_layout(cr);
        pango_layout_set_text(layout, string, -1);
        snprintf(fontName, MSG_SIZ, "Sans Bold %dpx", 2*squareSize/3);
        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);
@@ -800,7 +802,7 @@ 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, flip = appData.upsideDown && flipView == (piece < BlackPawn);
@@ -821,7 +823,7 @@ InscribeKanji (ChessSquare piece, int x, int y)
     strncpy(buf, p, 10);
     for(q=buf; (*++q & 0xC0) == 0x80;);
     *q = NULLCHAR;
-    DrawUnicode(buf, x, y, PieceToChar(n), flip);
+    DrawUnicode(canvas, buf, x, y, PieceToChar(n), flip);
 }
 
 void
@@ -833,7 +835,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)
@@ -882,6 +884,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