X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=backend.c;h=94d715d06b6c41cac3ad6254ca95f7d7b01ac358;hb=988cc3c7cdc6ad6f0441e6dfa93881fae2119caa;hp=15c3e42acfd32e42da70ae96130adb7e928336c0;hpb=e8ee92700cdae0637fdce80b013bd76aba7a730d;p=xboard.git

diff --git a/backend.c b/backend.c
index 15c3e42..94d715d 100644
--- a/backend.c
+++ b/backend.c
@@ -269,6 +269,7 @@ char chatPartner[MAX_CHAT][MSG_SIZ]; /* [HGM] chat: list of chatting partners */
 extern int chatCount;
 int chattingPartner;
 char marker[BOARD_RANKS][BOARD_FILES]; /* [HGM] marks for target squares */
+char legal[BOARD_RANKS][BOARD_FILES];  /* [HGM] legal target squares */
 char lastMsg[MSG_SIZ];
 ChessSquare pieceSweep = EmptySquare;
 ChessSquare promoSweep = EmptySquare, defaultPromoChoice;
@@ -5238,7 +5239,8 @@ ProcessICSInitScript (FILE *f)
 }
 
 
-static int lastX, lastY, selectFlag, dragging;
+static int lastX, lastY, lastLeftX, lastLeftY, selectFlag, dragging;
+static ClickType lastClickType;
 
 void
 Sweep (int step)
@@ -7019,13 +7021,23 @@ MarkByFEN(char *fen)
 {
 	int r, f;
 	if(!appData.markers || !appData.highlightDragging) return;
-	for(r=0; r<BOARD_HEIGHT; r++) for(f=BOARD_LEFT; f<BOARD_RGHT; f++) marker[r][f] = 0;
+	for(r=0; r<BOARD_HEIGHT; r++) for(f=BOARD_LEFT; f<BOARD_RGHT; f++) legal[r][f] = 0;
 	r=BOARD_HEIGHT-1; f=BOARD_LEFT;
 	while(*fen) {
 	    int s = 0;
 	    marker[r][f] = 0;
+	    if(*fen == 'M') legal[r][f] = 2; else // request promotion choice
+	    if(*fen >= 'A' && *fen <= 'Z') legal[r][f] = 1; else
+	    if(*fen >= 'a' && *fen <= 'z') *fen += 'A' - 'a';
 	    if(*fen == '/' && f > BOARD_LEFT) f = BOARD_LEFT, r--; else
+	    if(*fen == 'T') marker[r][f++] = 0; else
 	    if(*fen == 'Y') marker[r][f++] = 1; else
+	    if(*fen == 'G') marker[r][f++] = 3; else
+	    if(*fen == 'B') marker[r][f++] = 4; else
+	    if(*fen == 'C') marker[r][f++] = 5; else
+	    if(*fen == 'M') marker[r][f++] = 6; else
+	    if(*fen == 'W') marker[r][f++] = 7; else
+	    if(*fen == 'D') marker[r][f++] = 8; else
 	    if(*fen == 'R') marker[r][f++] = 2; else {
 		while(*fen <= '9' && *fen >= '0') s = 10*s + *fen++ - '0';
 	      f += s; fen -= s>0;
@@ -7101,9 +7113,34 @@ CanPromote (ChessSquare piece, int y)
 		piece == WhiteLance && y == BOARD_HEIGHT-2 );
 }
 
+void
+HoverEvent (int hiX, int hiY, int x, int y)
+{
+	static char baseMarker[BOARD_RANKS][BOARD_FILES], baseLegal[BOARD_RANKS][BOARD_FILES];
+	int r, f;
+	if(!first.highlight) return;
+	if(hiX == -1 && hiY == -1 && x == fromX && y == fromY) // record markings 
+	  for(r=0; r<BOARD_HEIGHT; r++) for(f=BOARD_LEFT; f<BOARD_RGHT; f++)
+	    baseMarker[r][f] = marker[r][f], baseLegal[r][f] = legal[r][f];
+	else if(hiX != x || hiY != y) {
+	  // [HGM] lift: entered new to-square; redraw arrow, and inform engine
+	  for(r=0; r<BOARD_HEIGHT; r++) for(f=BOARD_LEFT; f<BOARD_RGHT; f++)
+	    marker[r][f] = baseMarker[r][f], legal[r][f] = baseLegal[r][f];
+	  if((marker[y][x] == 2 || marker[y][x] == 6) && legal[y][x]) {
+ 	    char buf[MSG_SIZ];
+	    snprintf(buf, MSG_SIZ, "hover %c%d\n", x + AAA, y + ONE - '0');
+	    SendToProgram(buf, &first);
+	  }
+	  SetHighlights(fromX, fromY, x, y);
+	}
+}
+
 void ReportClick(char *action, int x, int y)
 {
 	char buf[MSG_SIZ]; // Inform engine of what user does
+	int r, f;
+	if(action[0] == 'l') // mark any target square of a lifted piece as legal to-square, clear markers
+	  for(r=0; r<BOARD_HEIGHT; r++) for(f=BOARD_LEFT; f<BOARD_RGHT; f++) legal[r][f] = 1, marker[r][f] = 0;
 	if(!first.highlight || gameMode == EditPosition) return;
 	snprintf(buf, MSG_SIZ, "%s %c%d%s\n", action, x+AAA, y+ONE-'0', controlKey && action[0]=='p' ? "," : "");
 	SendToProgram(buf, &first);
@@ -7124,6 +7161,7 @@ LeftClick (ClickType clickType, int xPix, int yPix)
     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);
@@ -7321,6 +7359,13 @@ LeftClick (ClickType clickType, int xPix, int yPix)
 
     clearFlag = 0;
 
+    if(gameMode != EditPosition && !appData.testLegality && !legal[y][x]) {
+	if(dragging) DragPieceEnd(xPix, yPix), dragging = 0;
+	DisplayMessage(_("only marked squares are legal"),"");
+	DrawPosition(TRUE, NULL);
+	return; // ignore to-click
+    }
+
     /* we now have a different from- and (possibly off-board) to-square */
     /* Completed move */
     if(!sweepSelecting) {
@@ -7336,7 +7381,7 @@ LeftClick (ClickType clickType, int xPix, int yPix)
 	    if(x >= BOARD_LEFT && x < BOARD_RGHT) clearFlag = 1; // and defer click-click move of empty-square to up-click
 	    return;
 	}
-	if(HasPromotionChoice(fromX, fromY, toX, toY, &promoChoice, FALSE)) {
+	if(legal[y][x] == 2 || HasPromotionChoice(fromX, fromY, toX, toY, &promoChoice, FALSE)) {
 	  if(appData.sweepSelect) {
 	    ChessSquare piece = boards[currentMove][fromY][fromX];
 	    promoSweep = defaultPromoChoice;
@@ -8622,6 +8667,23 @@ if(appData.debugMode) fprintf(debugFP, "nodes = %d, %lld\n", (int) programStats.
 	MarkByFEN(message+10); // [HGM] alien: allow engine to mark board squares
 	return;
     }
+    if(!strncmp(message, "click ", 6)) {
+	char f, c=0; int x, y; // [HGM] alien: allow engine to finish user moves (i.e. engine-driven one-click moving)
+	if(appData.testLegality || !appData.oneClick) return;
+	sscanf(message+6, "%c%d%c", &f, &y, &c);
+	x = f - 'a' + BOARD_LEFT, y -= ONE - '0';
+	if(flipView) x = BOARD_WIDTH-1 - x; else y = BOARD_HEIGHT-1 - y;
+	x = x*squareSize + (x+1)*lineGap + squareSize/2;
+	y = y*squareSize + (y+1)*lineGap + squareSize/2;
+	f = first.highlight; first.highlight = 0; // kludge to suppress lift/put in response to own clicks
+	if(lastClickType == Press) // if button still down, fake release on same square, to be ready for next click
+	    LeftClick(Release, lastLeftX, lastLeftY);
+	controlKey  = (c == ',');
+	LeftClick(Press, x, y);
+	LeftClick(Release, x, y);
+	first.highlight = f;
+	return;
+    }
     /*
      * If the move is illegal, cancel it and redraw the board.
      * Also deal with other error cases.  Matching is rather loose