X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=xboard.c;h=3041c88feb40d0488c4a12f8f77a4b92656740c5;hb=39d79ffb3def5d8ac66c02dd97245a13d89ba8eb;hp=a8620227db1aa8ea44074250c6394fc5d644e651;hpb=df04542efd5b686f8c9f382315eb3fb619866da7;p=xboard.git diff --git a/xboard.c b/xboard.c index a862022..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)); @@ -256,8 +260,6 @@ void DrawPositionProc P((Widget w, XEvent *event, void CommentClick P((Widget w, XEvent * event, String * params, Cardinal * nParams)); void ICSInputBoxPopUp P((void)); -void FileNamePopUp P((char *label, char *def, char *filter, - FileProc proc, char *openMode)); void SelectCommand P((Widget w, XtPointer client_data, XtPointer call_data)); void KeyBindingProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); void QuitWrapper P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); @@ -272,9 +274,7 @@ void DisplayMove P((int moveNumber)); void ICSInitScript P((void)); void SelectMove P((Widget w, XEvent * event, String * params, Cardinal * nParams)); void update_ics_width P(()); -int get_term_width P(()); int CopyMemoProc P(()); -void SetupDropMenu P((void)); /* * XBoard depends on Xt R4 or higher @@ -305,8 +305,6 @@ XFontStruct *coordFontStruct, *countFontStruct; XtAppContext appContext; char *layoutName; -FileProc fileProc; -char *fileOpenMode; char installDir[] = "."; // [HGM] UCI: needed for UCI; probably needs run-time initializtion Position commentX = -1, commentY = -1; @@ -342,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*/ @@ -885,7 +888,8 @@ MainWindowUp () return xBoardWindow != 0; } -void SwitchWindow() +void +SwitchWindow () { extern Option dualOptions[]; static Window dual; @@ -1031,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; } @@ -1093,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 */ @@ -1162,6 +1175,63 @@ InitializeFonts (int clockFontPxlSize, int coordFontPxlSize, int fontPxlSize) #endif } +char * +PrintArg (ArgType t) +{ + char *p=""; + switch(t) { + case ArgZ: + case ArgInt: p = " N"; break; + case ArgString: p = " STR"; break; + case ArgBoolean: p = " TF"; break; + case ArgSettingsFilename: + case ArgFilename: p = " FILE"; break; + case ArgX: p = " Nx"; break; + case ArgY: p = " Ny"; break; + case ArgAttribs: p = " TEXTCOL"; break; + case ArgColor: p = " COL"; break; + case ArgFont: p = " FONT"; break; + case ArgBoardSize: p = " SIZE"; break; + case ArgFloat: p = " FLOAT"; break; + case ArgTrue: + case ArgFalse: + case ArgTwo: + case ArgNone: + case ArgCommSettings: + break; + } + return p; +} + +void +PrintOptions () +{ + char buf[MSG_SIZ]; + int len=0; + ArgDescriptor *q, *p = argDescriptors+5; + printf("\nXBoard accepts the following options:\n" + "(N = integer, TF = true or false, STR = text string, FILE = filename,\n" + " Nx, Ny = relative coordinates, COL = color, FONT = X-font spec,\n" + " SIZE = board-size spec(s)\n" + " Within parentheses are short forms, or options to set to true or false.\n" + " Persistent options (saved in the settings file) are marked with *)\n\n"); + while(p->argName) { + if(p->argType == ArgCommSettings) { p++; continue; } // XBoard has no comm port + snprintf(buf+len, MSG_SIZ, "-%s%s", p->argName, PrintArg(p->argType)); + if(p->save) strcat(buf+len, "*"); + for(q=p+1; q->argLoc == p->argLoc; q++) { + if(q->argName[0] == '-') continue; + strcat(buf+len, q == p+1 ? " (" : " "); + sprintf(buf+strlen(buf), "-%s%s", q->argName, PrintArg(q->argType)); + } + if(q != p+1) strcat(buf+len, ")"); + len = strlen(buf); + if(len > 39) len = 0, printf("%s\n", buf); else while(len < 39) buf[len++] = ' '; + p = q; + } + if(len) buf[len] = NULLCHAR, printf("%s\n", buf); +} + int main (int argc, char **argv) { @@ -1183,6 +1253,11 @@ main (int argc, char **argv) exit(0); } + if(argc > 1 && !strcmp(argv[1], "--help" )) { + PrintOptions(); + exit(0); + } + programName = strrchr(argv[0], '/'); if (programName == NULL) programName = argv[0]; @@ -1397,7 +1472,7 @@ XBoard square size (hint): %d\n\ #if ENABLE_NLS &clockFontSet); #else - &clockFonStruct); + clockFontStruct); #endif boardWidget = optList[W_BOARD].handle; menuBarWidget = optList[W_MENU].handle; @@ -1463,6 +1538,13 @@ XBoard square size (hint): %d\n\ CreateGrid(); CreateAnyPieces(); + if(appData.logoSize) + { // locate and read user logo + char buf[MSG_SIZ]; + snprintf(buf, MSG_SIZ, "%s/%s.png", appData.logoDir, UserName()); + ASSIGN(userLogo, buf); + } + if (appData.animate || appData.animateDragging) CreateAnimVars(); @@ -1510,6 +1592,7 @@ XBoard square size (hint): %d\n\ gameInfo.boardWidth = 0; // [HGM] pieces: kludge to ensure InitPosition() calls InitDrawingSizes() InitPosition(TRUE); + UpdateLogos(TRUE); // XtSetKeyboardFocus(shellWidget, formWidget); XSetInputFocus(xDisplay, XtWindow(formWidget), RevertToPointerRoot, CurrentTime); @@ -1978,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; } @@ -2138,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() @@ -2282,7 +2420,7 @@ MarkMenuItem (char *menuRef, int state) } void -EnableMenuItem (char *menuRef, int state) +EnableNamedMenuItem (char *menuRef, int state) { MenuItem *item = MenuNameToItem(menuRef); @@ -2300,7 +2438,7 @@ void SetMenuEnables (Enables *enab) { while (enab->name != NULL) { - EnableMenuItem(enab->name, enab->value); + EnableNamedMenuItem(enab->name, enab->value); enab++; } } @@ -2315,14 +2453,6 @@ KeyBindingProc (Widget w, XEvent *event, String *prms, Cardinal *nprms) } static void -MenuBarSelect (Widget w, caddr_t addr, caddr_t index) -{ - MenuProc *proc = (MenuProc *) addr; - - (proc)(); -} - -static void MenuEngineSelect (Widget w, caddr_t addr, caddr_t index) { RecentEngineEvent((int) (intptr_t) addr); @@ -2369,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 @@ -2395,11 +2527,43 @@ CutOutSquare (int x, int y, int *x0, int *y0, int kind) return 1; } +void +DrawLogo (void *handle, void *logo) +{ + cairo_surface_t *img, *cs; + cairo_t *cr; + int w, h; + + if(!logo || !handle) return; + 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 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 @@ -2550,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 @@ -2561,6 +2746,8 @@ ChooseDrawFunc () } else { return monoDrawPiece; } + } else if(appData.pngDirectory[0]) { + return pngDrawPiece; } else { if (useImages) return colorDrawPieceImage; @@ -2572,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 @@ -2713,47 +2907,141 @@ EventProc (Widget widget, caddr_t unused, XEvent *event) 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 (csBoardWindow); + + 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 (csBoardWindow); + + 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 (csBoardWindow); + + 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 (csBoardWindow); 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); + if(!csBoardWindow) csBoardWindow = cairo_xlib_surface_create(xDisplay, xBoardWindow, DefaultVisual(xDisplay, 0), boardWidth, boardHeight); } +void +DrawSeekClose () +{ +} + +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 (csBoardWindow); + + 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); + + return; +} /* * event handler for redrawing the board @@ -2809,26 +3097,6 @@ CommentPopDown () PopDown(CommentDlg); } -static char *openName; -FILE *openFP; - -void -DelayedLoad () -{ - (void) (*fileProc)(openFP, 0, openName); -} - -void -FileNamePopUp (char *label, char *def, char *filter, FileProc proc, char *openMode) -{ - fileProc = proc; /* I can't see a way not */ - fileOpenMode = openMode; /* to use globals here */ - { // [HGM] use file-selector dialog stolen from Ghostview - // int index; // this is not supported yet - Browse(BoardWindow, label, (def[0] ? def : NULL), filter, False, openMode, &openName, &openFP); - } -} - /* Disable all user input other than deleting the window */ static int frozen = 0; @@ -2894,7 +3162,9 @@ ModeHighlight () MarkMenuItem("Mode.MachineMatch", matchMode && matchGame < appData.matchGames); /* Maybe all the enables should be handled here, not just this one */ - EnableMenuItem("Mode.Training", gameMode == Training || gameMode == PlayFromGameFile); + EnableNamedMenuItem("Mode.Training", gameMode == Training || gameMode == PlayFromGameFile); + + DisplayLogos(optList[W_WHITE-1].handle, optList[W_BLACK+1].handle); } @@ -3154,6 +3424,12 @@ ManInner (Widget w, XEvent *event, String *prms, Cardinal *nprms) } void +ManProc () +{ // called from menu + ManInner(NULL, NULL, NULL, NULL); +} + +void SetWindowTitle (char *text, char *title, char *icon) { Arg args[16]; @@ -3357,7 +3633,7 @@ DisplayTimerLabel (Option *opt, char *color, long timer, int highlight) foregroundOrWarningColor = lowTimeWarningColor; if (appData.clockMode) { - snprintf(buf, MSG_SIZ, "%s: %s", color, TimeString(timer)); + snprintf(buf, MSG_SIZ, "%s:%s%s", color, appData.logoSize && !partnerUp ? "\n" : " ", TimeString(timer)); XtSetArg(args[0], XtNlabel, buf); } else { snprintf(buf, MSG_SIZ, "%s ", color); @@ -3478,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) @@ -3563,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, @@ -3719,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); } @@ -3742,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); @@ -3749,19 +4061,56 @@ SetDragPiece (AnimNr anr, ChessSquare piece) /* [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;itidy); + } + } + if(logoName[0]) + { ASSIGN(cps->programLogo, logoName); } } void UpdateLogos (int displ) { - return; // no logos in XBoard yet + if(optList[W_WHITE-1].handle == NULL) return; + LoadLogo(&first, 0, 0); + LoadLogo(&second, 1, appData.icsActive); + if(displ) DisplayLogos(optList[W_WHITE-1].handle, optList[W_BLACK+1].handle); + return; }