X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.c;h=1655d40af701731b0cdc1fdc0e3308e2795d899e;hb=407cd1126c6c24d890359f1fe1686f6d90c0ad61;hp=ae9d56165adc1e76c715511c5e76cc1fdc86cf41;hpb=7454f494554a3406c6a382d6feba2f9040eb3121;p=xboard.git

diff --git a/winboard/winboard.c b/winboard/winboard.c
index ae9d561..1655d40 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -955,6 +955,24 @@ EnsureOnScreen(int *x, int *y, int minX, int minY)
   if (*y < minY) *y = minY;
 }
 
+VOID
+LoadLogo(ChessProgramState *cps, int n)
+{
+  if( appData.logo[n] && appData.logo[n][0] != NULLCHAR) {
+      cps->programLogo = LoadImage( 0, appData.logo[n], IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE );
+
+      if (cps->programLogo == NULL && appData.debugMode) {
+          fprintf( debugFP, "Unable to load logo bitmap '%s'\n", appData.logo[n] );
+      }
+  } else if(appData.autoLogo) {
+      if(appData.firstDirectory && appData.directory[n][0]) {
+	char buf[MSG_SIZ];
+	  snprintf(buf, MSG_SIZ, "%s/logo.bmp", appData.directory[n]);
+	cps->programLogo = LoadImage( 0, buf, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE );	
+      }
+  }
+}
+
 BOOL
 InitInstance(HINSTANCE hInstance, int nCmdShow, LPSTR lpCmdLine)
 {
@@ -1010,19 +1028,7 @@ InitInstance(HINSTANCE hInstance, int nCmdShow, LPSTR lpCmdLine)
   }
 
   /* [HGM] logo: Load logos if specified (must be done before InitDrawingSizes) */
-  if( appData.firstLogo && appData.firstLogo[0] != NULLCHAR) {
-      first.programLogo = LoadImage( 0, appData.firstLogo, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE );
-
-      if (first.programLogo == NULL && appData.debugMode) {
-          fprintf( debugFP, "Unable to load logo bitmap '%s'\n", appData.firstLogo );
-      }
-  } else if(appData.autoLogo) {
-      if(appData.firstDirectory && appData.firstDirectory[0]) {
-	char buf[MSG_SIZ];
-	  snprintf(buf, MSG_SIZ, "%s/logo.bmp", appData.firstDirectory);
-	first.programLogo = LoadImage( 0, buf, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE );	
-      }
-  }
+  LoadLogo(&first, 0);
 
   if( appData.secondLogo && appData.secondLogo[0] != NULLCHAR) {
       second.programLogo = LoadImage( 0, appData.secondLogo, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE );
@@ -4937,7 +4943,8 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       break;
 
     case IDM_EditProgs2:
-      EditTagsPopUp(secondChessProgramNames, &secondChessProgramNames);
+     LoadEnginePopUp(hwndMain);
+//      EditTagsPopUp(secondChessProgramNames, &secondChessProgramNames);
       break;
 
     case IDM_EditServers:
@@ -4949,6 +4956,10 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       EditTagsProc();
       break;
 
+    case IDM_EditBook:
+      EditBookEvent();
+      break;
+
     case IDM_EditComment:
     case IDM_Comment:
       if (commentUp && editComment) {
@@ -5100,6 +5111,10 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       UciOptionsPopup(hwnd);
       break;
 
+    case IDM_Tourney:
+      TourneyPopup(hwnd);
+      break;
+
     case IDM_IcsOptions:
       IcsOptionsPopup(hwnd);
       break;
@@ -6065,8 +6080,8 @@ StartupDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 	          appData.firstChessProgram, "fd", appData.firstDirectory,
 		  firstChessProgramNames);
     InitEngineBox(hDlg, GetDlgItem(hDlg, OPT_SecondChessEngineName),
-	          appData.secondChessProgram, "sd", appData.secondDirectory,
-		  secondChessProgramNames);
+	          appData.secondChessProgram, singleList ? "fd" : "sd", appData.secondDirectory,
+		  singleList ? firstChessProgramNames : secondChessProgramNames); //[HGM] single: use first list in second combo
     hwndCombo = GetDlgItem(hDlg, OPT_ChessServerName);
     InitComboStringsFromOption(hwndCombo, icsNames);    
       snprintf(buf, MSG_SIZ, "%s /icsport=%s", appData.icsHost, appData.icsPort);
@@ -6103,10 +6118,12 @@ StartupDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 	GetDlgItemText(hDlg, OPT_ChessEngineName, buf + strlen(buf), sizeof(buf) - strlen(buf));
         p = buf;
 	ParseArgs(StringGet, &p);
-	safeStrCpy(buf, "/scp=", sizeof(buf)/sizeof(buf[0]) );
+	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'
 	appData.noChessProgram = FALSE;
 	appData.icsActive = FALSE;
       } else if (IsDlgButtonChecked(hDlg, OPT_ChessServer)) {
@@ -7742,6 +7759,22 @@ Enables gnuEnables[] = {
   { IDM_Revert, MF_BYCOMMAND|MF_GRAYED },
   { IDM_Annotate, MF_BYCOMMAND|MF_GRAYED },
   { IDM_NewChat, MF_BYCOMMAND|MF_GRAYED },
+
+  // Needed to switch from ncp to GNU mode on Engine Load
+  { ACTION_POS, MF_BYPOSITION|MF_ENABLED },
+  { IDM_MachineWhite, MF_BYCOMMAND|MF_ENABLED },
+  { IDM_MachineBlack, MF_BYCOMMAND|MF_ENABLED },
+  { IDM_TwoMachines, MF_BYCOMMAND|MF_ENABLED },
+  { IDM_Match, MF_BYCOMMAND|MF_ENABLED },
+  { IDM_AnalysisMode, MF_BYCOMMAND|MF_ENABLED },
+  { IDM_AnalyzeFile, MF_BYCOMMAND|MF_ENABLED },
+  { IDM_Engine1Options, MF_BYCOMMAND|MF_ENABLED },
+  { IDM_Engine2Options, MF_BYCOMMAND|MF_ENABLED },
+  { IDM_TimeControl, MF_BYCOMMAND|MF_ENABLED },
+  { IDM_RetractMove, MF_BYCOMMAND|MF_ENABLED },
+  { IDM_MoveNow, MF_BYCOMMAND|MF_ENABLED },
+  { IDM_Hint, MF_BYCOMMAND|MF_ENABLED },
+  { IDM_Book, MF_BYCOMMAND|MF_ENABLED },
   { -1, -1 }
 };
 
@@ -7759,10 +7792,12 @@ 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_IcsOptions, MF_BYCOMMAND|MF_ENABLED },
   { IDM_Engine1Options, MF_BYCOMMAND|MF_GRAYED },
   { IDM_Engine2Options, MF_BYCOMMAND|MF_GRAYED },
   { IDM_Annotate, MF_BYCOMMAND|MF_GRAYED },
+  { IDM_Tourney, MF_BYCOMMAND|MF_GRAYED },
   { -1, -1 }
 };
 
@@ -8877,6 +8912,9 @@ StartChildProcess(char *cmdLine, char *dir, ProcRef *pr)
    * dir relative to the directory WinBoard loaded from. */
   GetCurrentDirectory(MSG_SIZ, buf);
   SetCurrentDirectory(installDir);
+  // kludgey way to update logos in tourney, as long as back-end can't do it
+  if(!strcmp(cmdLine, first.program)) LoadLogo(&first, 0); else
+  if(!strcmp(cmdLine, second.program)) LoadLogo(&second, 1);
   SetCurrentDirectory(dir);
 
   /* Now create the child process. */