X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fjaws.c;h=aa843ad083148bab9714ed688276a4a4d972fd7b;hb=HEAD;hp=ce056efa696161c39ad95630a4c24c23f66c4884;hpb=8c28ae0e55589ac417f39265f7a0c9a16e14894a;p=xboard.git

diff --git a/winboard/jaws.c b/winboard/jaws.c
index ce056ef..aa843ad 100644
--- a/winboard/jaws.c
+++ b/winboard/jaws.c
@@ -5,7 +5,8 @@
  * Massachusetts.
  *
  * Enhancements Copyright 1992-2001, 2002, 2003, 2004, 2005, 2006,
- * 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+ * 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Free
+ * Software Foundation, Inc.
  *
  * XBoard borrows its colors and the bitmaps.xchess bitmap set from XChess,
  * which was written and is copyrighted by Wayne Christopher.
@@ -166,7 +167,7 @@ VOID SayString(char *mess, BOOL flag)
         int l = strlen(buf);
 	if(appData.debugMode) fprintf(debugFP, "SAY '%s'\n", mess);
         if(l) buf[l++] = ' '; // separate by space from previous
-	safeStrCpy(buf+l, mess, 8000-1-l); // buffer
+	safeStrCpy(buf+l, _(mess), 8000-1-l); // buffer
         if(!flag) return; // wait for flush
 	if(p = StrCaseStr(buf, "Xboard adjudication:")) {
 		int i;
@@ -240,7 +241,7 @@ AdaptMenu()
 	    if(menuItemJAWS[i].name[0] == '-')
 		 AppendMenu(menuJAWS, MF_SEPARATOR, (UINT_PTR) 0, NULL);
 	    else AppendMenu(menuJAWS, MF_ENABLED|MF_STRING,
-			(UINT_PTR) menuItemJAWS[i].code, (LPCTSTR) menuItemJAWS[i].name);
+			(UINT_PTR) menuItemJAWS[i].code, (LPCTSTR) _(menuItemJAWS[i].name));
 	}
 	InsertMenu(menuMain, 7, MF_BYPOSITION|MF_POPUP|MF_ENABLED|MF_STRING,
 		(UINT_PTR) menuJAWS, "&JAWS");
@@ -270,7 +271,7 @@ InitJAWS()
 
 		AdaptMenu();
 		menuBarText[0][8] = menuBarText[0][7]; menuBarText[0][7] = "&JAWS";
-		for(i=0; i<9; i++) menuBarText[1][i] = menuBarText[0][i];
+		for(i=0; i<9; i++) menuBarText[2][i] = menuBarText[1][i] = menuBarText[0][i];
 	}
 
 	hAccelJAWS = CreateAcceleratorTable(acceleratorsJAWS, 14);
@@ -1240,9 +1241,8 @@ NiceTime(int x)
       }\
       return 0;\
 
-#define JAWS_KB_NAVIGATION \
+#define JAWS_KBDOWN_NAVIGATION \
 \
-	case WM_KEYDOWN:\
 \
 		if(GetKeyState(VK_MENU) < 0 && GetKeyState(VK_CONTROL) < 0) {\
 		    /* Control + Alt + letter used for speaking piece positions */\
@@ -1275,17 +1275,17 @@ NiceTime(int x)
 			KeyboardEvent(hwnd, message, wParam, lParam);\
 			break;\
 		case VK_SPACE:\
+                        shiftKey = GetKeyState(VK_SHIFT) < 0;\
 			KeyboardMove(hwnd, message, wParam, lParam);\
 			break;\
 		}\
-		break;\
-	case WM_KEYUP:\
+
+#define JAWS_KBUP_NAVIGATION \
 		switch (wParam) {\
 		case VK_SPACE:\
 			KeyboardMove(hwnd, message, wParam, lParam);\
 			break;\
 		}\
-		break;\
 
 #define JAWS_MENU_ITEMS \
 		case IDM_PossibleAttackMove:  /*What can I possible attack from here */\