X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=xboard.c;h=edf20c609fec627179cf1cbb589f12df7947202c;hb=bf1467b590e28b4dc641a3c753ce728b90d42081;hp=cc04327e278e847fecdea63f4557feb079f275f8;hpb=a08cdaabd09c9fd7351b1726065d5157b1651fd5;p=xboard.git

diff --git a/xboard.c b/xboard.c
index cc04327..edf20c6 100644
--- a/xboard.c
+++ b/xboard.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.
  *
  * The following terms apply to Digital Equipment Corporation's copyright
  * interest in XBoard:
@@ -1000,7 +1000,7 @@ char boardTranslations[] =
    <Btn1Up>: HandleUserMove() \n \
    <Btn1Motion>: AnimateUserMove() \n \
    <Btn3Motion>: HandlePV() \n \
-   <Btn3Up>: UnLoadPV() \n \
+   <Btn3Up>: PieceMenuPopup(menuB) \n \
    Shift<Btn2Down>: XawPositionSimpleMenu(menuB) XawPositionSimpleMenu(menuD)\
                  PieceMenuPopup(menuB) \n \
    Any<Btn2Down>: XawPositionSimpleMenu(menuW) XawPositionSimpleMenu(menuD) \
@@ -2469,7 +2469,7 @@ XBoard square size (hint): %d\n\
 
     /* Why is the following needed on some versions of X instead
      * of a translation? */
-    XtAddEventHandler(boardWidget, ExposureMask, False,
+    XtAddEventHandler(boardWidget, ExposureMask|PointerMotionMask, False,
 		      (XtEventHandler) EventProc, NULL);
     /* end why */
 
@@ -3714,54 +3714,18 @@ void PieceMenuPopup(w, event, params, num_params)
      String *params;
      Cardinal *num_params;
 {
-    String whichMenu;
-
-    if (event->type == ButtonRelease) UnLoadPV(); // [HGM] pv
-    if (event->type != ButtonPress) return;
-    if (errorUp) ErrorPopDown();
-    switch (gameMode) {
-      case EditPosition:
-      case IcsExamining:
-	whichMenu = params[0];
-	break;
-      case IcsObserving:
-	if(!appData.icsEngineAnalyze) return;
-      case IcsPlayingWhite:
-      case IcsPlayingBlack:
-	if(!appData.zippyPlay) goto noZip;
-      case AnalyzeMode:
-      case AnalyzeFile:
-      case MachinePlaysWhite:
-      case MachinePlaysBlack:
-      case TwoMachinesPlay: // [HGM] pv: use for showing PV
-	if (!appData.dropMenu) {
-	  LoadPV(event->xbutton.x, event->xbutton.y);
-	  return;
-	}
-	if(gameMode == TwoMachinesPlay || gameMode == AnalyzeMode ||
-           gameMode == AnalyzeFile || gameMode == IcsObserving) return;
-      case EditGame:
-      noZip:
-	if (!appData.dropMenu || appData.testLegality &&
-	    gameInfo.variant != VariantBughouse &&
-	    gameInfo.variant != VariantCrazyhouse) return;
-	SetupDropMenu();
-	whichMenu = "menuD";
-	break;
-      default:
-	return;
+    String whichMenu; int menuNr;
+    if (event->type == ButtonRelease)
+        menuNr = RightClick(Release, event->xbutton.x, event->xbutton.y, &pmFromX, &pmFromY); 
+    else if (event->type == ButtonPress)
+        menuNr = RightClick(Press,   event->xbutton.x, event->xbutton.y, &pmFromX, &pmFromY);
+    switch(menuNr) {
+      case 0: whichMenu = params[0]; break;
+      case 1: SetupDropMenu(); whichMenu = "menuD"; break;
+      case 2:
+      case -1: if (errorUp) ErrorPopDown();
+      default: return;
     }
-
-    if (((pmFromX = EventToSquare(event->xbutton.x, BOARD_WIDTH)) < 0) ||
-	((pmFromY = EventToSquare(event->xbutton.y, BOARD_HEIGHT)) < 0)) {
-	pmFromX = pmFromY = -1;
-	return;
-    }
-    if (flipView)
-      pmFromX = BOARD_WIDTH - 1 - pmFromX;
-    else
-      pmFromY = BOARD_HEIGHT - 1 - pmFromY;
-
     XtPopupSpringLoaded(XtNameToWidget(boardWidget, whichMenu));
 }
 
@@ -3869,14 +3833,18 @@ SetHighlights(fromX, fromY, toX, toY)
 	if (hi1X >= 0 && hi1Y >= 0) {
 	    drawHighlight(hi1X, hi1Y, lineGC);
 	}
+    } // [HGM] first erase both, then draw new!
+    if (hi2X != toX || hi2Y != toY) {
+	if (hi2X >= 0 && hi2Y >= 0) {
+	    drawHighlight(hi2X, hi2Y, lineGC);
+	}
+    }
+    if (hi1X != fromX || hi1Y != fromY) {
 	if (fromX >= 0 && fromY >= 0) {
 	    drawHighlight(fromX, fromY, highlineGC);
 	}
     }
     if (hi2X != toX || hi2Y != toY) {
-	if (hi2X >= 0 && hi2Y >= 0) {
-	    drawHighlight(hi2X, hi2Y, lineGC);
-	}
 	if (toX >= 0 && toY >= 0) {
 	    drawHighlight(toX, toY, highlineGC);
 	}
@@ -4255,6 +4223,8 @@ void EventProc(widget, unused, event)
 	if (event->xexpose.count > 0) return;  /* no clipping is done */
 	XDrawPosition(widget, True, NULL);
 	break;
+      case MotionNotify:
+        if(SeekGraphClick(Press, event->xbutton.x, event->xbutton.y, 1)) break;
       default:
 	return;
     }
@@ -4335,6 +4305,36 @@ static int check_castle_draw(newb, oldb, rrow, rcol)
     return 0;
 }
 
+// [HGM] seekgraph: some low-level drawing routines cloned from xevalgraph 
+void DrawSeekAxis( int x, int y, int xTo, int yTo )
+{
+      XDrawLine(xDisplay, xBoardWindow, lineGC, x, y, xTo, yTo);
+}
+
+void DrawSeekBackground( int left, int top, int right, int bottom )
+{
+    XFillRectangle(xDisplay, xBoardWindow, lightSquareGC, left, top, right-left, bottom-top);
+}
+
+void DrawSeekText(char *buf, int x, int y)
+{
+    XDrawString(xDisplay, xBoardWindow, coordGC, x, y+4, buf, strlen(buf));
+}
+
+void DrawSeekDot(int x, int y, int colorNr)
+{
+    int square = colorNr & 0x80;
+    GC color;
+    colorNr &= 0x7F;
+    color = colorNr == 0 ? prelineGC : colorNr == 1 ? darkSquareGC : highlineGC;
+    if(square)
+	XFillRectangle(xDisplay, xBoardWindow, color,
+		x-squareSize/9, y-squareSize/9, 2*squareSize/9, 2*squareSize/9);
+    else
+	XFillArc(xDisplay, xBoardWindow, color, 
+		x-squareSize/8, y-squareSize/8, squareSize/4, squareSize/4, 0, 64*360);
+}
+
 static int damage[BOARD_RANKS][BOARD_FILES];
 
 /*
@@ -4352,6 +4352,8 @@ void XDrawPosition(w, repaint, board)
     Arg args[16];
     int rrow, rcol;
 
+    if(DrawSeekGraph()) return; // [HGM] seekgraph: suppress any drawing if seek graph up
+
     if (board == NULL) {
 	if (!lastBoardValid) return;
 	board = lastBoard;