* 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:
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];
}
}
}
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", "Crown", "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
};
{
int xx = x, yy = y;
cairo_text_extents_t te;
+ cairo_matrix_t m;
cairo_t *cr;
cr = cairo_create (csBoardWindow);
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;
} 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;
+ 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);
InscribeKanji (ChessSquare piece, int x, int y)
{
char *p, *q, buf[10];
- int n;
+ int n, black = 2*(appData.upsideDown && flipView);
if(piece == EmptySquare) return;
- if(piece >= BlackPawn) piece = BLACK_TO_WHITE piece;
+ if(piece >= BlackPawn) piece = BLACK_TO_WHITE piece, black = 2 - black;
p = appData.inscriptions;
n = piece;
while(piece > WhitePawn) {
strncpy(buf, p, 10);
for(q=buf; (*++q & 0xC0) == 0x80;);
*q = NULLCHAR;
- DrawText(buf, x, y, n > WhiteLion ? -2 : -1);
+ DrawText(buf, x, y, (PieceToChar(n) == '+' ? -2 : -1) - black);
}
void