X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=draw.c;h=a306abaac0c2f26730c701da181a3196c9f5aea1;hb=c37d45adc7d98a702a7459ccdc0ac23df01a476e;hp=45a332c626ec3403390ec3535222e1bcfb88810d;hpb=4ca3b41e1ccb5ebfade606202c2084f8e9328978;p=xboard.git diff --git a/draw.c b/draw.c index 45a332c..a306aba 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, 2014 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,22 +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 "xevalgraph.h" #include "board.h" #include "menus.h" #include "dialogs.h" +#include "evalgraph.h" #include "gettext.h" #include "draw.h" @@ -110,10 +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,34 +117,45 @@ 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]; -static int dual = 0; - void -SwitchWindow () -{ - cairo_surface_t *cstmp = csBoardWindow; - csBoardWindow = csDualBoard; - dual = !dual; - if(!csDualBoard) { - csBoardWindow = GetOutputSurface(&dualOptions[3], 0, 0); - dual = 1; - } - csDualBoard = cstmp; +SwitchWindow (int main) +{ + currBoard = (main ? &mainOptions[W_BOARD] : &dualOptions[3]); + csBoardWindow = DRAWABLE(currBoard); } void -NewSurfaces () +SelectPieces(VariantClass v) { -return; - // 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]; + } + } } #define BoardSize int @@ -157,13 +163,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 int oldWidth, oldHeight; static VariantClass oldVariant; - static int oldMono = -1, oldTwoBoards = 0; - extern Widget formWidget; + static int oldTwoBoards = 0; - if(!formWidget) return; + if(!mainOptions[W_BOARD].handle) return; if(oldTwoBoards && !twoBoards) PopDown(DummyDlg); oldTwoBoards = twoBoards; @@ -176,7 +180,6 @@ InitDrawingSizes (BoardSize boardSize, int flags) oldWidth = boardWidth; oldHeight = boardHeight; CreateGrid(); - NewSurfaces(); /* * Inhibit shell resizing. @@ -191,32 +194,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 @@ -234,64 +227,84 @@ 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", "King", "GoldKnight", "GoldLance", "GoldPawn", "GoldSilver", NULL }; -cairo_surface_t * -ConvertPixmap (int color, int piece) -{ - int i, j, stride, f, colcode[10], w, b; - char ch[10]; - cairo_surface_t *res; - XpmPieces *p = builtInXpms + 10; - char **pixels = p->xpm[piece % BlackPawn][2*color]; - int *buf; - sscanf(pixels[0], "%*d %*d %d", &f); - sscanf(appData.whitePieceColor+1, "%x", &w); - sscanf(appData.blackPieceColor+1, "%x", &b); - res = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, p->size, p->size); - stride = cairo_image_surface_get_stride(res); - buf = (int *) cairo_image_surface_get_data(res); - for(i=0; isize; i++) { - for(j=0; jsize; j++) { - char c = pixels[i+f+1][j]; - int k; - for(k=0; ch[k] != c && k < f; k++); - buf[i*p->size + j] = colcode[k]; +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; } - } - cairo_surface_mark_dirty(res); - return res; + if(svgerror) + g_error_free(svgerror); + return NULL; } static void -ScaleOnePiece (char *name, int color, int piece) +ScaleOnePiece (int color, int piece) { float w, h; char buf[MSG_SIZ]; cairo_surface_t *img, *cs; cairo_t *cr; - if((img = pngPieceImages[color][piece]) == NULL) { // if PNG file for this piece was not yet read, read it now and store it - if(!*appData.pngDirectory) img = ConvertPixmap(color, piece); else { - snprintf(buf, MSG_SIZ, "%s/%s%s.png", appData.pngDirectory, color ? "Black" : "White", pngPieceNames[piece]); - img = cairo_image_surface_create_from_png (buf); - if(cairo_surface_status(img) != CAIRO_STATUS_SUCCESS) img = ConvertPixmap(color, piece); + 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; } } - 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 -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); w = cairo_image_surface_get_width (img); @@ -300,7 +313,8 @@ ScaleOnePiece (char *name, int color, int piece) cairo_set_source_surface (cr, img, 0, 0); cairo_paint (cr); cairo_destroy (cr); - { // operate on bitmap to color it (king-size hack...) + + 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; @@ -315,6 +329,11 @@ ScaleOnePiece (char *name, int color, int piece) 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); } @@ -326,9 +345,10 @@ 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); } void @@ -343,11 +363,12 @@ void InitDrawingParams (int reloadPieces) { int i, p; - MakeColors(); 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 @@ -585,14 +606,16 @@ BlankSquare (cairo_surface_t *dest, int x, int y, int color, ChessSquare piece, 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_rectangle (cr, fac*x, fac*y, squareSize, squareSize); + cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE); cairo_fill (cr); cairo_destroy (cr); } @@ -601,7 +624,7 @@ BlankSquare (cairo_surface_t *dest, int x, int y, int color, ChessSquare piece, static void 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) { @@ -610,7 +633,7 @@ pngDrawPiece (cairo_surface_t *dest, ChessSquare piece, int square_color, int x, kind = 1; piece -= BlackPawn; } - if(appData.upsideDown && flipView) { p += p < BlackPawn ? BlackPawn : -BlackPawn; }// swap white and black pieces + 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); @@ -640,27 +663,16 @@ DoDrawDot (cairo_surface_t *cs, int marker, int x, int y, int r) void DrawDot (int marker, int x, int y, int r) { // used for atomic captures; no need to draw on backup - DrawSeekOpen(); 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 - cairo_t *cr; - - DrawSeekOpen(); - - if (piece == EmptySquare) { - BlankSquare(csBoardWindow, x, y, square_color, piece, 1); - } else { - pngDrawPiece(csBoardWindow, piece, square_color, x, y); - } - - 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; cairo_text_extents_t te; + cairo_t *cr; cr = cairo_create (csBoardWindow); cairo_select_font_face (cr, "Sans", @@ -688,6 +700,22 @@ DrawOneSquare (int x, int y, ChessSquare piece, int square_color, int marker, ch else cairo_set_source_rgb (cr, 1.0, 1.0, 1.0); cairo_show_text (cr, string); cairo_destroy (cr); +} + +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 + + if (piece == EmptySquare) { + BlankSquare(csBoardWindow, x, y, square_color, piece, 1); + } else { + pngDrawPiece(csBoardWindow, piece, square_color, x, y); + } + + 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 @@ -708,7 +736,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; @@ -749,13 +776,15 @@ DrawBlank (AnimNr anr, int x, int y, int startColor) 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]); 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) - DrawExpose(NULL, destX, destY, squareSize, squareSize); + if(c_animBufs[anr+destBuf] == csBoardWindow) // suspect that GTK needs this! + GraphExpose(currBoard, destX, destY, width, height); } void @@ -794,4 +823,105 @@ DrawPolygon (Pnt arrow[], int 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); +}