X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=xboard.c;h=5dc557c53293cb2a5248a8b901c02d30653e923e;hb=464c850454acd87b1f293c00d138a932a8641eba;hp=3041c88feb40d0488c4a12f8f77a4b92656740c5;hpb=39d79ffb3def5d8ac66c02dd97245a13d89ba8eb;p=xboard.git diff --git a/xboard.c b/xboard.c index 3041c88..5dc557c 100644 --- a/xboard.c +++ b/xboard.c @@ -340,8 +340,8 @@ WindowPlacement wpTags; #define SOLID 0 #define OUTLINE 1 -Boolean cairoAnimate = True; -static cairo_surface_t *csBoardWindow; +Boolean cairoAnimate; +static cairo_surface_t *csBoardWindow, *csBoardBackup, *csDualBoard; 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]; @@ -894,9 +894,16 @@ SwitchWindow () extern Option dualOptions[]; static Window dual; Window tmp = xBoardWindow; + cairo_surface_t *cstmp = csBoardWindow; if(!dual) dual = XtWindow(dualOptions[3].handle); // must be first call xBoardWindow = dual; // swap them dual = tmp; + csBoardWindow = csDualBoard; + if(!csDualBoard && cstmp) { + int boardWidth = lineGap + BOARD_WIDTH * (squareSize + lineGap); + int boardHeight = lineGap + BOARD_HEIGHT * (squareSize + lineGap); + csBoardWindow = cairo_xlib_surface_create(xDisplay, xBoardWindow, DefaultVisual(xDisplay, 0), boardWidth, boardHeight); + } } void @@ -927,6 +934,16 @@ ConvertToLine (int argc, char **argv) //-------------------------------------------------------------------------------------------- +void +NewSurfaces () +{ + // delete surfaces after size becomes invalid, so they will be recreated + if(csBoardWindow) cairo_surface_destroy(csBoardWindow); + if(csBoardBackup) cairo_surface_destroy(csBoardBackup); + if(csDualBoard) cairo_surface_destroy(csDualBoard); + csBoardWindow = csBoardBackup = csDualBoard = NULL; +} + #define BoardSize int void InitDrawingSizes (BoardSize boardSize, int flags) @@ -950,15 +967,16 @@ InitDrawingSizes (BoardSize boardSize, int flags) oldWidth = boardWidth; oldHeight = boardHeight; CreateGrid(); + NewSurfaces(); /* * Inhibit shell resizing. */ - shellArgs[0].value = w = (XtArgVal) boardWidth + marginW ; + shellArgs[0].value = w = (XtArgVal) boardWidth + marginW + 1; // [HGM] not sure why the +1 is (sometimes) needed... shellArgs[1].value = h = (XtArgVal) boardHeight + marginH; shellArgs[4].value = shellArgs[2].value = w; shellArgs[5].value = shellArgs[3].value = h; - XtSetValues(shellWidget, &shellArgs[0], 6); + XtSetValues(shellWidget, &shellArgs[0], cairoAnimate ? 2 : 6); XSync(xDisplay, False); DelayedDrag(); @@ -1037,7 +1055,6 @@ 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 } @@ -1045,7 +1062,7 @@ printf("Copy pieces\n"); oldVariant = gameInfo.variant; } #if HAVE_LIBXPM - if(appData.monoMode != oldMono) + if(appData.monoMode != oldMono || cairoAnimate) CreateAnimVars(); #endif oldMono = appData.monoMode; @@ -1523,12 +1540,17 @@ XBoard square size (hint): %d\n\ /* * Inhibit shell resizing. */ + + CreateAnyPieces(); + cairoAnimate = *appData.pngDirectory && useTexture == 3 + && strstr(appData.liteBackTextureFile, ".png") && strstr(appData.darkBackTextureFile, ".png"); + shellArgs[0].value = (XtArgVal) &w; shellArgs[1].value = (XtArgVal) &h; XtGetValues(shellWidget, shellArgs, 2); shellArgs[4].value = shellArgs[2].value = w; shellArgs[5].value = shellArgs[3].value = h; - XtSetValues(shellWidget, &shellArgs[2], 4); + if(!cairoAnimate) XtSetValues(shellWidget, &shellArgs[2], 4); marginW = w - boardWidth; // [HGM] needed to set new shellWidget size when we resize board marginH = h - boardHeight; @@ -1536,7 +1558,6 @@ XBoard square size (hint): %d\n\ CreateGCs(False); CreateGrid(); - CreateAnyPieces(); if(appData.logoSize) { // locate and read user logo @@ -2244,25 +2265,23 @@ ScaleOnePiece (char *name, int color, int piece) 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 + if((img = 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); } + if(w != 64 || h != 64) { 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_scale(cr, squareSize/64., squareSize/64.); cairo_set_source_surface (cr, img, 0, 0); cairo_paint (cr); cairo_destroy (cr); - cairo_surface_destroy (img); } void @@ -2497,18 +2516,25 @@ do_flash_delay (unsigned long msec) } void -DrawBorder (int x, int y, int type) +DoDrawBorder (cairo_surface_t *cs, int x, int y, int type) { cairo_t *cr; DrawSeekOpen(); - cr = cairo_create(csBoardWindow); + 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); } +void +DrawBorder (int x, int y, int type) +{ + DoDrawBorder(csBoardWindow, x, y, type); + DoDrawBorder(csBoardBackup, x, y, type); +} + static int CutOutSquare (int x, int y, int *x0, int *y0, int kind) { @@ -2563,10 +2589,36 @@ BlankSquare (int x, int y, int color, ChessSquare piece, Drawable dest, int fac) cairo_rectangle (cr, x*fac, y*fac, squareSize, squareSize); cairo_fill (cr); cairo_destroy (cr); + if(fac) { + cr = cairo_create (csBoardBackup); + 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 + if(csBoardWindow) { + cairo_t *cr = cairo_create (csBoardWindow); + char *col; + switch (color) { + case 0: col = appData.darkSquareColor; break; + case 1: col = appData.lightSquareColor; break; + case 2: col = "#000000"; break; + } + SetPen(cr, 2.0, col, 0); + cairo_rectangle (cr, x, y, squareSize, squareSize); + cairo_fill (cr); + cairo_destroy (cr); + cr = cairo_create (csBoardBackup); + SetPen(cr, 2.0, col, 0); + cairo_rectangle (cr, x, y, squareSize, squareSize); + cairo_fill (cr); + cairo_destroy (cr); + } else if (useImages && useImageSqs) { Pixmap pm; switch (color) { @@ -2733,6 +2785,10 @@ pngDrawPiece (ChessSquare piece, int square_color, int x, int y, Drawable dest) cairo_set_source_surface (cr, pngPieceBitmaps[kind][piece], x, y); cairo_paint(cr); cairo_destroy (cr); + cr = cairo_create (csBoardBackup); + cairo_set_source_surface (cr, pngPieceBitmaps[kind][piece], x, y); + cairo_paint(cr); + cairo_destroy (cr); } typedef void (*DrawFunc)(); @@ -2757,11 +2813,11 @@ ChooseDrawFunc () } void -DrawDot (int marker, int x, int y, int r) +DoDrawDot (int marker, int x, int y, int r, cairo_surface_t *cs) { cairo_t *cr; DrawSeekOpen(); - cr = cairo_create(csBoardWindow); + cr = cairo_create(cs); cairo_arc(cr, x+r/2, y+r/2, r/2, 0.0, 2*M_PI); if(appData.monoMode) { SetPen(cr, 2, marker == 2 ? "#000000" : "#FFFFFF", 0); @@ -2777,6 +2833,13 @@ DrawDot (int marker, int x, int y, int r) } void +DrawDot (int marker, int x, int y, int r) +{ + DoDrawDot(marker, x, y, r, csBoardWindow); + DoDrawDot(marker, x, y, r, csBoardBackup); +} + +void DrawOneSquare (int x, int y, ChessSquare piece, int square_color, int marker, char *string, int align) { // basic front-end board-draw function: takes care of everything that can be in square: // piece, background, coordinate/count, marker dot @@ -2812,6 +2875,32 @@ DrawOneSquare (int x, int y, ChessSquare piece, int square_color, int marker, ch if (appData.monoMode) { XDrawImageString(xDisplay, xBoardWindow, hGC, xx, yy, string, 1); } else { + if(*appData.pngDirectory) { + cairo_t *cr = cairo_create (csBoardWindow); + cairo_select_font_face (cr, "Sans", + CAIRO_FONT_SLANT_NORMAL, + CAIRO_FONT_WEIGHT_BOLD); + + cairo_set_font_size (cr, squareSize/4); + + cairo_move_to (cr, xx-1, yy); + if(align < 3) cairo_set_source_rgb (cr, 0.0, 0.0, 0.0); + else cairo_set_source_rgb (cr, 1.0, 1.0, 1.0); + cairo_show_text (cr, string); + cairo_destroy (cr); + cr = cairo_create (csBoardBackup); + cairo_select_font_face (cr, "Sans", + CAIRO_FONT_SLANT_NORMAL, + CAIRO_FONT_WEIGHT_BOLD); + + cairo_set_font_size (cr, squareSize/4); + + cairo_move_to (cr, xx-1, yy); + if(align < 3) cairo_set_source_rgb (cr, 0.0, 0.0, 0.0); + else cairo_set_source_rgb (cr, 1.0, 1.0, 1.0); + cairo_show_text (cr, string); + cairo_destroy (cr); + } else XDrawString(xDisplay, xBoardWindow, hGC, xx, yy, string, 1); } } @@ -2873,15 +2962,37 @@ CoDrag (Widget sh, WindowPlacement *wp) XtSetValues(sh, args, j); } +void +ReSize (WindowPlacement *wp) +{ + int sqx, sqy; + if(wp->width == wpMain.width && wp->height == wpMain.height) return; // not sized + sqx = (wp->width - lineGap - marginW) / BOARD_WIDTH - lineGap; + sqy = (wp->height - lineGap - marginH) / BOARD_HEIGHT - lineGap; + if(sqy < sqx) sqx = sqy; + if(sqx != squareSize) { + squareSize = sqx; // adopt new square size + NewSurfaces(); + CreatePNGPieces(); // make newly scaled pieces + InitDrawingSizes(0, 0); // creates grid etc. + } +} + static XtIntervalId delayedDragID = 0; void DragProc () { + static int busy; + if(busy) return; + + busy = 1; GetActualPlacement(shellWidget, &wpNew); if(wpNew.x == wpMain.x && wpNew.y == wpMain.y && // not moved - wpNew.width == wpMain.width && wpNew.height == wpMain.height) // not sized - return; // false alarm + wpNew.width == wpMain.width && wpNew.height == wpMain.height) { // not sized + busy = 0; return; // false alarm + } + ReSize(&wpNew); if(shellUp[EngOutDlg]) CoDrag(shells[EngOutDlg], &wpEngineOutput); if(shellUp[HistoryDlg]) CoDrag(shells[HistoryDlg], &wpMoveHistory); if(shellUp[EvalGraphDlg]) CoDrag(shells[EvalGraphDlg], &wpEvalGraph); @@ -2889,6 +3000,7 @@ DragProc () wpMain = wpNew; DrawPosition(True, NULL); delayedDragID = 0; // now drag executed, make sure next DelayedDrag will not cancel timer event (which could now be used by other) + busy = 0; } @@ -2897,7 +3009,7 @@ DelayedDrag () { if(delayedDragID) XtRemoveTimeOut(delayedDragID); // cancel pending delayedDragID = - XtAppAddTimeOut(appContext, 50, (XtTimerCallbackProc) DragProc, (XtPointer) 0); // and schedule new one 50 msec later + XtAppAddTimeOut(appContext, 100, (XtTimerCallbackProc) DragProc, (XtPointer) 0); // and schedule new one 50 msec later } void @@ -2969,10 +3081,8 @@ void DrawSeekText(char *buf, int x, int y) 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); + cairo_show_text( cr, buf); /* free memory */ cairo_destroy (cr); @@ -3007,7 +3117,10 @@ DrawSeekOpen () { 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); + if(!csBoardWindow) { + csBoardWindow = cairo_xlib_surface_create(xDisplay, xBoardWindow, DefaultVisual(xDisplay, 0), boardWidth, boardHeight); + csBoardBackup = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, boardWidth, boardHeight); + } } void @@ -3016,7 +3129,7 @@ DrawSeekClose () } void -DrawGrid() +DoDrawGrid(cairo_surface_t *cs) { /* draws a grid starting around Nx, Ny squares starting at x,y */ int i; @@ -3024,7 +3137,7 @@ DrawGrid() DrawSeekOpen(); /* get a cairo_t */ - cr = cairo_create (csBoardWindow); + cr = cairo_create (cs); cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE); SetPen(cr, lineGap, "#000000", 0); @@ -3043,6 +3156,13 @@ DrawGrid() return; } +void +DrawGrid() +{ + DoDrawGrid(csBoardWindow); + DoDrawGrid(csBoardBackup); +} + /* * event handler for redrawing the board */ @@ -3842,6 +3962,8 @@ InitAnimState (AnimNr anr, XWindowAttributes *info) if(cairoAnimate) { 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; 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); @@ -3877,7 +3999,7 @@ CreateAnimVars () { XWindowAttributes info; - if (xpmDone && gameInfo.variant == oldVariant) return; + if (!cairoAnimate && xpmDone && gameInfo.variant == oldVariant) return; if(xpmDone) oldVariant = gameInfo.variant; // first time pieces might not be created yet XGetWindowAttributes(xDisplay, xBoardWindow, &info); @@ -3885,7 +4007,7 @@ CreateAnimVars () InitAnimState(Player, &info); /* For XPM pieces, we need bitmaps to use as masks. */ - if (useImages) + if (useImages & !xpmDone) CreateAnimMasks(info.depth), xpmDone = 1; } @@ -4007,14 +4129,17 @@ static void CairoOverlayPiece (ChessSquare piece, cairo_surface_t *dest) { static ChessSquare oldPiece = -1; + static int oldSize; static cairo_t *pieceSource; - if(piece != oldPiece) { // try make it faster by only changing cr if we need other piece + extern int doubleClick; // in backend.c + if(piece != oldPiece || squareSize != oldSize) { // 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; + oldPiece = piece; oldSize = squareSize; } - cairo_paint(pieceSource); + if(doubleClick) cairo_paint_with_alpha (pieceSource, 0.6); + else cairo_paint(pieceSource); } void @@ -4039,11 +4164,22 @@ 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_t *cr;// = cairo_create (c_animBufs[anr+destBuf]); + cr = cairo_create (c_animBufs[anr+destBuf]); + if(c_animBufs[anr+srcBuf] == csBoardWindow) + cairo_set_source_surface (cr, csBoardBackup, destX - srcX, destY - srcY); + else + 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); + if(c_animBufs[anr+destBuf] == csBoardWindow) { + cr = cairo_create (csBoardBackup); // also draw to backup 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);