X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.c;h=a9d7454b3936482ca9d2c45df64f14947b962655;hb=7c9ee0544821f7981792be03e90ba15e9a8aeada;hp=9ce542829252fe6b7a57f07d96383218d8178e78;hpb=f4cc69edd466fda83f84629f40c086dd2a249616;p=xboard.git

diff --git a/winboard/winboard.c b/winboard/winboard.c
index 9ce5428..a9d7454 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -102,6 +102,8 @@ Boolean flipClock = FALSE;
 extern HANDLE chatHandle[];
 extern int 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"
 
@@ -4996,9 +5000,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:
@@ -5468,7 +5475,7 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 
     default:
       if(wmId >= IDM_RecentEngines && wmId < IDM_RecentEngines + appData.recentEngines)
-          RecentEngineEvent(wmId - 3000);
+          RecentEngineEvent(wmId - IDM_RecentEngines);
       else
       if(wmId > IDM_English && wmId < IDM_English+20) {
           LoadLanguageFile(languageFile[wmId - IDM_English - 1]);
@@ -6181,6 +6188,7 @@ StartupDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
         safeStrCpy(buf, "/fcp=", sizeof(buf)/sizeof(buf[0]) );
 	GetDlgItemText(hDlg, OPT_ChessEngineName, buf + strlen(buf), sizeof(buf) - strlen(buf));
         p = buf;
+	comboLine = strdup(p+5); // [HGM] recent: remember complete line of first combobox
 	ParseArgs(StringGet, &p);
 	safeStrCpy(buf, singleList ? "/fcp=" : "/scp=", sizeof(buf)/sizeof(buf[0]) );
 	GetDlgItemText(hDlg, OPT_SecondChessEngineName, buf + strlen(buf), sizeof(buf) - strlen(buf));
@@ -7492,6 +7500,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);
@@ -7856,7 +7865,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 },
@@ -9201,6 +9211,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;