X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.c;h=b86a399157c479292af2011e14d8af2d2cc8cb90;hb=a31d0897123ab90c8d4a8304619834079c3ad5a9;hp=8a16fb49dc7fc55800345a4226e986282e3c2fa6;hpb=71c3de687d33523d83dec50208b0e44815fd7d20;p=xboard.git

diff --git a/winboard/winboard.c b/winboard/winboard.c
index 8a16fb4..b86a399 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -889,16 +889,19 @@ WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
 void
 SetUserLogo()
 {   // update user logo if necessary
-    static char oldUserName[MSG_SIZ], *curName;
+    static char oldUserName[MSG_SIZ], dir[MSG_SIZ], *curName;
 
     if(appData.autoLogo) {
 	  curName = UserName();
 	  if(strcmp(curName, oldUserName)) {
-	    snprintf(oldUserName, MSG_SIZ, "logos\\%s.bmp", curName);
+		GetCurrentDirectory(MSG_SIZ, dir);
+		SetCurrentDirectory(installDir);
+		snprintf(oldUserName, MSG_SIZ, "logos\\%s.bmp", curName);
 		userLogo = LoadImage( 0, oldUserName, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE );	
 		safeStrCpy(oldUserName, curName, sizeof(oldUserName)/sizeof(oldUserName[0]) );
 		if(userLogo == NULL)
 		    userLogo = LoadImage( 0, "logos\\dummy.bmp", IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE );	
+		SetCurrentDirectory(dir); /* return to prev directory */
 	  }
     }
 }
@@ -956,8 +959,11 @@ EnsureOnScreen(int *x, int *y, int minX, int minY)
 }
 
 VOID
-LoadLogo(ChessProgramState *cps, int n)
+LoadLogo(ChessProgramState *cps, int n, Boolean ics)
 {
+  char buf[MSG_SIZ], dir[MSG_SIZ];
+  GetCurrentDirectory(MSG_SIZ, dir);
+  SetCurrentDirectory(installDir);
   if( appData.logo[n] && appData.logo[n][0] != NULLCHAR) {
       cps->programLogo = LoadImage( 0, appData.logo[n], IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE );
 
@@ -965,12 +971,16 @@ LoadLogo(ChessProgramState *cps, int n)
           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 );	
+      if(ics) { // [HGM] logo: in ICS mode second can be used for ICS
+	sprintf(buf, "logos\\%s.bmp", appData.icsHost);
+	cps->programLogo = LoadImage( 0, buf, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE );
+      } else
+      if(appData.directory[n] && appData.directory[n][0]) {
+        SetCurrentDirectory(appData.directory[n]);
+	cps->programLogo = LoadImage( 0, "logo.bmp", IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE );	
       }
   }
+  SetCurrentDirectory(dir); /* return to prev directory */
 }
 
 BOOL
@@ -1028,25 +1038,8 @@ InitInstance(HINSTANCE hInstance, int nCmdShow, LPSTR lpCmdLine)
   }
 
   /* [HGM] logo: Load logos if specified (must be done before InitDrawingSizes) */
-  LoadLogo(&first, 0);
-
-  if( appData.secondLogo && appData.secondLogo[0] != NULLCHAR) {
-      second.programLogo = LoadImage( 0, appData.secondLogo, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE );
-
-      if (second.programLogo == NULL && appData.debugMode) {
-          fprintf( debugFP, "Unable to load logo bitmap '%s'\n", appData.secondLogo );
-      }
-  } else if(appData.autoLogo) {
-      char buf[MSG_SIZ];
-      if(appData.icsActive) { // [HGM] logo: in ICS mode second can be used for ICS
-	snprintf(buf, MSG_SIZ, "logos\\%s.bmp", appData.icsHost);
-	second.programLogo = LoadImage( 0, buf, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE );
-      } else
-      if(appData.secondDirectory && appData.secondDirectory[0]) {
-	snprintf(buf, MSG_SIZ, "%s\\logo.bmp", appData.secondDirectory);
-	second.programLogo = LoadImage( 0, buf, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE );	
-      }
-  }
+  LoadLogo(&first, 0, FALSE);
+  LoadLogo(&second, 1, appData.icsActive);
 
   SetUserLogo();
 
@@ -3386,7 +3379,10 @@ DrawLogoOnDC(HDC hdc, RECT logoRect, HBITMAP logo)
   HBITMAP hbm;
   int w = 100, h = 50;
 
-  if(logo == NULL) return;
+  if(logo == NULL) {
+    if(!logoHeight) return;
+    FillRect( hdc, &logoRect, whitePieceBrush );
+  }
 //  GetClientRect(hwndMain, &Rect);
 //  bufferBitmap = CreateCompatibleBitmap(hdc, Rect.right-Rect.left+1,
 //					Rect.bottom-Rect.top+1);
@@ -3444,6 +3440,15 @@ DisplayLogos()
   }
 }
 
+void
+UpdateLogos(int display)
+{ // called after loading new engine(s), in tourney or from menu
+  LoadLogo(&first, 0, FALSE);
+  LoadLogo(&second, 1, appData.icsActive);
+  InitDrawingSizes(-2, 0); // adapt layout of board window to presence/absence of logos
+  if(display) DisplayLogos();
+}
+
 static HDC hdcSeek;
 
 // [HGM] seekgraph
@@ -4944,6 +4949,7 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 
     case IDM_EditProgs2:
      LoadEnginePopUp(hwndMain);
+//      EditTagsPopUp(secondChessProgramNames, &secondChessProgramNames);
       break;
 
     case IDM_EditServers:
@@ -4955,6 +4961,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) {
@@ -5106,6 +5116,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;
@@ -5607,7 +5621,7 @@ MyLoadSound(MySound *ms)
   struct stat st;
   FILE *f;
 
-  if (ms->data) free(ms->data);
+  if (ms->data && ms->flag) free(ms->data);
   ms->data = NULL;
 
   switch (ms->name[0]) {
@@ -5628,6 +5642,7 @@ MyLoadSound(MySound *ms)
       HANDLE h = FindResource(hInst, ms->name + 1, "WAVE");
       if (h == NULL) break;
       ms->data = (void *)LoadResource(hInst, h);
+      ms->flag = 0; // not maloced, so cannot be freed!
       if (h == NULL) break;
       ok = TRUE;
     }
@@ -5638,6 +5653,7 @@ MyLoadSound(MySound *ms)
     if (f == NULL) break;
     if (fstat(fileno(f), &st) < 0) break;
     ms->data = malloc(st.st_size);
+    ms->flag = 1;
     if (fread(ms->data, st.st_size, 1, f) < 1) break;
     fclose(f);
     ok = TRUE;
@@ -6071,8 +6087,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);
@@ -6109,10 +6125,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)) {
@@ -7748,6 +7766,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 }
 };
 
@@ -7765,10 +7799,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 }
 };
 
@@ -8883,9 +8919,6 @@ 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. */