* Massachusetts.
*
* Enhancements Copyright 1992-2001, 2002, 2003, 2004, 2005, 2006,
- * 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Free Software Foundation, Inc.
+ * 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Free
+ * Software Foundation, Inc.
*
* The following terms apply to Digital Equipment Corporation's copyright
* interest in XBoard:
static cairo_surface_t *pngPieceImages[2][(int)BlackPawn]; // png 256 x 256 images
static cairo_surface_t *pngPieceBitmaps[2][(int)BlackPawn]; // scaled pieces as used
static cairo_surface_t *pngPieceBitmaps2[2][(int)BlackPawn]; // scaled pieces in store
-static RsvgHandle *svgPieces[2][(int)BlackPawn+4]; // vector pieces in store
+static RsvgHandle *svgPieces[2][(int)BlackPawn]; // vector pieces in store
static cairo_surface_t *pngBoardBitmap[2], *pngOriginalBoardBitmap[2];
int useTexture, textureW[2], textureH[2];
SwitchWindow (int main)
{
currBoard = (main ? &mainOptions[W_BOARD] : &dualOptions[3]);
- csBoardWindow = DRAWABLE(currBoard);
+// CsBoardWindow = DRAWABLE(currBoard);
}
+
+static void
+NewCanvas (Option *graph)
+{
+ cairo_t *cr;
+ int w = graph->max, h = graph->value;
+ if(graph->choice) cairo_surface_destroy((cairo_surface_t *) graph->choice);
+ graph->choice = (char**) cairo_image_surface_create (CAIRO_FORMAT_ARGB32, w, h);
+ // paint white, to prevent weirdness when people maximize window and drag pieces over space next to board
+ cr = cairo_create ((cairo_surface_t *) graph->choice);
+ cairo_rectangle (cr, 0, 0, w, h);
+ cairo_set_source_rgba(cr, 1.0, 1.0, 1.0, 1.0);
+ cairo_fill(cr);
+ cairo_destroy (cr);
+ graph->min &= ~REPLACE;
+}
+
+static cairo_surface_t *
+CsBoardWindow (Option *opt)
+{ // test before every draw event if we need to resize the canvas
+ if(opt->min & REPLACE) NewCanvas(opt);
+ return DRAWABLE(opt);
+}
+
+
void
SelectPieces(VariantClass v)
{
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];
- }
}
}
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();
+ CreatePNGPieces(appData.pieceDirectory);
CreateGrid();
}
oldNrOfFiles = BOARD_WIDTH;
cairo_destroy(cr);
}
+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);
- n[kind] = 1.;
+ 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
while(0.8*squareSize*BOARD_WIDTH > n[kind]*w || 0.8*squareSize*BOARD_HEIGHT > n[kind]*h) n[kind]++;
if(!svg && *dir) {
svg = rsvg_handle_new_from_file(buf, &svgerror);
+ if(!svg) { // failed! If -pid name starts with "sub_" we try to load the piece from the parent directory
+ char *p = buf, *q;
+ safeStrCpy(buf, dir, MSG_SIZ);
+ while((q = strchr(p, '/'))) p = q + 1;
+ if(!strncmp(p, "sub_", 4)) {
+ if(p == buf) safeStrCpy(buf, ".", MSG_SIZ); else p[-1] = NULLCHAR; // strip last directory off path
+ return LoadSVG(buf, color, piece, retry);
+ }
+ }
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);
}
static void
-ScaleOnePiece (int color, int piece)
+ScaleOnePiece (int color, int piece, char *pieceDir)
{
float w, h;
char buf[MSG_SIZ];
svgPieces[color][piece] = LoadSVG("", color, piece, 0); // this fills pngPieceImages if we had cached svg with bitmap of wanted size
if(!pngPieceImages[color][piece]) { // we don't have cached bitmap (implying we did not have cached svg)
- if(*appData.pieceDirectory) { // user specified piece directory
- snprintf(buf, MSG_SIZ, "%s/%s%s.png", appData.pieceDirectory, color ? "Black" : "White", pngPieceNames[piece]);
+ if(*pieceDir) { // user specified piece directory
+ snprintf(buf, MSG_SIZ, "%s/%s%s.png", pieceDir, color ? "Black" : "White", pngPieceNames[piece]);
img = cairo_image_surface_create_from_png (buf); // try if there are png pieces there
if(cairo_surface_status(img) != CAIRO_STATUS_SUCCESS) { // there were not
- svgPieces[color][piece] = LoadSVG(appData.pieceDirectory, color, piece, 0); // so try if he has svg there
+ svgPieces[color][piece] = LoadSVG(pieceDir, color, piece, 0); // so try if he has svg there
} else pngPieceImages[color][piece] = img;
}
}
cairo_paint (cr);
cairo_destroy (cr);
- if(!appData.trueColors || !*appData.pieceDirectory) { // operate on bitmap to color it (king-size hack...)
+ if(!appData.trueColors || !*pieceDir) { // operate on bitmap to color it (king-size hack...)
int stride = cairo_image_surface_get_stride(cs)/4;
int *buf = (int *) cairo_image_surface_get_data(cs);
int i, j, p;
}
void
-CreatePNGPieces ()
+CreatePNGPieces (char *pieceDir)
{
int p;
-
for(p=0; pngPieceNames[p]; p++) {
- ScaleOnePiece(0, p);
- ScaleOnePiece(1, p);
+ ScaleOnePiece(0, p, pieceDir);
+ ScaleOnePiece(1, p, pieceDir);
}
SelectPieces(gameInfo.variant);
}
void
CreateAnyPieces (int p)
{ // [HGM] taken out of main
- if(p) CreatePNGPieces();
+ if(p) CreatePNGPieces(appData.pieceDirectory);
CreatePNGBoard(appData.liteBackTextureFile, 1);
CreatePNGBoard(appData.darkBackTextureFile, 0);
}
-void
-InitDrawingParams (int reloadPieces)
+static void
+ClearPieces ()
{
int i, p;
- if(reloadPieces)
- for(i=0; i<2; i++) for(p=0; p<BlackPawn+4; p++) {
+ for(i=0; i<2; i++) for(p=0; p<BlackPawn; p++) {
if(pngPieceImages[i][p]) cairo_surface_destroy(pngPieceImages[i][p]);
pngPieceImages[i][p] = NULL;
if(svgPieces[i][p]) rsvg_handle_close(svgPieces[i][p], NULL);
svgPieces[i][p] = NULL;
}
+}
+
+void
+InitDrawingParams (int reloadPieces)
+{
+ if(reloadPieces) ClearPieces();
CreateAnyPieces(1);
}
+void
+Preview (int n, char *s)
+{
+ static Boolean changed[4];
+ changed[n] = TRUE;
+ switch(n) {
+ case 0: // restore true setting
+ if(changed[3]) ClearPieces();
+ CreateAnyPieces(changed[3]); // recomputes textures and (optionally) pieces
+ for(n=0; n<4; n++) changed[n] = FALSE;
+ break;
+ case 1:
+ case 2:
+ CreatePNGBoard(s, n-1);
+ break;
+ case 3:
+ ClearPieces();
+ CreatePNGPieces(s);
+ break;
+ }
+ DrawPosition(TRUE, NULL);
+}
+
// [HGM] seekgraph: some low-level drawing routines (by JC, mostly)
float
cairo_t *cr;
/* get a cairo_t */
- cr = cairo_create (csBoardWindow);
+ cr = cairo_create (CsBoardWindow(currBoard));
cairo_move_to (cr, x, y);
cairo_line_to(cr, xTo, yTo );
void DrawSeekBackground( int left, int top, int right, int bottom )
{
- cairo_t *cr = cairo_create (csBoardWindow);
+ cairo_t *cr = cairo_create (CsBoardWindow(currBoard));
cairo_rectangle (cr, left, top, right-left, bottom-top);
void DrawSeekText(char *buf, int x, int y)
{
- cairo_t *cr = cairo_create (csBoardWindow);
+ cairo_t *cr = cairo_create (CsBoardWindow(currBoard));
cairo_select_font_face (cr, "Sans",
CAIRO_FONT_SLANT_NORMAL,
void DrawSeekDot(int x, int y, int colorNr)
{
- cairo_t *cr = cairo_create (csBoardWindow);
+ cairo_t *cr = cairo_create (CsBoardWindow(currBoard));
int square = colorNr & 0x80;
colorNr &= 0x7F;
void
InitDrawingHandle (Option *opt)
{
- csBoardWindow = DRAWABLE(opt);
+// CsBoardWindow = DRAWABLE(opt);
+ currBoard = opt;
}
void
cairo_t *cr;
/* get a cairo_t */
- cr = cairo_create (csBoardWindow);
+ cr = cairo_create (CsBoardWindow(currBoard));
cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE);
SetPen(cr, lineGap, "#000000", 0);
case 2: col = appData.premoveHighlightColor; break;
default: col = "#808080"; break; // cannot happen
}
- cr = cairo_create(csBoardWindow);
+ cr = cairo_create(CsBoardWindow(currBoard));
cairo_set_antialias(cr, CAIRO_ANTIALIAS_NONE);
cairo_rectangle(cr, x+odd/2., y+odd/2., squareSize+lineGap, squareSize+lineGap);
SetPen(cr, lineGap, col, 0);
cairo_stroke(cr);
cairo_destroy(cr);
- GraphExpose(currBoard, x - lineGap/2, y - lineGap/2, squareSize+2*lineGap+odd, squareSize+2*lineGap+odd);
+// GraphExpose(currBoard, x - lineGap/2, y - lineGap/2, squareSize+2*lineGap+odd, squareSize+2*lineGap+odd);
}
static int
int nx = x/(squareSize + lineGap), ny = y/(squareSize + lineGap);
*x0 = 0; *y0 = 0;
if(textureW[kind] < squareSize || textureH[kind] < squareSize) return 0;
+ if(modV[kind] > 0) nx %= modH[kind], ny %= modV[kind]; // tile fixed-format board periodically to extend it
if(textureW[kind] < W*squareSize)
*x0 = (textureW[kind] - squareSize) * nx/(W-1);
else
int w, h;
if(!opt) return;
- cr = cairo_create(DRAWABLE(opt));
+ cr = cairo_create(CsBoardWindow(opt));
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
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);
void
DrawDot (int marker, int x, int y, int r)
{ // used for atomic captures; no need to draw on backup
- DoDrawDot(csBoardWindow, marker, x, y, r);
+ DoDrawDot(CsBoardWindow(currBoard), marker, x, y, r);
GraphExpose(currBoard, x-r, y-r, 2*r, 2*r);
}
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);
cairo_destroy(cr);
}
-static void
+void
DrawText (char *string, int x, int y, int align)
{
int xx = x, yy = y;
cairo_text_extents_t te;
cairo_t *cr;
- cr = cairo_create (csBoardWindow);
+ cr = cairo_create (CsBoardWindow(currBoard));
cairo_select_font_face (cr, "Sans",
CAIRO_FONT_SLANT_NORMAL,
CAIRO_FONT_WEIGHT_BOLD);
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
// piece, background, coordinate/count, marker dot
if (piece == EmptySquare) {
- BlankSquare(csBoardWindow, x, y, square_color, piece, 1);
+ BlankSquare(CsBoardWindow(currBoard), x, y, square_color, piece, 1);
} else {
- pngDrawPiece(csBoardWindow, piece, square_color, x, y);
- if(appData.inscriptions[0]) InscribeKanji(csBoardWindow, piece, x, y);
+ pngDrawPiece(CsBoardWindow(currBoard), piece, square_color, x, y);
+ if(appData.inscriptions[0]) InscribeKanji(CsBoardWindow(currBoard), piece, x, y);
}
if(align) { // square carries inscription (coord or piece count)
}
if(marker) { // print fat marker dot, if requested
- DoDrawDot(csBoardWindow, marker, x + squareSize/4, y+squareSize/4, squareSize/2);
+ DoDrawDot(CsBoardWindow(currBoard), marker, x + squareSize/4, y+squareSize/4, squareSize/2);
}
}
{
if(c_animBufs[anr]) cairo_surface_destroy (c_animBufs[anr]);
if(c_animBufs[anr+2]) cairo_surface_destroy (c_animBufs[anr+2]);
- c_animBufs[anr+4] = csBoardWindow;
+ c_animBufs[anr+4] = CsBoardWindow(currBoard);
c_animBufs[anr+2] = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, squareSize, squareSize);
c_animBufs[anr] = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, squareSize, squareSize);
}
int srcX, int srcY, int width, int height, int destX, int destY)
{
cairo_t *cr;
- c_animBufs[anr+4] = csBoardWindow;
+ c_animBufs[anr+4] = CsBoardWindow(currBoard);
cr = cairo_create (c_animBufs[anr+destBuf]);
cairo_set_source_surface (cr, c_animBufs[anr+srcBuf], destX - srcX, destY - srcY);
cairo_rectangle (cr, destX, destY, width, height);
cairo_fill (cr);
cairo_destroy (cr);
- if(c_animBufs[anr+destBuf] == csBoardWindow) // suspect that GTK needs this!
+ if(c_animBufs[anr+destBuf] == CsBoardWindow(currBoard)) // suspect that GTK needs this!
GraphExpose(currBoard, destX, destY, width, height);
}
void
DrawPolygon (Pnt arrow[], int nr)
{
- DoDrawPolygon(csBoardWindow, arrow, nr);
+ DoDrawPolygon(CsBoardWindow(currBoard), arrow, nr);
// if(!dual) DoDrawPolygon(csBoardBackup, arrow, nr);
}
static int curX, curY;
if(penType != PEN_NONE) {
- cairo_t *cr = cairo_create(DRAWABLE(disp));
+ cairo_t *cr = cairo_create(CsBoardWindow(disp));
cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE);
cairo_move_to (cr, curX, curY);
cairo_line_to (cr, x,y);
{
cairo_t *cr;
- cr = cairo_create (DRAWABLE(disp));
+ cr = cairo_create (CsBoardWindow(disp));
cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE);
cairo_rectangle (cr, left, top, right-left, bottom-top);
switch(side)
{
// the magic constants 8 and 5 should really be derived from the font size somehow
cairo_text_extents_t extents;
- cairo_t *cr = cairo_create(DRAWABLE(disp));
+ cairo_t *cr = cairo_create(CsBoardWindow(disp));
/* GTK-TODO this has to go into the font-selection */
cairo_select_font_face (cr, "Sans",
projects / xboard.git / blobdiff