* Massachusetts.
*
* Enhancements Copyright 1992-2001, 2002, 2003, 2004, 2005, 2006,
- * 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
+ * 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Free Software Foundation, Inc.
*
* The following terms apply to Digital Equipment Corporation's copyright
* interest in XBoard:
#include <cairo/cairo-xlib.h>
#include <librsvg/rsvg.h>
#include <librsvg/rsvg-cairo.h>
+#include <pango/pangocairo.h>
#if STDC_HEADERS
# include <stdlib.h>
pngPieceBitmaps[i][(int)WhiteNightrider] = pngPieceBitmaps2[i][(int)WhiteLion];
}
if(v == VariantChu) {
- pngPieceBitmaps[i][(int)WhiteNightrider] = pngPieceBitmaps2[i][(int)WhiteKing+1];
- pngPieceBitmaps[i][(int)WhiteUnicorn] = pngPieceBitmaps2[i][(int)WhiteCat];
- pngPieceBitmaps[i][(int)WhiteSilver] = pngPieceBitmaps2[i][(int)WhiteSword];
- pngPieceBitmaps[i][(int)WhiteFalcon] = pngPieceBitmaps2[i][(int)WhiteDagger];
+ pngPieceBitmaps[i][(int)WhiteNightrider] = pngPieceBitmaps2[i][(int)WhiteClaw];
+ pngPieceBitmaps[i][(int)WhiteClaw] = pngPieceBitmaps2[i][(int)WhiteNightrider];
+ pngPieceBitmaps[i][(int)WhiteUnicorn] = pngPieceBitmaps2[i][(int)WhiteHorned];
+ pngPieceBitmaps[i][(int)WhiteSilver] = pngPieceBitmaps2[i][(int)WhiteStag];
+ pngPieceBitmaps[i][(int)WhiteFalcon] = pngPieceBitmaps2[i][(int)WhiteEagle];
+ pngPieceBitmaps[i][(int)WhiteHorned] = pngPieceBitmaps2[i][(int)WhiteUnicorn];
+ pngPieceBitmaps[i][(int)WhiteStag] = pngPieceBitmaps2[i][(int)WhiteSilver];
+ pngPieceBitmaps[i][(int)WhiteEagle] = pngPieceBitmaps2[i][(int)WhiteFalcon];
}
}
}
float w, h;
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 *pngPieceNames[] = // must be in same order as internal piece encoding
{ "Pawn", "Knight", "Bishop", "Rook", "Queen", "Advisor", "Elephant", "Archbishop", "Marshall", "Gold", "Commoner",
- "Canon", "Nightrider", "CrownedBishop", "CrownedRook", "Princess", "Chancellor", "Hawk", "Lance", "Cobra", "Unicorn", "Lion",
- "GoldPawn", "HSword", "PromoHorse", "PromoDragon", "Leopard", "PromoSword", "Prince", "Phoenix", "Kylin", "PromoRook", "PromoHSword",
- "Dolphin", "Chancellor", "Unicorn", "Hawk", "Sword", "Princess", "HCrown", "Knight", "Elephant", "PromoBishop", "King",
+ "Canon", "Nightrider", "CrownedBishop", "CrownedRook", "Crown", "Chancellor", "Hawk", "Lance", "Cobra", "Unicorn", "Lion",
+ "GoldPawn", "Claw", "PromoHorse", "PromoDragon", "GoldLance", "PromoSword", "Prince", "Phoenix", "Kylin", "PromoRook", "PromoHSword",
+ "Dolphin", "Sword", "Leopard", "HSword", "GoldSilver", "Princess", "HCrown", "Knight", "Elephant", "PromoBishop", "King",
"Claw", "GoldKnight", "GoldLance", "GoldSilver", NULL
};
-char *backupPiece[] = { "King", "Queen", "Lion" }; // pieces that map on other when not kanji
+char *backupPiece[] = { "Princess", NULL, NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL, NULL, "King", "Queen", "Lion" }; // pieces that map on other when not kanji
RsvgHandle *
LoadSVG (char *dir, int color, int piece, int retry)
GError *svgerror=NULL;
cairo_surface_t *img;
cairo_t *cr;
+ char *name = (retry ? backupPiece[piece - WhiteGrasshopper] : pngPieceNames[piece]);
- snprintf(buf, MSG_SIZ, "%s/%s%s.svg", dir, color ? "Black" : "White",
- retry ? backupPiece[piece - WhiteMonarch] : pngPieceNames[piece]);
+ if(!name) return NULL;
+
+ snprintf(buf, MSG_SIZ, "%s/%s%s.svg", dir, color ? "Black" : "White", name);
if(svg || *dir && (svg = rsvg_handle_new_from_file(buf, &svgerror))) {
return svg;
}
- if(!retry && piece >= WhiteMonarch && piece <= WhiteNothing) // pieces that are only different in kanji sets
+ if(!retry && piece >= WhiteGrasshopper && piece <= WhiteNothing) // pieces that are only different in kanji sets
return LoadSVG(dir, color, piece, 1);
if(svgerror)
g_error_free(svgerror);
}
static void
+DrawUnicode (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;
+ 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);
+ 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);
+ 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;
yy += -te.y_bearing + 3;
} else if (align == 4) {
xx += te.x_bearing + 1, yy += -te.y_bearing + 3;
- } else if (align < 0) {
- xx += squareSize/2 - te.width/2, yy += 9*squareSize/16 - te.y_bearing/2;
}
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);
InscribeKanji (ChessSquare piece, int x, int y)
{
char *p, *q, buf[10];
- int n;
+ int n, flip = appData.upsideDown && flipView == (piece < BlackPawn);
if(piece == EmptySquare) return;
if(piece >= BlackPawn) piece = BLACK_TO_WHITE piece;
p = appData.inscriptions;
strncpy(buf, p, 10);
for(q=buf; (*++q & 0xC0) == 0x80;);
*q = NULLCHAR;
- DrawText(buf, x, y, n > WhiteLion ? -2 : -1);
+ DrawUnicode(buf, x, y, PieceToChar(n), flip);
}
void