X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.c;h=e4175594c1efd29d8c08da09d71d351b87acc84d;hb=d3e72e265a417fa9dcbc0e040184b93df99cd894;hp=8053123e5a5888e3fe9df04a4615bd2e45ed1f0a;hpb=398df75992ba050823ce8fda5e55735d03b8a9be;p=xboard.git

diff --git a/winboard/winboard.c b/winboard/winboard.c
index 8053123..e417559 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -867,7 +867,6 @@ InitInstance(HINSTANCE hInstance, int nCmdShow, LPSTR lpCmdLine)
 	if(q) *q++ = 0;
 	if(*p) ChatPopUp(p);
       } while(p=q);
-//      Sleep(1000);
     }
     SetActiveWindow(hwndConsole);
   }
@@ -4665,7 +4664,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:
@@ -5852,6 +5855,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 */
@@ -5896,6 +5900,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);
@@ -7307,6 +7341,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
@@ -7330,6 +7365,7 @@ Enables gnuEnables[] = {
   { 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 }
 };
@@ -7350,6 +7386,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 }
 };
 
@@ -7374,6 +7411,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 },
@@ -8083,7 +8121,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);
 }