X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.c;h=bbd8563add2b30379186c6d2f08094391ebfbb45;hb=bf368bef696bee3555a370ac8ff88418e1f5c498;hp=a17e4ac0f1f216dc63de117419a072ca7f8541e9;hpb=8bac62c70d682a8dbdb029af5fa80660979821e2;p=xboard.git

diff --git a/winboard/winboard.c b/winboard/winboard.c
index a17e4ac..bbd8563 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -100,6 +100,8 @@
 
 extern int whiteFlag, blackFlag;
 Boolean flipClock = FALSE;
+extern HANDLE chatHandle[];
+extern int ics_type;
 
 void DisplayHoldingsCount(HDC hdc, int x, int y, int align, int copyNumber);
 VOID NewVariantPopup(HWND hwnd);
@@ -108,6 +110,7 @@ int FinishMove P((ChessMove moveType, int fromX, int fromY, int toX, int toY,
 void AnimateAtomicCapture(int fromX, int fromY, int toX, int toY, int nFrames);
 void DisplayMove P((int moveNumber));
 Boolean ParseFEN P((Board board, int *blackPlaysFirst, char *fen));
+void ChatPopUp P(());
 typedef struct {
   ChessSquare piece;  
   POINT pos;      /* window coordinates of current pos */
@@ -222,7 +225,11 @@ static struct { int x; int y; int mode; } backTextureSquareInfo[BOARD_SIZE][BOAR
 #if __GNUC__ && !defined(_winmajor)
 #define oldDialog 0 /* cygwin doesn't define _winmajor; mingw does */
 #else
+#if defined(_winmajor)
 #define oldDialog (_winmajor < 4)
+#else
+#define oldDialog 0
+#endif
 #endif
 
 char *defaultTextAttribs[] = 
@@ -449,6 +456,8 @@ VOID EngineOutputPopDown();
 BOOL EngineOutputIsUp();
 VOID EngineOutputUpdate( FrontEndProgramStats * stats );
 
+VOID EngineOptionsPopup(); // [HGM] settings
+
 VOID GothicPopUp(char *title, VariantClass variant);
 /*
  * Setting "frozen" should disable all user input other than deleting
@@ -492,6 +501,7 @@ static int fromX = -1, fromY = -1, toX, toY; // [HGM] moved upstream, so JAWS ca
 #include "jaws.c"
 #else
 #define JAWS_INIT
+#define JAWS_ARGS
 #define JAWS_ALT_INTERCEPT
 #define JAWS_KB_NAVIGATION
 #define JAWS_MENU_ITEMS
@@ -570,7 +580,7 @@ WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
 	if(msg.hwnd == e2)                 currentElement = 3; else
 	if(msg.hwnd == moveHistoryDialog) currentElement = 4; else
 	if(msg.hwnd == mh)                currentElement = 4; else
-	if(msg.hwnd == evalGraphDialog)    currentElement = 7; else
+	if(msg.hwnd == evalGraphDialog)    currentElement = 6; else
 	if(msg.hwnd == hText)  currentElement = 5; else
 	if(msg.hwnd == hInput) currentElement = 6; else
 	for (i = 0; i < N_BUTTONS; i++) {
@@ -595,7 +605,7 @@ WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
 		case 4:
 		  if(!MoveHistoryIsUp()) continue;
 		  h = mh; break;
-//		case 5: // input to eval graph does not seem to get here!
+//		case 6: // input to eval graph does not seem to get here!
 //		  if(!EvalGraphIsUp()) continue;
 //		  h = evalGraphDialog; break;
 		case 5:
@@ -627,6 +637,12 @@ WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
 	  !(!frozen && TranslateAccelerator(hwndMain, hAccelMain, &msg)) && JAWS_ACCEL
           !(!hwndConsole && TranslateAccelerator(hwndMain, hAccelNoICS, &msg)) &&
 	  !(!hwndConsole && TranslateAccelerator(hwndMain, hAccelNoAlt, &msg))) {
+	int done = 0, i; // [HGM] chat: dispatch cat-box messages
+	for(i=0; i<MAX_CHAT; i++) 
+	    if(chatHandle[i] && IsDialogMessage(chatHandle[i], &msg)) {
+		done = 1; break;
+	}
+	if(done) continue; // [HGM] chat: end patch
 	TranslateMessage(&msg);	/* Translates virtual key codes */
 	DispatchMessage(&msg);	/* Dispatches message to window */
       }
@@ -867,6 +883,7 @@ InitInstance(HINSTANCE hInstance, int nCmdShow, LPSTR lpCmdLine)
     ShowWindow(hwndConsole, nCmdShow);
   }
   if(!appData.noGUI)   UpdateWindow(hwnd);  else ShowWindow(hwnd, SW_MINIMIZE);
+  if(gameListDialog) SetFocus(gameListDialog); // [HGM] jaws: for if we clicked multi-game game file
 
   return TRUE;
 
@@ -908,6 +925,7 @@ ArgDescriptor argDescriptors[] = {
   { "loadGameFile", ArgFilename, (LPVOID) &appData.loadGameFile, FALSE },
   { "", ArgNone, NULL },
   /* keyword arguments */
+  JAWS_ARGS
   { "whitePieceColor", ArgColor, (LPVOID) &whitePieceColor, TRUE },
   { "wpc", ArgColor, (LPVOID) &whitePieceColor, FALSE },
   { "blackPieceColor", ArgColor, (LPVOID) &blackPieceColor, TRUE },
@@ -1319,6 +1337,9 @@ ArgDescriptor argDescriptors[] = {
   { "secondOptions", ArgString, (LPVOID) &appData.secondOptions, FALSE },
   { "firstNeedsNoncompliantFEN", ArgString, (LPVOID) &appData.fenOverride1, FALSE },
   { "secondNeedsNoncompliantFEN", ArgString, (LPVOID) &appData.fenOverride2, FALSE },
+  { "keepAlive", ArgInt, (LPVOID) &appData.keepAlive, FALSE },
+  { "icstype", ArgInt, (LPVOID) &ics_type, FALSE },
+  { "forceIllegalMoves", ArgTrue, (LPVOID) &appData.forceIllegal, FALSE },
 
 #ifdef ZIPPY
   { "zippyTalk", ArgBoolean, (LPVOID) &appData.zippyTalk, FALSE },
@@ -5094,7 +5115,7 @@ MouseEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
                                                                         ) {
       /* Downclick on different square. */
       /* [HGM] if on holdings file, should count as new first click ! */
-      { /* [HGM] <sameColor> now always do UserMoveTest(), and check colors there */
+      /* [HGM] <sameColor> now always do UserMoveTest(), and check colors there */
 	toX = x;
 	toY = y;
         /* [HGM] <popupFix> UserMoveEvent requires two calls now,
@@ -5107,6 +5128,9 @@ MouseEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 		break; 
 	} else 
         if(moveType != ImpossibleMove) {
+	  if(moveType == IllegalMove) {
+		;
+	  } else
           /* [HGM] We use PromotionToKnight in Shogi to indicate frorced promotion */
           if (moveType == WhitePromotionKnight || moveType == BlackPromotionKnight ||
             ((moveType == WhitePromotionQueen || moveType == BlackPromotionQueen) &&
@@ -5124,7 +5148,7 @@ MouseEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
                      If promotion to Q is legal, all are legal! */
 		  if(gameInfo.variant == VariantSuper || gameInfo.variant == VariantGreat)
 		  { ChessSquare p = boards[currentMove][fromY][fromX], q = boards[currentMove][toY][toX];
-		    // kludge to temporarily execute move on display, wthout promotng yet
+		    // kludge to temporarily execute move on display, without promoting yet
 		    promotionChoice = TRUE;
 		    boards[currentMove][fromY][fromX] = EmptySquare; // move Pawn to 8th rank
 		    boards[currentMove][toY][toX] = p;
@@ -5649,7 +5673,7 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
     
     JAWS_ALT_INTERCEPT
 
-    if (appData.icsActive && (isalpha((char)wParam) || wParam == '0')) { 
+    if (appData.icsActive && (char)wParam > ' ' && !((char)wParam >= '1' && (char)wParam <= '9')) { 
 	// [HGM] movenum: for non-zero digits we always do type-in dialog
 	HWND h = GetDlgItem(hwndConsole, OPT_ConsoleInput);
 	if (IsIconic(hwndConsole)) ShowWindow(hwndConsole, SW_RESTORE);
@@ -5860,6 +5884,10 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       GameListOptions();
       break;
 
+    case IDM_NewChat:
+      ChatPopUp();
+      break;
+
     case IDM_CopyPosition:
       CopyFENToClipboard();
       break;
@@ -6111,6 +6139,12 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       DrawPosition(FALSE, NULL);
       break;
 
+    case IDM_MuteSounds:
+      mute = !mute; // [HGM] mute: keep track of global muting variable
+      CheckMenuItem(GetMenu(hwndMain),IDM_MuteSounds, 
+				MF_BYCOMMAND|(mute?MF_CHECKED:MF_UNCHECKED));
+      break;
+
     case IDM_GeneralOptions:
       GeneralOptionsPopup(hwnd);
       DrawPosition(TRUE, NULL);
@@ -6670,6 +6704,7 @@ MyPlaySound(MySound *ms)
 {
   BOOLEAN ok = FALSE;
 
+  if(mute) return TRUE; // [HGM] mute: suppress all sound play when muted
   switch (ms->name[0]) {
   case NULLCHAR:
 	if(appData.debugMode) fprintf(debugFP, "silence\n");
@@ -9388,6 +9423,7 @@ static GLT_Item GLT_ItemInfo[] = {
     { GLT_TIME_CONTROL,"Time Control" },
     { GLT_VARIANT,    "Variant" },
     { GLT_OUT_OF_BOOK,PGN_OUT_OF_BOOK },
+    { GLT_RESULT_COMMENT, "Result Comment" }, // [HGM] rescom
     { 0, 0 }
 };
 
@@ -9844,11 +9880,12 @@ void
 ScheduleDelayedEvent(DelayedEventCallback cb, long millisec)
 {
   if (delayedTimerEvent != 0) {
-    if (appData.debugMode) {
+    if (appData.debugMode && cb != delayedTimerCallback) { // [HGM] alive: not too much debug
       fprintf(debugFP, "ScheduleDelayedEvent: event already scheduled\n");
     }
     KillTimer(hwndMain, delayedTimerEvent);
     delayedTimerEvent = 0;
+    if(delayedTimerCallback != cb) // [HGM] alive: do not "flush" same event, just postpone it
     delayedTimerCallback();
   }
   delayedTimerCallback = cb;