X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.c;h=ec17e4745b0ba03e4a4c31122642c933cdef2b4d;hb=e9468d50717061047e1dbc5817d0f69b12c291c8;hp=b535d44cdaa1d432f2faceb92caeb33006720ad8;hpb=e80c98c04e951e5026a24531cd6316be962636b9;p=xboard.git

diff --git a/winboard/winboard.c b/winboard/winboard.c
index b535d44..ec17e47 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -332,7 +332,7 @@ int dialogItems[][40] = {
 
 static char languageBuf[50000], *foreign[1000], *english[1000], *languageFile[MSG_SIZ];
 static int lastChecked;
-static char oldLanguage[MSG_SIZ], *menuText[10][25];
+static char oldLanguage[MSG_SIZ], *menuText[10][30];
 extern int tinyLayout;
 extern char * menuBarText[][8];
 
@@ -383,7 +383,7 @@ T_(char *s)
 {   // return the translation of the given string
     // efficiency can be improved a lot...
     int i=0;
-if(appData.debugMode) fprintf(debugFP, "T_(%s)\n", s);
+//if(appData.debugMode) fprintf(debugFP, "T_(%s)\n", s);
     if(!barbaric) return s;
     if(!s) return ""; // sanity
     while(english[i]) {
@@ -404,7 +404,7 @@ Translate(HWND hDlg, int dialogID)
     if(dialogItems[i][0] != dialogID) return; // unknown dialog, should not happen
     GetWindowText( hDlg, buf, MSG_SIZ );
     s = T_(buf);
-if(appData.debugMode) fprintf(debugFP, "WindowText '%s' -> '%s'\n", buf, s);
+//if(appData.debugMode) fprintf(debugFP, "WindowText '%s' -> '%s'\n", buf, s);
     if(strcmp(buf, s)) SetWindowText(hDlg, s); // replace by translated string (if different)
     for(j=1; k=dialogItems[i][j]; j++) { // translate all listed dialog items
         GetDlgItemText(hDlg, k, buf, MSG_SIZ);
@@ -2459,7 +2459,7 @@ InitDrawingSizes(BoardSize boardSize, int flags)
   pieceBitmap[2][WhiteBishop] = DoLoadBitmap(hInst, "b", squareSize, "w");
   pieceBitmap[2][WhiteRook] = DoLoadBitmap(hInst, "r", squareSize, "w");
   pieceBitmap[2][WhiteKing] = DoLoadBitmap(hInst, "k", squareSize, "w");
-  if( !strcmp(appData.variant, "shogi") && (squareSize==72 || squareSize==49)) {
+  if( gameInfo.variant == VariantShogi && squareSize <= 72 && squareSize >= 33) {
     // in Shogi, Hijack the unused Queen for Lance
     pieceBitmap[0][WhiteQueen] = DoLoadBitmap(hInst, "l", squareSize, "s");
     pieceBitmap[1][WhiteQueen] = DoLoadBitmap(hInst, "l", squareSize, "o");
@@ -4073,6 +4073,8 @@ MouseEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
     x = BOARD_WIDTH - 1 - x;
   }
 
+  shiftKey = GetKeyState(VK_SHIFT) < 0; // [HGM] remember last shift status
+
   switch (message) {
   case WM_LBUTTONDOWN:
       if (PtInRect((LPRECT) &whiteRect, pt)) {
@@ -6365,7 +6367,8 @@ TypeInMoveDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 
   case WM_COMMAND:
     switch (LOWORD(wParam)) {
-    case IDOK:
+    case IDOK:
+      shiftKey = GetKeyState(VK_SHIFT) < 0; // [HGM] remember last shift status
       GetDlgItemText(hDlg, OPT_Move, move, sizeof(move));
       { int n; Board board;
 	// [HGM] FENedit