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

diff --git a/winboard/winboard.c b/winboard/winboard.c
index d790116..03b1fc2 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
  *
@@ -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;
     }