X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.c;h=e943a22a8f71361f9340374f761e98998ffbbb77;hb=2efc0144a02840f0454378b19b4dbaf428c226bd;hp=e0a6969061741f7972b626e7dd530e418fa2712e;hpb=0e642a2b9658ccaef62bf668f9d51598ee3a7deb;p=xboard.git

diff --git a/winboard/winboard.c b/winboard/winboard.c
index e0a6969..e943a22 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -1906,6 +1906,7 @@ ResizeBoard(int newSizeX, int newSizeY, int flags)
 }
 
 
+extern Boolean twoBoards, partnerUp; // [HGM] dual
 
 VOID
 InitDrawingSizes(BoardSize boardSize, int flags)
@@ -2041,6 +2042,7 @@ InitDrawingSizes(BoardSize boardSize, int flags)
   winW = 2 * GetSystemMetrics(SM_CXFRAME) + boardRect.right + OUTER_MARGIN;
   winH = 2 * GetSystemMetrics(SM_CYFRAME) + GetSystemMetrics(SM_CYMENU) +
     GetSystemMetrics(SM_CYCAPTION) + boardRect.bottom + OUTER_MARGIN;
+  winW *= 1 + twoBoards;
   if(suppressVisibleEffects) return; // [HGM] when called for filling sizeInfo only
   wpMain.width = winW;  // [HGM] placement: set through temporary which can used by initial sizing choice
   wpMain.height = winH; //       without disturbing window attachments
@@ -3153,10 +3155,10 @@ void DrawSeekDot(int x, int y, int color)
 VOID
 HDCDrawPosition(HDC hdc, BOOLEAN repaint, Board board)
 {
-  static Board lastReq, lastDrawn;
+  static Board lastReq[2], lastDrawn[2];
   static HighlightInfo lastDrawnHighlight, lastDrawnPremove;
   static int lastDrawnFlipView = 0;
-  static int lastReqValid = 0, lastDrawnValid = 0;
+  static int lastReqValid[2] = {0, 0}, lastDrawnValid[2] = {0, 0};
   int releaseDC, x, y, x2, y2, row, column, num_clips = 0, i;
   HDC tmphdc;
   HDC hdcmem;
@@ -3165,6 +3167,7 @@ HDCDrawPosition(HDC hdc, BOOLEAN repaint, Board board)
   RECT Rect;
   HRGN clips[MAX_CLIPS];
   ChessSquare dragged_piece = EmptySquare;
+  int nr = twoBoards*partnerUp;
 
   /* I'm undecided on this - this function figures out whether a full
    * repaint is necessary on its own, so there's no real reason to have the
@@ -3183,13 +3186,13 @@ HDCDrawPosition(HDC hdc, BOOLEAN repaint, Board board)
   }
 
   if (board == NULL) {
-    if (!lastReqValid) {
+    if (!lastReqValid[nr]) {
       return;
     }
-    board = lastReq;
+    board = lastReq[nr];
   } else {
-    CopyBoard(lastReq, board);
-    lastReqValid = 1;
+    CopyBoard(lastReq[nr], board);
+    lastReqValid[nr] = 1;
   }
 
   if (doingSizing) {
@@ -3235,16 +3238,17 @@ HDCDrawPosition(HDC hdc, BOOLEAN repaint, Board board)
    * newest board with the last drawn board and checking if
    * flipping has changed.
    */
-  if (!fullrepaint && lastDrawnValid && lastDrawnFlipView == flipView) {
+  if (!fullrepaint && lastDrawnValid[nr] && (nr == 1 || lastDrawnFlipView == flipView)) {
     for (row = 0; row < BOARD_HEIGHT; row++) { /* [HGM] true size, not 8 */
       for (column = 0; column < BOARD_WIDTH; column++) {
-	if (lastDrawn[row][column] != board[row][column]) {
+	if (lastDrawn[nr][row][column] != board[row][column]) {
 	  SquareToPos(row, column, &x, &y);
 	  clips[num_clips++] =
 	    CreateRectRgn(x, y, x + squareSize, y + squareSize);
 	}
       }
     }
+   if(nr == 0) { // [HGM] dual: no highlights on second board
     for (i=0; i<2; i++) {
       if (lastDrawnHighlight.sq[i].x != highlightInfo.sq[i].x ||
 	  lastDrawnHighlight.sq[i].y != highlightInfo.sq[i].y) {
@@ -3285,6 +3289,7 @@ HDCDrawPosition(HDC hdc, BOOLEAN repaint, Board board)
 	}
       }
     }
+   }
   } else {
     fullrepaint = TRUE;
   }
@@ -3344,7 +3349,7 @@ HDCDrawPosition(HDC hdc, BOOLEAN repaint, Board board)
 	 explodes.  The old and new positions both had an empty square
 	 at the destination, but animation has drawn a piece there and
 	 we have to remember to erase it. [HGM] moved until after setting lastDrawn */
-      lastDrawn[animInfo.to.y][animInfo.to.x] = animInfo.piece;
+      lastDrawn[0][animInfo.to.y][animInfo.to.x] = animInfo.piece;
     }
   }
 
@@ -3381,9 +3386,10 @@ HDCDrawPosition(HDC hdc, BOOLEAN repaint, Board board)
 	SelectObject(hdcmem, oldBrush);
   } else {
     DrawGridOnDC(hdcmem);
-    DrawHighlightsOnDC(hdcmem);
+    if(nr == 0) DrawHighlightsOnDC(hdcmem); // [HGM] dual: no highlights on right board yet
     DrawBoardOnDC(hdcmem, board, tmphdc);
   }
+  if(nr == 0) // [HGM] dual: markers only on left board
   for (row = 0; row < BOARD_HEIGHT; row++) {
     for (column = 0; column < BOARD_WIDTH; column++) {
 	if (marker[row][column]) { // marker changes only occur with full repaint!
@@ -3438,7 +3444,7 @@ HDCDrawPosition(HDC hdc, BOOLEAN repaint, Board board)
 
   DrawCoordsOnDC(hdcmem);
 
-  CopyBoard(lastDrawn, board); /* [HGM] Moved to here from end of routine, */
+  CopyBoard(lastDrawn[nr], board); /* [HGM] Moved to here from end of routine, */
                  /* to make sure lastDrawn contains what is actually drawn */
 
   /* Put the dragged piece back into place and draw it (out of place!) */
@@ -3475,6 +3481,13 @@ HDCDrawPosition(HDC hdc, BOOLEAN repaint, Board board)
 
   /* Set clipping on the target DC */
   if (!fullrepaint) {
+    if(nr == 1) for (x = 0; x < num_clips; x++) { // [HGM] dual: translate clips
+	RECT rect;
+	GetRgnBox(clips[x], &rect);
+	DeleteObject(clips[x]);
+	clips[x] = CreateRectRgn(rect.left + wpMain.width/2, rect.top, 
+	                  rect.right + wpMain.width/2, rect.bottom);
+    }
     SelectClipRgn(hdc, clips[0]);
     for (x = 1; x < num_clips; x++) {
       if (ExtSelectClipRgn(hdc, clips[x], RGN_OR) == ERROR)
@@ -3486,7 +3499,7 @@ HDCDrawPosition(HDC hdc, BOOLEAN repaint, Board board)
    * This way we avoid any flickering
    */
   oldBitmap = SelectObject(tmphdc, bufferBitmap);
-  BitBlt(hdc, boardRect.left, boardRect.top,
+  BitBlt(hdc, boardRect.left + twoBoards*partnerUp*wpMain.width/2, boardRect.top, // [HGM] dual
 	 boardRect.right - boardRect.left,
 	 boardRect.bottom - boardRect.top,
 	 tmphdc, boardRect.left, boardRect.top, SRCCOPY);
@@ -3574,7 +3587,7 @@ HDCDrawPosition(HDC hdc, BOOLEAN repaint, Board board)
   if (releaseDC) 
     ReleaseDC(hwndMain, hdc);
   
-  if (lastDrawnFlipView != flipView) {
+  if (lastDrawnFlipView != flipView && nr == 0) {
     if (flipView)
       CheckMenuItem(GetMenu(hwndMain),IDM_FlipView, MF_BYCOMMAND|MF_CHECKED);
     else
@@ -3585,7 +3598,7 @@ HDCDrawPosition(HDC hdc, BOOLEAN repaint, Board board)
   lastDrawnHighlight = highlightInfo;
   lastDrawnPremove   = premoveHighlightInfo;
   lastDrawnFlipView = flipView;
-  lastDrawnValid = 1;
+  lastDrawnValid[nr] = 1;
 }
 
 /* [HGM] diag: Save the current board display to the given open file and close the file */
@@ -3626,6 +3639,11 @@ PaintProc(HWND hwnd)
 	RealizePalette(hdc);
       }
       HDCDrawPosition(hdc, 1, NULL);
+      if(twoBoards) { // [HGM] dual: also redraw other board in other orientation
+	flipView = !flipView; partnerUp = !partnerUp;
+	HDCDrawPosition(hdc, 1, NULL);
+	flipView = !flipView; partnerUp = !partnerUp;
+      }
       oldFont =
 	SelectObject(hdc, font[boardSize][MESSAGE_FONT]->hf);
       ExtTextOut(hdc, messageRect.left, messageRect.top,
@@ -5855,6 +5873,7 @@ CommentDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 	sizeY = newSizeY;
       }
     }
+    SendDlgItemMessage( hDlg, OPT_CommentText, EM_SETEVENTMASK, 0, ENM_MOUSEEVENTS );
     return FALSE;
 
   case WM_COMMAND: /* message: received a command */
@@ -5899,6 +5918,36 @@ CommentDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
     }
     break;
 
+  case WM_NOTIFY: // [HGM] vari: cloned from whistory.c
+        if( wParam == OPT_CommentText ) {
+            MSGFILTER * lpMF = (MSGFILTER *) lParam;
+
+            if( lpMF->msg == WM_RBUTTONDOWN && (lpMF->wParam & (MK_CONTROL | MK_SHIFT)) == 0 ) {
+                POINTL pt;
+                LRESULT index;
+
+                pt.x = LOWORD( lpMF->lParam );
+                pt.y = HIWORD( lpMF->lParam );
+
+                index = SendDlgItemMessage( hDlg, OPT_CommentText, EM_CHARFROMPOS, 0, (LPARAM) &pt );
+
+		hwndText = GetDlgItem(hDlg, OPT_CommentText); // cloned from above
+		len = GetWindowTextLength(hwndText);
+		str = (char *) malloc(len + 1);
+		GetWindowText(hwndText, str, len + 1);
+		ReplaceComment(commentIndex, str);
+		if(commentIndex != currentMove) ToNrEvent(commentIndex);
+                LoadVariation( index, str ); // [HGM] also does the actual moving to it, now
+		free(str);
+
+                /* Zap the message for good: apparently, returning non-zero is not enough */
+                lpMF->msg = WM_USER;
+
+                return TRUE;
+            }
+        }
+        break;
+
   case WM_SIZE:
     newSizeX = LOWORD(lParam);
     newSizeY = HIWORD(lParam);
@@ -8090,7 +8139,7 @@ VOID
 CommentPopUp(char *title, char *str)
 {
   HWND hwnd = GetActiveWindow();
-  EitherCommentPopUp(0, title, str, FALSE);
+  EitherCommentPopUp(currentMove, title, str, FALSE); // [HGM] vari: fake move index, rather than 0
   SAY(str);
   SetActiveWindow(hwnd);
 }