X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=xboard.c;h=83715629acefbe0bec786662eb74920b63d93033;hb=30bee1681398fd9d9dfbcfc9fcb5d4e5180415bd;hp=55655a50bb398f3d258e5e5136fdd4713d96d66d;hpb=d9e6a27b308737052647882e8738bbb5e89f2be1;p=xboard.git diff --git a/xboard.c b/xboard.c index 55655a5..8371562 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, *csBoardBackup; +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(); @@ -1045,7 +1063,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 +1541,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 +1559,6 @@ XBoard square size (hint): %d\n\ CreateGCs(False); CreateGrid(); - CreateAnyPieces(); if(appData.logoSize) { // locate and read user logo @@ -2244,14 +2266,13 @@ 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 != 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); @@ -2262,7 +2283,6 @@ ScaleOnePiece (char *name, int color, int piece) cairo_set_source_surface (cr, img, 0, 0); cairo_paint (cr); cairo_destroy (cr); - cairo_surface_destroy (img); } void @@ -2838,6 +2858,22 @@ 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); + + /* free memory */ + cairo_destroy (cr); + } else XDrawString(xDisplay, xBoardWindow, hGC, xx, yy, string, 1); } } @@ -2899,15 +2935,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); @@ -2915,6 +2973,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; } @@ -2923,7 +2982,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 @@ -2995,10 +3054,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); @@ -3878,6 +3935,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); @@ -3913,7 +3972,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); @@ -3921,7 +3980,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; } @@ -4043,12 +4102,13 @@ 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 + 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); }