X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=draw.c;h=0f34e2481eb7209aeb0b657212c71263ca89a3ea;hb=1c03d229073e56dda9e5856db5adaae51576a3bb;hp=99203b917b57eb08f2e9ea9fb2b0524a044ec464;hpb=ed46e7344f667397536ed0d682daf1df972da735;p=xboard.git diff --git a/draw.c b/draw.c index 99203b9..0f34e24 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: @@ -74,16 +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" -#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" @@ -120,6 +117,9 @@ 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]; @@ -169,9 +169,8 @@ InitDrawingSizes (BoardSize boardSize, int flags) static int oldWidth, oldHeight; static VariantClass oldVariant; static int oldMono = -1, oldTwoBoards = 0; - extern Widget formWidget; - if(!formWidget) return; + if(!mainOptions[W_BOARD].handle) return; if(oldTwoBoards && !twoBoards) PopDown(DummyDlg); oldTwoBoards = twoBoards; @@ -233,8 +232,8 @@ 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 }; @@ -587,7 +586,8 @@ DrawLogo (Option *opt, void *logo) w = cairo_image_surface_get_width (img); h = cairo_image_surface_get_height (img); cr = cairo_create(DRAWABLE(opt)); - cairo_scale(cr, (float)appData.logoSize/w, appData.logoSize/(2.*h)); +// 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_destroy (cr); @@ -772,13 +772,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) - GraphExpose(currBoard, destX, destY, squareSize, squareSize); + if(c_animBufs[anr+destBuf] == csBoardWindow) // suspect that GTK needs this! + GraphExpose(currBoard, destX, destY, width, height); } void @@ -817,4 +819,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); +}