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

diff --git a/winboard/winboard.c b/winboard/winboard.c
index f818927..e98e516 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,
@@ -5052,6 +5053,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 +5713,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 +6802,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 +9767,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);
+}