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

diff --git a/winboard/winboard.c b/winboard/winboard.c
index 6f26f2b..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,
@@ -435,7 +437,7 @@ TranslateOneMenu(int i, HMENU subMenu)
             info.dwTypeData = buf;
             info.cch = sizeof(buf);
             GetMenuItemInfo(subMenu, j, TRUE, &info);
-            if(i < 10) {
+            if(i < 10) {
                 if(menuText[i][j]) safeStrCpy(buf, menuText[i][j], sizeof(buf)/sizeof(buf[0]) );
                 else menuText[i][j] = strdup(buf); // remember original on first change
             }
@@ -492,6 +494,30 @@ TranslateMenus(int addLanguage)
 
 #endif
 
+#define IDM_RecentEngines 3000
+
+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
+	int i=IDM_RecentEngines;
+	recentEngines = strdup(appData.recentEngineList); // remember them as they are in menu
+	AppendMenu(subMenu, MF_SEPARATOR, (UINT_PTR) 0, NULL);
+	while(*s) {
+	  char *p = strchr(s, '\n');
+	  if(p == NULL) return; // malformed!
+	  *p = NULLCHAR;
+	  AppendMenu(subMenu, MF_ENABLED|MF_STRING|MF_UNCHECKED, (UINT_PTR) i++, (LPCTSTR) s);
+	  *p = '\n';
+	  s = p+1;
+	}
+    }
+}
+
+
 typedef struct {
   char *name;
   int squareSize;
@@ -1095,6 +1121,7 @@ InitInstance(HINSTANCE hInstance, int nCmdShow, LPSTR lpCmdLine)
   }
 
   InitDrawingSizes(boardSize, 0);
+  RecentEngineMenu(appData.recentEngineList);
   InitMenuChecks();
   buttonCount = GetSystemMetrics(SM_CMOUSEBUTTONS);
 
@@ -1169,6 +1196,7 @@ InitMenuChecks()
 
 #define OPTCHAR "/"
 #define SEPCHAR "="
+#define TOPLEVEL 0
 
 #include "args.h"
 
@@ -4247,7 +4275,7 @@ MouseEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       }
       break;
     case 2:
-      SetCapture(hwndMain);
+      SetCapture(hwndMain);
       break;
     case 1:
       hmenu = LoadMenu(hInst, "DropPieceMenu");
@@ -4972,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:
@@ -5443,6 +5474,9 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       break;
 
     default:
+      if(wmId >= IDM_RecentEngines && wmId < IDM_RecentEngines + appData.recentEngines)
+          RecentEngineEvent(wmId - IDM_RecentEngines);
+      else
       if(wmId > IDM_English && wmId < IDM_English+20) {
           LoadLanguageFile(languageFile[wmId - IDM_English - 1]);
           TranslateMenus(0);
@@ -6154,10 +6188,11 @@ 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));
-        p = buf;
+        p = buf;
 	SwapEngines(singleList); // temporarily swap first and second, to load a second 'first', ...
 	ParseArgs(StringGet, &p);
 	SwapEngines(singleList); // ... and then make it 'second'
@@ -6467,10 +6502,10 @@ 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));
+      GetDlgItemText(hDlg, OPT_Move, move, sizeof(move));
       TypeInDoneEvent(move);
       EndDialog(hDlg, TRUE);
       return TRUE;
@@ -7433,7 +7468,7 @@ DisplayHoldingsCount(HDC hdc, int x, int y, int rightAlign, int copyNumber)
   HFONT oldFont;
   RECT rect;
 
-  if(copyNumber > 1)
+  if(copyNumber > 1)
     snprintf(buf, sizeof(buf)/sizeof(buf[0]),"%d", copyNumber); else buf[0] = 0;
 
   oldFg = SetTextColor(hdc, RGB(255, 255, 255)); /* white */
@@ -7465,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);
@@ -7829,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 },
@@ -8183,8 +8220,8 @@ DisplayMessage(char *str1, char *str2)
     if (len > remain) len = remain;
     strncat(messageText, str2, len);
   }
-  messageText[MESSAGE_TEXT_MAX - 1] = NULLCHAR;
-  safeStrCpy(lastMsg, messageText, MSG_SIZ);
+  messageText[MESSAGE_TEXT_MAX - 1] = NULLCHAR;
+  safeStrCpy(lastMsg, messageText, MSG_SIZ);
 
   if (hwndMain == NULL || IsIconic(hwndMain)) return;
 
@@ -9174,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;