X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.c;h=aaf615054c3152d6723a16a31b3be91d963c30e8;hb=7fb56edee87ea24c7b2b6b0065e73e5053650383;hp=0fa4807bd602b1632aee421bf181cb2e749e5c8d;hpb=cf0a1ceb59b82f6a167a922b3f1294a303554523;p=xboard.git

diff --git a/winboard/winboard.c b/winboard/winboard.c
index 0fa4807..aaf6150 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -1105,10 +1105,6 @@ ArgDescriptor argDescriptors[] = {
   { "autoraise", ArgTrue, (LPVOID) &appData.autoRaiseBoard, FALSE },
   { "xautoraise", ArgFalse, (LPVOID) &appData.autoRaiseBoard, FALSE },
   { "-autoraise", ArgFalse, (LPVOID) &appData.autoRaiseBoard, FALSE },
-#if 0
-  { "cmailGameName", ArgString, (LPVOID) &appData.cmailGameName, FALSE },
-  { "cmail", ArgString, (LPVOID) &appData.cmailGameName, FALSE },
-#endif
   { "alwaysPromoteToQueen", ArgBoolean, (LPVOID) &appData.alwaysPromoteToQueen, TRUE },
   { "queen", ArgTrue, (LPVOID) &appData.alwaysPromoteToQueen, FALSE },
   { "xqueen", ArgFalse, (LPVOID) &appData.alwaysPromoteToQueen, FALSE },
@@ -1396,6 +1392,7 @@ ArgDescriptor argDescriptors[] = {
   { "firstNPS", ArgInt, (LPVOID) &appData.firstNPS, FALSE },
   { "secondNPS", ArgInt, (LPVOID) &appData.secondNPS, FALSE },
   { "noGUI", ArgTrue, (LPVOID) &appData.noGUI, FALSE },
+  { "keepLineBreaksICS", ArgBoolean, (LPVOID) &appData.noJoin, TRUE },
 
   // [HGM] placement: put all window layouts last in ini file, but man X,Y before all others
   { "minX", ArgZ, (LPVOID) &minX, FALSE }, // [HGM] placement: to make suer auxialary windows can be placed
@@ -3040,57 +3037,10 @@ void CreatePiecesFromFont()
 
             /* Create bitmaps */
             hfont_old = SelectObject( hdc, hPieceFont );
-#if 0
-            CreatePieceMaskFromFont( hdc_window, hdc, PM_WP );
-            CreatePieceMaskFromFont( hdc_window, hdc, PM_WN );
-            CreatePieceMaskFromFont( hdc_window, hdc, PM_WB );
-            CreatePieceMaskFromFont( hdc_window, hdc, PM_WR );
-            CreatePieceMaskFromFont( hdc_window, hdc, PM_WQ );
-            CreatePieceMaskFromFont( hdc_window, hdc, PM_WK );
-            CreatePieceMaskFromFont( hdc_window, hdc, PM_BP );
-            CreatePieceMaskFromFont( hdc_window, hdc, PM_BN );
-            CreatePieceMaskFromFont( hdc_window, hdc, PM_BB );
-            CreatePieceMaskFromFont( hdc_window, hdc, PM_BR );
-            CreatePieceMaskFromFont( hdc_window, hdc, PM_BQ );
-            CreatePieceMaskFromFont( hdc_window, hdc, PM_BK );
-
-            CreatePieceMaskFromFont( hdc_window, hdc, PM_WA );
-            CreatePieceMaskFromFont( hdc_window, hdc, PM_WC );
-            CreatePieceMaskFromFont( hdc_window, hdc, PM_WF );
-            CreatePieceMaskFromFont( hdc_window, hdc, PM_WH );
-            CreatePieceMaskFromFont( hdc_window, hdc, PM_WE );
-            CreatePieceMaskFromFont( hdc_window, hdc, PM_WW );
-            CreatePieceMaskFromFont( hdc_window, hdc, PM_WU );
-            CreatePieceMaskFromFont( hdc_window, hdc, PM_WO );
-            CreatePieceMaskFromFont( hdc_window, hdc, PM_WG );
-            CreatePieceMaskFromFont( hdc_window, hdc, PM_WM );
-            CreatePieceMaskFromFont( hdc_window, hdc, PM_WSG );
-            CreatePieceMaskFromFont( hdc_window, hdc, PM_WV );
-            CreatePieceMaskFromFont( hdc_window, hdc, PM_WAB );
-            CreatePieceMaskFromFont( hdc_window, hdc, PM_WD );
-            CreatePieceMaskFromFont( hdc_window, hdc, PM_WL );
-            CreatePieceMaskFromFont( hdc_window, hdc, PM_WS );
-            CreatePieceMaskFromFont( hdc_window, hdc, PM_BA );
-            CreatePieceMaskFromFont( hdc_window, hdc, PM_BC );
-            CreatePieceMaskFromFont( hdc_window, hdc, PM_BF );
-            CreatePieceMaskFromFont( hdc_window, hdc, PM_BH );
-            CreatePieceMaskFromFont( hdc_window, hdc, PM_BE );
-            CreatePieceMaskFromFont( hdc_window, hdc, PM_BW );
-            CreatePieceMaskFromFont( hdc_window, hdc, PM_BU );
-            CreatePieceMaskFromFont( hdc_window, hdc, PM_BO );
-            CreatePieceMaskFromFont( hdc_window, hdc, PM_BG );
-            CreatePieceMaskFromFont( hdc_window, hdc, PM_BM );
-            CreatePieceMaskFromFont( hdc_window, hdc, PM_BSG );
-            CreatePieceMaskFromFont( hdc_window, hdc, PM_BV );
-            CreatePieceMaskFromFont( hdc_window, hdc, PM_BAB );
-            CreatePieceMaskFromFont( hdc_window, hdc, PM_BD );
-            CreatePieceMaskFromFont( hdc_window, hdc, PM_BL );
-            CreatePieceMaskFromFont( hdc_window, hdc, PM_BS );
-#else
 	    for(i=(int)WhitePawn; i<(int)EmptySquare; i++) /* [HGM] made a loop for this */
 		if(PieceToChar((ChessSquare)i) != '.')     /* skip unused pieces         */
 		    CreatePieceMaskFromFont( hdc_window, hdc, i );
-#endif
+
             SelectObject( hdc, hfont_old );
 
             fontBitmapSquareSize = squareSize;
@@ -3886,35 +3836,13 @@ DrawPieceOnDC(HDC hdc, ChessSquare piece, int color, int sqcolor, int x, int y,
         StretchBlt(hdc, x+tmpSize, y+tmpSize, -tmpSize, -tmpSize, tmphdc, 0, 0, tmpSize, tmpSize, 0x00B8074A);
       else
         BitBlt(hdc, x, y, tmpSize, tmpSize, tmphdc, 0, 0, 0x00B8074A);
-#if 0
-      /* Use black piece color for outline of white pieces */
-      /* Not sure this looks really good (though xboard does it).
-	 Maybe better to have another selectable color, default black */
-      SelectObject(hdc, blackPieceBrush); /* could have own brush */
-      SelectObject(tmphdc, PieceBitmap(piece, OUTLINE_PIECE));
-      BitBlt(hdc, x, y, tmpSize, tmpSize, tmphdc, 0, 0, 0x00B8074A);
-#else
       /* Use black for outline of white pieces */
       SelectObject(tmphdc, PieceBitmap(piece, OUTLINE_PIECE));
       if(appData.upsideDown && color==flipView)
         StretchBlt(hdc, x+tmpSize, y+tmpSize, -tmpSize, -tmpSize, tmphdc, 0, 0, tmpSize, tmpSize, SRCAND);
       else
         BitBlt(hdc, x, y, tmpSize, tmpSize, tmphdc, 0, 0, SRCAND);
-#endif
     } else {
-#if 0
-      /* Use white piece color for details of black pieces */
-      /* Requires filled-in solid bitmaps (BLACK_PIECE class); the
-	 WHITE_PIECE ones aren't always the right shape. */
-      /* Not sure this looks really good (though xboard does it).
-	 Maybe better to have another selectable color, default medium gray? */
-      oldBitmap = SelectObject(tmphdc, PieceBitmap(piece, BLACK_PIECE));
-      oldBrush = SelectObject(hdc, whitePieceBrush); /* could have own brush */
-      BitBlt(hdc, x, y, tmpSize, tmpSize, tmphdc, 0, 0, 0x00B8074A);
-      SelectObject(tmphdc, PieceBitmap(piece, SOLID_PIECE));
-      SelectObject(hdc, blackPieceBrush);
-      BitBlt(hdc, x, y, tmpSize, tmpSize, tmphdc, 0, 0, 0x00B8074A);
-#else
       /* Use square color for details of black pieces */
       oldBitmap = SelectObject(tmphdc, PieceBitmap(piece, SOLID_PIECE));
       oldBrush = SelectObject(hdc, blackPieceBrush);
@@ -3922,7 +3850,6 @@ DrawPieceOnDC(HDC hdc, ChessSquare piece, int color, int sqcolor, int x, int y,
         StretchBlt(hdc, x+tmpSize, y+tmpSize, -tmpSize, -tmpSize, tmphdc, 0, 0, tmpSize, tmpSize, 0x00B8074A);
       else
         BitBlt(hdc, x, y, tmpSize, tmpSize, tmphdc, 0, 0, 0x00B8074A);
-#endif
     }
     SelectObject(hdc, oldBrush);
     SelectObject(tmphdc, oldBitmap);
@@ -4459,17 +4386,6 @@ HDCDrawPosition(HDC hdc, BOOLEAN repaint, Board board)
       fullrepaint = TRUE;
   }
 
-#if 0
-  if( fullrepaint ) {
-      static int repaint_count = 0;
-      char buf[128];
-
-      repaint_count++;
-      sprintf( buf, "FULL repaint: %d\n", repaint_count );
-      OutputDebugString( buf );
-  }
-#endif
-
   if (board == NULL) {
     if (!lastReqValid) {
       return;
@@ -4499,35 +4415,6 @@ HDCDrawPosition(HDC hdc, BOOLEAN repaint, Board board)
     releaseDC = FALSE;
   }
 
-#if 0
-  fprintf(debugFP, "*******************************\n"
-                   "repaint = %s\n"
-                   "dragInfo.from (%d,%d)\n"
-                   "dragInfo.start (%d,%d)\n"
-                   "dragInfo.pos (%d,%d)\n"
-                   "dragInfo.lastpos (%d,%d)\n", 
-                    repaint ? "TRUE" : "FALSE",
-                    dragInfo.from.x, dragInfo.from.y, 
-                    dragInfo.start.x, dragInfo.start.y,
-                    dragInfo.pos.x, dragInfo.pos.y,
-                    dragInfo.lastpos.x, dragInfo.lastpos.y);
-  fprintf(debugFP, "prev:  ");
-  for (row = 0; row < BOARD_HEIGHT; row++) {
-    for (column = 0; column < BOARD_WIDTH; column++) {
-      fprintf(debugFP, "%d ", lastDrawn[row][column]);
-    }
-  }
-  fprintf(debugFP, "\n");
-  fprintf(debugFP, "board: ");
-  for (row = 0; row < BOARD_HEIGHT; row++) {
-    for (column = 0; column < BOARD_WIDTH; column++) {
-      fprintf(debugFP, "%d ", board[row][column]);
-    }
-  }
-  fprintf(debugFP, "\n");
-  fflush(debugFP);
-#endif
-
   /* Create some work-DCs */
   hdcmem = CreateCompatibleDC(hdc);
   tmphdc = CreateCompatibleDC(hdc);
@@ -4817,7 +4704,6 @@ HDCDrawPosition(HDC hdc, BOOLEAN repaint, Board board)
 	GetDIBits(tmphdc,bufferBitmap,0,b.bmHeight,pData,(BITMAPINFO*)&bih,DIB_RGB_COLORS);
 //	fprintf(diagFile, "%8x\n", (int) pData);
 
-#if 1
 	wb = b.bmWidthBytes;
 	// count colors
 	for(i=0; i<wb*(b.bmHeight - boardRect.top + OUTER_MARGIN)>>2; i++) {
@@ -4865,7 +4751,6 @@ 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);
-#endif
      }
   }
 
@@ -5356,16 +5241,6 @@ MouseEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 	else
 	  MenuPopup(hwnd, pt, LoadMenu(hInst, "WhitePieceMenu"), -1);
       } else { /* message == WM_RBUTTONDOWN */
-#if 0
-	if (buttonCount == 3) {
-	  if (wParam & MK_SHIFT) 
-	    MenuPopup(hwnd, pt, LoadMenu(hInst, "WhitePieceMenu"), -1);
-	  else
-	    MenuPopup(hwnd, pt, LoadMenu(hInst, "BlackPieceMenu"), -1);
-	} else {
-	  MenuPopup(hwnd, pt, LoadMenu(hInst, "PieceMenu"), -1);
-	}
-#else
 	/* Just have one menu, on the right button.  Windows users don't
 	   think to try the middle one, and sometimes other software steals
 	   it, or it doesn't really exist. */
@@ -5373,7 +5248,6 @@ MouseEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
             MenuPopup(hwnd, pt, LoadMenu(hInst, "PieceMenu"), -1);
         else
             MenuPopup(hwnd, pt, LoadMenu(hInst, "ShogiPieceMenu"), -1);
-#endif
       }
       break;
     case IcsPlayingWhite:
@@ -5583,6 +5457,36 @@ LoadGameDialog(HWND hwnd, char* title)
   }
 }
 
+void UpdateICSWidth(HWND hText)
+{
+	HDC hdc;
+	TEXTMETRIC tm;
+	RECT rc;
+	HFONT hfont, hold_font;
+	LONG old_width, new_width;
+	
+	// get the text metrics
+	hdc = GetDC(hText);
+	hfont = CreateFontIndirect(&font[boardSize][CONSOLE_FONT]->lf);
+	hold_font = SelectObject(hdc, hfont);
+	GetTextMetrics(hdc, &tm);
+	SelectObject(hdc, hold_font);
+	DeleteObject(hfont);
+	ReleaseDC(hText, hdc);
+
+	// get the rectangle
+	SendMessage(hText, EM_GETRECT, 0, (LPARAM)&rc);
+
+	// update the width
+	new_width = (rc.right-rc.left) / tm.tmAveCharWidth;
+	old_width = GetWindowLong(hText, GWL_USERDATA);
+	if (new_width != old_width)
+	{
+		ics_update_width(new_width);
+		SetWindowLong(hText, GWL_USERDATA, new_width);
+	}
+}
+
 VOID
 ChangedConsoleFont()
 {
@@ -5622,6 +5526,7 @@ ChangedConsoleFont()
   paraf.dxOffset = WRAP_INDENT;
   SendMessage(hText, EM_SETPARAFORMAT, 0, (LPARAM) &paraf);
   SendMessage(hText, EM_EXSETSEL, 0, (LPARAM)&sel);
+  UpdateICSWidth(hText);
 }
 
 /*---------------------------------------------------------------------------*\
@@ -5698,11 +5603,7 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       nnew = RealizePalette(hdc);
       if (nnew > 0) {
 	paletteChanged = TRUE;
-#if 0
-        UpdateColors(hdc);
-#else
-        InvalidateRect(hwnd, &boardRect, FALSE);/*faster!*/
-#endif
+        InvalidateRect(hwnd, &boardRect, FALSE);
       }
       ReleaseDC(hwnd, hdc);
     }
@@ -5730,14 +5631,12 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
     switch (wmId) {
     case IDM_NewGame:
       ResetGameEvent();
-      AnalysisPopDown();
       SAY("new game enter a move to play against the computer with white");
       break;
 
     case IDM_NewGameFRC:
       if( NewGameFRC() == 0 ) {
         ResetGameEvent();
-        AnalysisPopDown();
       }
       break;
 
@@ -6739,13 +6638,6 @@ MyPlaySound(MySound *ms)
   /* Don't print an error: this can happen innocently if the sound driver
      is busy; for instance, if another instance of WinBoard is playing
      a sound at about the same time. */
-#if 0
-  if (!ok) {
-    char buf[MSG_SIZ];
-    sprintf(buf, "Error playing sound %s", ms->name);
-    DisplayError(buf, GetLastError());
-  }
-#endif
   return ok;
 }
 
@@ -8237,18 +8129,35 @@ LRESULT CALLBACK
 ConsoleWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
   static SnapData sd;
-  static HWND hText, hInput /*, hFocus*/;
-//  InputSource *is = consoleInputSource;
+  HWND hText, hInput;
   RECT rect;
   static int sizeX, sizeY;
   int newSizeX, newSizeY;
   MINMAXINFO *mmi;
+  WORD wMask;
+
+  hText = GetDlgItem(hDlg, OPT_ConsoleText);
+  hInput = GetDlgItem(hDlg, OPT_ConsoleInput);
 
   switch (message) {
+  case WM_NOTIFY:
+    if (((NMHDR*)lParam)->code == EN_LINK)
+    {
+      ENLINK *pLink = (ENLINK*)lParam;
+      if (pLink->msg == WM_LBUTTONUP)
+      {
+        TEXTRANGE tr;
+
+        tr.chrg = pLink->chrg;
+        tr.lpstrText = malloc(1+tr.chrg.cpMax-tr.chrg.cpMin);
+        SendMessage(hText, EM_GETTEXTRANGE, 0, (LPARAM)&tr);
+        ShellExecute(NULL, "open", tr.lpstrText, NULL, NULL, SW_SHOW);
+        free(tr.lpstrText);
+      }
+    }
+    break;
   case WM_INITDIALOG: /* message: initialize dialog box */
     hwndConsole = hDlg;
-    hText = GetDlgItem(hDlg, OPT_ConsoleText);
-    hInput = GetDlgItem(hDlg, OPT_ConsoleInput);
     SetFocus(hInput);
     consoleTextWindowProc = (WNDPROC)
       SetWindowLong(hText, GWL_WNDPROC, (LONG) ConsoleTextSubclass);
@@ -8276,7 +8185,7 @@ ConsoleWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
       wp.rcNormalPosition.bottom = wpConsole.y + wpConsole.height;
       SetWindowPlacement(hDlg, &wp);
     }
-#if 1
+
    // [HGM] Chessknight's change 2004-07-13
    else { /* Determine Defaults */
        WINDOWPLACEMENT wp;
@@ -8295,7 +8204,13 @@ ConsoleWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
        wp.rcNormalPosition.bottom = wpConsole.y + wpConsole.height;
        SetWindowPlacement(hDlg, &wp);
     }
-#endif
+
+   // Allow hText to highlight URLs and send notifications on them
+   wMask = SendMessage(hText, EM_GETEVENTMASK, 0, 0L);
+   SendMessage(hText, EM_SETEVENTMASK, 0, wMask | ENM_LINK);
+   SendMessage(hText, EM_AUTOURLDETECT, TRUE, 0L);
+   SetWindowLong(hText, GWL_USERDATA, 79); // initialize the text window's width
+
     return FALSE;
 
   case WM_SETFOCUS:
@@ -8355,6 +8270,7 @@ ConsoleWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
     return OnMoving( &sd, hDlg, wParam, lParam );
 
   case WM_EXITSIZEMOVE:
+  	UpdateICSWidth(hText);
     return OnExitSizeMove( &sd, hDlg, wParam, lParam );
   }
 
@@ -8824,6 +8740,7 @@ Enables gnuEnables[] = {
   { IDM_StopExamining, MF_BYCOMMAND|MF_GRAYED },
   { IDM_StopObserving, MF_BYCOMMAND|MF_GRAYED },
   { IDM_Revert, MF_BYCOMMAND|MF_GRAYED },
+  { IDM_NewChat, MF_BYCOMMAND|MF_GRAYED },
   { -1, -1 }
 };
 
@@ -8833,6 +8750,7 @@ Enables icsEnables[] = {
   { IDM_MachineWhite, MF_BYCOMMAND|MF_GRAYED },
   { IDM_MachineBlack, MF_BYCOMMAND|MF_GRAYED },
   { IDM_TwoMachines, MF_BYCOMMAND|MF_GRAYED },
+  { IDM_MachineBoth, MF_BYCOMMAND|MF_GRAYED },
   { IDM_AnalysisMode, MF_BYCOMMAND|MF_ENABLED },
   { IDM_AnalyzeFile, MF_BYCOMMAND|MF_GRAYED },
   { IDM_TimeControl, MF_BYCOMMAND|MF_GRAYED },
@@ -8840,6 +8758,8 @@ Enables icsEnables[] = {
   { IDM_Hint, MF_BYCOMMAND|MF_GRAYED },
   { IDM_Book, MF_BYCOMMAND|MF_GRAYED },
   { IDM_IcsOptions, MF_BYCOMMAND|MF_ENABLED },
+  { IDM_Engine1Options, MF_BYCOMMAND|MF_GRAYED },
+  { IDM_Engine2Options, MF_BYCOMMAND|MF_GRAYED },
   { -1, -1 }
 };
 
@@ -8848,6 +8768,7 @@ Enables zippyEnables[] = {
   { IDM_MoveNow, MF_BYCOMMAND|MF_ENABLED },
   { IDM_Hint, MF_BYCOMMAND|MF_ENABLED },
   { IDM_Book, MF_BYCOMMAND|MF_ENABLED },
+  { IDM_Engine1Options, MF_BYCOMMAND|MF_ENABLED },
   { -1, -1 }
 };
 #endif
@@ -8868,6 +8789,10 @@ Enables ncpEnables[] = {
   { IDM_TimeControl, MF_BYCOMMAND|MF_GRAYED },
   { IDM_Hint, MF_BYCOMMAND|MF_GRAYED },
   { IDM_Book, MF_BYCOMMAND|MF_GRAYED },
+  { IDM_MachineBoth, MF_BYCOMMAND|MF_GRAYED },
+  { IDM_NewChat, MF_BYCOMMAND|MF_GRAYED },
+  { IDM_Engine1Options, MF_BYCOMMAND|MF_GRAYED },
+  { IDM_Engine2Options, MF_BYCOMMAND|MF_GRAYED },
   { -1, -1 }
 };
 
@@ -9625,6 +9550,11 @@ DrawPosition(int fullRedraw, Board board)
   HDCDrawPosition(NULL, (BOOLEAN) fullRedraw, board); 
 }
 
+void NotifyFrontendLogin()
+{
+	if (hwndConsole)
+		UpdateICSWidth(GetDlgItem(hwndConsole, OPT_ConsoleText));
+}
 
 VOID
 ResetFrontEnd()
@@ -10767,51 +10697,6 @@ AnalysisDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 }
 
 VOID
-AnalysisPopUp(char* title, char* str)
-{
-  FARPROC lpProc;
-  char *p, *q;
-
-  /* [AS] */
-  EngineOutputPopUp();
-  return;
-
-  if (str == NULL) str = "";
-  p = (char *) malloc(2 * strlen(str) + 2);
-  q = p;
-  while (*str) {
-    if (*str == '\n') *q++ = '\r';
-    *q++ = *str++;
-  }
-  *q = NULLCHAR;
-  if (analysisText != NULL) free(analysisText);
-  analysisText = p;
-
-  if (analysisDialog) {
-    SetWindowText(analysisDialog, title);
-    SetDlgItemText(analysisDialog, OPT_AnalysisText, analysisText);
-    ShowWindow(analysisDialog, SW_SHOW);
-  } else {
-    analysisTitle = title;
-    lpProc = MakeProcInstance((FARPROC)AnalysisDialog, hInst);
-    CreateDialog(hInst, MAKEINTRESOURCE(DLG_Analysis),
-		 hwndMain, (DLGPROC)lpProc);
-    FreeProcInstance(lpProc);
-  }
-  analysisDialogUp = TRUE;  
-}
-
-VOID
-AnalysisPopDown()
-{
-  if (analysisDialog) {
-    ShowWindow(analysisDialog, SW_HIDE);
-  }
-  analysisDialogUp = FALSE;  
-}
-
-
-VOID
 SetHighlights(int fromX, int fromY, int toX, int toY)
 {
   highlightInfo.sq[0].x = fromX;
@@ -11011,15 +10896,6 @@ Tween(start, mid, finish, factor, frames, nFrames)
 void
 HistorySet( char movelist[][2*MOVE_LEN], int first, int last, int current )
 {
-#if 0
-    char buf[256];
-
-    sprintf( buf, "HistorySet: first=%d, last=%d, current=%d (%s)\n",
-        first, last, current, current >= 0 ? movelist[current] : "n/a" );
-
-    OutputDebugString( buf );
-#endif
-
     MoveHistorySet( movelist, first, last, current, pvInfoList );
 
     EvalGraphSet( first, last, current, pvInfoList );
@@ -11027,14 +10903,5 @@ HistorySet( char movelist[][2*MOVE_LEN], int first, int last, int current )
 
 void SetProgramStats( FrontEndProgramStats * stats )
 {
-#if 0
-    char buf[1024];
-
-    sprintf( buf, "SetStats for %d: depth=%d, nodes=%lu, score=%5.2f, time=%5.2f, pv=%s\n",
-        stats->which, stats->depth, stats->nodes, stats->score / 100.0, stats->time / 100.0, stats->pv == 0 ? "n/a" : stats->pv );
-
-    OutputDebugString( buf );
-#endif
-
     EngineOutputUpdate( stats );
 }