#include <sys/stat.h>
#include <pwd.h>
#include <math.h>
+#include <cairo/cairo.h>
+#include <cairo/cairo-xlib.h>
#if !OMIT_SOCKETS
# if HAVE_SYS_SOCKET_H
#include "childio.h"
#include "xgamelist.h"
#include "xhistory.h"
+#include "xevalgraph.h"
#include "xedittags.h"
#include "menus.h"
#include "board.h"
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
return 1;
}
-#include <cairo/cairo.h>
-#include <cairo/cairo-xlib.h>
-
void
DrawLogo (void *handle, void *logo)
{
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
// [HGM] seekgraph: some low-level drawing routines (by JC, mostly)
-static cairo_surface_t *cs; // to keep out of back-end :-(
+float
+Color (char *col, int n)
+{
+ int c;
+ sscanf(col, "#%x", &c);
+ c = c >> 4*n & 255;
+ return c/255.;
+}
+
+void
+SetPen (cairo_t *cr, float w, char *col, int dash)
+{
+ 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 DrawSeekAxis( int x, int y, int xTo, int yTo )
{
cairo_move_to (cr, x, y);
cairo_line_to(cr, xTo, yTo );
- cairo_set_line_width(cr, 2);
- cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 1.0);
+ SetPen(cr, 2, "#000000", 0);
cairo_stroke(cr);
/* free memory */
else
cairo_arc(cr, x, y, squareSize/8, 0.0, 2*M_PI);
- cairo_set_line_width(cr, 2);
- cairo_set_source_rgba(cr, 0, 0, 0,1.0);
+ 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;
}
void
-DrawGrid ()
+DrawGrid()
{
- XDrawSegments(xDisplay, xBoardWindow, lineGC,
- gridSegments, BOARD_HEIGHT + BOARD_WIDTH + 2);
-}
+ /* 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
/* [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<nr;i++) {
+ cairo_line_to(cr, arrow[i].x, arrow[i].y);
+ }
+ if(appData.monoMode) { // should we always outline arrow?
+ cairo_line_to(cr, arrow[0].x, arrow[0].y);
+ SetPen(cr, 2, "#000000", 0);
+ cairo_stroke_preserve(cr);
+ }
+ SetPen(cr, 2, appData.highlightSquareColor, 0);
+ cairo_fill(cr);
+
+ /* free memory */
+ cairo_destroy (cr);
+ cairo_surface_destroy (boardSurface);
}
static void
projects / xboard.git / blobdiff