X-Git-Url: http://winboard.nl/cgi-bin?p=xboard.git;a=blobdiff_plain;f=winboard%2Fwinboard.c;fp=winboard%2Fwinboard.c;h=fb64ff7f8448ca14613e18930600658a8908390d;hp=6ad5def96778020d577f4db5a17c7f886309db21;hb=ea750683ac62717dd7346de17b5ae072622ff92a;hpb=74025874f2010f84fd4f7f2e120e84b56ee9781b

diff --git a/winboard/winboard.c b/winboard/winboard.c
index 6ad5def..fb64ff7 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -688,11 +688,6 @@ InitInstance(HINSTANCE hInstance, int nCmdShow, LPSTR lpCmdLine)
 
   mysrandom( (unsigned) time(NULL) );
 
-  /* Make a console window if needed */
-  if (appData.icsActive) {
-    ConsoleCreate();
-  }
-
   /* [AS] Restore layout */
   if( wpMoveHistory.visible ) {
       MoveHistoryPopUp();
@@ -1277,6 +1272,7 @@ ArgDescriptor argDescriptors[] = {
   { "secondAccumulateTC", ArgInt, (LPVOID) &appData.secondAccumulateTC, FALSE },
   { "firstNPS", ArgInt, (LPVOID) &appData.firstNPS, FALSE },
   { "secondNPS", ArgInt, (LPVOID) &appData.secondNPS, FALSE },
+  { "noGUI", ArgTrue, (LPVOID) &appData.noGUI, FALSE },
   { NULL, ArgNone, NULL, FALSE }
 };
 
@@ -1838,6 +1834,7 @@ InitAppData(LPSTR lpCmdLine)
   appData.reuseFirst = TRUE;
   appData.reuseSecond = TRUE;
   appData.blindfold = FALSE;
+  appData.icsEngineAnalyze = FALSE;
   dcb.DCBlength = sizeof(DCB);
   dcb.BaudRate = 9600;
   dcb.fBinary = TRUE;
@@ -1852,7 +1849,12 @@ InitAppData(LPSTR lpCmdLine)
   dcb.fNull = FALSE;
   dcb.fRtsControl = RTS_CONTROL_ENABLE;
   dcb.fAbortOnError = FALSE;
-  dcb.wReserved = 0;
+  /* Microsoft SDK >= Feb. 2003 (MS VS >= 2002) */
+  #if (defined(_MSC_VER) && _MSC_VER <= 1200) 
+	//dcb.wReserved = 0;
+  #else
+    dcb.wReserved = 0;
+  #endif
   dcb.ByteSize = 7;
   dcb.Parity = SPACEPARITY;
   dcb.StopBits = ONESTOPBIT;
@@ -5039,6 +5041,17 @@ MouseEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
     }
     break;
 
+  case WM_MOUSEWHEEL: // [DM]
+       /* Mouse Wheel is being rolled forward
+        * Play moves forward
+        */
+       if((short)HIWORD(wParam) > 0 && currentMove < forwardMostMove) ForwardEvent();
+       /* Mouse Wheel is being rolled backward
+        * Play moves backward
+        */
+       if((short)HIWORD(wParam) < 0 && currentMove > backwardMostMove) BackwardEvent();
+       break;
+
   case WM_MBUTTONDOWN:
   case WM_RBUTTONDOWN:
     ErrorPopDown();
@@ -5373,6 +5386,7 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
   FILE *f;
   UINT number;
   char fileTitle[MSG_SIZ];
+  char buf[MSG_SIZ];
   static SnapData sd;
 
   switch (message) {
@@ -5397,6 +5411,7 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
   case WM_MBUTTONUP:
   case WM_RBUTTONUP:
   case WM_MOUSEMOVE:
+  case WM_MOUSEWHEEL:
     MouseEvent(hwnd, message, wParam, lParam);
     break;
 
@@ -5686,10 +5701,34 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 
     case IDM_AnalysisMode:
       if (!first.analysisSupport) {
-        char buf[MSG_SIZ];
         sprintf(buf, "%s does not support analysis", first.tidy);
         DisplayError(buf, 0);
       } else {
+        /* [DM] icsEngineAnlyze [HGM] Why is this front-end??? */
+        if (appData.icsActive) {
+               if (gameMode != IcsObserving) {
+                       sprintf(buf, "You are not observing a game");
+                       DisplayError(buf, 0);
+                       /* secure check */
+                       if (appData.icsEngineAnalyze) {
+                               if (appData.debugMode) 
+                                       fprintf(debugFP, "Found unexpected active ICS engine analyze \n");
+                               ExitAnalyzeMode();
+                               ModeHighlight();
+                               break;
+                       }
+                       break;
+               } else {
+                       /* if enable, user want disable icsEngineAnalyze */
+                       if (appData.icsEngineAnalyze) {
+                               ExitAnalyzeMode();
+                               ModeHighlight();
+                               break;
+                       }
+                       appData.icsEngineAnalyze = TRUE;
+                       if (appData.debugMode) fprintf(debugFP, "ICS engine analyze starting...\n");
+               }
+        } 
 	if (!appData.showThinking) ToggleShowThinking();
 	AnalyzeModeEvent();
       }
@@ -6155,8 +6194,8 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       AutoPlayGameLoop(); /* call into back end */
       break;
     case ANALYSIS_TIMER_ID:
-      if ((gameMode == AnalyzeMode || gameMode == AnalyzeFile) && 
-	  appData.periodicUpdates) {
+      if ((gameMode == AnalyzeMode || gameMode == AnalyzeFile
+                 || appData.icsEngineAnalyze) && appData.periodicUpdates) {
 	AnalysisPeriodicEvent(0);
       } else {
 	KillTimer(hwnd, analysisTimerEvent);
@@ -7916,6 +7955,26 @@ ConsoleWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
       wp.rcNormalPosition.bottom = consoleY + consoleH;
       SetWindowPlacement(hDlg, &wp);
     }
+#if 0 
+   // [HGM] Chessknight's change 2004-07-13
+   else { /* Determine Defaults */
+       WINDOWPLACEMENT wp;
+       consoleX = winWidth + 1;
+       consoleY = boardY;
+       consoleW = screenWidth -  winWidth;
+       consoleH = winHeight;
+       EnsureOnScreen(&consoleX, &consoleY);
+       wp.length = sizeof(WINDOWPLACEMENT);
+       wp.flags = 0;
+       wp.showCmd = SW_SHOW;
+       wp.ptMaxPosition.x = wp.ptMaxPosition.y = 0;
+       wp.rcNormalPosition.left = consoleX;
+       wp.rcNormalPosition.right = consoleX + consoleW;
+       wp.rcNormalPosition.top = consoleY;
+       wp.rcNormalPosition.bottom = consoleY + consoleH;
+       SetWindowPlacement(hDlg, &wp);
+    }
+#endif
     return FALSE;
 
   case WM_SETFOCUS:
@@ -8441,7 +8500,7 @@ Enables icsEnables[] = {
   { IDM_MachineWhite, MF_BYCOMMAND|MF_GRAYED },
   { IDM_MachineBlack, MF_BYCOMMAND|MF_GRAYED },
   { IDM_TwoMachines, MF_BYCOMMAND|MF_GRAYED },
-  { IDM_AnalysisMode, MF_BYCOMMAND|MF_GRAYED },
+  { IDM_AnalysisMode, MF_BYCOMMAND|MF_ENABLED },
   { IDM_AnalyzeFile, MF_BYCOMMAND|MF_GRAYED },
   { IDM_TimeControl, MF_BYCOMMAND|MF_GRAYED },
   { IDM_MoveNow, MF_BYCOMMAND|MF_GRAYED },
@@ -8636,6 +8695,17 @@ ModeHighlight()
   }
 
   prevChecked = nowChecked;
+
+  /* [DM] icsEngineAnalyze - Do a sceure check too */
+  if (appData.icsActive) {
+       if (appData.icsEngineAnalyze) {
+               (void) CheckMenuItem(GetMenu(hwndMain), IDM_AnalysisMode,
+                       MF_BYCOMMAND|MF_CHECKED);
+       } else {
+               (void) CheckMenuItem(GetMenu(hwndMain), IDM_AnalysisMode,
+                       MF_BYCOMMAND|MF_UNCHECKED);
+       }
+  }
 }
 
 VOID
@@ -8648,6 +8718,9 @@ SetICSMode()
 #ifdef ZIPPY
   if (appData.zippyPlay) {
     SetMenuEnables(hmenu, zippyEnables);
+    if (!appData.noChessProgram)     /* [DM] icsEngineAnalyze */
+         (void) EnableMenuItem(GetMenu(hwndMain), IDM_AnalysisMode,
+          MF_BYCOMMAND|MF_ENABLED);
   }
 #endif
 }
@@ -9382,9 +9455,10 @@ void
 DisplayWhiteClock(long timeRemaining, int highlight)
 {
   HDC hdc;
-  hdc = GetDC(hwndMain);
   char *flag = whiteFlag && gameMode == TwoMachinesPlay ? "(!)" : "";
 
+  if(appData.noGUI) return;
+  hdc = GetDC(hwndMain);
   if (!IsIconic(hwndMain)) {
     DisplayAClock(hdc, timeRemaining, highlight, 
 			(logoHeight > 0 ? flipView: flipClock) ? &blackRect : &whiteRect, "White", flag);
@@ -9407,6 +9481,7 @@ DisplayBlackClock(long timeRemaining, int highlight)
   HDC hdc;
   char *flag = blackFlag && gameMode == TwoMachinesPlay ? "(!)" : "";
 
+  if(appData.noGUI) return;
   hdc = GetDC(hwndMain);
   if (!IsIconic(hwndMain)) {
     DisplayAClock(hdc, timeRemaining, highlight, 
@@ -10322,6 +10397,11 @@ AnalysisDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
   case WM_COMMAND: /* message: received a command */
     switch (LOWORD(wParam)) {
     case IDCANCEL:
+      if (appData.icsActive && appData.icsEngineAnalyze) { /* [DM] icsEngineAnalyze */
+          ExitAnalyzeMode();
+          ModeHighlight();
+          return TRUE;
+      }
       EditGameEvent();
       return TRUE;
     default: