X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=draw.c;h=a3a9cb1c5768da77411fe22b1427b77b89bcacae;hb=fa1ce90bbcd27d332afebd9ecbd4e0ed662c4940;hp=0b63833dc81260648a87bd5b7bc054009bf7cdd0;hpb=ef69c417ccc6498ba0c13591b4deaa34a9a76ba1;p=xboard.git diff --git a/draw.c b/draw.c index 0b63833..a3a9cb1 100644 --- a/draw.c +++ b/draw.c @@ -5,7 +5,7 @@ * Massachusetts. * * Enhancements Copyright 1992-2001, 2002, 2003, 2004, 2005, 2006, - * 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. + * 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc. * * The following terms apply to Digital Equipment Corporation's copyright * interest in XBoard: @@ -55,6 +55,8 @@ #include #include #include +#include +#include #if STDC_HEADERS # include @@ -72,23 +74,13 @@ extern char *getenv(); #include #endif - -// [HGM] bitmaps: put before incuding the bitmaps / pixmaps, to know how many piece types there are. #include "common.h" -#if HAVE_LIBXPM -#include "pixmaps/pixmaps.h" -#else -#include "bitmaps/bitmaps.h" -#endif - -#include "frontend.h" #include "backend.h" -#include "xboard.h" -#include "xevalgraph.h" #include "board.h" #include "menus.h" #include "dialogs.h" +#include "evalgraph.h" #include "gettext.h" #include "draw.h" @@ -111,9 +103,12 @@ extern char *getenv(); #define SOLID 0 #define OUTLINE 1 Boolean cairoAnimate; -static cairo_surface_t *csBoardWindow, *csBoardBackup, *csDualBoard; +Option *currBoard; +cairo_surface_t *csBoardWindow; +static cairo_surface_t *pngPieceImages[2][(int)BlackPawn+4]; // 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+4]; // scaled pieces in store +static RsvgHandle *svgPieces[2][(int)BlackPawn+4]; // vector pieces in store static cairo_surface_t *pngBoardBitmap[2]; int useTexture, textureW[2], textureH[2]; @@ -122,30 +117,50 @@ int useTexture, textureW[2], textureH[2]; #define White(piece) ((int)(piece) < (int)BlackPawn) +char *crWhite = "#FFFFB0"; +char *crBlack = "#AD5D3D"; + struct { int x1, x2, y1, y2; } gridSegments[BOARD_RANKS + BOARD_FILES + 2]; void -SwitchWindow () -{ - cairo_surface_t *cstmp = csBoardWindow; - csBoardWindow = csDualBoard; - if(!csDualBoard && cstmp) { - int boardWidth = lineGap + BOARD_WIDTH * (squareSize + lineGap); - int boardHeight = lineGap + BOARD_HEIGHT * (squareSize + lineGap); - csBoardWindow = cairo_xlib_surface_create(xDisplay, xBoardWindow, DefaultVisual(xDisplay, 0), boardWidth, boardHeight); - } +SwitchWindow (int main) +{ + currBoard = (main ? &mainOptions[W_BOARD] : &dualOptions[3]); + csBoardWindow = DRAWABLE(currBoard); } void -NewSurfaces () +SelectPieces(VariantClass v) { - // delete surfaces after size becomes invalid, so they will be recreated - if(csBoardWindow) cairo_surface_destroy(csBoardWindow); - if(csBoardBackup) cairo_surface_destroy(csBoardBackup); - if(csDualBoard) cairo_surface_destroy(csDualBoard); - csBoardWindow = csBoardBackup = csDualBoard = NULL; + int i; + for(i=0; i<2; i++) { + int p; + for(p=0; p<=(int)WhiteKing; p++) + pngPieceBitmaps[i][p] = pngPieceBitmaps2[i][p]; // defaults + if(v == VariantShogi) { + pngPieceBitmaps[i][(int)WhiteCannon] = pngPieceBitmaps2[i][(int)WhiteKing+1]; + pngPieceBitmaps[i][(int)WhiteNightrider] = pngPieceBitmaps2[i][(int)WhiteKing+2]; + pngPieceBitmaps[i][(int)WhiteSilver] = pngPieceBitmaps2[i][(int)WhiteKing+3]; + pngPieceBitmaps[i][(int)WhiteGrasshopper] = pngPieceBitmaps2[i][(int)WhiteKing+4]; + pngPieceBitmaps[i][(int)WhiteQueen] = pngPieceBitmaps2[i][(int)WhiteLance]; + } +#ifdef GOTHIC + if(v == VariantGothic) { + pngPieceBitmaps[i][(int)WhiteMarshall] = pngPieceBitmaps2[i][(int)WhiteSilver]; + } +#endif + if(v == VariantSChess) { + pngPieceBitmaps[i][(int)WhiteAngel] = pngPieceBitmaps2[i][(int)WhiteFalcon]; + pngPieceBitmaps[i][(int)WhiteMarshall] = pngPieceBitmaps2[i][(int)WhiteAlfil]; + } + if(v == VariantChu) { + pngPieceBitmaps[i][(int)WhiteUnicorn] = pngPieceBitmaps2[i][(int)WhiteCat]; + pngPieceBitmaps[i][(int)WhiteSilver] = pngPieceBitmaps2[i][(int)WhiteSword]; + pngPieceBitmaps[i][(int)WhiteFalcon] = pngPieceBitmaps2[i][(int)WhiteDagger]; + } + } } #define BoardSize int @@ -153,12 +168,11 @@ void InitDrawingSizes (BoardSize boardSize, int flags) { // [HGM] resize is functional now, but for board format changes only (nr of ranks, files) int boardWidth, boardHeight; - int i; - static Dimension oldWidth, oldHeight; + static int oldWidth, oldHeight; static VariantClass oldVariant; - static int oldMono = -1, oldTwoBoards = 0; + static int oldTwoBoards = 0; - if(!formWidget) return; + if(!mainOptions[W_BOARD].handle) return; if(oldTwoBoards && !twoBoards) PopDown(DummyDlg); oldTwoBoards = twoBoards; @@ -171,12 +185,11 @@ InitDrawingSizes (BoardSize boardSize, int flags) oldWidth = boardWidth; oldHeight = boardHeight; CreateGrid(); - NewSurfaces(); /* * Inhibit shell resizing. */ - ResizeBoardWindow(boardWidth, boardHeight, !cairoAnimate); + ResizeBoardWindow(boardWidth, boardHeight, 0); DelayedDrag(); } @@ -186,32 +199,22 @@ InitDrawingSizes (BoardSize boardSize, int flags) if(gameInfo.variant != oldVariant) { // and only if variant changed - for(i=0; i<2; i++) { - int p; - for(p=0; p<=(int)WhiteKing; p++) - pngPieceBitmaps[i][p] = pngPieceBitmaps2[i][p]; // defaults - if(gameInfo.variant == VariantShogi) { - pngPieceBitmaps[i][(int)WhiteCannon] = pngPieceBitmaps2[i][(int)WhiteKing+1]; - pngPieceBitmaps[i][(int)WhiteNightrider] = pngPieceBitmaps2[i][(int)WhiteKing+2]; - pngPieceBitmaps[i][(int)WhiteSilver] = pngPieceBitmaps2[i][(int)WhiteKing+3]; - pngPieceBitmaps[i][(int)WhiteGrasshopper] = pngPieceBitmaps2[i][(int)WhiteKing+4]; - pngPieceBitmaps[i][(int)WhiteQueen] = pngPieceBitmaps2[i][(int)WhiteLance]; - } -#ifdef GOTHIC - if(gameInfo.variant == VariantGothic) { - pngPieceBitmaps[i][(int)WhiteMarshall] = pngPieceBitmaps2[i][(int)WhiteSilver]; - } -#endif - if(gameInfo.variant == VariantSChess) { - pngPieceBitmaps[i][(int)WhiteAngel] = pngPieceBitmaps2[i][(int)WhiteFalcon]; - pngPieceBitmaps[i][(int)WhiteMarshall] = pngPieceBitmaps2[i][(int)WhiteAlfil]; - } - } - oldMono = -10; // kludge to force recreation of animation masks + SelectPieces(gameInfo.variant); + oldVariant = gameInfo.variant; } CreateAnimVars(); - oldMono = appData.monoMode; +} + +void +ExposeRedraw (Option *graph, int x, int y, int w, int h) +{ // copy a selected part of the buffer bitmap to the display + cairo_t *cr = cairo_create((cairo_surface_t *) graph->textValue); + cairo_set_source_surface(cr, (cairo_surface_t *) graph->choice, 0, 0); + cairo_set_antialias(cr, CAIRO_ANTIALIAS_NONE); + cairo_rectangle(cr, x, y, w, h); + cairo_fill(cr); + cairo_destroy(cr); } static void @@ -229,37 +232,118 @@ CreatePNGBoard (char *s, int kind) } 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", "King", +{ "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", "King", "Queen", "Lion", "PromoRook", "PromoHSword", + "Dolphin", "Chancellor", "Unicorn", "Hawk", "Sword", "Princess", "HCrown", "Knight", "Elephant", "PromoBishop", "King", "GoldKnight", "GoldLance", "GoldPawn", "GoldSilver", NULL }; +RsvgHandle * +LoadSVG (char *dir, int color, int piece) +{ + char buf[MSG_SIZ]; + RsvgHandle *svg=svgPieces[color][piece]; + RsvgDimensionData svg_dimensions; + GError *svgerror=NULL; + cairo_surface_t *img; + cairo_t *cr; + + snprintf(buf, MSG_SIZ, "%s/%s%s.svg", dir, color ? "Black" : "White", pngPieceNames[piece]); + + if(svg || *dir && (svg = rsvg_handle_new_from_file(buf, &svgerror))) { + + rsvg_handle_get_dimensions(svg, &svg_dimensions); + img = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, squareSize, squareSize); + + cr = cairo_create(img); + cairo_scale(cr, squareSize/(double) svg_dimensions.width, squareSize/(double) svg_dimensions.height); + rsvg_handle_render_cairo(svg, cr); + if(cairo_surface_status(img) == CAIRO_STATUS_SUCCESS) { + if(pngPieceImages[color][piece]) cairo_surface_destroy(pngPieceImages[color][piece]); + pngPieceImages[color][piece] = img; + } + cairo_destroy(cr); + + return svg; + } + if(svgerror) + g_error_free(svgerror); + return NULL; +} + static void -ScaleOnePiece (char *name, int color, int piece) +ScaleOnePiece (int color, int piece) { - int w, h; + float w, h; char buf[MSG_SIZ]; cairo_surface_t *img, *cs; cairo_t *cr; - static cairo_surface_t *pngPieceImages[2][(int)BlackPawn+4]; // png 256 x 256 images - if((img = pngPieceImages[color][piece]) == NULL) { // if PNG file for this piece was not yet read, read it now and store it - snprintf(buf, MSG_SIZ, "%s/%s%s.png", appData.pngDirectory, color ? "Black" : "White", pngPieceNames[piece]); - pngPieceImages[color][piece] = img = cairo_image_surface_create_from_png (buf); - w = cairo_image_surface_get_width (img); - h = cairo_image_surface_get_height (img); - if(w != 64 || h != 64) { printf("Bad png size %dx%d in %s\n", w, h, buf); exit(1); } + g_type_init (); + + svgPieces[color][piece] = LoadSVG("", color, piece); // 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]); + 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); // so try if he has svg there + } else pngPieceImages[color][piece] = img; + } + } + + 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)) && !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); + warned = 1; // prevent error message being repeated for each piece type + } } + + img = pngPieceImages[color][piece]; + // create new bitmap to hold scaled piece image (and remove any old) if(pngPieceBitmaps2[color][piece]) cairo_surface_destroy (pngPieceBitmaps2[color][piece]); pngPieceBitmaps2[color][piece] = cs = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, squareSize, squareSize); - if(piece <= WhiteKing) pngPieceBitmaps[color][piece] = cs; + + if(!img) return; + // scaled copying of the raw png image cr = cairo_create(cs); - cairo_scale(cr, squareSize/64., squareSize/64.); + w = cairo_image_surface_get_width (img); + h = cairo_image_surface_get_height (img); + cairo_scale(cr, squareSize/w, squareSize/h); cairo_set_source_surface (cr, img, 0, 0); cairo_paint (cr); cairo_destroy (cr); + + if(!appData.trueColors || !*appData.pieceDirectory) { // 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; + sscanf(color ? appData.blackPieceColor+1 : appData.whitePieceColor+1, "%x", &p); // replacement color + cairo_surface_flush(cs); + for(i=0; i> 24; r = c >> 16 & 255; // alpha and red, where red is the 'white' weight, since white is #FFFFCC in the source images + f = (color ? a - r : r)/255.; // fraction of black or white in the mix that has to be replaced + buf[i*stride + j] = c & 0xFF000000; // alpha channel is kept at same opacity + buf[i*stride + j] += ((int)(f*(p&0xFF0000)) & 0xFF0000) + ((int)(f*(p&0xFF00)) & 0xFF00) + (int)(f*(p&0xFF)); // add desired fraction of new color + if(color) buf[i*stride + j] += r | r << 8 | r << 16; // details on black pieces get their weight added in pure white + if(appData.monoMode) { + if(a < 64) buf[i*stride + j] = 0; // if not opaque enough, totally transparent + else if(2*r < a) buf[i*stride + j] = 0xFF000000; // if not light enough, totally black + else buf[i*stride + j] = 0xFFFFFFFF; // otherwise white + } + } + cairo_surface_mark_dirty(cs); + } } void @@ -268,28 +352,31 @@ CreatePNGPieces () int p; for(p=0; pngPieceNames[p]; p++) { - ScaleOnePiece(pngPieceNames[p], 0, p); - ScaleOnePiece(pngPieceNames[p], 1, p); + ScaleOnePiece(0, p); + ScaleOnePiece(1, p); } + SelectPieces(gameInfo.variant); } -int +void CreateAnyPieces () { // [HGM] taken out of main - if (appData.pngDirectory[0] != NULLCHAR) { - CreatePNGPieces(); - } + CreatePNGPieces(); CreatePNGBoard(appData.liteBackTextureFile, 1); CreatePNGBoard(appData.darkBackTextureFile, 0); - cairoAnimate = *appData.pngDirectory && useTexture == 3 - && strstr(appData.liteBackTextureFile, ".png") && strstr(appData.darkBackTextureFile, ".png"); - return cairoAnimate; } void -InitDrawingParams () -{ - MakeColors(); +InitDrawingParams (int reloadPieces) +{ + int i, p; + if(reloadPieces) + for(i=0; i<2; i++) for(p=0; pmax/w, (float)opt->value/h); cairo_set_source_surface (cr, img, 0, 0); cairo_paint (cr); cairo_destroy (cr); cairo_surface_destroy (img); - cairo_surface_destroy (cs); + GraphExpose(opt, 0, 0, appData.logoSize, appData.logoSize/2); } static void -BlankSquare (int x, int y, int color, ChessSquare piece, cairo_surface_t *dest, int fac) +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; cairo_t *cr; - DrawSeekOpen(); - cr = cairo_create (fac ? csBoardWindow : dest); + 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); @@ -543,39 +612,26 @@ BlankSquare (int x, int y, int color, ChessSquare piece, cairo_surface_t *dest, cairo_rectangle (cr, x*fac, y*fac, squareSize, squareSize); cairo_fill (cr); cairo_destroy (cr); - if(fac) { - cr = cairo_create (csBoardBackup); - 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 - char *col; + char *col = NULL; switch (color) { case 0: col = appData.darkSquareColor; break; case 1: col = appData.lightSquareColor; break; case 2: col = "#000000"; break; + default: col = "#808080"; break; // cannot happen } SetPen(cr, 2.0, col, 0); - cairo_rectangle (cr, x, y, squareSize, squareSize); - cairo_fill (cr); - cairo_destroy (cr); - if(fac) { - cr = cairo_create (csBoardBackup); - SetPen(cr, 2.0, col, 0); - cairo_rectangle (cr, x, y, squareSize, squareSize); + cairo_rectangle (cr, fac*x, fac*y, squareSize, squareSize); + cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE); cairo_fill (cr); cairo_destroy (cr); - } } } static void -pngDrawPiece (ChessSquare piece, int square_color, int x, int y, cairo_surface_t *dest) +pngDrawPiece (cairo_surface_t *dest, ChessSquare piece, int square_color, int x, int y) { - int kind, p = piece; + int kind; cairo_t *cr; if ((int)piece < (int) BlackPawn) { @@ -584,24 +640,21 @@ pngDrawPiece (ChessSquare piece, int square_color, int x, int y, cairo_surface_t kind = 1; piece -= BlackPawn; } - if(appData.upsideDown && flipView) { p += p < BlackPawn ? BlackPawn : -BlackPawn; }// swap white and black pieces - BlankSquare(x, y, square_color, piece, dest, 1); // erase previous contents with background - DrawSeekOpen(); - cr = cairo_create (csBoardWindow); - cairo_set_source_surface (cr, pngPieceBitmaps[kind][piece], x, y); - cairo_paint(cr); - cairo_destroy (cr); - cr = cairo_create (csBoardBackup); + 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); cairo_set_source_surface (cr, pngPieceBitmaps[kind][piece], x, y); cairo_paint(cr); cairo_destroy (cr); } +static char *markerColor[8] = { "#FFFF00", "#FF0000", "#00FF00", "#0000FF", "#00FFFF", "#FF00FF", "#FFFFFF", "#000000" }; + void -DoDrawDot (int marker, int x, int y, int r, cairo_surface_t *cs) +DoDrawDot (cairo_surface_t *cs, int marker, int x, int y, int r) { cairo_t *cr; - DrawSeekOpen(); + cr = cairo_create(cs); cairo_arc(cr, x+r/2, y+r/2, r/2, 0.0, 2*M_PI); if(appData.monoMode) { @@ -609,80 +662,73 @@ DoDrawDot (int marker, int x, int y, int r, cairo_surface_t *cs) cairo_stroke_preserve(cr); SetPen(cr, 2, marker == 2 ? "#FFFFFF" : "#000000", 0); } else { - SetPen(cr, 2, marker == 2 ? "#FF0000" : "#FFFF00", 0); + SetPen(cr, 2, markerColor[marker-1], 0); } cairo_fill(cr); - cairo_stroke(cr); cairo_destroy(cr); } void DrawDot (int marker, int x, int y, int r) -{ - DoDrawDot(marker, x, y, r, csBoardWindow); - DoDrawDot(marker, x, y, r, csBoardBackup); +{ // used for atomic captures; no need to draw on backup + DoDrawDot(csBoardWindow, marker, x, y, r); + GraphExpose(currBoard, x-r, y-r, 2*r, 2*r); } -void -DrawOneSquare (int x, int y, ChessSquare piece, int square_color, int marker, char *string, int align) -{ // basic front-end board-draw function: takes care of everything that can be in square: - // piece, background, coordinate/count, marker dot - int direction, font_ascent, font_descent; - XCharStruct overall; - cairo_t *cr; - - if (piece == EmptySquare) { - BlankSquare(x, y, square_color, piece, csBoardWindow, 1); - } else { - pngDrawPiece(piece, square_color, x, y, csBoardWindow); - } - - if(align) { // square carries inscription (coord or piece count) +static void +DrawText (char *string, int x, int y, int align) +{ int xx = x, yy = y; - // first calculate where it goes - XTextExtents(countFontStruct, string, 1, &direction, - &font_ascent, &font_descent, &overall); - if (align == 1) { - xx += squareSize - overall.width - 2; - yy += squareSize - font_descent - 1; - } else if (align == 2) { - xx += 2, yy += font_ascent + 1; - } else if (align == 3) { - xx += squareSize - overall.width - 2; - yy += font_ascent + 1; - } else if (align == 4) { - xx += 2, yy += font_ascent + 1; - } + cairo_text_extents_t te; + cairo_t *cr; + cr = cairo_create (csBoardWindow); cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_BOLD); cairo_set_font_size (cr, squareSize/4); + // calculate where it goes + cairo_text_extents (cr, string, &te); + + if (align == 1) { + xx += squareSize - te.width - te.x_bearing - 1; + yy += squareSize - te.height - te.y_bearing - 1; + } else if (align == 2) { + xx += te.x_bearing + 1, yy += -te.y_bearing + 1; + } else if (align == 3) { + xx += squareSize - te.width -te.x_bearing - 1; + yy += -te.y_bearing + 3; + } else if (align == 4) { + xx += te.x_bearing + 1, yy += -te.y_bearing + 3; + } cairo_move_to (cr, xx-1, yy); 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); cairo_destroy (cr); +} - cr = cairo_create (csBoardBackup); - cairo_select_font_face (cr, "Sans", - CAIRO_FONT_SLANT_NORMAL, - CAIRO_FONT_WEIGHT_BOLD); +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 - cairo_set_font_size (cr, squareSize/4); + if (piece == EmptySquare) { + BlankSquare(csBoardWindow, x, y, square_color, piece, 1); + } else { + pngDrawPiece(csBoardWindow, piece, square_color, x, y); + } - cairo_move_to (cr, xx-1, yy); - 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); - cairo_destroy (cr); + if(align) { // square carries inscription (coord or piece count) + if(align > 1) DrawText(tString, x, y, align); // top (rank or count) + if(bString && *bString) DrawText(bString, x, y, 1); // bottom (always lower right file ID) } if(marker) { // print fat marker dot, if requested - DrawDot(marker, x + squareSize/4, y+squareSize/4, squareSize/2); + DoDrawDot(csBoardWindow, marker, x + squareSize/4, y+squareSize/4, squareSize/2); } } @@ -699,7 +745,6 @@ static cairo_surface_t *c_animBufs[3*NrOfAnims]; // newBuf, saveBuf static void InitAnimState (AnimNr anr) { - DrawSeekOpen(); // set cs to board widget 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; @@ -734,28 +779,21 @@ InsertPiece (AnimNr anr, ChessSquare piece) void DrawBlank (AnimNr anr, int x, int y, int startColor) { - BlankSquare(x, y, startColor, EmptySquare, c_animBufs[anr+2], 0); + BlankSquare(c_animBufs[anr+2], x, y, startColor, EmptySquare, 0); } void CopyRectangle (AnimNr anr, int srcBuf, int destBuf, int srcX, int srcY, int width, int height, int destX, int destY) { - cairo_t *cr;// = cairo_create (c_animBufs[anr+destBuf]); + cairo_t *cr; + c_animBufs[anr+4] = csBoardWindow; cr = cairo_create (c_animBufs[anr+destBuf]); - if(c_animBufs[anr+srcBuf] == csBoardWindow) - cairo_set_source_surface (cr, csBoardBackup, destX - srcX, destY - srcY); - else - 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) { - cr = cairo_create (csBoardBackup); // also draw to backup 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! + GraphExpose(currBoard, destX, destY, width, height); } void @@ -791,7 +829,108 @@ void DrawPolygon (Pnt arrow[], int nr) { DoDrawPolygon(csBoardWindow, arrow, nr); - DoDrawPolygon(csBoardBackup, arrow, nr); +// if(!dual) DoDrawPolygon(csBoardBackup, arrow, nr); } +//-------------------- Eval Graph drawing routines (formerly in xevalgraph.h) -------------------- + +static void +ChoosePen(cairo_t *cr, int i) +{ + switch(i) { + case PEN_BLACK: + SetPen(cr, 1.0, "#000000", 0); + break; + case PEN_DOTTED: + SetPen(cr, 1.0, "#A0A0A0", 1); + break; + case PEN_BLUEDOTTED: + SetPen(cr, 1.0, "#0000FF", 1); + break; + case PEN_BOLDWHITE: + SetPen(cr, 3.0, crWhite, 0); + break; + case PEN_BOLDBLACK: + SetPen(cr, 3.0, crBlack, 0); + break; + case PEN_BACKGD: + SetPen(cr, 3.0, "#E0E0F0", 0); + break; + } +} + +// [HGM] front-end, added as wrapper to avoid use of LineTo and MoveToEx in other routines (so they can be back-end) +void +DrawSegment (int x, int y, int *lastX, int *lastY, int penType) +{ + static int curX, curY; + + if(penType != PEN_NONE) { + cairo_t *cr = cairo_create(DRAWABLE(disp)); + cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE); + cairo_move_to (cr, curX, curY); + cairo_line_to (cr, x,y); + ChoosePen(cr, penType); + cairo_stroke (cr); + cairo_destroy (cr); + } + + if(lastX != NULL) { *lastX = curX; *lastY = curY; } + curX = x; curY = y; +} +// front-end wrapper for drawing functions to do rectangles +void +DrawRectangle (int left, int top, int right, int bottom, int side, int style) +{ + cairo_t *cr; + + cr = cairo_create (DRAWABLE(disp)); + cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE); + cairo_rectangle (cr, left, top, right-left, bottom-top); + switch(side) + { + case 0: ChoosePen(cr, PEN_BOLDWHITE); break; + case 1: ChoosePen(cr, PEN_BOLDBLACK); break; + case 2: ChoosePen(cr, PEN_BACKGD); break; + } + cairo_fill (cr); + + if(style != FILLED) + { + cairo_rectangle (cr, left, top, right-left-1, bottom-top-1); + ChoosePen(cr, PEN_BLACK); + cairo_stroke (cr); + } + + cairo_destroy(cr); +} + +// front-end wrapper for putting text in graph +void +DrawEvalText (char *buf, int cbBuf, int y) +{ + // 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)); + + /* GTK-TODO this has to go into the font-selection */ + cairo_select_font_face (cr, "Sans", + CAIRO_FONT_SLANT_NORMAL, + CAIRO_FONT_WEIGHT_NORMAL); + cairo_set_font_size (cr, 12.0); + + + cairo_text_extents (cr, buf, &extents); + + cairo_move_to (cr, MarginX - 2 - 8*cbBuf, y+5); + cairo_text_path (cr, buf); + cairo_set_source_rgb (cr, 0.0, 0.0, 0); + cairo_fill_preserve (cr); + cairo_set_source_rgb (cr, 0, 1.0, 0); + cairo_set_line_width (cr, 0.1); + cairo_stroke (cr); + + /* free memory */ + cairo_destroy (cr); +}