#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];
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
//--------------------------------------------------------------------------------------------
+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)
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();
}
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
+ if(gameInfo.variant == VariantShogi) {
+ pngPieceBitmaps[i][(int)WhiteCannon] = pngPieceBitmaps2[i][(int)WhiteKing+1];
+ pngPieceBitmaps[i][(int)WhiteNightrider] = pngPieceBitmaps2[i][(int)WhiteKing+2];
+ pngPieceBitmaps[i][(int)WhiteSilver] = pngPieceBitmaps2[i][(int)WhiteKing+3];
+ pngPieceBitmaps[i][(int)WhiteGrasshopper] = pngPieceBitmaps2[i][(int)WhiteKing+4];
+ pngPieceBitmaps[i][(int)WhiteQueen] = pngPieceBitmaps2[i][(int)WhiteLance];
+ }
+ if(gameInfo.variant == VariantGothic) {
+ pngPieceBitmaps[i][(int)WhiteMarshall] = pngPieceBitmaps2[i][(int)WhiteSilver];
+ }
+ if(gameInfo.variant == VariantSChess) {
+ pngPieceBitmaps[i][(int)WhiteAngel] = pngPieceBitmaps2[i][(int)WhiteFalcon];
+ pngPieceBitmaps[i][(int)WhiteMarshall] = pngPieceBitmaps2[i][(int)WhiteAlfil];
+ }
}
oldMono = -10; // kludge to force recreation of animation masks
oldVariant = gameInfo.variant;
}
#if HAVE_LIBXPM
- if(appData.monoMode != oldMono)
+ if(appData.monoMode != oldMono || cairoAnimate)
CreateAnimVars();
#endif
oldMono = appData.monoMode;
/*
* 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;
CreateGCs(False);
CreateGrid();
- CreateAnyPieces();
if(appData.logoSize)
{ // locate and read user logo
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);
cairo_set_source_surface (cr, img, 0, 0);
cairo_paint (cr);
cairo_destroy (cr);
- cairo_surface_destroy (img);
}
void
{
cairo_t *cr;
DrawSeekOpen();
+ char *col;
+ switch(type) {
+ case 0: col = "#000000"; break;
+ case 1: col = appData.highlightSquareColor; break;
+ case 2: col = appData.premoveHighlightColor; break;
+ }
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);
+ SetPen(cr, lineGap, col, 0);
cairo_stroke(cr);
}
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) {
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);
}
}
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);
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;
}
{
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
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);
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);
{
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);
InitAnimState(Player, &info);
/* For XPM pieces, we need bitmaps to use as masks. */
- if (useImages)
+ if (useImages & !xpmDone)
CreateAnimMasks(info.depth), xpmDone = 1;
}
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);
+ pieceSource = cairo_create (dest);
+ cairo_set_source_surface (pieceSource, pngPieceBitmaps[!White(piece)][piece % BlackPawn], 0, 0);
+ if(doubleClick) cairo_paint_with_alpha (pieceSource, 0.6);
+ else cairo_paint(pieceSource);
+ cairo_destroy (pieceSource);
}
void
/* [AS] Arrow highlighting support */
-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;
+void
+DoDrawPolygon (cairo_surface_t *cs, Pnt arrow[], int nr)
+{
cairo_t *cr;
int i;
- 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);
+ cr = cairo_create (cs);
cairo_move_to (cr, arrow[nr-1].x, arrow[nr-1].y);
for (i=0;i<nr;i++) {
cairo_line_to(cr, arrow[i].x, arrow[i].y);
/* free memory */
cairo_destroy (cr);
- cairo_surface_destroy (boardSurface);
+}
+
+void
+DrawPolygon (Pnt arrow[], int nr)
+{
+ DoDrawPolygon(csBoardWindow, arrow, nr);
+ DoDrawPolygon(csBoardBackup, arrow, nr);
}
static void
projects / xboard.git / blobdiff