X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.c;h=e6227ec931294e05e84f4877025ea618b33aca41;hb=9f8e3f62352236d94f044b198a897488d404ed7e;hp=d790116d632f1464b7ef0845ded7fa44e8d75f7e;hpb=671b4c9fb4a307e0caaec84408afefa455901cca;p=xboard.git

diff --git a/winboard/winboard.c b/winboard/winboard.c
index d790116..e6227ec 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 */
@@ -159,7 +159,7 @@ BoardSize boardSize;
 Boolean chessProgram;
 //static int boardX, boardY;
 int  minX, minY; // [HGM] placement: volatile limits on upper-left corner
-static int squareSize, lineGap, minorSize;
+int squareSize, lineGap, minorSize;
 static int winW, winH;
 static RECT messageRect, whiteRect, blackRect, leftLogoRect, rightLogoRect; // [HGM] logo
 static int logoHeight = 0;
@@ -2005,6 +2005,8 @@ InitDrawingSizes(BoardSize boardSize, int flags)
     blackRect.right = blackRect.left + boardWidth/2 - 1;
     blackRect.top = whiteRect.top;
     blackRect.bottom = whiteRect.bottom;
+
+    logoHeight = 0; // [HGM] logo: suppress logo after change to tiny layout!
   }
 
   messageRect.left = OUTER_MARGIN + MESSAGE_LINE_LEFTMARGIN;
@@ -3082,6 +3084,62 @@ DrawLogoOnDC(HDC hdc, RECT logoRect, HBITMAP logo)
   DeleteDC(tmphdc);
 }
 
+static HDC hdcSeek;
+
+// [HGM] seekgraph
+void DrawSeekAxis( int x, int y, int xTo, int yTo )
+{
+    POINT stPt;
+    HPEN hp = SelectObject( hdcSeek, gridPen );
+    MoveToEx( hdcSeek, boardRect.left+x, boardRect.top+y, &stPt );
+    LineTo( hdcSeek, boardRect.left+xTo, boardRect.top+yTo );
+    SelectObject( hdcSeek, hp );
+}
+
+// front-end wrapper for drawing functions to do rectangles
+void DrawSeekBackground( int left, int top, int right, int bottom )
+{
+    HPEN hp;
+    RECT rc;
+
+    if (hdcSeek == NULL) {
+    hdcSeek = GetDC(hwndMain);
+      if (!appData.monoMode) {
+        SelectPalette(hdcSeek, hPal, FALSE);
+        RealizePalette(hdcSeek);
+      }
+    }
+    hp = SelectObject( hdcSeek, gridPen );
+    rc.top = boardRect.top+top; rc.left = boardRect.left+left; 
+    rc.bottom = boardRect.top+bottom; rc.right = boardRect.left+right;
+    FillRect( hdcSeek, &rc, lightSquareBrush );
+    SelectObject( hdcSeek, hp );
+}
+
+// front-end wrapper for putting text in graph
+void DrawSeekText(char *buf, int x, int y)
+{
+        SIZE stSize;
+	SetBkMode( hdcSeek, TRANSPARENT );
+        GetTextExtentPoint32( hdcSeek, buf, strlen(buf), &stSize );
+        TextOut( hdcSeek, boardRect.left+x-3, boardRect.top+y-stSize.cy/2, buf, strlen(buf) );
+}
+
+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);
+}
+
 VOID
 HDCDrawPosition(HDC hdc, BOOLEAN repaint, Board board)
 {
@@ -3108,6 +3166,8 @@ HDCDrawPosition(HDC hdc, BOOLEAN repaint, Board board)
    */
   Boolean fullrepaint = repaint;
 
+  if(DrawSeekGraph()) return; // [HG} seekgraph: suppress printing board if seek graph up
+
   if( DrawPositionNeedsFullRepaint() ) {
       fullrepaint = TRUE;
   }
@@ -3652,7 +3712,7 @@ void DragPieceEnd(int x, int y)
 VOID
 MouseEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
-  int x, y;
+  int x, y, menuNr;
   POINT pt;
   static int recursive = 0;
   HMENU hmenu;
@@ -3719,6 +3779,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, 1)) break;
     MovePV(pt.x - boardRect.left, pt.y - boardRect.top, boardRect.bottom - boardRect.top);
     if ((appData.animateDragging || appData.highlightDragging)
 	&& (wParam & MK_LBUTTON)
@@ -3760,7 +3821,7 @@ MouseEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
   case WM_MBUTTONUP:
   case WM_RBUTTONUP:
     ReleaseCapture();
-    UnLoadPV();
+    RightClick(Release, pt.x - boardRect.left, pt.y - boardRect.top, &fromX, &fromY);
     break;
  
   case WM_MBUTTONDOWN:
@@ -3785,14 +3846,9 @@ MouseEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
     }
     DrawPosition(TRUE, NULL);
 
-    switch (gameMode) {
-    case IcsExamining:
-      if(x < BOARD_LEFT || x >= BOARD_RGHT) break;
-    case EditPosition:
-      if (x == BOARD_LEFT-1 || x == BOARD_RGHT) break;
-      if (x < 0 || y < 0) break;
-      fromX = x;
-      fromY = y;
+    menuNr = RightClick(Press, pt.x - boardRect.left, pt.y - boardRect.top, &fromX, &fromY);
+    switch (menuNr) {
+    case 0:
       if (message == WM_MBUTTONDOWN) {
 	buttonCount = 3;  /* even if system didn't think so */
 	if (wParam & MK_SHIFT) 
@@ -3809,35 +3865,13 @@ MouseEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
             MenuPopup(hwnd, pt, LoadMenu(hInst, "ShogiPieceMenu"), -1);
       }
       break;
-    case IcsObserving:
-      if(!appData.icsEngineAnalyze) break;
-    case IcsPlayingWhite:
-    case IcsPlayingBlack:
-      if(!appData.zippyPlay) goto noZip;
-    case MachinePlaysWhite:
-    case MachinePlaysBlack:
-    case TwoMachinesPlay:
-    case AnalyzeMode:
-    case AnalyzeFile:
-      if (!appData.dropMenu) {
-        SetCapture(hwndMain);
-        LoadPV(pt.x - boardRect.left, pt.y - boardRect.top);
-        break;
-      }
-      if(gameMode == TwoMachinesPlay || gameMode == AnalyzeMode ||
-         gameMode == AnalyzeFile || gameMode == IcsObserving) break;
-    case EditGame:
-    noZip:
-      if (x < 0 || y < 0) break;
-      if (!appData.dropMenu || appData.testLegality &&
-  	  gameInfo.variant != VariantBughouse &&
-  	  gameInfo.variant != VariantCrazyhouse) break;
-      fromX = x;
-      fromY = y;
+    case 2:
+      SetCapture(hwndMain);
+      break;
+    case 1:
       hmenu = LoadMenu(hInst, "DropPieceMenu");
       SetupDropMenu(hmenu);
       MenuPopup(hwnd, pt, hmenu, -1);
-      break;
     default:
       break;
     }
@@ -4388,7 +4422,7 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       break;
 
     case IDM_NewChat:
-      ChatPopUp();
+      ChatPopUp(NULL);
       break;
 
     case IDM_CopyPosition:
@@ -4585,6 +4619,10 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       StopExaminingEvent();
       break;
 
+    case IDM_Upload:
+      UploadGameEvent();
+      break;
+
     case IDM_TypeInMove:
       PopUpMoveDialog('\000');
       break;
@@ -6279,13 +6317,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++;
@@ -6354,6 +6393,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;
@@ -6406,11 +6446,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);
@@ -6421,9 +6470,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:
@@ -6432,21 +6489,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:
@@ -7275,6 +7317,7 @@ 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_NewChat, MF_BYCOMMAND|MF_GRAYED },
   { -1, -1 }