#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"
static void CreateAnyPieces P((void));
void CreateXIMPieces P((void));
void CreateXPMPieces P((void));
+void CreatePNGPieces P((void));
void CreateXPMBoard P((char *s, int n));
void CreatePieces P((void));
Widget CreateMenuBar P((Menu *mb, int boardWidth));
#define SOLID 0
#define OUTLINE 1
+cairo_surface_t *pngPieceBitmaps[2][(int)BlackPawn]; // scaled pieces as used
+cairo_surface_t *pngPieceBitmaps2[2][(int)BlackPawn+4]; // scaled pieces in store
Pixmap pieceBitmap[2][(int)BlackPawn];
Pixmap pieceBitmap2[2][(int)BlackPawn+4]; /* [HGM] pieces */
Pixmap xpmPieceBitmap[4][(int)BlackPawn]; /* LL, LD, DL, DD actually used*/
}
}
}
+ for(i=0; i<2; i++) {
+ int p;
+printf("Copy pieces\n");
+ for(p=0; p<=(int)WhiteKing; p++)
+ pngPieceBitmaps[i][p] = pngPieceBitmaps2[i][p]; // defaults
+ }
oldMono = -10; // kludge to force recreation of animation masks
oldVariant = gameInfo.variant;
}
CreateXPMBoard(appData.liteBackTextureFile, 1);
CreateXPMBoard(appData.darkBackTextureFile, 0);
}
+ if (appData.pngDirectory[0] != NULLCHAR) { // for now do in parallel
+ CreatePNGPieces();
+ }
#else
CreateXIMPieces();
/* Create regular pieces */
}
#endif /* HAVE_LIBXPM */
+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",
+ "GoldKnight", "GoldLance", "GoldPawn", "GoldSilver", NULL
+};
+
+void
+ScaleOnePiece (char *name, int color, int piece)
+{
+ int w, h;
+ char buf[MSG_SIZ];
+ cairo_surface_t *img, *cs;
+ cairo_t *cr;
+ static cairo_surface_t *pngPieceImages[2][(int)BlackPawn+4]; // png 256 x 256 images
+
+ if(pngPieceImages[color][piece] == NULL) { // if PNG file for this piece was not yet read, read it now and store it
+ snprintf(buf, MSG_SIZ, "%s/%s%s.png", appData.pngDirectory, color ? "Black" : "White", pngPieceNames[piece]);
+ pngPieceImages[color][piece] = img = cairo_image_surface_create_from_png (buf);
+ w = cairo_image_surface_get_width (img);
+ h = cairo_image_surface_get_height (img);
+ if(w != 256 || h != 256) { printf("Bad png size %dx%d in %s\n", w, h, buf); exit(1); }
+ }
+
+ // 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;
+ // scaled copying of the raw png image
+ cr = cairo_create(cs);
+ cairo_scale(cr, squareSize/256., squareSize/256.);
+ cairo_set_source_surface (cr, img, 0, 0);
+ cairo_paint (cr);
+ cairo_destroy (cr);
+ cairo_surface_destroy (img);
+}
+
+void
+CreatePNGPieces ()
+{
+ int p;
+
+ for(p=0; pngPieceNames[p]; p++) {
+ ScaleOnePiece(pngPieceNames[p], 0, p);
+ ScaleOnePiece(pngPieceNames[p], 1, p);
+ }
+}
+
#if HAVE_LIBXPM
/* No built-in bitmaps */
void CreatePieces()
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)
{
squareSize, squareSize, x, y);
}
+static void
+pngDrawPiece (ChessSquare piece, int square_color, int x, int y, Drawable dest)
+{
+ int kind, p = piece;
+ cairo_t *cr;
+
+ if ((int)piece < (int) BlackPawn) {
+ kind = 0;
+ } else {
+ kind = 1;
+ piece -= BlackPawn;
+ }
+ if(appData.upsideDown && flipView) { p += p < BlackPawn ? BlackPawn : -BlackPawn; }// swap white and black pieces
+ BlankSquare(x, y, square_color, piece, dest, 1); // erase previous contents with background
+ DrawSeekOpen();
+ cr = cairo_create (cs);
+ cairo_set_source_surface (cr, pngPieceBitmaps[kind][piece], x, y);
+ cairo_paint(cr);
+ cairo_destroy (cr);
+ DrawSeekClose();
+}
+
typedef void (*DrawFunc)();
DrawFunc
} else {
return monoDrawPiece;
}
+ } else if(appData.pngDirectory[0]) {
+ return pngDrawPiece;
} else {
if (useImages)
return colorDrawPieceImage;
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
}
if(appData.monoMode) { // should we always outline arrow?
cairo_line_to(cr, arrow[0].x, arrow[0].y);
- 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);
}
- cairo_set_line_width(cr, 2);
- cairo_set_source_rgba(cr, 1, 1, 0, 1.0);
+ SetPen(cr, 2, appData.highlightSquareColor, 0);
cairo_fill(cr);
/* free memory */
projects / xboard.git / blobdiff