X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.c;h=ba6933f7f419c2b40a9d82327a8b39087a52028b;hb=85ceab43886403019cd91c13d4b9c366279227b6;hp=971309b91ccc02b42dcdf0112365b706dc3a88db;hpb=a24992eef4621e0f45993a38cc6770cdb631d2cc;p=xboard.git

diff --git a/winboard/winboard.c b/winboard/winboard.c
index 971309b..ba6933f 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -1106,6 +1106,8 @@ InitGeometry()
   screenGeometry.bottom = screenGeometry.top + screenHeight;
 }
 
+ChessProgramState broadcast;
+
 BOOL
 InitInstance(HINSTANCE hInstance, int nCmdShow, LPSTR lpCmdLine)
 {
@@ -1138,7 +1140,18 @@ InitInstance(HINSTANCE hInstance, int nCmdShow, LPSTR lpCmdLine)
     appData.ringBellAfterMoves = TRUE;
   }
   if (appData.debugMode) {
-    debugFP = fopen(appData.nameOfDebugFile, "w");
+    char *c = appData.nameOfDebugFile;
+    if(strstr(c, "///") == c) {
+      broadcast.which = "broadcaster";
+      broadcast.pr   = NoProc;
+      broadcast.isr  = NULL;
+      broadcast.prog = c + 3;
+      broadcast.dir  = ".";
+      broadcast.host = "localhost";
+      StartChessProgram(&broadcast);
+      debugFP = (FILE*) _fdopen(_open_osfhandle((long)(((ChildProc*)(broadcast.pr))->hTo), _O_WRONLY), "w");
+    } else
+    debugFP = fopen(c, "w");
     setbuf(debugFP, NULL);
   }
 
@@ -2589,10 +2602,12 @@ InitDrawingSizes(BoardSize boardSize, int flags)
 	 piece = (ChessSquare) ((int) piece + 1)) {
       if (pieceBitmap[i][piece] != NULL)
 	DeleteObject(pieceBitmap[i][piece]);
+      pieceBitmap[i][piece] = NULL;
     }
   }
 
   fontBitmapSquareSize = 0; /* [HGM] render: make sure pieces will be recreated, as we might need others now */
+
   // Orthodox Chess pieces
   pieceBitmap[0][WhitePawn] = DoLoadBitmap(hInst, "p", squareSize, "s");
   pieceBitmap[0][WhiteKnight] = DoLoadBitmap(hInst, "n", squareSize, "s");
@@ -2797,6 +2812,15 @@ InitDrawingSizes(BoardSize boardSize, int flags)
   pieceBitmap[2][WhiteSilver] = DoLoadBitmap(hInst, "sw", squareSize, "w");
   minorSize = 0;
   }
+
+  if(appData.pieceDirectory[0]) for(i=WhitePawn; i<BlackPawn; i++) { // try for all missing pieces with new naming convention
+    char buf[MSG_SIZ];
+    if(pieceBitmap[0][i]) continue;
+    snprintf(buf, MSG_SIZ, "piece%d_", i);
+    pieceBitmap[0][i] = DoLoadBitmap(hInst, buf, squareSize, "s");
+    pieceBitmap[1][i] = DoLoadBitmap(hInst, buf, squareSize, "o");
+    pieceBitmap[2][i] = DoLoadBitmap(hInst, buf, squareSize, "w");
+  }
 }
 
 HBITMAP
@@ -5091,6 +5115,7 @@ 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(matchMode) EnableMenuItem(GetMenu(hwndMain), IDM_Match, MF_BYCOMMAND|MF_GRAYED);
       MatchEvent(2); // distinguish from command-line-triggered case (matchMode=1)
       break;
 
@@ -6714,7 +6739,7 @@ TypeInNameDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
     case IDOK:
       GetDlgItemText(hDlg, OPT_Name, move, sizeof(move));
       appData.userName = strdup(move);
-      SetUserLogo();
+      SetUserLogo(); DisplayLogos();
       SetGameInfo();
       if(gameMode == MachinePlaysWhite || gameMode == MachinePlaysBlack) {
 	snprintf(move, MSG_SIZ, "%s vs. %s", gameInfo.white, gameInfo.black);
@@ -7670,6 +7695,7 @@ DisplayAClock(HDC hdc, int timeRemaining, int highlight,
     oldFg = SetTextColor(hdc, RGB(0, 0, 0)); /* black */
     oldBg = SetBkColor(hdc, RGB(255, 255, 255)); /* white */
   }
+
   oldFont = SelectObject(hdc, font[boardSize][CLOCK_FONT]->hf);
 
   JAWS_SILENCE
@@ -7986,6 +8012,7 @@ Enables gnuEnables[] = {
   { 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 },
@@ -8215,6 +8242,8 @@ ModeHighlight()
     nowChecked = 0;
     break;
   }
+  if(prevChecked == IDM_TwoMachine) // [HGM] 'Machine Match' might have gotten disabled when stopping match
+    EnableMenuItem(GetMenu(hwndMain), IDM_Match, MF_BYCOMMAND|MF_ENABLED)
   CheckMark(prevChecked, MF_UNCHECKED);
   CheckMark(nowChecked, MF_CHECKED);
   CheckMark(IDM_Match, matchMode && matchGame < appData.matchGames ? MF_CHECKED : MF_UNCHECKED);