static cairo_surface_t *pngPieceBitmaps[2][(int)BlackPawn]; // scaled pieces as used
static cairo_surface_t *pngPieceBitmaps2[2][(int)BlackPawn+4]; // scaled pieces in store
static RsvgHandle *svgPieces[2][(int)BlackPawn+4]; // vector pieces in store
-static cairo_surface_t *pngBoardBitmap[2];
+static cairo_surface_t *pngBoardBitmap[2], *pngOriginalBoardBitmap[2];
int useTexture, textureW[2], textureH[2];
#define pieceToSolid(piece) &pieceBitmap[SOLID][(piece) % (int)BlackPawn]
#define White(piece) ((int)(piece) < (int)BlackPawn)
+char svgDir[MSG_SIZ] = SVGDIR;
+
char *crWhite = "#FFFFB0";
char *crBlack = "#AD5D3D";
int p;
for(p=0; p<=(int)WhiteKing; p++)
pngPieceBitmaps[i][p] = pngPieceBitmaps2[i][p]; // defaults
- if(v == VariantShogi) {
+ if(v == VariantShogi && BOARD_HEIGHT != 7) { // no exceptions in Tori Shogi
pngPieceBitmaps[i][(int)WhiteCannon] = pngPieceBitmaps2[i][(int)WhiteTokin];
pngPieceBitmaps[i][(int)WhiteNightrider] = pngPieceBitmaps2[i][(int)WhiteKing+2];
pngPieceBitmaps[i][(int)WhiteGrasshopper] = pngPieceBitmaps2[i][(int)WhiteKing+3];
if(boardSize == -2 && gameInfo.variant != oldVariant
&& oldNrOfFiles && oldNrOfFiles != BOARD_WIDTH) { // called because variant switch changed board format
- squareSize = ((squareSize + lineGap) * oldNrOfFiles + 0.5*BOARD_WIDTH) / BOARD_WIDTH - lineGap; // keep total width fixed
+ squareSize = ((squareSize + lineGap) * oldNrOfFiles + 0.5*BOARD_WIDTH) / BOARD_WIDTH; // keep total width fixed
+ if(appData.overrideLineGap < 0) lineGap = squareSize < 37 ? 1 : squareSize < 59 ? 2 : squareSize < 116 ? 3 : 4;
+ squareSize -= lineGap;
CreatePNGPieces();
CreateGrid();
}
oldWidth = boardWidth; oldHeight = boardHeight;
CreateGrid();
+ CreateAnyPieces(0); // redo texture scaling
/*
* Inhibit shell resizing.
static void
CreatePNGBoard (char *s, int kind)
{
+ 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) {
- useTexture |= kind + 1; pngBoardBitmap[kind] = img;
- textureW[kind] = cairo_image_surface_get_width (img);
- textureH[kind] = cairo_image_surface_get_height (img);
+ char c, *p = s, *q;
+ int r, f;
+ if(pngOriginalBoardBitmap[kind]) cairo_surface_destroy(pngOriginalBoardBitmap[kind]);
+ if(n[kind] != 1.) cairo_surface_destroy(pngBoardBitmap[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);
+ n[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
+ } else
+ if((p = strstr(s, "xq")) && (p == s || p[-1] == '/')) { // assume full-board image for Xiangqi
+ while(0.8*squareSize*BOARD_WIDTH > n[kind]*w || 0.8*squareSize*BOARD_HEIGHT > n[kind]*h) n[kind]++;
+ } else {
+ while(squareSize > n[kind]*w || squareSize > n[kind]*h) n[kind]++;
+ }
+ if(n[kind] == 1.) pngBoardBitmap[kind] = img; else {
+ // create scaled-up copy of the raw png image when it was too small
+ cairo_surface_t *cs = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, n[kind]*w, n[kind]*h);
+ cairo_t *cr = cairo_create(cs);
+ pngBoardBitmap[kind] = cs; textureW[kind] *= n[kind]; textureH[kind] *= n[kind];
+// cairo_set_antialias(cr, CAIRO_ANTIALIAS_NONE);
+ cairo_scale(cr, n[kind], n[kind]);
+ cairo_set_source_surface (cr, img, 0, 0);
+ cairo_paint (cr);
+ cairo_destroy (cr);
+ }
}
}
}
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)) && !warned) { // try to fall back on installed svg
char *msg = _("No default pieces installed!\nSelect your own using '-pieceImageDirectory'.");
printf("%s\n", msg); // give up
DisplayError(msg, 0);
}
void
-CreateAnyPieces ()
+CreateAnyPieces (int p)
{ // [HGM] taken out of main
- CreatePNGPieces();
+ if(p) CreatePNGPieces();
CreatePNGBoard(appData.liteBackTextureFile, 1);
CreatePNGBoard(appData.darkBackTextureFile, 0);
}
if(svgPieces[i][p]) rsvg_handle_close(svgPieces[i][p], NULL);
svgPieces[i][p] = NULL;
}
- CreateAnyPieces();
+ CreateAnyPieces(1);
}
// [HGM] seekgraph: some low-level drawing routines (by JC, mostly)
CAIRO_FONT_SLANT_NORMAL,
CAIRO_FONT_WEIGHT_BOLD);
- cairo_set_font_size (cr, squareSize/4);
+ cairo_set_font_size (cr, align < 0 ? 2*squareSize/3 : squareSize/4);
// calculate where it goes
cairo_text_extents (cr, string, &te);
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);
}
void
+InscribeKanji (ChessSquare piece, int x, int y)
+{
+ char *p, *q, buf[10];
+ int n;
+ if(piece == EmptySquare) return;
+ if(piece >= BlackPawn) piece = BLACK_TO_WHITE piece;
+ p = appData.inscriptions;
+ n = piece;
+ while(piece > WhitePawn) {
+ if(*p++ == NULLCHAR) {
+ if(n != WhiteKing) return;
+ p = q;
+ break;
+ }
+ q = p - 1;
+ while((*p & 0xC0) == 0x80) p++; // skip UTF-8 continuation bytes
+ piece--;
+ }
+ strncpy(buf, p, 10);
+ for(q=buf; (*++q & 0xC0) == 0x80;);
+ *q = NULLCHAR;
+ DrawText(buf, x, y, n > WhiteLion ? -2 : -1);
+}
+
+void
DrawOneSquare (int x, int y, ChessSquare piece, int square_color, int marker, char *tString, char *bString, int align)
{ // basic front-end board-draw function: takes care of everything that can be in square:
// piece, background, coordinate/count, marker dot
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(align) { // square carries inscription (coord or piece count)