#include <math.h>
#include <cairo/cairo.h>
#include <cairo/cairo-xlib.h>
+#include <librsvg/rsvg.h>
+#include <librsvg/rsvg-cairo.h>
#if STDC_HEADERS
# include <stdlib.h>
#if HAVE_LIBXPM
#include "pixmaps/pixmaps.h"
-#else
-#include "bitmaps/bitmaps.h"
#endif
#include "frontend.h"
#define SOLID 0
#define OUTLINE 1
Boolean cairoAnimate;
-static cairo_surface_t *csBoardWindow, *csBoardBackup, *csDualBoard;
+Option *currBoard;
+cairo_surface_t *csBoardWindow;
static cairo_surface_t *pngPieceImages[2][(int)BlackPawn+4]; // png 256 x 256 images
static cairo_surface_t *pngPieceBitmaps[2][(int)BlackPawn]; // scaled pieces as used
static cairo_surface_t *pngPieceBitmaps2[2][(int)BlackPawn+4]; // scaled pieces in store
+static RsvgHandle *svgPieces[2][(int)BlackPawn+4]; // vector pieces in store
static cairo_surface_t *pngBoardBitmap[2];
int useTexture, textureW[2], textureH[2];
void
SwitchWindow ()
{
- cairo_surface_t *cstmp = csBoardWindow;
- csBoardWindow = csDualBoard;
dual = !dual;
- if(!csDualBoard) {
- csBoardWindow = GetOutputSurface(&dualOptions[3], 0, 0);
- dual = 1;
- }
- csDualBoard = cstmp;
+ currBoard = (dual ? &mainOptions[W_BOARD] : &dualOptions[3]);
+ csBoardWindow = DRAWABLE(currBoard);
}
#define BoardSize int
return res;
}
+RsvgHandle *
+LoadSVG (char *dir, int color, int piece)
+{
+ char buf[MSG_SIZ];
+ RsvgHandle *svg=NULL;
+ RsvgDimensionData svg_dimensions;
+ GError **svgerror=NULL;
+ cairo_surface_t *img;
+ cairo_t *cr;
+
+ snprintf(buf, MSG_SIZ, "%s/%s%s.svg", dir, color ? "Black" : "White", pngPieceNames[piece]);
+
+ if(svg = rsvg_handle_new_from_file(buf,svgerror)) {
+
+ rsvg_handle_get_dimensions(svg, &svg_dimensions);
+ img = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, squareSize, squareSize);
+
+ cr = cairo_create(img);
+ cairo_scale(cr, squareSize/(double) svg_dimensions.width, squareSize/(double) svg_dimensions.height);
+ rsvg_handle_render_cairo(svg, cr);
+ if(cairo_surface_status(img) == CAIRO_STATUS_SUCCESS) {
+ if(pngPieceImages[color][piece]) cairo_surface_destroy(pngPieceImages[color][piece]);
+ pngPieceImages[color][piece] = img;
+ }
+ cairo_destroy(cr);
+
+ return svg;
+ }
+ return NULL;
+}
+
static void
-ScaleOnePiece (char *name, int color, int piece)
+ScaleOnePiece (int color, int piece)
{
float w, h;
char buf[MSG_SIZ];
cairo_surface_t *img, *cs;
cairo_t *cr;
+ g_type_init ();
+
+ if(!svgPieces[color][piece] && *appData.svgDirectory) { // try to freshly render svg pieces first, always from file, to supply the source bitmap
+ svgPieces[color][piece] = LoadSVG(appData.svgDirectory, color, piece);
+ }
+
if((img = pngPieceImages[color][piece]) == NULL) { // if PNG file for this piece was not yet read, read it now and store it
- if(!*appData.pngDirectory) img = ConvertPixmap(color, piece); else {
- snprintf(buf, MSG_SIZ, "%s/%s%s.png", appData.pngDirectory, color ? "Black" : "White", pngPieceNames[piece]);
+ if(!*appData.pieceDirectory) img = ConvertPixmap(color, piece); else {
+ snprintf(buf, MSG_SIZ, "%s/%s%s.png", appData.pieceDirectory, color ? "Black" : "White", pngPieceNames[piece]);
img = cairo_image_surface_create_from_png (buf);
if(cairo_surface_status(img) != CAIRO_STATUS_SUCCESS) img = ConvertPixmap(color, piece);
}
}
pngPieceImages[color][piece] = img;
+
+
// 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);
w = cairo_image_surface_get_width (img);
cairo_set_source_surface (cr, img, 0, 0);
cairo_paint (cr);
cairo_destroy (cr);
- { // operate on bitmap to color it (king-size hack...)
+
+ if(!appData.trueColors || !*appData.pieceDirectory && !appData.svgDirectory) { // operate on bitmap to color it (king-size hack...)
int stride = cairo_image_surface_get_stride(cs)/4;
int *buf = (int *) cairo_image_surface_get_data(cs);
int i, j, p;
int p;
for(p=0; pngPieceNames[p]; p++) {
- ScaleOnePiece(pngPieceNames[p], 0, p);
- ScaleOnePiece(pngPieceNames[p], 1, p);
+ ScaleOnePiece(0, p);
+ ScaleOnePiece(1, p);
}
}
for(i=0; i<2; i++) for(p=0; p<BlackPawn+4; p++) {
if(pngPieceImages[i][p]) cairo_surface_destroy(pngPieceImages[i][p]);
pngPieceImages[i][p] = NULL;
+ if(svgPieces[i][p]) rsvg_handle_close(svgPieces[i][p], NULL);
+ svgPieces[i][p] = NULL;
}
CreateAnyPieces();
}
/* free memory */
cairo_destroy (cr);
+ GraphExpose(currBoard, x-1, yTo-1, xTo-x+2, y-yTo+2);
}
void DrawSeekBackground( int left, int top, int right, int bottom )
/* free memory */
cairo_destroy (cr);
+ GraphExpose(currBoard, left, top, right-left, bottom-top);
}
void DrawSeekText(char *buf, int x, int y)
/* free memory */
cairo_destroy (cr);
+ GraphExpose(currBoard, x-5, y-10, 60, 15);
}
void DrawSeekDot(int x, int y, int colorNr)
/* free memory */
cairo_destroy (cr);
+ GraphExpose(currBoard, x-squareSize/8, y-squareSize/8, 2*(squareSize/8), 2*(squareSize/8));
}
void
-DrawSeekOpen ()
-{
- csBoardWindow = (cairo_surface_t *) mainOptions[W_BOARD].choice;
-}
-
-void
-DrawSeekClose ()
+InitDrawingHandle (Option *opt)
{
+ csBoardWindow = DRAWABLE(opt);
}
void
{
/* draws a grid starting around Nx, Ny squares starting at x,y */
int i;
+ float odd = (lineGap & 1)/2.;
cairo_t *cr;
- DrawSeekOpen();
/* get a cairo_t */
cr = cairo_create (csBoardWindow);
/* 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_move_to (cr, gridSegments[i].x1 + odd, gridSegments[i].y1 + odd);
+ cairo_line_to (cr, gridSegments[i].x2 + odd, gridSegments[i].y2 + odd);
cairo_stroke (cr);
}
}
void
-DrawBorder (int x, int y, int type)
+DrawBorder (int x, int y, int type, int odd)
{
cairo_t *cr;
- DrawSeekOpen();
char *col;
switch(type) {
}
cr = cairo_create(csBoardWindow);
cairo_set_antialias(cr, CAIRO_ANTIALIAS_NONE);
- cairo_rectangle(cr, x, y, squareSize+lineGap, squareSize+lineGap);
+ cairo_rectangle(cr, x+odd/2., y+odd/2., squareSize+lineGap, squareSize+lineGap);
SetPen(cr, lineGap, col, 0);
cairo_stroke(cr);
cairo_destroy(cr);
- DrawExpose(NULL, x, y, squareSize+2*lineGap, squareSize+2*lineGap);
+ GraphExpose(currBoard, x - lineGap/2, y - lineGap/2, squareSize+2*lineGap+odd, squareSize+2*lineGap+odd);
}
static int
}
void
-DrawLogo (void *handle, void *logo)
+DrawLogo (Option *opt, void *logo)
{
- cairo_surface_t *img, *cs;
+ cairo_surface_t *img;
cairo_t *cr;
int w, h;
- if(!logo || !handle) return;
- cs = GetOutputSurface(handle, appData.logoSize, appData.logoSize/2);
+ if(!logo || !opt) return;
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);
+ cr = cairo_create(DRAWABLE(opt));
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);
+ GraphExpose(opt, 0, 0, appData.logoSize, appData.logoSize/2);
}
static void
case 2: col = "#000000"; break;
}
SetPen(cr, 2.0, col, 0);
- cairo_rectangle (cr, x, y, squareSize, squareSize);
+ cairo_rectangle (cr, fac*x, fac*y, squareSize, squareSize);
+ cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE);
cairo_fill (cr);
cairo_destroy (cr);
}
void
DrawDot (int marker, int x, int y, int r)
{ // used for atomic captures; no need to draw on backup
- DrawSeekOpen();
DoDrawDot(csBoardWindow, marker, x, y, r);
+ GraphExpose(currBoard, x-r, y-r, 2*r, 2*r);
}
void
// piece, background, coordinate/count, marker dot
cairo_t *cr;
- DrawSeekOpen();
-
if (piece == EmptySquare) {
BlankSquare(csBoardWindow, x, y, square_color, piece, 1);
} else {
static void
InitAnimState (AnimNr anr)
{
- DrawSeekOpen(); // set cs to board widget
if(c_animBufs[anr]) cairo_surface_destroy (c_animBufs[anr]);
if(c_animBufs[anr+2]) cairo_surface_destroy (c_animBufs[anr+2]);
c_animBufs[anr+4] = csBoardWindow;
cairo_fill (cr);
cairo_destroy (cr);
if(c_animBufs[anr+destBuf] == csBoardWindow)
- DrawExpose(NULL, destX, destY, squareSize, squareSize);
+ GraphExpose(currBoard, destX, destY, squareSize, squareSize);
}
void
projects / xboard.git / blobdiff