X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.c;h=08cafb995bd779a9e2f78e4becf2f3e7fc06f89d;hb=47b84d7023fd7405ec1cec9b14f49ac8be13f891;hp=f818927530ee9bafe77cd8595e99ba2b3ceb9d9a;hpb=eb0b8eabe5bf8d5139bc82bf79b88aded98d96c8;p=xboard.git

diff --git a/winboard/winboard.c b/winboard/winboard.c
index f818927..08cafb9 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -186,6 +186,7 @@ COLORREF lightSquareColor, darkSquareColor, whitePieceColor,
 HPALETTE hPal;
 ColorClass currentColorClass;
 
+static HWND savedHwnd;
 HWND hCommPort = NULL;    /* currently open comm port */
 static HWND hwndPause;    /* pause button */
 static HBITMAP pieceBitmap[3][(int) BlackPawn]; /* [HGM] nr of bitmaps referred to bP in stead of wK */
@@ -305,7 +306,7 @@ int dialogItems[][40] = {
   OPT_VariantBughouse, OPT_VariantTwilight, OPT_VariantShogi, OPT_VariantSuper,
   OPT_VariantKnightmate, OPT_VariantBerolina, OPT_VariantCylinder, OPT_VariantFairy,
   OPT_VariantMakruk, OPT_VariantGothic, OPT_VariantCapablanca, OPT_VariantJanus,
-  OPT_VariantCRC, OPT_VariantFalcon, OPT_VariantCourier, OPT_VariantGreat,
+  OPT_VariantCRC, OPT_VariantFalcon, OPT_VariantCourier, OPT_VariantGreat, OPT_VariantSChess,
   OPT_VariantShatranj, OPT_VariantXiangqi, GPB_Variant, GPB_Board, IDC_Height,
   IDC_Width, IDC_Hand, IDC_Pieces, IDC_Def }, 
 { DLG_Fonts, IDOK, IDCANCEL, OPT_ChooseClockFont, OPT_ChooseMessageFont,
@@ -333,7 +334,7 @@ static char languageBuf[50000], *foreign[1000], *english[1000], *languageFile[MS
 static int lastChecked;
 static char oldLanguage[MSG_SIZ], *menuText[10][30];
 extern int tinyLayout;
-extern char * menuBarText[][8];
+extern char * menuBarText[][10];
 
 void
 LoadLanguageFile(char *name)
@@ -548,10 +549,10 @@ MyButtonDesc buttonDesc[N_BUTTONS] =
 };
 
 int tinyLayout = 0, smallLayout = 0;
-#define MENU_BAR_ITEMS 7
+#define MENU_BAR_ITEMS 9
 char *menuBarText[2][MENU_BAR_ITEMS+1] = {
-  { N_("&File"), N_("&Mode"), N_("&Action"), N_("&Step"), N_("&Options"), N_("&Help"), NULL },
-  { N_("&F"), N_("&M"), N_("&A"), N_("&S"), N_("&O"), N_("&H"), NULL },
+  { N_("&File"), N_("&Edit"), N_("&View"), N_("&Mode"), N_("&Action"), N_("E&ngine"), N_("&Options"), N_("&Help"), NULL },
+  { N_("&F"), N_("&E"), N_("&V"), N_("&M"), N_("&A"), N_("&N"), N_("&O"), N_("&H"), NULL },
 };
 
 
@@ -2485,14 +2486,24 @@ InitDrawingSizes(BoardSize boardSize, int flags)
       pieceBitmap[1][WhiteLance] = DoLoadBitmap(hInst, "l", squareSize, "o");
       pieceBitmap[2][WhiteLance] = DoLoadBitmap(hInst, "l", squareSize, "w");
     } else { // Smirf-like
-      pieceBitmap[0][WhiteAngel] = DoLoadBitmap(hInst, "aa", squareSize, "s");
-      pieceBitmap[1][WhiteAngel] = DoLoadBitmap(hInst, "aa", squareSize, "o");
-      pieceBitmap[2][WhiteAngel] = DoLoadBitmap(hInst, "aa", squareSize, "w");
+      if(gameInfo.variant == VariantSChess) {
+        pieceBitmap[0][WhiteAngel] = DoLoadBitmap(hInst, "v", squareSize, "s");
+        pieceBitmap[1][WhiteAngel] = DoLoadBitmap(hInst, "v", squareSize, "o");
+        pieceBitmap[2][WhiteAngel] = DoLoadBitmap(hInst, "v", squareSize, "w");
+      } else {
+        pieceBitmap[0][WhiteAngel] = DoLoadBitmap(hInst, "aa", squareSize, "s");
+        pieceBitmap[1][WhiteAngel] = DoLoadBitmap(hInst, "aa", squareSize, "o");
+        pieceBitmap[2][WhiteAngel] = DoLoadBitmap(hInst, "aa", squareSize, "w");
+      }
     }
     if(gameInfo.variant == VariantGothic) { // Vortex-like
       pieceBitmap[0][WhiteMarshall] = DoLoadBitmap(hInst, "cv", squareSize, "s");
       pieceBitmap[1][WhiteMarshall] = DoLoadBitmap(hInst, "cv", squareSize, "o");
       pieceBitmap[2][WhiteMarshall] = DoLoadBitmap(hInst, "cv", squareSize, "w");
+    } else if(gameInfo.variant == VariantSChess && (squareSize == 49 || squareSize == 72)) {
+      pieceBitmap[0][WhiteMarshall] = DoLoadBitmap(hInst, "e", squareSize, "s");
+      pieceBitmap[1][WhiteMarshall] = DoLoadBitmap(hInst, "e", squareSize, "o");
+      pieceBitmap[2][WhiteMarshall] = DoLoadBitmap(hInst, "e", squareSize, "w");
     } else { // WinBoard standard
       pieceBitmap[0][WhiteMarshall] = DoLoadBitmap(hInst, "c", squareSize, "s");
       pieceBitmap[1][WhiteMarshall] = DoLoadBitmap(hInst, "c", squareSize, "o");
@@ -3504,7 +3515,7 @@ HDCDrawPosition(HDC hdc, BOOLEAN repaint, Board board)
             if(--board[dragInfo.from.y][dragInfo.from.x-1] == 0 )
         board[dragInfo.from.y][dragInfo.from.x] = EmptySquare;
     } else 
-        board[dragInfo.from.y][dragInfo.from.x] = EmptySquare;
+        board[dragInfo.from.y][dragInfo.from.x] = gatingPiece;
   }
 
   /* Figure out which squares need updating by comparing the 
@@ -4817,7 +4828,9 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       break;
 
     case IDM_Match: // [HGM] match: flows into next case, after setting Match Mode and nr of Games
-      if(gameMode != BeginningOfGame) break; // allow menu item to remain enabled for better mode highligting
+      if(gameMode != BeginningOfGame) { // allow menu item to remain enabled for better mode highligting
+        DisplayError(_("You can only start a match from the initial position."), 0); break;
+      }
       matchMode = 2;// distinguish from command-line-triggered case (matchMode=1)
       appData.matchGames = appData.defaultMatchGames;
       matchGame = 1;
@@ -5052,6 +5065,8 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       break;
 
     case IDM_Engine2Options:
+      savedHwnd = hwnd;
+      if(WaitForSecond(SettingsMenuIfReady)) break;
       EngineOptionsPopup(hwnd, &second);
       break;
 
@@ -5710,12 +5725,12 @@ OpenFileDialog(HWND hwnd, char *write, char *defName, char *defExt, // [HGM] dia
 
   if (fileName == NULL) fileName = buf1;
   if (defName == NULL) {
-    safeStrCpy(fileName, "*.", sizeof(fileName)/sizeof(fileName[0]) );
+    safeStrCpy(fileName, "*.", 3 );
     strcat(fileName, defExt);
   } else {
-    safeStrCpy(fileName, defName, sizeof(fileName)/sizeof(fileName[0]) );
+    safeStrCpy(fileName, defName, MSG_SIZ );
   }
-    if (fileTitle) safeStrCpy(fileTitle, "", sizeof(fileTitle)/sizeof(fileTitle[0]) );
+    if (fileTitle) safeStrCpy(fileTitle, "", MSG_SIZ );
   if (number) *number = 0;
 
   openFileName.lStructSize       = sizeof(OPENFILENAME);
@@ -6799,6 +6814,7 @@ CommandX(HWND hwnd, char *command, BOOLEAN getname, BOOLEAN immediate)
     SendMessage(hwnd, EM_GETSELTEXT, 0, (LPARAM) name);
   }
   if (immediate) {
+    if(strstr(command, "%s")) snprintf(buf, MSG_SIZ, command, name); else
     snprintf(buf, MSG_SIZ, "%s %s", command, name);
     SetWindowText(hInput, buf);
     SendMessage(hInput, WM_CHAR, '\r', 0);
@@ -9763,3 +9779,9 @@ HistorySet( char movelist[][2*MOVE_LEN], int first, int last, int current )
 
     EvalGraphSet( first, last, current, pvInfoList );
 }
+
+void
+SettingsPopUp(ChessProgramState *cps)
+{     // [HGM] wrapper needed because handles must not be passed through back-end
+      EngineOptionsPopup(savedHwnd, cps);
+}