X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=xboard.c;h=99af0487cb335cda688e893f655b229fe6711d17;hb=c64bb96345d0464fe123b5e1af71eb3f0f1afc3c;hp=41f772b4c02d1ae68d31052fbb145ab3351c9109;hpb=ba7645365e2048776a32c813e39e5c7ae53dea6f;p=xboard.git diff --git a/xboard.c b/xboard.c index 41f772b..99af048 100644 --- a/xboard.c +++ b/xboard.c @@ -61,6 +61,8 @@ #include #include #include +#include +#include #if !OMIT_SOCKETS # if HAVE_SYS_SOCKET_H @@ -202,6 +204,7 @@ extern char *getenv(); #include "childio.h" #include "xgamelist.h" #include "xhistory.h" +#include "xevalgraph.h" #include "xedittags.h" #include "menus.h" #include "board.h" @@ -2423,15 +2426,21 @@ do_flash_delay (unsigned long msec) TimeDelay(msec); } +static cairo_surface_t *cs; // to keep out of back-end :-( + void DrawBorder (int x, int y, int type) { - GC gc = lineGC; + cairo_t *cr; + DrawSeekOpen(); - if(type == 1) gc = highlineGC; else if(type == 2) gc = prelineGC; + cr = cairo_create(cs); + cairo_set_antialias(cr, CAIRO_ANTIALIAS_NONE); + cairo_rectangle(cr, x, y, squareSize+lineGap, squareSize+lineGap); + SetPen(cr, lineGap, type == 1 ? appData.highlightSquareColor : appData.premoveHighlightColor, 0); + cairo_stroke(cr); - XDrawRectangle(xDisplay, xBoardWindow, gc, x, y, - squareSize+lineGap, squareSize+lineGap); + DrawSeekClose(); } static int @@ -2452,9 +2461,6 @@ CutOutSquare (int x, int y, int *x0, int *y0, int kind) return 1; } -#include -#include - void DrawLogo (void *handle, void *logo) { @@ -2653,14 +2659,22 @@ ChooseDrawFunc () void DrawDot (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) { - XFillArc(xDisplay, xBoardWindow, marker == 2 ? darkSquareGC : lightSquareGC, - x, y, r, r, 0, 64*360); - XDrawArc(xDisplay, xBoardWindow, marker == 2 ? lightSquareGC : darkSquareGC, - x, y, r, r, 0, 64*360); - } else - XFillArc(xDisplay, xBoardWindow, marker == 2 ? prelineGC : highlineGC, - x, y, r, r, 0, 64*360); + SetPen(cr, 2, marker == 2 ? "#000000" : "#FFFFFF", 0); + cairo_stroke_preserve(cr); + SetPen(cr, 2, marker == 2 ? "#FFFFFF" : "#000000", 0); + } else { + SetPen(cr, 2, marker == 2 ? "#FF0000" : "#FFFF00", 0); + } + cairo_fill(cr); + cairo_stroke(cr); + + cairo_destroy(cr); + DrawSeekClose(); } void @@ -2794,47 +2808,143 @@ EventProc (Widget widget, caddr_t unused, XEvent *event) DelayedDrag(); // as long as events keep coming in faster than 50 msec, they destroy each other } -// [HGM] seekgraph: some low-level drawing routines cloned from xevalgraph -void -DrawSeekAxis (int x, int y, int xTo, int yTo) +// [HGM] seekgraph: some low-level drawing routines (by JC, mostly) + +float +Color (char *col, int n) { - XDrawLine(xDisplay, xBoardWindow, lineGC, x, y, xTo, yTo); + int c; + sscanf(col, "#%x", &c); + c = c >> 4*n & 255; + return c/255.; } void -DrawSeekBackground (int left, int top, int right, int bottom) +SetPen (cairo_t *cr, float w, char *col, int dash) { - XFillRectangle(xDisplay, xBoardWindow, lightSquareGC, left, top, right-left, bottom-top); + static const double dotted[] = {4.0, 4.0}; + static int len = sizeof(dotted) / sizeof(dotted[0]); + cairo_set_line_width (cr, w); + cairo_set_source_rgba (cr, Color(col, 4), Color(col, 2), Color(col, 0), 1.0); + if(dash) cairo_set_dash (cr, dotted, len, 0.0); } -void -DrawSeekText (char *buf, int x, int y) +void DrawSeekAxis( int x, int y, int xTo, int yTo ) { - XDrawString(xDisplay, xBoardWindow, coordGC, x, y+4, buf, strlen(buf)); + cairo_t *cr; + + /* get a cairo_t */ + cr = cairo_create (cs); + + cairo_move_to (cr, x, y); + cairo_line_to(cr, xTo, yTo ); + + SetPen(cr, 2, "#000000", 0); + cairo_stroke(cr); + + /* free memory */ + cairo_destroy (cr); } -void -DrawSeekDot (int x, int y, int colorNr) +void DrawSeekBackground( int left, int top, int right, int bottom ) +{ + cairo_t *cr = cairo_create (cs); + + cairo_rectangle (cr, left, top, right-left, bottom-top); + + cairo_set_source_rgba(cr, 0.8, 0.8, 0.4,1.0); + cairo_fill(cr); + + /* free memory */ + cairo_destroy (cr); +} + +void DrawSeekText(char *buf, int x, int y) +{ + cairo_t *cr = cairo_create (cs); + + cairo_select_font_face (cr, "Sans", + CAIRO_FONT_SLANT_NORMAL, + CAIRO_FONT_WEIGHT_NORMAL); + + cairo_set_font_size (cr, 12.0); + + cairo_move_to (cr, x, y+4); + cairo_show_text( cr, buf); + + cairo_set_source_rgba(cr, 0, 0, 0,1.0); + cairo_stroke(cr); + + /* free memory */ + cairo_destroy (cr); +} + +void DrawSeekDot(int x, int y, int colorNr) { + cairo_t *cr = cairo_create (cs); int square = colorNr & 0x80; - GC color; colorNr &= 0x7F; - color = colorNr == 0 ? prelineGC : colorNr == 1 ? darkSquareGC : highlineGC; + if(square) - XFillRectangle(xDisplay, xBoardWindow, color, - x-squareSize/9, y-squareSize/9, 2*squareSize/9, 2*squareSize/9); + cairo_rectangle (cr, x-squareSize/9, y-squareSize/9, 2*squareSize/9, 2*squareSize/9); else - XFillArc(xDisplay, xBoardWindow, color, - x-squareSize/8, y-squareSize/8, squareSize/4, squareSize/4, 0, 64*360); + cairo_arc(cr, x, y, squareSize/8, 0.0, 2*M_PI); + + SetPen(cr, 2, "#000000", 0); + cairo_stroke_preserve(cr); + switch (colorNr) { + case 0: cairo_set_source_rgba(cr, 1.0, 0, 0,1.0); break; + case 1: cairo_set_source_rgba (cr, 0.0, 0.7, 0.2, 1.0); break; + default: cairo_set_source_rgba (cr, 1.0, 1.0, 0.0, 1.0); break; + } + cairo_fill(cr); + + /* free memory */ + cairo_destroy (cr); } void -DrawGrid () +DrawSeekOpen () { - XDrawSegments(xDisplay, xBoardWindow, lineGC, - gridSegments, BOARD_HEIGHT + BOARD_WIDTH + 2); + int boardWidth = lineGap + BOARD_WIDTH * (squareSize + lineGap); + int boardHeight = lineGap + BOARD_HEIGHT * (squareSize + lineGap); + cs = cairo_xlib_surface_create(xDisplay, xBoardWindow, DefaultVisual(xDisplay, 0), boardWidth, boardHeight); } +void +DrawSeekClose () +{ + cairo_surface_destroy(cs); +} + +void +DrawGrid() +{ + /* draws a grid starting around Nx, Ny squares starting at x,y */ + int i; + cairo_t *cr; + + DrawSeekOpen(); + /* get a cairo_t */ + cr = cairo_create (cs); + + cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE); + SetPen(cr, lineGap, "#000000", 0); + + /* lines in X */ + for (i = 0; i < BOARD_WIDTH + BOARD_HEIGHT + 2; i++) + { + cairo_move_to (cr, gridSegments[i].x1, gridSegments[i].y1); + cairo_line_to (cr, gridSegments[i].x2, gridSegments[i].y2); + cairo_stroke (cr); + } + + /* free memory */ + cairo_destroy (cr); + DrawSeekClose(); + + return; +} /* * event handler for redrawing the board @@ -3818,14 +3928,30 @@ SetDragPiece (AnimNr anr, ChessSquare piece) /* [AS] Arrow highlighting support */ -void -DrawPolygon (Pnt arrow[], int nr) -{ - XPoint pts[10]; +void DrawPolygon(Pnt arrow[], int nr) +{ // for now on own surface; eventually this should become a global that is only destroyed on resize + cairo_surface_t *boardSurface; + cairo_t *cr; int i; - for(i=0; i<10; i++) pts[i].x = arrow[i].x, pts[i].y = arrow[i].y; - XFillPolygon(xDisplay, xBoardWindow, highlineGC, pts, nr, Nonconvex, CoordModeOrigin); - if(appData.monoMode) arrow[nr] = arrow[0], XDrawLines(xDisplay, xBoardWindow, darkSquareGC, pts, nr+1, CoordModeOrigin); + int w = lineGap + BOARD_WIDTH * (squareSize + lineGap); + int h = lineGap + BOARD_HEIGHT * (squareSize + lineGap); + boardSurface = cairo_xlib_surface_create(xDisplay, xBoardWindow, DefaultVisual(xDisplay, 0), w, h); + cr = cairo_create (boardSurface); + cairo_move_to (cr, arrow[nr-1].x, arrow[nr-1].y); + for (i=0;i