From 157adeb7709d0a011bf18dc1a8e6173d25b8078e Mon Sep 17 00:00:00 2001
From: H.G. Muller <h.g.muller@hccnet.nl>
Date: Thu, 1 Apr 2010 15:22:41 +0200
Subject: [PATCH] Fix JAWS piece drop cursor, and streamline some sentences

The cursor square was reset to a1 after every use of the piece menu,
which was very inconvenient. Some of the spoken sentences have been
improved; the square is read before the piece now, when using the arrow
keys on the board.
---
 winboard/jaws.c     |   12 +++++++++---
 winboard/winboard.c |    4 ++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/winboard/jaws.c b/winboard/jaws.c
index 540bf7b..56c7411 100644
--- a/winboard/jaws.c
+++ b/winboard/jaws.c
@@ -282,6 +282,7 @@ InitJAWS()
 
 int beeps[] = { 1, 0, 0, 0, 0 };
 int beepCodes[] = { 0, MB_OK, MB_ICONERROR, MB_ICONQUESTION, MB_ICONEXCLAMATION, MB_ICONASTERISK };
+static int dropX = -1, dropY = -1;
 
 VOID
 KeyboardEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
@@ -290,6 +291,10 @@ KeyboardEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 	char *piece, *xchar, *ynum ;
 	int n, beepType = 1; // empty beep
 
+	if(fromX == -1 || fromY == -1) { // if we just dropped piece, stay at that square
+		fromX = dropX; fromY = dropY;
+		dropX = dropY = -1; // but only once
+        }
 	if(fromX == -1 || fromY == -1) {
 		fromX = BOARD_LEFT; fromY = 0;
         }
@@ -345,7 +350,7 @@ KeyboardEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 		ynum = SquareToNum(fromY);
 		if(currentPiece != EmptySquare) {
 //			SayString(piece[0] == 'W' ? "white" : "black", TRUE);
-			sprintf(buf, "%s %s %s", piece, xchar, ynum);
+			sprintf(buf, "%s %s %s", xchar, ynum, piece);
 		} else sprintf(buf, "%s %s", xchar, ynum);
 		SayString(buf, TRUE);
 	}
@@ -1071,11 +1076,11 @@ SayClockTime()
 		suppressClocks = 0; // back on after two requests in rapid succession
 	sprintf(buf1, "%s", TimeString(whiteTimeRemaining));
 	str1 = buf1;
-	SayString("White's remaining time is", FALSE);
+	SayString("White clock", FALSE);
 	SayString(str1, FALSE);
 	sprintf(buf2, "%s", TimeString(blackTimeRemaining));
 	str2 = buf2;
-	SayString("Black's remaining time is", FALSE);
+	SayString("Black clock", FALSE);
 	SayString(str2, FALSE);
 	lastWhiteTime = whiteTimeRemaining;
 	lastBlackTime = blackTimeRemaining;
@@ -1194,6 +1199,7 @@ NiceTime(int x)
 	    if ((char)wParam == 022 && gameMode == EditPosition) { /* <Ctl R>. Pop up piece menu */\
 		POINT pt; int x, y;\
 		SquareToPos(fromY, fromX, &x, &y);\
+		dropX = fromX; dropY = fromY;\
 		pt.x = x; pt.y = y;\
         	if(gameInfo.variant != VariantShogi)\
 		    MenuPopup(hwnd, pt, LoadMenu(hInst, "PieceMenu"), -1);\
diff --git a/winboard/winboard.c b/winboard/winboard.c
index 87eb9eb..0ac478c 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -4548,7 +4548,7 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 	  TagsPopUp(tags, CmailMsg());
 	  free(tags);
       }
-      SAY("programs start playing each other");
+      SAY("computer starts playing both sides");
       break;
 
     case IDM_AnalysisMode:
@@ -4611,7 +4611,7 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 
     case IDM_EditPosition:
       EditPositionEvent();
-      SAY("to set up a position type a FEN");
+      SAY("enter a FEN string or setup a position on the board using the control R pop up menu");
       break;
 
     case IDM_Training:
-- 
1.7.0.4