From 47761953d6a1a4456d808c6f7a66fa5d3a029879 Mon Sep 17 00:00:00 2001
From: H.G.Muller <hgm@hgm-xboard.(none)>
Date: Tue, 5 Jul 2022 22:07:22 +0200
Subject: [PATCH] Allow accessible version to recite pieces by type

The move type-in can be used to enter a piece ID.
In this case the accessible version will read out on which squares
pieces of that colored type can be found.
---
 winboard/jaws.c     |   20 ++++++++++++++++++++
 winboard/winboard.c |    4 ++++
 2 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/winboard/jaws.c b/winboard/jaws.c
index a6c1927..42c203f 100644
--- a/winboard/jaws.c
+++ b/winboard/jaws.c
@@ -842,6 +842,26 @@ SayPieces(ChessSquare p)
 }
 
 VOID
+SayPieceType(char id)
+{
+	int f, r, nr = 0;
+	char buf[MSG_SIZ];
+	ChessSquare piece = CharToPiece(id);
+	if(piece == EmptySquare) {
+		SayString(T_("That is not a valid piece"), FALSE);
+		return;
+	}
+	for(r=0; r<BOARD_HEIGHT; r++) for(f=BOARD_LEFT; f<BOARD_RGHT; f++) {
+		if(boards[currentMove][r][f] != piece) continue;
+		if(!nr++) SayString(PieceToName(piece, 1), FALSE), SayString(T_("on"), FALSE);
+		else SayString(T_("and"), FALSE);
+		SayString(SquareToChar(f), FALSE);
+		SayString(SquareToNum(r), FALSE);
+	}
+	if(!nr) SayString(T_("There is no"), FALSE); SayString(PieceToName(piece, 1), FALSE); SayString(T_("on the board"), FALSE);
+}
+
+VOID
 SayCurrentPos()
 {
 	ChessSquare currentpiece;
diff --git a/winboard/winboard.c b/winboard/winboard.c
index ae89e8a..38280a2 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -381,6 +381,7 @@ LoadLanguageFile(char *name)
               case 't': k = '\t'; break;
             }
             languageBuf[--i] = k;
+
         }
         i++;
     }
@@ -6775,6 +6776,9 @@ TypeInMoveDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 
       shiftKey = GetKeyState(VK_SHIFT) < 0; // [HGM] remember last shift status
       GetDlgItemText(hDlg, OPT_Move, move, sizeof(move));
+#ifdef JAWS
+      if(strlen(move) == 1 && !isdigit(*move)) SayPieceType(*move); else
+#endif
       TypeInDoneEvent(move);
       EndDialog(hDlg, TRUE);
       return TRUE;
-- 
1.7.0.4