#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"
if(appData.logoSize)
{ // locate and read user logo
char buf[MSG_SIZ];
- snprintf(buf, MSG_SIZ, "%s/%s.xpm", appData.logoDir, UserName());
- XpmReadFileToPixmap(xDisplay, xBoardWindow, buf, (Pixmap *) &userLogo, NULL, NULL);
+ snprintf(buf, MSG_SIZ, "%s/%s.png", appData.logoDir, UserName());
+ ASSIGN(userLogo, buf);
}
if (appData.animate || appData.animateDragging)
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
void
DrawLogo (void *handle, void *logo)
{
+ cairo_surface_t *img, *cs;
+ cairo_t *cr;
+ int w, h;
+
if(!logo || !handle) return;
- XCopyArea(xDisplay, (Pixmap) logo, XtWindow((Widget) handle), wlPieceGC,
- 0, 0, appData.logoSize, appData.logoSize/2, 0, 0);
+ cs = cairo_xlib_surface_create(xDisplay, XtWindow(handle), DefaultVisual(xDisplay, 0), appData.logoSize, appData.logoSize/2);
+ img = cairo_image_surface_create_from_png (logo);
+ w = cairo_image_surface_get_width (img);
+ h = cairo_image_surface_get_height (img);
+ cr = cairo_create(cs);
+ cairo_scale(cr, (float)appData.logoSize/w, appData.logoSize/(2.*h));
+ cairo_set_source_surface (cr, img, 0, 0);
+ cairo_paint (cr);
+ cairo_destroy (cr);
+ cairo_surface_destroy (img);
+ cairo_surface_destroy (cs);
}
static void
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
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
/* [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
logoName = appData.logo[n];
} else if(appData.autoLogo) {
if(ics) { // [HGM] logo: in ICS mode second can be used for ICS
- sprintf(buf, "%s/%s.xpm", appData.logoDir, appData.icsHost);
+ sprintf(buf, "%s/%s.png", appData.logoDir, appData.icsHost);
} else if(appData.directory[n] && appData.directory[n][0]) {
- sprintf(buf, "%s/%s.xpm", appData.logoDir, cps->tidy);
+ sprintf(buf, "%s/%s.png", appData.logoDir, cps->tidy);
}
}
if(logoName[0])
- XpmReadFileToPixmap(xDisplay, xBoardWindow, logoName, (Pixmap *) &(cps->programLogo), NULL, NULL);
+ { ASSIGN(cps->programLogo, logoName); }
}
void
projects / xboard.git / blobdiff