X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=xboard.c;h=3041c88feb40d0488c4a12f8f77a4b92656740c5;hb=39d79ffb3def5d8ac66c02dd97245a13d89ba8eb;hp=0fd1d3e9160b80f61f5b2f3164376d285cc71068;hpb=8701da4fd9968fb938ae04c91e9f59a8d64fef9f;p=xboard.git diff --git a/xboard.c b/xboard.c index 0fd1d3e..3041c88 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" @@ -234,6 +237,7 @@ static void CreateGCs P((int redo)); 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)); @@ -336,6 +340,11 @@ WindowPlacement wpTags; #define SOLID 0 #define OUTLINE 1 +Boolean cairoAnimate = True; +static cairo_surface_t *csBoardWindow; +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 cairo_surface_t *pngBoardBitmap[2]; Pixmap pieceBitmap[2][(int)BlackPawn]; Pixmap pieceBitmap2[2][(int)BlackPawn+4]; /* [HGM] pieces */ Pixmap xpmPieceBitmap[4][(int)BlackPawn]; /* LL, LD, DL, DD actually used*/ @@ -1026,6 +1035,12 @@ InitDrawingSizes (BoardSize boardSize, int flags) } } } + 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; } @@ -1088,6 +1103,9 @@ CreateAnyPieces () CreateXPMBoard(appData.liteBackTextureFile, 1); CreateXPMBoard(appData.darkBackTextureFile, 0); } + if (appData.pngDirectory[0] != NULLCHAR) { // for now do in parallel + CreatePNGPieces(); + } #else CreateXIMPieces(); /* Create regular pieces */ @@ -2043,6 +2061,14 @@ CreateXPMBoard (char *s, int kind) XpmAttributes attr; attr.valuemask = 0; if(!appData.useBitmaps || s == NULL || *s == 0 || *s == '*') { useTexture &= ~(kind+1); return; } + if(strstr(s, ".png")) { + cairo_surface_t *img = cairo_image_surface_create_from_png (s); + if(img) { + useTexture |= kind + 1; pngBoardBitmap[kind] = img; + textureW[kind] = cairo_image_surface_get_width (img); + textureH[kind] = cairo_image_surface_get_height (img); + } + } else if (XpmReadFileToPixmap(xDisplay, xBoardWindow, s, &(xpmBoardBitmap[kind]), NULL, &attr) == 0) { useTexture |= kind + 1; textureW[kind] = attr.width; textureH[kind] = attr.height; } @@ -2203,6 +2229,53 @@ CreateXPMPieces () } #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() @@ -2426,12 +2499,14 @@ do_flash_delay (unsigned long msec) void DrawBorder (int x, int y, int type) { - GC gc = lineGC; - - if(type == 1) gc = highlineGC; else if(type == 2) gc = prelineGC; + cairo_t *cr; + DrawSeekOpen(); - XDrawRectangle(xDisplay, xBoardWindow, gc, x, y, - squareSize+lineGap, squareSize+lineGap); + cr = cairo_create(csBoardWindow); + 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); } static int @@ -2452,9 +2527,6 @@ CutOutSquare (int x, int y, int *x0, int *y0, int kind) return 1; } -#include -#include - void DrawLogo (void *handle, void *logo) { @@ -2481,6 +2553,17 @@ BlankSquare (int x, int y, int color, ChessSquare piece, Drawable dest, int fac) { // [HGM] extra param 'fac' for forcing destination to (0,0) for copying to animation buffer int x0, y0; if (useImages && color != 2 && (useTexture & color+1) && CutOutSquare(x, y, &x0, &y0, color)) { + if(pngBoardBitmap[color]) { + cairo_t *cr; + if(!fac && !cairoAnimate) return; + DrawSeekOpen(); + cr = cairo_create (fac ? csBoardWindow : (cairo_surface_t *) dest); + cairo_set_source_surface (cr, pngBoardBitmap[color], x*fac - x0, y*fac - y0); + cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE); + cairo_rectangle (cr, x*fac, y*fac, squareSize, squareSize); + cairo_fill (cr); + cairo_destroy (cr); + } else XCopyArea(xDisplay, xpmBoardBitmap[color], dest, wlPieceGC, x0, y0, squareSize, squareSize, x*fac, y*fac); } else @@ -2631,6 +2714,27 @@ colorDrawPieceImage (ChessSquare piece, int square_color, int x, int y, Drawable 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 (csBoardWindow); + cairo_set_source_surface (cr, pngPieceBitmaps[kind][piece], x, y); + cairo_paint(cr); + cairo_destroy (cr); +} + typedef void (*DrawFunc)(); DrawFunc @@ -2642,6 +2746,8 @@ ChooseDrawFunc () } else { return monoDrawPiece; } + } else if(appData.pngDirectory[0]) { + return pngDrawPiece; } else { if (useImages) return colorDrawPieceImage; @@ -2653,14 +2759,21 @@ ChooseDrawFunc () void DrawDot (int marker, int x, int y, int r) { + cairo_t *cr; + DrawSeekOpen(); + cr = cairo_create(csBoardWindow); + 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); } void @@ -2796,20 +2909,36 @@ EventProc (Widget widget, caddr_t unused, XEvent *event) // [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_t *cr; /* get a cairo_t */ - cr = cairo_create (cs); + cr = cairo_create (csBoardWindow); 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 */ @@ -2818,7 +2947,7 @@ void DrawSeekAxis( int x, int y, int xTo, int yTo ) void DrawSeekBackground( int left, int top, int right, int bottom ) { - cairo_t *cr = cairo_create (cs); + cairo_t *cr = cairo_create (csBoardWindow); cairo_rectangle (cr, left, top, right-left, bottom-top); @@ -2831,7 +2960,7 @@ void DrawSeekBackground( int left, int top, int right, int bottom ) void DrawSeekText(char *buf, int x, int y) { - cairo_t *cr = cairo_create (cs); + cairo_t *cr = cairo_create (csBoardWindow); cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL, @@ -2851,7 +2980,7 @@ void DrawSeekText(char *buf, int x, int y) void DrawSeekDot(int x, int y, int colorNr) { - cairo_t *cr = cairo_create (cs); + cairo_t *cr = cairo_create (csBoardWindow); int square = colorNr & 0x80; colorNr &= 0x7F; @@ -2860,8 +2989,7 @@ void DrawSeekDot(int x, int y, int colorNr) 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; @@ -2879,13 +3007,12 @@ DrawSeekOpen () { 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); + if(!csBoardWindow) csBoardWindow = cairo_xlib_surface_create(xDisplay, xBoardWindow, DefaultVisual(xDisplay, 0), boardWidth, boardHeight); } void DrawSeekClose () { - cairo_surface_destroy(cs); } void @@ -2897,13 +3024,10 @@ DrawGrid() DrawSeekOpen(); /* get a cairo_t */ - cr = cairo_create (cs); + cr = cairo_create (csBoardWindow); cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE); - cairo_set_line_width (cr, lineGap); - - /* TODO: use appdata colors */ - cairo_set_source_rgba (cr, 0, 0, 0, 1.0); + SetPen(cr, lineGap, "#000000", 0); /* lines in X */ for (i = 0; i < BOARD_WIDTH + BOARD_HEIGHT + 2; i++) @@ -2915,7 +3039,6 @@ DrawGrid() /* free memory */ cairo_destroy (cr); - DrawSeekClose(); return; } @@ -3631,6 +3754,7 @@ RemoveInputSource (InputSourceRef isr) static int xpmDone = 0; static Pixmap animBufs[3*NrOfAnims]; // newBuf, saveBuf static GC animGCs[3*NrOfAnims]; // blitGC, pieceGC, outlineGC; +static cairo_surface_t *c_animBufs[3*NrOfAnims]; // newBuf, saveBuf static void CreateAnimMasks (int pieceDepth) @@ -3716,6 +3840,13 @@ InitAnimState (AnimNr anr, XWindowAttributes *info) XtGCMask mask; XGCValues values; + if(cairoAnimate) { + DrawSeekOpen(); // set cs to board widget + c_animBufs[anr+4] = csBoardWindow; + c_animBufs[anr+2] = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, squareSize, squareSize); + c_animBufs[anr] = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, squareSize, squareSize); + } + /* Each buffer is square size, same depth as window */ animBufs[anr+4] = xBoardWindow; animBufs[anr+2] = XCreatePixmap(xDisplay, xBoardWindow, @@ -3872,21 +4003,48 @@ OverlayPiece (ChessSquare piece, GC clip, GC outline, Drawable dest) } } +static void +CairoOverlayPiece (ChessSquare piece, cairo_surface_t *dest) +{ + static ChessSquare oldPiece = -1; + static cairo_t *pieceSource; + if(piece != oldPiece) { // try make it faster by only changing cr if we need other piece + if(pieceSource) cairo_destroy (pieceSource); + pieceSource = cairo_create (dest); + cairo_set_source_surface (pieceSource, pngPieceBitmaps[!White(piece)][piece % BlackPawn], 0, 0); + oldPiece = piece; + } + cairo_paint(pieceSource); +} + void InsertPiece (AnimNr anr, ChessSquare piece) { + if(cairoAnimate) { + CairoOverlayPiece(piece, c_animBufs[anr]); + } else OverlayPiece(piece, animGCs[anr+2], animGCs[anr+4], animBufs[anr]); } void DrawBlank (AnimNr anr, int x, int y, int startColor) { + if(cairoAnimate) + BlankSquare(x, y, startColor, EmptySquare, (Drawable) c_animBufs[anr+2], 0); + else BlankSquare(x, y, startColor, EmptySquare, animBufs[anr+2], 0); } void CopyRectangle (AnimNr anr, int srcBuf, int destBuf, int srcX, int srcY, int width, int height, int destX, int destY) { + if(cairoAnimate) { + cairo_t *cr = cairo_create (c_animBufs[anr+destBuf]); + cairo_set_source_surface (cr, c_animBufs[anr+srcBuf], destX - srcX, destY - srcY); + cairo_rectangle (cr, destX, destY, width, height); + cairo_fill (cr); + cairo_destroy (cr); + } else XCopyArea(xDisplay, animBufs[anr+srcBuf], animBufs[anr+destBuf], animGCs[anr], srcX, srcY, width, height, destX, destY); } @@ -3895,6 +4053,7 @@ void SetDragPiece (AnimNr anr, ChessSquare piece) { Pixmap mask; + if(cairoAnimate) return; /* The piece will be drawn using its own bitmap as a matte */ SelectGCMask(piece, &animGCs[anr+2], &animGCs[anr+4], &mask); XSetClipMask(xDisplay, animGCs[anr+2], mask); @@ -3917,12 +4076,10 @@ void DrawPolygon(Pnt arrow[], int nr) } 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 */