pngPieceBitmaps[i][(int)WhiteHorned] = pngPieceBitmaps2[i][(int)WhiteUnicorn];
pngPieceBitmaps[i][(int)WhiteStag] = pngPieceBitmaps2[i][(int)WhiteSilver];
pngPieceBitmaps[i][(int)WhiteEagle] = 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];
}
}
}
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", "Crown", "Chancellor", "Hawk", "Lance", "Cobra", "Unicorn", "Lion",
+ "Butterfly", "Zebra", "Camel", "Tower", "Wolf", "Dragon", "Duck", "Axe", "Hat", "Gnu", "Cub",
"GoldPawn", "Claw", "PromoHorse", "PromoDragon", "GoldLance", "PromoSword", "Prince", "Phoenix", "Kylin", "PromoRook", "PromoHSword",
- "Dolphin", "Sword", "Leopard", "HSword", "GoldSilver", "Princess", "HCrown", "Knight", "Elephant", "PromoBishop", "King",
+ "Dolphin", "Sword", "Leopard", "HSword", "GoldSilver", "Princess", "HCrown", "Pegasus", "Elephant", "PromoBishop",
+ "Left", "GoldKnight", "Wizard", "Copper", "Iron", "Viking", "Flag", "Lance", "Right", "LShield", "RShield", "King",
"Claw", "GoldKnight", "GoldLance", "GoldSilver", NULL
};
char *backupPiece[] = { "Princess", NULL, NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, "King", "Queen", "Lion" }; // pieces that map on other when not kanji
RsvgHandle *
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);
if(!pngPieceImages[color][piece]) { // we still did not manage to acquire a piece bitmap
static int warned = 0;
- if(!(svgPieces[color][piece] = LoadSVG(svgDir, color, piece, 0)) && !warned) { // try to fall back on installed svg
+ if(!(svgPieces[color][piece] = LoadSVG(svgDir, color, piece, 0)) // try to fall back on installed svg
+ && !warned && strcmp(pngPieceNames[piece], "Tile")) { // but do not complain about missing 'Tile'
char *msg = _("No default pieces installed!\nSelect your own using '-pieceImageDirectory'.");
- printf("%s\n", msg); // give up
+ printf("%s (%s)\n", msg, pngPieceNames[piece]); // give up
DisplayError(msg, 0);
warned = 1; // prevent error message being repeated for each piece type
}
cairo_t *cr;
int w, h;
- if(!logo || !opt) return;
- img = cairo_image_surface_create_from_png (logo);
- w = cairo_image_surface_get_width (img);
- h = cairo_image_surface_get_height (img);
+ if(!opt) return;
cr = cairo_create(DRAWABLE(opt));
-// cairo_scale(cr, (float)appData.logoSize/w, appData.logoSize/(2.*h));
- cairo_scale(cr, (float)opt->max/w, (float)opt->value/h);
- cairo_set_source_surface (cr, img, 0, 0);
- cairo_paint (cr);
+ cairo_rectangle (cr, 0, 0, opt->max, opt->value);
+ cairo_set_source_rgba(cr, 0.5, 0.5, 0.5, 1.0);
+ cairo_fill(cr); // paint background in case logo does not exist
+ if(logo) {
+ img = cairo_image_surface_create_from_png (logo);
+ if(cairo_surface_status(img) == CAIRO_STATUS_SUCCESS) {
+ w = cairo_image_surface_get_width (img);
+ h = cairo_image_surface_get_height (img);
+// cairo_scale(cr, (float)appData.logoSize/w, appData.logoSize/(2.*h));
+ cairo_scale(cr, (float)opt->max/w, (float)opt->value/h);
+ cairo_set_source_surface (cr, img, 0, 0);
+ cairo_paint (cr);
+ }
+ cairo_surface_destroy (img);
+ }
cairo_destroy (cr);
- cairo_surface_destroy (img);
- GraphExpose(opt, 0, 0, appData.logoSize, appData.logoSize/2);
+ GraphExpose(opt, 0, 0, opt->max, opt->value);
}
static void
int s = 1 - 2*flip;
PangoLayout *layout;
PangoFontDescription *desc;
+ PangoRectangle r;
char fontName[MSG_SIZ];
cr = cairo_create (canvas);
- 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);
+ 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);
projects / xboard.git / blobdiff