X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=backend.c;h=6bf57ac091d1a9e9d61e8fc2a5b38fdd534a803f;hb=2392a87503272e7ae1dcaa6aa8628955dc5493d1;hp=bdafe3dfaf934fce7aca7b520b8b18d142b98dea;hpb=07713bc9c098f6accb3228d75319256cd1eaef1a;p=xboard.git

diff --git a/backend.c b/backend.c
index bdafe3d..6bf57ac 100644
--- a/backend.c
+++ b/backend.c
@@ -6948,7 +6948,7 @@ UserMoveEvent(int fromX, int fromY, int toX, int toY, int promoChar)
 	/* EditPosition, empty square, or different color piece;
 	   click-click move is possible */
 	if (toX == -2 || toY == -2) {
-	    boards[0][fromY][fromX] = EmptySquare;
+	    boards[0][fromY][fromX] = (boards[0][fromY][fromX] == EmptySquare ? DarkSquare : EmptySquare);
 	    DrawPosition(FALSE, boards[currentMove]);
 	    return;
 	} else if (toX >= 0 && toY >= 0) {
@@ -7367,6 +7367,8 @@ void ReportClick(char *action, int x, int y)
 	SendToProgram(buf, &first);
 }
 
+Boolean right; // instructs front-end to use button-1 events as if they were button 3
+
 void
 LeftClick (ClickType clickType, int xPix, int yPix)
 {
@@ -7377,13 +7379,6 @@ LeftClick (ClickType clickType, int xPix, int yPix)
     ChessSquare piece;
     static TimeMark lastClickTime, prevClickTime;
 
-    if(SeekGraphClick(clickType, xPix, yPix, 0)) return;
-
-    prevClickTime = lastClickTime; GetTimeMark(&lastClickTime);
-
-    if (clickType == Press) ErrorPopDown();
-    lastClickType = clickType, lastLeftX = xPix, lastLeftY = yPix; // [HGM] alien: remember state
-
     x = EventToSquare(xPix, BOARD_WIDTH);
     y = EventToSquare(yPix, BOARD_HEIGHT);
     if (!flipView && y >= 0) {
@@ -7393,6 +7388,20 @@ LeftClick (ClickType clickType, int xPix, int yPix)
 	x = BOARD_WIDTH - 1 - x;
     }
 
+    if(appData.monoMouse && gameMode == EditPosition && fromX < 0 && clickType == Press && boards[currentMove][y][x] == EmptySquare) {
+	static int dummy;
+	RightClick(clickType, xPix, yPix, &dummy, &dummy);
+	right = TRUE;
+	return;
+    }
+
+    if(SeekGraphClick(clickType, xPix, yPix, 0)) return;
+
+    prevClickTime = lastClickTime; GetTimeMark(&lastClickTime);
+
+    if (clickType == Press) ErrorPopDown();
+    lastClickType = clickType, lastLeftX = xPix, lastLeftY = yPix; // [HGM] alien: remember state
+
     if(promoSweep != EmptySquare) { // up-click during sweep-select of promo-piece
 	defaultPromoChoice = promoSweep;
 	promoSweep = EmptySquare;   // terminate sweep
@@ -7486,7 +7495,7 @@ LeftClick (ClickType clickType, int xPix, int yPix)
 	    return;
 	}
     }
-
+printf("to click %d,%d\n",x,y);
     /* fromX != -1 */
     if (clickType == Press && gameMode != EditPosition) {
 	ChessSquare fromP;
@@ -7549,6 +7558,12 @@ LeftClick (ClickType clickType, int xPix, int yPix)
 	// ignore clicks on holdings
 	if(x < BOARD_LEFT || x >= BOARD_RGHT) return;
     }
+printf("A type=%d\n",clickType);
+
+    if(x == fromX && y == fromY && gameMode == EditPosition && SubtractTimeMarks(&lastClickTime, &prevClickTime) < 200) {
+	gatingPiece = boards[currentMove][fromY][fromX]; // prepare to copy rather than move
+	return;
+    }
 
     if (clickType == Release && x == fromX && y == fromY && killX < 0) {
 	DragPieceEnd(xPix, yPix); dragging = 0;
@@ -7582,7 +7597,7 @@ LeftClick (ClickType clickType, int xPix, int yPix)
     }
 
     clearFlag = 0;
-
+printf("B\n");
     if(gameMode != EditPosition && !appData.testLegality && !legal[y][x] &&
        fromX >= BOARD_LEFT && fromX < BOARD_RGHT && (x != killX || y != killY) && !sweepSelecting) {
 	if(dragging) DragPieceEnd(xPix, yPix), dragging = 0;
@@ -7590,7 +7605,7 @@ LeftClick (ClickType clickType, int xPix, int yPix)
 	DrawPosition(TRUE, NULL);
 	return; // ignore to-click
     }
-
+printf("(%d,%d)-(%d,%d) %d %d\n",fromX,fromY,toX,toY,x,y);
     /* we now have a different from- and (possibly off-board) to-square */
     /* Completed move */
     if(!sweepSelecting) {
@@ -15121,7 +15136,7 @@ EditPositionMenuEvent (ChessSquare selection, int x, int y)
                                     AAA + x, ONE + y);
 			    SendToICS(buf);
 			}
-		    } else {
+		    } else if(boards[0][y][x] != DarkSquare) {
 			if(boards[0][y][x] != p) nonEmpty++;
 			boards[0][y][x] = p;
 		    }