X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=board.c;h=b8be924af6f315fd5e4edb0cbe0418f558dd493c;hb=67b3a0d7c465522feb67841c7374bf863df19357;hp=676ea0b9e154eb13f007ed6e7c5ebd6c791cf0e7;hpb=c0d0ea91773838e5d11c3cd3b407fea251058c34;p=xboard.git diff --git a/board.c b/board.c index 676ea0b..b8be924 100644 --- a/board.c +++ b/board.c @@ -98,6 +98,7 @@ extern char *getenv(); #include "backend.h" #include "moves.h" #include "board.h" +#include "draw.h" #ifdef __EMX__ @@ -118,6 +119,9 @@ int damage[2][BOARD_RANKS][BOARD_FILES]; AnimState anims[NrOfAnims]; static void DrawSquare P((int row, int column, ChessSquare piece, int do_flash)); +static Boolean IsDrawArrowEnabled P((void)); +static void DrawArrowHighlight P((int fromX, int fromY, int toX,int toY)); +static void ArrowDamage P((int s_col, int s_row, int d_col, int d_row)); static void drawHighlight (int file, int rank, int type) @@ -145,6 +149,8 @@ int pm1X = -1, pm1Y = -1, pm2X = -1, pm2Y = -1; void SetHighlights (int fromX, int fromY, int toX, int toY) { + int arrow = hi2X >= 0 && hi1Y >= 0 && IsDrawArrowEnabled(); + if (hi1X != fromX || hi1Y != fromY) { if (hi1X >= 0 && hi1Y >= 0) { drawHighlight(hi1X, hi1Y, 0); @@ -156,6 +162,10 @@ SetHighlights (int fromX, int fromY, int toX, int toY) drawHighlight(hi2X, hi2Y, 0); } } + + if(arrow) // there currently is an arrow displayed + ArrowDamage(hi1X, hi1Y, hi2X, hi2Y); // mark which squares it damaged + if (hi1X != fromX || hi1Y != fromY) { if (fromX >= 0 && fromY >= 0) { drawHighlight(fromX, fromY, 1); @@ -167,13 +177,13 @@ SetHighlights (int fromX, int fromY, int toX, int toY) } } - if(toX<0) // clearing the highlights must have damaged arrow - DrawArrowHighlight(hi1X, hi1Y, hi2X, hi2Y); // for now, redraw it (should really be cleared!) - hi1X = fromX; hi1Y = fromY; hi2X = toX; hi2Y = toY; + + if(arrow || toX >= 0 && fromY >= 0 && IsDrawArrowEnabled()) + DrawPosition(FALSE, NULL); // repair any arrow damage, or draw a new one } void @@ -803,8 +813,10 @@ DrawSquare (int row, int column, ChessSquare piece, int do_flash) if (do_flash && piece != EmptySquare && appData.flashCount > 0) { for (i=0; i 0) @@ -949,25 +964,34 @@ DrawPosition (int repaint, Board board) DrawSquare(i, j, board[i][j], 0); damage[nr][i][j] = False; } + + exposeAll = True; } CopyBoard(lastBoard[nr], board); lastBoardValid[nr] = 1; if(nr == 0) { // [HGM] dual: no highlights on second board yet lastFlipView = flipView; + for (i = 0; i < BOARD_HEIGHT; i++) + for (j = 0; j < BOARD_WIDTH; j++) + lastMarker[i][j] = marker[i][j]; /* Draw highlights */ if (pm1X >= 0 && pm1Y >= 0) { drawHighlight(pm1X, pm1Y, 2); + damage[nr][pm1Y][pm1X] = False; } if (pm2X >= 0 && pm2Y >= 0) { drawHighlight(pm2X, pm2Y, 2); + damage[nr][pm2Y][pm2X] = False; } if (hi1X >= 0 && hi1Y >= 0) { drawHighlight(hi1X, hi1Y, 1); + damage[nr][hi1Y][hi1X] = False; } if (hi2X >= 0 && hi2Y >= 0) { drawHighlight(hi2X, hi2Y, 1); + damage[nr][hi2Y][hi2X] = False; } DrawArrowHighlight(hi1X, hi1Y, hi2X, hi2Y); } @@ -976,6 +1000,30 @@ DrawPosition (int repaint, Board board) /* If piece being dragged around board, must redraw that too */ DrawDragPiece(); + if(exposeAll) + GraphExpose(currBoard, 0, 0, BOARD_WIDTH*(squareSize + lineGap) + lineGap, BOARD_HEIGHT*(squareSize + lineGap) + lineGap); + else { + for (i = 0; i < BOARD_HEIGHT; i++) + for (j = 0; j < BOARD_WIDTH; j++) + if(damage[nr][i][j]) { + int x, y; + if (flipView) { + x = lineGap + ((BOARD_WIDTH-1)-j) * + (squareSize + lineGap); + y = lineGap + i * (squareSize + lineGap); + } else { + x = lineGap + j * (squareSize + lineGap); + y = lineGap + ((BOARD_HEIGHT-1)-i) * + (squareSize + lineGap); + } + if(damage[nr][i][j] & 2) // damage by old or new arrow + GraphExpose(currBoard, x - lineGap, y - lineGap, squareSize + 2*lineGap, squareSize + 2*lineGap); + else + GraphExpose(currBoard, x, y, squareSize, squareSize); + damage[nr][i][j] &= ~2; // remember damage by newly drawn error in '2' bit, to schedule it for erasure next draw + } + } + FlashDelay(0); // this flushes drawing queue; if(nr) SwitchWindow(); } @@ -1012,7 +1060,7 @@ SquareToPos (int rank, int file, int *x, int *y) } /* Draw an arrow between two points using current settings */ -void +static void DrawArrowBetweenPoints (int s_x, int s_y, int d_x, int d_y) { Pnt arrow[8]; @@ -1115,22 +1163,22 @@ DrawArrowBetweenPoints (int s_x, int s_y, int d_x, int d_y) // Polygon( hdc, arrow, 7 ); } -void +static void ArrowDamage (int s_col, int s_row, int d_col, int d_row) { int hor, vert, i, n = partnerUp * twoBoards; hor = 64*s_col + 32; vert = 64*s_row + 32; for(i=0; i<= 64; i++) { - damage[n][vert+6>>6][hor+6>>6] = True; - damage[n][vert-6>>6][hor+6>>6] = True; - damage[n][vert+6>>6][hor-6>>6] = True; - damage[n][vert-6>>6][hor-6>>6] = True; + damage[n][vert+6>>6][hor+6>>6] |= 2; + damage[n][vert-6>>6][hor+6>>6] |= 2; + damage[n][vert+6>>6][hor-6>>6] |= 2; + damage[n][vert-6>>6][hor-6>>6] |= 2; hor += d_col - s_col; vert += d_row - s_row; } } /* [AS] Draw an arrow between two squares */ -void +static void DrawArrowBetweenSquares (int s_col, int s_row, int d_col, int d_row) { int s_x, s_y, d_x, d_y; @@ -1173,13 +1221,13 @@ DrawArrowBetweenSquares (int s_col, int s_row, int d_col, int d_row) ArrowDamage(s_col, s_row, d_col, d_row); } -Boolean +static Boolean IsDrawArrowEnabled () { return (appData.highlightMoveWithArrow || twoBoards && partnerUp) && squareSize >= 32; } -void +static void DrawArrowHighlight (int fromX, int fromY, int toX,int toY) { if( IsDrawArrowEnabled() && fromX >= 0 && fromY >= 0 && toX >= 0 && toY >= 0)