X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.c;h=6eca9146697da188b443e97ddb88d086192cb60c;hb=f5d26e9d980c67de39d3525802afb9d99f6fb5e8;hp=0958d008ee86483aea68a423e9e7f53e0f2f14a3;hpb=394d2d698de4f7f24853af499fdfe9a339d7a832;p=xboard.git

diff --git a/winboard/winboard.c b/winboard/winboard.c
index 0958d00..6eca914 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -5,7 +5,7 @@
  * Massachusetts. 
  *
  * Enhancements Copyright 1992-2001, 2002, 2003, 2004, 2005, 2006,
- * 2007, 2008, 2009 Free Software Foundation, Inc.
+ * 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
  *
  * Enhancements Copyright 2005 Alessandro Scotti
  *
@@ -108,7 +108,7 @@ int FinishMove P((ChessMove moveType, int fromX, int fromY, int toX, int toY,
 void AnimateAtomicCapture(int fromX, int fromY, int toX, int toY, int nFrames);
 void DisplayMove P((int moveNumber));
 Boolean ParseFEN P((Board board, int *blackPlaysFirst, char *fen));
-void ChatPopUp P(());
+void ChatPopUp P((char *s));
 typedef struct {
   ChessSquare piece;  
   POINT pos;      /* window coordinates of current pos */
@@ -859,6 +859,16 @@ InitInstance(HINSTANCE hInstance, int nCmdShow, LPSTR lpCmdLine)
                  0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE);
 #endif
     ShowWindow(hwndConsole, nCmdShow);
+    if(appData.chatBoxes) { // [HGM] chat: open chat boxes
+      char buf[MSG_SIZ], *p = buf, *q;
+      strcpy(buf, appData.chatBoxes);
+      do {
+	q = strchr(p, ';');
+	if(q) *q++ = 0;
+	if(*p) ChatPopUp(p);
+      } while(p=q);
+    }
+    SetActiveWindow(hwndConsole);
   }
   if(!appData.noGUI)   UpdateWindow(hwnd);  else ShowWindow(hwnd, SW_MINIMIZE);
   if(gameListDialog) SetFocus(gameListDialog); // [HGM] jaws: for if we clicked multi-game game file
@@ -1896,6 +1906,7 @@ ResizeBoard(int newSizeX, int newSizeY, int flags)
 }
 
 
+extern Boolean twoBoards, partnerUp; // [HGM] dual
 
 VOID
 InitDrawingSizes(BoardSize boardSize, int flags)
@@ -2031,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
@@ -3127,8 +3139,14 @@ void DrawSeekText(char *buf, int x, int y)
 
 void DrawSeekDot(int x, int y, int color)
 {
+	int square = color & 0x80;
+	color &= 0x7F;
 	    HBRUSH oldBrush = SelectObject(hdcSeek, 
 			color == 0 ? markerBrush : color == 1 ? darkSquareBrush : explodeBrush);
+	if(square)
+	    Rectangle(hdcSeek, boardRect.left+x - squareSize/9, boardRect.top+y - squareSize/9,
+			       boardRect.left+x + squareSize/9, boardRect.top+y + squareSize/9);
+	else
 	    Ellipse(hdcSeek, boardRect.left+x - squareSize/8, boardRect.top+y - squareSize/8,
 			     boardRect.left+x + squareSize/8, boardRect.top+y + squareSize/8);
 	    SelectObject(hdcSeek, oldBrush);
@@ -3165,6 +3183,7 @@ HDCDrawPosition(HDC hdc, BOOLEAN repaint, Board board)
   if( DrawPositionNeedsFullRepaint() ) {
       fullrepaint = TRUE;
   }
+  if(twoBoards) fullrepaint = TRUE; // [HGM] dual: our memory of last-drawn will be all wrong
 
   if (board == NULL) {
     if (!lastReqValid) {
@@ -3470,7 +3489,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);
@@ -3773,7 +3792,7 @@ MouseEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
     break;
 
   case WM_MOUSEMOVE:
-    if(SeekGraphClick(Press, pt.x - boardRect.left, pt.y - boardRect.top, TRUE)) break;
+    if(SeekGraphClick(Press, pt.x - boardRect.left, pt.y - boardRect.top, 1)) break;
     MovePV(pt.x - boardRect.left, pt.y - boardRect.top, boardRect.bottom - boardRect.top);
     if ((appData.animateDragging || appData.highlightDragging)
 	&& (wParam & MK_LBUTTON)
@@ -4416,7 +4435,7 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       break;
 
     case IDM_NewChat:
-      ChatPopUp();
+      ChatPopUp(NULL);
       break;
 
     case IDM_CopyPosition:
@@ -4613,6 +4632,10 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       StopExaminingEvent();
       break;
 
+    case IDM_Upload:
+      UploadGameEvent();
+      break;
+
     case IDM_TypeInMove:
       PopUpMoveDialog('\000');
       break;
@@ -4644,7 +4667,11 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       break;
 
     case IDM_Revert:
-      RevertEvent();
+      RevertEvent(FALSE);
+      break;
+
+    case IDM_Annotate: // [HGM] vari: revert with annotation
+      RevertEvent(TRUE);
       break;
 
     case IDM_TruncateGame:
@@ -5831,6 +5858,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 */
@@ -5875,6 +5903,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);
@@ -6307,13 +6365,14 @@ LoadIcsTextMenu(IcsTextMenuEntry *e)
   while (e->item) {
     if (strcmp(e->item, "-") == 0) {
       AppendMenu(h, MF_SEPARATOR, 0, 0);
-    } else {
+    } else { // [HGM] re-written a bit to use only one AppendMenu call for both cases (| or no |)
+      int flags = MF_STRING, j = 0;
       if (e->item[0] == '|') {
-	AppendMenu(h, MF_STRING|MF_MENUBARBREAK,
-		   IDM_CommandX + i, &e->item[1]);
-      } else {
-	AppendMenu(h, MF_STRING, IDM_CommandX + i, e->item);
+	flags |= MF_MENUBARBREAK;
+        j++;
       }
+      if(!strcmp(e->command, "none")) flags |= MF_GRAYED; // [HGM] chatclick: provide inactive dummy
+      AppendMenu(h, flags, IDM_CommandX + i, e->item + j);
     }
     e++;
     i++;
@@ -6382,6 +6441,7 @@ CommandX(HWND hwnd, char *command, BOOLEAN getname, BOOLEAN immediate)
     SetWindowText(hInput, buf);
     SendMessage(hInput, WM_CHAR, '\r', 0);
   } else {
+    if(!strcmp(command, "chat")) { ChatPopUp(name); return; }
     sprintf(buf, "%s %s ", command, name); /* trailing space */
     SetWindowText(hInput, buf);
     sel.cpMin = 999999;
@@ -6434,11 +6494,20 @@ ConsoleTextSubclass(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
     }
     return 0;
    } // [HGM] navigate: for Ctrl+R, flow into nex case (moved up here) to summon up menu
-  case WM_RBUTTONUP:
-    if (GetKeyState(VK_SHIFT) & ~1) {
-      SendDlgItemMessage(hwndConsole, OPT_ConsoleText, 
-        WM_COMMAND, MAKEWPARAM(IDM_QuickPaste, 0), 0);
-    } else {
+  case WM_RBUTTONDOWN:
+    if (!(GetKeyState(VK_SHIFT) & ~1)) {
+      /* Move selection here if it was empty */
+      POINT pt;
+      pt.x = LOWORD(lParam);
+      pt.y = HIWORD(lParam);
+      SendMessage(hwnd, EM_EXGETSEL, 0, (LPARAM)&sel);
+      if (sel.cpMin == sel.cpMax) {
+        sel.cpMin = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM)&pt); /*doc is wrong*/
+	sel.cpMax = sel.cpMin;
+	SendMessage(hwnd, EM_EXSETSEL, 0, (LPARAM)&sel);
+      }
+      SendMessage(hwnd, EM_HIDESELECTION, FALSE, FALSE);
+{ // [HGM] chatclick: code moved here from WM_RBUTTONUP case, to have menu appear on down-click
       POINT pt;
       HMENU hmenu = LoadIcsTextMenu(icsTextMenuEntry);
       SendMessage(hwnd, EM_EXGETSEL, 0, (LPARAM)&sel);
@@ -6449,9 +6518,17 @@ ConsoleTextSubclass(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       if (!IsClipboardFormatAvailable(CF_TEXT)) {
         EnableMenuItem(hmenu, IDM_Paste, MF_BYCOMMAND|MF_GRAYED);
       }
-      pt.x = LOWORD(lParam);
-      pt.y = HIWORD(lParam);
+      pt.x = LOWORD(lParam)-30; // [HGM] chatclick: make menu pop up with pointer above upper-right item
+      pt.y = HIWORD(lParam)-10; //       make it appear as if mouse moved there, so it will be selected on up-click
+      PostMessage(hwnd, WM_MOUSEMOVE, wParam, lParam+5);
       MenuPopup(hwnd, pt, hmenu, -1);
+}
+    }
+    return 0;
+  case WM_RBUTTONUP:
+    if (GetKeyState(VK_SHIFT) & ~1) {
+      SendDlgItemMessage(hwndConsole, OPT_ConsoleText, 
+        WM_COMMAND, MAKEWPARAM(IDM_QuickPaste, 0), 0);
     }
     return 0;
   case WM_PASTE:
@@ -6460,21 +6537,6 @@ ConsoleTextSubclass(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
     return SendMessage(hInput, message, wParam, lParam);
   case WM_MBUTTONDOWN:
     return SendMessage(hwnd, WM_COMMAND, MAKEWPARAM(IDM_QuickPaste, 0), 0);
-  case WM_RBUTTONDOWN:
-    if (!(GetKeyState(VK_SHIFT) & ~1)) {
-      /* Move selection here if it was empty */
-      POINT pt;
-      pt.x = LOWORD(lParam);
-      pt.y = HIWORD(lParam);
-      SendMessage(hwnd, EM_EXGETSEL, 0, (LPARAM)&sel);
-      if (sel.cpMin == sel.cpMax) {
-        sel.cpMin = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM)&pt); /*doc is wrong*/
-	sel.cpMax = sel.cpMin;
-	SendMessage(hwnd, EM_EXSETSEL, 0, (LPARAM)&sel);
-      }
-      SendMessage(hwnd, EM_HIDESELECTION, FALSE, FALSE);
-    }
-    return 0;
   case WM_COMMAND:
     switch (LOWORD(wParam)) {
     case IDM_QuickPaste:
@@ -7282,6 +7344,7 @@ GreyRevert(Boolean grey)
 { // [HGM] vari: for retracting variations in local mode
   HMENU hmenu = GetMenu(hwndMain);
   EnableMenuItem(hmenu, IDM_Revert, MF_BYCOMMAND|(grey ? MF_GRAYED : MF_ENABLED));
+  EnableMenuItem(hmenu, IDM_Annotate, MF_BYCOMMAND|(grey ? MF_GRAYED : MF_ENABLED));
 }
 
 VOID
@@ -7303,7 +7366,9 @@ Enables gnuEnables[] = {
   { IDM_Adjourn, MF_BYCOMMAND|MF_GRAYED },
   { IDM_StopExamining, MF_BYCOMMAND|MF_GRAYED },
   { IDM_StopObserving, MF_BYCOMMAND|MF_GRAYED },
+  { IDM_Upload, MF_BYCOMMAND|MF_GRAYED },
   { IDM_Revert, MF_BYCOMMAND|MF_GRAYED },
+  { IDM_Annotate, MF_BYCOMMAND|MF_GRAYED },
   { IDM_NewChat, MF_BYCOMMAND|MF_GRAYED },
   { -1, -1 }
 };
@@ -7324,6 +7389,7 @@ Enables icsEnables[] = {
   { IDM_IcsOptions, MF_BYCOMMAND|MF_ENABLED },
   { IDM_Engine1Options, MF_BYCOMMAND|MF_GRAYED },
   { IDM_Engine2Options, MF_BYCOMMAND|MF_GRAYED },
+  { IDM_Annotate, MF_BYCOMMAND|MF_GRAYED },
   { -1, -1 }
 };
 
@@ -7348,6 +7414,7 @@ Enables ncpEnables[] = {
   { IDM_IcsClient, MF_BYCOMMAND|MF_GRAYED },
   { ACTION_POS, MF_BYPOSITION|MF_GRAYED },
   { IDM_Revert, MF_BYCOMMAND|MF_GRAYED },
+  { IDM_Annotate, MF_BYCOMMAND|MF_GRAYED },
   { IDM_MoveNow, MF_BYCOMMAND|MF_GRAYED },
   { IDM_RetractMove, MF_BYCOMMAND|MF_GRAYED },
   { IDM_TimeControl, MF_BYCOMMAND|MF_GRAYED },
@@ -8057,7 +8124,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);
 }