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

diff --git a/winboard/winboard.c b/winboard/winboard.c
index 6452a5b..0fa4807 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -225,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[] = 
@@ -490,7 +494,7 @@ void ThawUI()
   DrawMenuBar(hwndMain);
 }
 
-static int fromX = -1, fromY = -1, toX, toY; // [HGM] moved upstream, so JAWS can use them
+/*static*/ int fromX = -1, fromY = -1, toX, toY; // [HGM] moved upstream, so JAWS can use them
 
 /* JAWS preparation patch (WinBoard for the sight impaired). Define required insertions as empty */
 #ifdef JAWS
@@ -879,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;
 
@@ -1334,6 +1339,7 @@ ArgDescriptor argDescriptors[] = {
   { "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 },
@@ -5114,17 +5120,14 @@ MouseEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 	toY = y;
         /* [HGM] <popupFix> UserMoveEvent requires two calls now,
            to make sure move is legal before showing promotion popup */
-        moveType = UserMoveTest(fromX, fromY, toX, toY, NULLCHAR);
+        moveType = UserMoveTest(fromX, fromY, toX, toY, NULLCHAR, FALSE);
 	if(moveType == AmbiguousMove) { /* [HGM] Edit-Position move executed */
 		fromX = fromY = -1; 
 		ClearHighlights();
 		DrawPosition(FALSE, boards[currentMove]);
 		break; 
 	} else 
-        if(moveType != ImpossibleMove) {
-	  if(moveType == IllegalMove) {
-		;
-	  } else
+        if(moveType != ImpossibleMove && moveType != Comment) {
           /* [HGM] We use PromotionToKnight in Shogi to indicate frorced promotion */
           if (moveType == WhitePromotionKnight || moveType == BlackPromotionKnight ||
             ((moveType == WhitePromotionQueen || moveType == BlackPromotionQueen) &&
@@ -5149,9 +5152,11 @@ MouseEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 		    DrawPosition(FALSE, boards[currentMove]);
 		    boards[currentMove][fromY][fromX] = p; // take back, but display stays
 		    boards[currentMove][toY][toX] = q;
+		    DisplayMessage("Select piece from holdings", "");
 		  } else
                   PromotionPopup(hwnd);
-          } else {       /* not a promotion */
+		  goto noClear;
+          } else { // not a promotion. Move can be illegal if testLegality off, and should be made then.
              if (appData.animate || appData.highlightLastMove) {
                  SetHighlights(fromX, fromY, toX, toY);
              } else {
@@ -5164,14 +5169,16 @@ MouseEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
              }
           }
           fromX = fromY = -1;
+	noClear:
 	  break;
         }
-        if (gotPremove) {
+        if (gotPremove && moveType != Comment) {
 	    SetPremoveHighlights(fromX, fromY, toX, toY);
-            DrawPosition(forceFullRepaint || FALSE, NULL);
+//            DrawPosition(forceFullRepaint || FALSE, NULL);
 	} else ClearHighlights();
         fromX = fromY = -1;
         DrawPosition(forceFullRepaint || FALSE, NULL);
+	if(moveType != Comment) break;
     }
     /* First downclick, or restart on a square with same color piece */
     if (!frozen && OKToStartUserMove(x, y)) {
@@ -5219,7 +5226,7 @@ MouseEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       toY = y;
       saveAnimate = appData.animate; /* sorry, Hawk :) */
       appData.animate = appData.animate && !appData.animateDragging;
-      moveType = UserMoveTest(fromX, fromY, toX, toY, NULLCHAR);
+      moveType = UserMoveTest(fromX, fromY, toX, toY, NULLCHAR, TRUE);
       if(moveType == AmbiguousMove) { /* [HGM] Edit-Position move executed */
 		fromX = fromY = -1; 
 		ClearHighlights();
@@ -5247,6 +5254,7 @@ MouseEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 		    boards[currentMove][fromY][fromX] = p; // take back, but display stays
 		    boards[currentMove][toY][toX] = q;
 		    appData.animate = saveAnimate;
+		    DisplayMessage("Select piece from holdings", "");
 		    break;
 		  } else
                PromotionPopup(hwnd); /* [HGM] Popup now calls FinishMove */
@@ -6133,6 +6141,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);
@@ -6692,6 +6706,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");
@@ -9632,6 +9647,7 @@ CommentPopUp(char *title, char *str)
 {
   HWND hwnd = GetActiveWindow();
   EitherCommentPopUp(0, title, str, FALSE);
+  SAY(str);
   SetActiveWindow(hwnd);
 }