From: H.G. Muller <h.g.muller@hccnet.nl>
Date: Wed, 8 Feb 2012 16:45:42 +0000 (+0100)
Subject: Put recently used engines in WB menu
X-Git-Url: http://winboard.nl/cgi-bin?a=commitdiff_plain;h=f4cc69edd466fda83f84629f40c086dd2a249616;p=xboard.git

Put recently used engines in WB menu

A new option -recentEngines specifies how many engines should be listed.
The list of nicknames is stored in the ettings file as -recentEngineList.
The engines are appended to the Engine menu.
---

diff --git a/args.h b/args.h
index bb35139..eb2833a 100644
--- a/args.h
+++ b/args.h
@@ -485,6 +485,8 @@ ArgDescriptor argDescriptors[] = {
   { "icsMenu", ArgString, (void *) &icsTextMenuString, TRUE, (ArgIniType) ICS_TEXT_MENU_DEFAULT },
   { "icsNames", ArgString, (void *) &icsNames, TRUE, (ArgIniType) ICS_NAMES },
   { "singleEngineList", ArgBoolean, (void *) &singleList, !XBOARD, (ArgIniType) FALSE },
+  { "recentEngines", ArgInt, (void *) &appData.recentEngines, TRUE, (ArgIniType) 6 },
+  { "recentEngineList", ArgString, (void *) &appData.recentEngineList, TRUE, (ArgIniType) "" },
   { "firstChessProgramNames", ArgString, (void *) &firstChessProgramNames,
     TRUE, (ArgIniType) FCP_NAMES },
   { "secondChessProgramNames", ArgString, (void *) &secondChessProgramNames,
diff --git a/backend.c b/backend.c
index e6f48a4..0a736e7 100644
--- a/backend.c
+++ b/backend.c
@@ -873,6 +873,25 @@ static char resetOptions[] =
 	"-firstOptions \"\" -firstNPS -1 -fn \"\"";
 
 void
+FloatToFront(char **list, char *engineLine)
+{
+    char buf[MSG_SIZ], tidy[MSG_SIZ], *p = buf, *q, *r = buf;
+    int i=0;
+    if(appData.recentEngines <= 0) return;
+    TidyProgramName(engineLine, "localhost", tidy+1);
+    tidy[0] = buf[0] = '\n'; strcat(tidy, "\n");
+    strncpy(buf+1, *list, MSG_SIZ-50);
+    if(p = strstr(buf, tidy)) { // tidy name appears in list
+	q = strchr(++p, '\n'); if(q == NULL) return; // malformed, don't touch
+	while(*p++ = *++q); // squeeze out
+    }
+    strcat(tidy, buf+1); // put list behind tidy name
+    p = tidy + 1; while(q = strchr(p, '\n')) i++, r = p, p = q + 1; // count entries in new list
+    if(i > appData.recentEngines) *r = NULLCHAR; // if maximum rached, strip off last
+    ASSIGN(*list, tidy+1);
+}
+
+void
 Load (ChessProgramState *cps, int i)
 {
     char *p, *q, buf[MSG_SIZ], command[MSG_SIZ], buf2[MSG_SIZ];
@@ -884,6 +903,7 @@ Load (ChessProgramState *cps, int i)
 	ParseArgsFromString(buf);
 	SwapEngines(i);
 	ReplaceEngine(cps, i);
+	FloatToFront(&appData.recentEngineList, engineLine);
 	return;
     }
     p = engineName;
@@ -926,6 +946,7 @@ Load (ChessProgramState *cps, int i)
 	firstChessProgramNames = malloc(len = strlen(q) + strlen(buf) + 1);
 	snprintf(firstChessProgramNames, len, "%s%s", q, buf);
 	if(q) 	free(q);
+	FloatToFront(&appData.recentEngineList, buf);
     }
     ReplaceEngine(cps, i);
 }
@@ -1473,6 +1494,7 @@ InitBackEnd3 P((void))
 	free(programVersion);
 	programVersion = (char*) malloc(8 + strlen(PACKAGE_STRING) + strlen(first.tidy));
 	sprintf(programVersion, "%s + %s", PACKAGE_STRING, first.tidy);
+	FloatToFront(&appData.recentEngineList, appData.firstChessProgram);
     }
 
     if (appData.icsActive) {
@@ -9904,11 +9926,11 @@ SwapEngines (int n)
     SWAP(engOptions, p)
 }
 
-void
-SetPlayer (int player)
+int
+SetPlayer (int player, char *p)
 {   // [HGM] find the engine line of the partcipant given by number, and parse its options.
     int i;
-    char buf[MSG_SIZ], *engineName, *p = appData.participants;
+    char buf[MSG_SIZ], *engineName;
     for(i=0; i<player; i++) p = strchr(p, '\n') + 1;
     engineName = strdup(p); if(p = strchr(engineName, '\n')) *p = NULLCHAR;
     for(i=1; command[i]; i++) if(!strcmp(mnemonic[i], engineName)) break;
@@ -9919,6 +9941,23 @@ SetPlayer (int player)
 	ParseArgsFromString(buf);
     }
     free(engineName);
+    return i;
+}
+
+char *recentEngines;
+
+void
+RecentEngineEvent (int nr)
+{
+    int n;
+//    SwapEngines(1); // bump first to second
+//    ReplaceEngine(&second, 1); // and load it there
+    NamesToList(firstChessProgramNames, command, mnemonic); // get mnemonics of installed engines
+    n = SetPlayer(nr, recentEngines); // select new (using original menu order!)
+    if(mnemonic[n]) { // if somehow the engine with the selected nickname is no longer found in the list, we skip
+	ReplaceEngine(&first, 0);
+	FloatToFront(&appData.recentEngineList, command[n]);
+    }
 }
 
 int
@@ -10026,12 +10065,12 @@ NextTourneyGame (int nr, int *swapColors)
     // redefine engines, engine dir, etc.
     NamesToList(firstChessProgramNames, command, mnemonic); // get mnemonics of installed engines
     if(first.pr == NoProc || nr < 0) {
-      SetPlayer(whitePlayer); // find white player amongst it, and parse its engine line
+      SetPlayer(whitePlayer, appData.participants); // find white player amongst it, and parse its engine line
       InitEngine(&first, 0);  // initialize ChessProgramStates based on new settings.
     }
     if(second.pr == NoProc) {
       SwapEngines(1);
-      SetPlayer(blackPlayer); // find black player amongst it, and parse its engine line
+      SetPlayer(blackPlayer, appData.participants); // find black player amongst it, and parse its engine line
       SwapEngines(1);         // and make that valid for second engine by swapping
       InitEngine(&second, 1);
     }
diff --git a/backend.h b/backend.h
index 490e86b..ce09c98 100644
--- a/backend.h
+++ b/backend.h
@@ -208,6 +208,7 @@ void ExitAnalyzeMode P((void));
 void AnalyzeModeEvent P((void));
 void AnalyzeFileEvent P((void));
 void MatchEvent P((int mode));
+void RecentEngineEvent P((int nr));
 void TypeInEvent P((char first));
 void TypeInDoneEvent P((char *move));
 void InitPosition P((int redraw));
@@ -434,6 +435,7 @@ extern Boolean shuffleOpenings;
 extern ChessProgramStats programStats;
 extern int opponentKibitzes; // used by wengineo.c
 extern int errorExitStatus;
+extern char *recentEngines;
 void SettingsPopUp P((ChessProgramState *cps)); // [HGM] really in front-end, but CPS not known in frontend.h
 int WaitForEngine P((ChessProgramState *cps, DelayedEventCallback x));
 void Load P((ChessProgramState *cps, int n));
diff --git a/common.h b/common.h
index ab3503d..a044993 100644
--- a/common.h
+++ b/common.h
@@ -670,6 +670,8 @@ typedef struct {
     Boolean scoreWhite;
     Boolean pvSAN[ENGINES];
 
+    int recentEngines;
+    char *recentEngineList;
     char *tourneyFile;
     char *defName;
     char *processes;
diff --git a/winboard/winboard.c b/winboard/winboard.c
index 6f26f2b..9ce5428 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -435,7 +435,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 +492,29 @@ TranslateMenus(int addLanguage)
 
 #endif
 
+#define IDM_RecentEngines 3000
+
+void
+RecentEngineMenu (char *s)
+{
+    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 +1118,7 @@ InitInstance(HINSTANCE hInstance, int nCmdShow, LPSTR lpCmdLine)
   }
 
   InitDrawingSizes(boardSize, 0);
+  RecentEngineMenu(appData.recentEngineList);
   InitMenuChecks();
   buttonCount = GetSystemMetrics(SM_CMOUSEBUTTONS);
 
@@ -4247,7 +4271,7 @@ MouseEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       }
       break;
     case 2:
-      SetCapture(hwndMain);
+      SetCapture(hwndMain);
       break;
     case 1:
       hmenu = LoadMenu(hInst, "DropPieceMenu");
@@ -5443,6 +5467,9 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       break;
 
     default:
+      if(wmId >= IDM_RecentEngines && wmId < IDM_RecentEngines + appData.recentEngines)
+          RecentEngineEvent(wmId - 3000);
+      else
       if(wmId > IDM_English && wmId < IDM_English+20) {
           LoadLanguageFile(languageFile[wmId - IDM_English - 1]);
           TranslateMenus(0);
@@ -6157,7 +6184,7 @@ StartupDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 	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 +6494,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 +7460,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 */
@@ -8183,8 +8210,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;