From: H.G. Muller <h.g.muller@hccnet.nl>
Date: Sun, 27 Sep 2009 19:14:25 +0000 (-0700)
Subject: Made the beep sounds for JAWS board navigation configurable through command-line... 
X-Git-Tag: v4.4.1.20091019~76
X-Git-Url: http://winboard.nl/cgi-bin?p=xboard.git;a=commitdiff_plain;h=399cc00c90b392f98ab83aa08d77077ada6043b5

Made the beep sounds for JAWS board navigation configurable through command-line options
---

diff --git a/winboard/jaws.c b/winboard/jaws.c
index 1891f07..95f70d2 100644
--- a/winboard/jaws.c
+++ b/winboard/jaws.c
@@ -117,6 +117,22 @@ char *pieceToName[] = {
 		"Empty"
 	};
 
+char *pieceTypeName[] = {
+		"Pawn", "Knight", "Bishop", "Rook", "Queen", 
+		"Guard", "Elephant", "Arch Bishop", "Chancellor",
+		"General", "Man", "Cannon", "Night Rider",
+		"Crowned Bishop", "Crowned Rook", "Grass Hopper", "Veteran",
+		"Falcon", "Amazon", "Snake", "Unicorn",
+		"King",
+		"Pawn", "Knight", "Bishop", "Rook", "Queen", 
+		"Guard", "Elephant", "Arch Bishop", "Chancellor",
+		"General", "Man", "Cannon", "Night Rider",
+		"Crowned Bishop", "Crowned Rook", "Grass Hopper", "Veteran",
+		"Falcon", "Amazon", "Snake", "Unicorn",
+		"King",
+		"Empty"
+	};
+
 int CoordToNum(c)
 		char c;
 {
@@ -130,7 +146,7 @@ char* PieceToName(p, i)
 	int i;
 {
 	if(i) return pieceToName[(int) p];
-		return pieceToName[(int) p]+6;
+		return pieceTypeName[(int) p];
 }
 
 char* SquareToChar(x)
@@ -219,7 +235,7 @@ AdaptMenu()
 {
 	HMENU menuMain, menuJAWS;
 	MENUBARINFO helpMenuInfo;
-	int e, i;
+	int i;
 
 	helpMenuInfo.cbSize = sizeof(helpMenuInfo);
 	menuMain = GetMenu(hwndMain);
@@ -275,12 +291,15 @@ InitJAWS()
 	return TRUE;
 }
 
+int beeps[] = { 1, 0, 0, 0, 0 };
+int beepCodes[] = { 0, MB_OK, MB_ICONERROR, MB_ICONQUESTION, MB_ICONEXCLAMATION, MB_ICONASTERISK };
+
 VOID
 KeyboardEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
 	ChessSquare currentPiece;
 	char *piece, *xchar, *ynum ;
-	int n;
+	int n, beepType = 1; // empty beep
 
 	if(fromX == -1 || fromY == -1) {
 		fromX = BOARD_LEFT; fromY = 0;
@@ -288,34 +307,37 @@ KeyboardEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 	switch(wParam) {
 	case VK_LEFT:
 		if(fromX == BOARD_RGHT+1) fromX -= 2; else
-		if(fromX == BOARD_LEFT) { if(fromY >= BOARD_HEIGHT - gameInfo.holdingsSize) fromX -= 2; } else
-		if(fromX > BOARD_LEFT) fromX--;
+		if(fromX == BOARD_LEFT) { if(fromY >= BOARD_HEIGHT - gameInfo.holdingsSize) fromX -= 2; else beepType = 0; } else
+		if(fromX > BOARD_LEFT) fromX--; else beepType = 0; // off-board beep
 		break;
 	case VK_RIGHT:
 		if(fromX == BOARD_LEFT-2) fromX += 2; else
-		if(fromX == BOARD_RGHT-1) { if(fromY < gameInfo.holdingsSize) fromX += 2; } else
-		if(fromX < BOARD_RGHT-1) fromX++;
+		if(fromX == BOARD_RGHT-1) { if(fromY < gameInfo.holdingsSize) fromX += 2; else beepType = 0; } else
+		if(fromX < BOARD_RGHT-1) fromX++; else beepType = 0;
 		break;
 	case VK_UP:
-		if(fromX == BOARD_RGHT+1) { if(fromY < gameInfo.holdingsSize - 1) fromY++; } else
-		if(fromY < BOARD_HEIGHT-1) fromY++;
+		if(fromX == BOARD_RGHT+1) { if(fromY < gameInfo.holdingsSize - 1) fromY++; else beepType = 0; } else
+		if(fromY < BOARD_HEIGHT-1) fromY++; else beepType = 0;
 		break;
 	case VK_DOWN:
-		if(fromX == BOARD_LEFT-2) { if(fromY > BOARD_HEIGHT - gameInfo.holdingsSize) fromY--; } else
-		if(fromY > 0) fromY--;
+		if(fromX == BOARD_LEFT-2) { if(fromY > BOARD_HEIGHT - gameInfo.holdingsSize) fromY--; else beepType = 0; } else
+		if(fromY > 0) fromY--; else beepType = 0;
 		break;
 	}
 	SetHighlights(fromX, fromY, -1, -1);
 	DrawPosition(FALSE, NULL);
 	currentPiece = boards[currentMove][fromY][fromX];
 	piece = PieceToName(currentPiece,1);
-	if(currentPiece != EmptySquare) MessageBeep(currentPiece < (int)BlackPawn ? MB_OK : MB_ICONEXCLAMATION);
+	if(beepType == 1 && currentPiece != EmptySquare) beepType = currentPiece < (int) BlackPawn ? 2 : 3; // white or black beep
+	if(beeps[beepType] == beeps[1] && (fromX == BOARD_RGHT+1 || fromX == BOARD_LEFT-2)) beepType = 4; // holdings beep
+	beepType = beeps[beepType]%6;
+	if(beepType) MessageBeep(beepCodes[beepType]);
 	if(fromX == BOARD_LEFT - 2) {
 		SayString("black holdings", FALSE);
 		if(currentPiece != EmptySquare) {
 			char buf[MSG_SIZ];
 			n = boards[currentMove][fromY][1];
-			sprintf(buf, "%d %s%s", n, piece+6, n == 1 ? "" : "s");
+			sprintf(buf, "%d %s%s", n, PieceToName(currentPiece,0), n == 1 ? "" : "s");
 			SayString(buf, TRUE);
 		}
 	} else
@@ -324,7 +346,7 @@ KeyboardEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 		if(currentPiece != EmptySquare) {
 			char buf[MSG_SIZ];
 			n = boards[currentMove][fromY][BOARD_WIDTH-2];
-			sprintf(buf, "%d %s%s", n, piece+6, n == 1 ? "" : "s");
+			sprintf(buf, "%d %s%s", n, PieceToName(currentPiece,0), n == 1 ? "" : "s");
 			SayString(buf, TRUE);
 		}
 	} else
@@ -814,7 +836,7 @@ SayAllBoard()
 {
 	int Xpos, Ypos;
 	ChessSquare currentpiece;
-	char *piece, *xchar, *ynum ;
+	char *piece, *ynum ;
 	
 	if(gameInfo.holdingsWidth) {
 		int first = 0;
@@ -848,7 +870,7 @@ SayAllBoard()
 		for(Xpos=BOARD_LEFT; Xpos<BOARD_RGHT; Xpos++) {
 			currentpiece = boards[currentMove][Ypos][Xpos];	
 			if(currentpiece != EmptySquare) {
-				int count = 0, oldX = Xpos;
+				int count = 0;
 				char buf[50];
 				piece = PieceToName(currentpiece,1);
 				while(Xpos < BOARD_RGHT && boards[currentMove][Ypos][Xpos] == currentpiece)
@@ -1167,12 +1189,12 @@ NiceTime(int x)
 	return (x%3000 == 0);
 }
 
-#if 0
-	    if(isalpha((char)wParam)) {
-		/* capitals of any ind are intercepted and distinguished by left and right shift */
-		int mine = GetKeyState(VK_RSHIFT) < 0;
-		if(mine || GetKeyState(VK_LSHIFT) < 0) {
-#endif
+#define JAWS_ARGS \
+  { "beepOffBoard", ArgInt, (LPVOID) beeps, TRUE },\
+  { "beepEmpty", ArgInt, (LPVOID) (beeps+1), TRUE },\
+  { "beepWhite", ArgInt, (LPVOID) (beeps+2), TRUE },\
+  { "beepBlack", ArgInt, (LPVOID) (beeps+3), TRUE },\
+  { "beepHoldings", ArgInt, (LPVOID) (beeps+4), TRUE },\
 
 #define JAWS_ALT_INTERCEPT \
 	    if(suppressOneKey) {\