X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.c;h=67e950a75a0527e911f229bd98a9db3e6b0b0b41;hb=4099d0667f611390759e74b42cadf4325ee1f2cd;hp=07e4bd20de7e04c3641a3cffe5a0be6e8bb6246d;hpb=d39b0224115daf24fa2608e27d0ca16c8cd4aa70;p=xboard.git

diff --git a/winboard/winboard.c b/winboard/winboard.c
index 07e4bd2..67e950a 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -73,6 +73,7 @@
 #include <richedit.h>
 #include <mmsystem.h>
 #include <ctype.h>
+#include <io.h>
 
 #if __GNUC__
 #include <errno.h>
@@ -954,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)
 {
@@ -1009,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 );
@@ -3842,11 +3849,11 @@ HDCDrawPosition(HDC hdc, BOOLEAN repaint, Board board)
 	 boardRect.bottom - boardRect.top,
 	 tmphdc, boardRect.left, boardRect.top, SRCCOPY);
   if(saveDiagFlag) { 
-    BITMAP b; int i, j=0, m, w, wb, fac=0; char pData[1000000]; 
+    BITMAP b; int i, j=0, m, w, wb, fac=0; char *pData; 
     BITMAPINFOHEADER bih; int color[16], nrColors=0;
 
     GetObject(bufferBitmap, sizeof(b), &b);
-    if(b.bmWidthBytes*b.bmHeight <= 990000) {
+    if(pData = malloc(b.bmWidthBytes*b.bmHeight + 10000)) {
 	bih.biSize = sizeof(BITMAPINFOHEADER);
 	bih.biWidth = b.bmWidth;
 	bih.biHeight = b.bmHeight;
@@ -3910,6 +3917,7 @@ HDCDrawPosition(HDC hdc, BOOLEAN repaint, Board board)
 	// write bitmap data
 	for(i=0; i<wb*(b.bmHeight - boardRect.top + OUTER_MARGIN); i++) 
 		fputc(pData[i], diagFile);
+	free(pData);
      }
   }
 
@@ -3946,11 +3954,8 @@ SaveDiagram(f)
 {
     saveDiagFlag = 1; diagFile = f;
     HDCDrawPosition(NULL, TRUE, NULL);
-
     saveDiagFlag = 0;
 
-//    if(f != NULL) fprintf(f, "Sorry, but this feature is still in preparation\n");
-    
     fclose(f);
     return TRUE;
 }
@@ -4843,10 +4848,6 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       break;
 
     case IDM_Match: // [HGM] match: flows into next case, after setting Match Mode and nr of Games
-      if(gameMode != BeginningOfGame) { // allow menu item to remain enabled for better mode highligting
-        DisplayError(_("You can only start a match from the initial position."), 0); break;
-      }
-      appData.matchGames = appData.defaultMatchGames;
       MatchEvent(2); // distinguish from command-line-triggered case (matchMode=1)
       break;
 
@@ -4942,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:
@@ -5097,7 +5099,7 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 
     case IDM_Engine2Options:
       savedHwnd = hwnd;
-      if(WaitForSecond(SettingsMenuIfReady)) break;
+      if(WaitForEngine(&second, SettingsMenuIfReady)) break;
       EngineOptionsPopup(hwnd, &second);
       break;
 
@@ -5105,6 +5107,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;
@@ -6070,8 +6076,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);
@@ -6108,10 +6114,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)) {
@@ -7747,6 +7755,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 }
 };
 
@@ -7764,10 +7788,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 }
 };
 
@@ -7859,7 +7885,7 @@ Enables machineThinkingEnables[] = {
   { IDM_MachineWhite, MF_BYCOMMAND|MF_GRAYED },
   { IDM_MachineBlack, MF_BYCOMMAND|MF_GRAYED },
   { IDM_TwoMachines, MF_BYCOMMAND|MF_GRAYED },
-  { IDM_Match, MF_BYCOMMAND|MF_GRAYED },
+//  { IDM_Match, MF_BYCOMMAND|MF_GRAYED },
   { IDM_TypeInMove, MF_BYCOMMAND|MF_GRAYED },
   { IDM_RetractMove, MF_BYCOMMAND|MF_GRAYED },
   { -1, -1 }
@@ -7879,7 +7905,7 @@ Enables userThinkingEnables[] = {
   { 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_Match, MF_BYCOMMAND|MF_ENABLED },
   { IDM_TypeInMove, MF_BYCOMMAND|MF_ENABLED },
   { IDM_RetractMove, MF_BYCOMMAND|MF_ENABLED },
   { -1, -1 }
@@ -7892,6 +7918,12 @@ Enables userThinkingEnables[] = {
  * 
 \*---------------------------------------------------------------------------*/
 VOID
+CheckMark(UINT item, int state)
+{
+    if(item) CheckMenuItem(GetMenu(hwndMain), item, MF_BYCOMMAND|state);
+}
+
+VOID
 ModeHighlight()
 {
   static UINT prevChecked = 0;
@@ -7921,7 +7953,7 @@ ModeHighlight()
     nowChecked = IDM_MachineWhite;
     break;
   case TwoMachinesPlay:
-    nowChecked = matchMode ? IDM_Match : IDM_TwoMachines; // [HGM] match
+    nowChecked = IDM_TwoMachines;
     break;
   case AnalyzeMode:
     nowChecked = IDM_AnalysisMode;
@@ -7952,12 +7984,9 @@ ModeHighlight()
     nowChecked = 0;
     break;
   }
-  if (prevChecked != 0)
-    (void) CheckMenuItem(GetMenu(hwndMain),
-			 prevChecked, MF_BYCOMMAND|MF_UNCHECKED);
-  if (nowChecked != 0)
-    (void) CheckMenuItem(GetMenu(hwndMain),
-			 nowChecked, MF_BYCOMMAND|MF_CHECKED);
+  CheckMark(prevChecked, MF_UNCHECKED);
+  CheckMark(nowChecked, MF_CHECKED);
+  CheckMark(IDM_Match, matchMode && matchGame < appData.matchGames ? MF_CHECKED : MF_UNCHECKED);
 
   if (nowChecked == IDM_LoadGame || nowChecked == IDM_Training) {
     (void) EnableMenuItem(GetMenu(hwndMain), IDM_Training, 
@@ -7972,11 +8001,9 @@ ModeHighlight()
   /* [DM] icsEngineAnalyze - Do a sceure check too */
   if (appData.icsActive) {
        if (appData.icsEngineAnalyze) {
-               (void) CheckMenuItem(GetMenu(hwndMain), IDM_AnalysisMode,
-                       MF_BYCOMMAND|MF_CHECKED);
+               CheckMark(IDM_AnalysisMode, MF_CHECKED);
        } else {
-               (void) CheckMenuItem(GetMenu(hwndMain), IDM_AnalysisMode,
-                       MF_BYCOMMAND|MF_UNCHECKED);
+               CheckMark(IDM_AnalysisMode, MF_UNCHECKED);
        }
   }
   DisplayLogos(); // [HGM] logos: mode change could have altered logos
@@ -8115,7 +8142,8 @@ DisplayMessage(char *str1, char *str2)
     if (len > remain) len = remain;
     strncat(messageText, str2, len);
   }
-  messageText[MESSAGE_TEXT_MAX - 1] = NULLCHAR;
+  messageText[MESSAGE_TEXT_MAX - 1] = NULLCHAR;
+  safeStrCpy(lastMsg, messageText, MSG_SIZ);
 
   if (hwndMain == NULL || IsIconic(hwndMain)) return;
 
@@ -8880,6 +8908,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. */
@@ -9785,3 +9816,19 @@ SettingsPopUp(ChessProgramState *cps)
 {     // [HGM] wrapper needed because handles must not be passed through back-end
       EngineOptionsPopup(savedHwnd, cps);
 }
+
+int flock(int fid, int code)
+{
+    HANDLE hFile = (HANDLE) _get_osfhandle(fid);
+    OVERLAPPED ov;
+    ov.hEvent = NULL;
+    ov.Offset = 0;
+    ov.OffsetHigh = 0;
+    switch(code) {
+      case 1: LockFileEx(hFile, LOCKFILE_EXCLUSIVE_LOCK, 0, 1024, 0, &ov); break;   // LOCK_SH
+      case 2: LockFileEx(hFile, LOCKFILE_EXCLUSIVE_LOCK, 0, 1024, 0, &ov); break;   // LOCK_EX
+      case 3: UnlockFileEx(hFile, 0, 1024, 0, &ov); break; // LOCK_UN
+      default: return -1;
+    }
+    return 0;
+}