if(v == VariantChuChess) {
pngPieceBitmaps[i][(int)WhiteNightrider] = pngPieceBitmaps2[i][(int)WhiteLion];
}
- if(v == VariantChu) {
- pngPieceBitmaps[i][(int)WhiteNightrider] = pngPieceBitmaps2[i][(int)WhiteClaw];
- pngPieceBitmaps[i][(int)WhiteClaw] = pngPieceBitmaps2[i][(int)WhiteNightrider];
- 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)WhiteCat] = pngPieceBitmaps2[i][(int)WhiteUnicorn];
- pngPieceBitmaps[i][(int)WhiteSword] = pngPieceBitmaps2[i][(int)WhiteSilver];
- pngPieceBitmaps[i][(int)WhiteDagger] = pngPieceBitmaps2[i][(int)WhiteFalcon];
- pngPieceBitmaps[i][(int)WhiteMan] = pngPieceBitmaps2[i][(int)WhiteCopper];
- pngPieceBitmaps[i][(int)WhiteCopper] = pngPieceBitmaps2[i][(int)WhiteMan];
- pngPieceBitmaps[i][(int)WhiteAxe] = pngPieceBitmaps2[i][(int)WhiteCannon];
- pngPieceBitmaps[i][(int)WhiteCannon] = pngPieceBitmaps2[i][(int)WhiteAxe];
- }
}
}
cairo_destroy(cr);
}
-static int modV[2], modH[2];
+static int modV[2], modH[2], transparency[2];
static void
CreatePNGBoard (char *s, int kind)
useTexture |= kind + 1; pngOriginalBoardBitmap[kind] = img;
w = textureW[kind] = cairo_image_surface_get_width (img);
h = textureH[kind] = cairo_image_surface_get_height (img);
+ transparency[kind] = cairo_image_surface_get_format (img) == CAIRO_FORMAT_ARGB32;
n[kind] = 1.; modV[kind] = modH[kind] = -1;
while((q = strchr(p+1, '-'))) p = q; // find last '-'
if(strlen(p) < 11 && sscanf(p, "-%dx%d.pn%c", &f, &r, &c) == 3 && c == 'g') {
if(f == 0 || r == 0) f = BOARD_WIDTH, r = BOARD_HEIGHT; // 0x0 means 'fits any', so make it fit
textureW[kind] = (w*BOARD_WIDTH)/f; // sync cutting locations with square pattern
textureH[kind] = (h*BOARD_HEIGHT)/r;
- n[kind] = r*squareSize/h; // scale to make it fit exactly vertically
+ n[kind] = (r*squareSize + 0.99)/h; // scale to make it fit exactly vertically
modV[kind] = r; modH[kind] = f;
} else
if((p = strstr(s, "xq")) && (p == s || p[-1] == '/')) { // assume full-board image for Xiangqi
static void
BlankSquare (cairo_surface_t *dest, int x, int y, int color, ChessSquare piece, int fac)
{ // [HGM] extra param 'fac' for forcing destination to (0,0) for copying to animation buffer
- int x0, y0;
+ int x0, y0, texture = (useTexture & color+1) && CutOutSquare(x, y, &x0, &y0, color);
cairo_t *cr;
cr = cairo_create (dest);
- if ((useTexture & color+1) && CutOutSquare(x, y, &x0, &y0, color)) {
- cairo_set_source_surface (cr, pngBoardBitmap[color], x*fac - x0, y*fac - y0);
- cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE);
- cairo_rectangle (cr, x*fac, y*fac, squareSize, squareSize);
- cairo_fill (cr);
- cairo_destroy (cr);
- } else { // evenly colored squares
+ if(!texture || transparency[color]) // draw color also (as background) when texture could be transparent
+ { // evenly colored squares
char *col = NULL;
switch (color) {
case 0: col = appData.darkSquareColor; break;
cairo_rectangle (cr, fac*x, fac*y, squareSize, squareSize);
cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE);
cairo_fill (cr);
- cairo_destroy (cr);
}
+ if (texture) {
+ cairo_set_source_surface (cr, pngBoardBitmap[color], x*fac - x0, y*fac - y0);
+ cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE);
+ cairo_rectangle (cr, x*fac, y*fac, squareSize, squareSize);
+ cairo_fill (cr);
+ }
+ cairo_destroy (cr);
}
static void
kind = 1;
piece -= BlackPawn;
}
+ if(piece == WhiteKing && kind == appData.jewelled) piece = WhiteZebra;
if(appData.upsideDown && flipView) kind = 1 - kind; // swap white and black pieces
BlankSquare(dest, x, y, square_color, piece, 1); // erase previous contents with background
cr = cairo_create (dest);
}
static void
-DrawUnicode (cairo_surface_t *canvas, 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, int size, int vpos)
{
// cairo_text_extents_t te;
cairo_t *cr;
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);
+ snprintf(fontName, MSG_SIZ, "Sans Normal %dpx", size*squareSize/64);
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);
+ cairo_translate(cr, x + squareSize/2 - s*r.width/2, y + (32+vpos*s)*squareSize/64 - 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);
void
InscribeKanji (cairo_surface_t *canvas, ChessSquare piece, int x, int y)
{
- char *p, *q, buf[10];
- int n, flip = appData.upsideDown && flipView == (piece < BlackPawn);
+ char *p, *q, buf[20], nr = 1;
+ int i, n, size = 40, flip = appData.upsideDown && flipView == (piece < BlackPawn);
if(piece == EmptySquare) return;
if(piece >= BlackPawn) piece = BLACK_TO_WHITE piece;
p = appData.inscriptions;
- n = piece;
+ if(*p > '0' && *p < '3') nr = *p++ - '0'; // nr of kanji per piece
+ n = piece; i = 0;
while(piece > WhitePawn) {
+ if(*p == '/') p++, piece = n - WhitePBishop; // secondary series
if(*p++ == NULLCHAR) {
if(n != WhiteKing) return;
p = q;
}
q = p - 1;
while((*p & 0xC0) == 0x80) p++; // skip UTF-8 continuation bytes
- piece--;
+ if(*q != '.' && ++i < nr) continue; // yet more kanji for the current piece
+ piece--; i = 0;
}
- strncpy(buf, p, 10);
- for(q=buf; (*++q & 0xC0) == 0x80;);
+ strncpy(buf, p, 20);
+ for(q=buf; (*++q & 0xC0) == 0x80;); // skip first unicode
+ if(nr > 1) {
+ p = q;
+ while((*++p & 0xC0) == 0x80) {} // skip second unicode
+ *p = NULLCHAR; size = 30; i = 16;
+ DrawUnicode(canvas, q, x, y, PieceToChar(n), flip, size, -10);
+ } else i = 4;
*q = NULLCHAR;
- DrawUnicode(canvas, buf, x, y, PieceToChar(n), flip);
+ DrawUnicode(canvas, buf, x, y, PieceToChar(n), flip, size, i);
}
void
projects / xboard.git / blobdiff