X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.c;h=f20e67145a841343e8aa216fc5c76f9dd8bb4948;hb=7f4e264c413aa1853b9f9587e577cab2bc60b2a3;hp=8d8b70e70673ca66957c4c6f5fe09c4f2765c718;hpb=71ad75d24941a489a162c6906998f656a7c398be;p=xboard.git

diff --git a/winboard/winboard.c b/winboard/winboard.c
index 8d8b70e..f20e671 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -100,8 +100,10 @@
 extern int whiteFlag, blackFlag;
 Boolean flipClock = FALSE;
 extern HANDLE chatHandle[];
-extern int ics_type;
+extern enum ICS_TYPE ics_type;
 
+int  MySearchPath P((char *installDir, char *name, char *fullname));
+int  MyGetFullPathName P((char *name, char *fullname));
 void DisplayHoldingsCount(HDC hdc, int x, int y, int align, int copyNumber);
 VOID NewVariantPopup(HWND hwnd);
 int FinishMove P((ChessMove moveType, int fromX, int fromY, int toX, int toY,
@@ -497,6 +499,7 @@ TranslateMenus(int addLanguage)
 void
 RecentEngineMenu (char *s)
 {
+    if(appData.icsActive) return;
     if(appData.recentEngines > 0 && *s) { // feature is on, and list non-empty
 	HMENU mainMenu = GetMenu(hwndMain);
 	HMENU subMenu = GetSubMenu(mainMenu, 5); // Engine menu
@@ -1193,6 +1196,7 @@ InitMenuChecks()
 
 #define OPTCHAR "/"
 #define SEPCHAR "="
+#define TOPLEVEL 0
 
 #include "args.h"
 
@@ -2232,12 +2236,28 @@ InitDrawingSizes(BoardSize boardSize, int flags)
   RECT crect, wrect, oldRect;
   int offby;
   LOGBRUSH logbrush;
+  VariantClass v = gameInfo.variant;
 
   int suppressVisibleEffects = 0; // [HGM] kludge to request updating sizeInfo only
   if((int)boardSize >= 1000 ) { boardSize -= 1000; suppressVisibleEffects = 1; }
 
   /* [HGM] call with -2 uses old size (for if nr of files, ranks changes) */
   if(boardSize == (BoardSize)(-2) ) boardSize = oldBoardSize;
+  oldBoardSize = boardSize;
+
+  if(boardSize != SizeMiddling && boardSize != SizePetite && boardSize != SizeBulky && !appData.useFont)
+  { // correct board size to one where built-in pieces exist
+    if((v == VariantCapablanca || v == VariantGothic || v == VariantGrand || v == VariantCapaRandom || v == VariantJanus || v == VariantSuper)
+       && (boardSize < SizePetite || boardSize > SizeBulky) // Archbishop and Chancellor available in entire middle range
+      || (v == VariantShogi && boardSize != SizeModerate)   // Japanese-style Shogi
+      ||  v == VariantKnightmate || v == VariantSChess || v == VariantXiangqi || v == VariantSpartan
+      ||  v == VariantShatranj || v == VariantMakruk || v == VariantGreat || v == VariantFairy ) {
+      if(boardSize < SizeMediocre) boardSize = SizePetite; else
+      if(boardSize > SizeModerate) boardSize = SizeBulky;  else
+                                   boardSize = SizeMiddling;
+    }
+  }
+  if(!appData.useFont && boardSize == SizePetite && (v == VariantShogi || v == VariantKnightmate)) boardSize = SizeMiddling; // no Unicorn in Petite
 
   oldRect.left = wpMain.x; //[HGM] placement: remember previous window params
   oldRect.top = wpMain.y;
@@ -2346,7 +2366,6 @@ InitDrawingSizes(BoardSize boardSize, int flags)
 
   sizeInfo[boardSize].cliWidth = boardRect.right + OUTER_MARGIN;
   sizeInfo[boardSize].cliHeight = boardRect.bottom + OUTER_MARGIN;
-  oldBoardSize = boardSize;
   oldTinyLayout = tinyLayout;
   winW = 2 * GetSystemMetrics(SM_CXFRAME) + boardRect.right + OUTER_MARGIN;
   winH = 2 * GetSystemMetrics(SM_CYFRAME) + GetSystemMetrics(SM_CYMENU) +
@@ -4996,9 +5015,12 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       EditTagsPopUp(firstChessProgramNames, &firstChessProgramNames);
       break;
 
-    case IDM_EditProgs2:
-     LoadEnginePopUp(hwndMain);
-//      EditTagsPopUp(secondChessProgramNames, &secondChessProgramNames);
+    case IDM_LoadProg1:
+     LoadEnginePopUp(hwndMain, 0);
+      break;
+
+    case IDM_LoadProg2:
+     LoadEnginePopUp(hwndMain, 1);
       break;
 
     case IDM_EditServers:
@@ -7493,6 +7515,7 @@ DisplayAClock(HDC hdc, int timeRemaining, int highlight,
   COLORREF oldFg, oldBg;
   HFONT oldFont;
 
+  if (twoBoards && partnerUp) return;
   if (appData.clockMode) {
     if (tinyLayout)
       snprintf(buf, sizeof(buf)/sizeof(buf[0]), "%c %s %s", color[0], TimeString(timeRemaining), flagFell);
@@ -7857,7 +7880,8 @@ Enables icsEnables[] = {
   { IDM_MoveNow, MF_BYCOMMAND|MF_GRAYED },
   { IDM_Hint, MF_BYCOMMAND|MF_GRAYED },
   { IDM_Book, MF_BYCOMMAND|MF_GRAYED },
-  { IDM_EditProgs2, MF_BYCOMMAND|MF_GRAYED },
+  { IDM_LoadProg1, MF_BYCOMMAND|MF_GRAYED },
+  { IDM_LoadProg2, MF_BYCOMMAND|MF_GRAYED },
   { IDM_IcsOptions, MF_BYCOMMAND|MF_ENABLED },
   { IDM_Engine1Options, MF_BYCOMMAND|MF_GRAYED },
   { IDM_Engine2Options, MF_BYCOMMAND|MF_GRAYED },
@@ -9202,6 +9226,7 @@ OpenTCP(char *host, char *port, ProcRef *pr)
   ChildProc *cp;
   int err;
   SOCKET s;
+
   struct sockaddr_in sa, mysa;
   struct hostent FAR *hp;
   unsigned short uport;