X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.c;h=50d82dde6cb4d4d8f2f0c579789e79febe4a1f0d;hb=6e81557cc7a3d288c2b0860675b83d2c50d672e9;hp=5cf1712edc120436c82ee4382d5c70ebaadd4e32;hpb=c6338f2b9f9b3191ab810791de54826faf01bc7f;p=xboard.git

diff --git a/winboard/winboard.c b/winboard/winboard.c
index 5cf1712..50d82dd 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -5,7 +5,7 @@
  * Massachusetts. 
  *
  * Enhancements Copyright 1992-2001, 2002, 2003, 2004, 2005, 2006,
- * 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+ * 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
  *
  * Enhancements Copyright 2005 Alessandro Scotti
  *
@@ -123,9 +123,10 @@ typedef struct {
   POINT pos;      /* window coordinates of current pos */
   POINT lastpos;  /* window coordinates of last pos - used for clipping */
   POINT from;     /* board coordinates of the piece's orig pos */
+  ChessSquare piece;
 } DragInfo;
 
-static DragInfo dragInfo = { {-1,-1}, {-1,-1}, {-1,-1}, {-1,-1} };
+static DragInfo dragInfo = { {-1,-1}, {-1,-1}, {-1,-1}, {-1,-1}, EmptySquare };
 
 typedef struct {
   POINT sq[2];	  /* board coordinates of from, to squares */
@@ -345,6 +346,7 @@ LoadLanguageFile(char *name)
 
     if(!name || name[0] == NULLCHAR) return;
       snprintf(buf, MSG_SIZ, "%s%s", name, strchr(name, '.') ? "" : ".lng"); // auto-append lng extension
+    appData.language = oldLanguage;
     if(!strcmp(buf, oldLanguage)) { barbaric = 1; return; } // this language already loaded; just switch on
     if((f = fopen(buf, "r")) == NULL) return;
     while((k = fgetc(f)) != EOF) {
@@ -443,7 +445,7 @@ TranslateMenus(int addLanguage)
     int i;
     WIN32_FIND_DATA fileData;
     HANDLE hFind;
-#define IDM_English 1895
+#define IDM_English 1970
     if(1) {
         HMENU mainMenu = GetMenu(hwndMain);
         for (i=GetMenuItemCount(mainMenu)-1; i>=0; i--) {
@@ -651,7 +653,6 @@ LRESULT CALLBACK
   StartupDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
 VOID APIENTRY MenuPopup(HWND hwnd, POINT pt, HMENU hmenu, UINT def);
 void ParseIcsTextMenu(char *icsTextMenuString);
-VOID PopUpMoveDialog(char firstchar);
 VOID PopUpNameDialog(char firstchar);
 VOID UpdateSampleText(HWND hDlg, int id, MyColorizeAttribs *mca);
 
@@ -2223,7 +2224,7 @@ InitDrawingSizes(BoardSize boardSize, int flags)
   }
 
   if (tinyLayout != oldTinyLayout) {
-    long style = GetWindowLong(hwndMain, GWL_STYLE);
+    long style = GetWindowLongPtr(hwndMain, GWL_STYLE);
     if (tinyLayout) {
       style &= ~WS_SYSMENU;
       InsertMenu(hmenu, IDM_Exit, MF_BYCOMMAND, IDM_Minimize,
@@ -2232,7 +2233,7 @@ InitDrawingSizes(BoardSize boardSize, int flags)
       style |= WS_SYSMENU;
       RemoveMenu(hmenu, IDM_Minimize, MF_BYCOMMAND);
     }
-    SetWindowLong(hwndMain, GWL_STYLE, style);
+    SetWindowLongPtr(hwndMain, GWL_STYLE, style);
 
     for (i=0; menuBarText[tinyLayout][i]; i++) {
       ModifyMenu(hmenu, i, MF_STRING|MF_BYPOSITION|MF_POPUP, 
@@ -2381,7 +2382,7 @@ InitDrawingSizes(BoardSize boardSize, int flags)
 		     boardRect.right - BUTTON_WIDTH*(N_BUTTONS-i),
 		     messageRect.top, BUTTON_WIDTH, messageSize.cy, hwndMain,
 		     (HMENU) buttonDesc[i].id,
-		     (HINSTANCE) GetWindowLong(hwndMain, GWL_HINSTANCE), NULL);
+		     (HINSTANCE) GetWindowLongPtr(hwndMain, GWLP_HINSTANCE), NULL);
       if (tinyLayout) {
 	SendMessage(buttonDesc[i].hwnd, WM_SETFONT, 
 		    (WPARAM)font[boardSize][MESSAGE_FONT]->hf,
@@ -2390,7 +2391,7 @@ InitDrawingSizes(BoardSize boardSize, int flags)
       if (buttonDesc[i].id == IDM_Pause)
 	hwndPause = buttonDesc[i].hwnd;
       buttonDesc[i].wndproc = (WNDPROC)
-	SetWindowLong(buttonDesc[i].hwnd, GWL_WNDPROC, (LONG) ButtonProc);
+	SetWindowLongPtr(buttonDesc[i].hwnd, GWLP_WNDPROC, (LONG_PTR) ButtonProc);
     }
   }
   if (gridPen != NULL) DeleteObject(gridPen);
@@ -3795,8 +3796,8 @@ HDCDrawPosition(HDC hdc, BOOLEAN repaint, Board board)
     board[dragInfo.from.y][dragInfo.from.x] = dragged_piece;
     x = dragInfo.pos.x - squareSize / 2;
     y = dragInfo.pos.y - squareSize / 2;
-    DrawPieceOnDC(hdcmem, dragged_piece,
-		  ((int) dragged_piece < (int) BlackPawn), 
+    DrawPieceOnDC(hdcmem, dragInfo.piece,
+		  ((int) dragInfo.piece < (int) BlackPawn), 
                   (dragInfo.from.y + dragInfo.from.x) % 2, x, y, tmphdc);
   }   
   
@@ -3841,11 +3842,11 @@ HDCDrawPosition(HDC hdc, BOOLEAN repaint, Board board)
 	 boardRect.bottom - boardRect.top,
 	 tmphdc, boardRect.left, boardRect.top, SRCCOPY);
   if(saveDiagFlag) { 
-    BITMAP b; int i, j=0, m, w, wb, fac=0; char pData[1000000]; 
+    BITMAP b; int i, j=0, m, w, wb, fac=0; char *pData; 
     BITMAPINFOHEADER bih; int color[16], nrColors=0;
 
     GetObject(bufferBitmap, sizeof(b), &b);
-    if(b.bmWidthBytes*b.bmHeight <= 990000) {
+    if(pData = malloc(b.bmWidthBytes*b.bmHeight + 10000)) {
 	bih.biSize = sizeof(BITMAPINFOHEADER);
 	bih.biWidth = b.bmWidth;
 	bih.biHeight = b.bmHeight;
@@ -3909,6 +3910,7 @@ 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);
+	free(pData);
      }
   }
 
@@ -3945,11 +3947,8 @@ SaveDiagram(f)
 {
     saveDiagFlag = 1; diagFile = f;
     HDCDrawPosition(NULL, TRUE, NULL);
-
     saveDiagFlag = 0;
 
-//    if(f != NULL) fprintf(f, "Sorry, but this feature is still in preparation\n");
-    
     fclose(f);
     return TRUE;
 }
@@ -4062,6 +4061,7 @@ void DragPieceBegin(int x, int y)
       dragInfo.lastpos.y = boardRect.top + y;
       dragInfo.from.x = fromX;
       dragInfo.from.y = fromY;
+      dragInfo.piece = boards[currentMove][fromY][fromX];
       dragInfo.start = dragInfo.from;
       SetCapture(hwndMain);
 }
@@ -4074,6 +4074,11 @@ void DragPieceEnd(int x, int y)
     dragInfo.pos = dragInfo.lastpos = dragInfo.start;
 }
 
+void ChangeDragPiece(ChessSquare piece)
+{
+    dragInfo.piece = piece;
+}
+
 /* Event handler for mouse messages */
 VOID
 MouseEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
@@ -4112,23 +4117,9 @@ MouseEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
   switch (message) {
   case WM_LBUTTONDOWN:
       if (PtInRect((LPRECT) &whiteRect, pt)) {
-        if (gameMode == EditPosition) {
-	  SetWhiteToPlayEvent();
-        } else if (gameMode == EditGame || GetKeyState(VK_SHIFT) < 0) {
-          AdjustClock(flipClock, -1);
-	} else if (gameMode == IcsPlayingBlack ||
-		   gameMode == MachinePlaysWhite) {
-	  CallFlagEvent();
-        }
+        ClockClick(flipClock);
       } else if (PtInRect((LPRECT) &blackRect, pt)) {
-	if (gameMode == EditPosition) {
-	  SetBlackToPlayEvent();
-        } else if (gameMode == EditGame || GetKeyState(VK_SHIFT) < 0) {
-          AdjustClock(!flipClock, -1);
-	} else if (gameMode == IcsPlayingWhite ||
-		   gameMode == MachinePlaysBlack) {
-	  CallFlagEvent();
-	}
+	ClockClick(!flipClock);
       }
       dragInfo.start.x = dragInfo.start.y = -1;
       dragInfo.from = dragInfo.start;
@@ -4148,6 +4139,7 @@ MouseEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 
   case WM_MOUSEMOVE:
     if(SeekGraphClick(Press, pt.x - boardRect.left, pt.y - boardRect.top, 1)) break;
+    if(PromoScroll(pt.x - boardRect.left, pt.y - boardRect.top)) break;
     MovePV(pt.x - boardRect.left, pt.y - boardRect.top, boardRect.bottom - boardRect.top);
     if ((appData.animateDragging || appData.highlightDragging)
 	&& (wParam & MK_LBUTTON)
@@ -4254,7 +4246,7 @@ MouseEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 LRESULT CALLBACK
 ButtonProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
-  int id = GetWindowLong(hwnd, GWL_ID);
+  int id = GetWindowLongPtr(hwnd, GWLP_ID);
   int i, dir;
 
   for (i=0; i<N_BUTTONS; i++) {
@@ -4285,7 +4277,7 @@ ButtonProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 	SendMessage(h, WM_CHAR, wParam, lParam);
 	return TRUE;
       } else if (isalpha((char)wParam) || isdigit((char)wParam)){
-	PopUpMoveDialog((char)wParam);
+	TypeInEvent((char)wParam);
       }
       break;
     }
@@ -4484,11 +4476,11 @@ void UpdateICSWidth(HWND hText)
     LONG old_width, new_width;
 
     new_width = get_term_width(hText, FALSE);
-    old_width = GetWindowLong(hText, GWL_USERDATA);
+    old_width = GetWindowLongPtr(hText, GWLP_USERDATA);
     if (new_width != old_width)
     {
         ics_update_width(new_width);
-        SetWindowLong(hText, GWL_USERDATA, new_width);
+        SetWindowLongPtr(hText, GWLP_USERDATA, new_width);
     }
 }
 
@@ -4594,7 +4586,7 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 	SendMessage(h, message, wParam, lParam);
     } else if(lParam != KF_REPEAT) {
 	if (isalpha((char)wParam) || isdigit((char)wParam)) {
-		PopUpMoveDialog((char)wParam);
+		TypeInEvent((char)wParam);
 	} else if((char)wParam == 003) CopyGameToClipboard();
 	 else if((char)wParam == 026) PasteGameOrFENFromClipboard();
     }
@@ -4719,7 +4711,7 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       f = OpenFileDialog(hwnd, "wb", defName,
 			 "bmp",
 			 DIAGRAM_FILT,
-			 "Save Diagram to File", NULL, fileTitle, NULL);
+			 _("Save Diagram to File"), NULL, fileTitle, NULL);
       if (f != NULL) {
 	SaveDiagram(f);
       }
@@ -4852,10 +4844,9 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       if(gameMode != BeginningOfGame) { // allow menu item to remain enabled for better mode highligting
         DisplayError(_("You can only start a match from the initial position."), 0); break;
       }
-      matchMode = 2;// distinguish from command-line-triggered case (matchMode=1)
-      appData.matchGames = appData.defaultMatchGames;
-      matchGame = 1;
-      first.matchWins = second.matchWins = 0;
+      appData.matchGames = appData.defaultMatchGames;
+      MatchEvent(2); // distinguish from command-line-triggered case (matchMode=1)
+      break;
 
     case IDM_TwoMachines:
       TwoMachinesEvent();
@@ -5019,7 +5010,7 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       break;
 
     case IDM_TypeInMove:
-      PopUpMoveDialog('\000');
+      TypeInEvent('\000');
       break;
 
     case IDM_TypeInName:
@@ -5397,7 +5388,7 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       break;
 
     case IDM_English:
-      barbaric = 0;
+      barbaric = 0; appData.language = "";
       TranslateMenus(0);
       CheckMenuItem(GetMenu(hwndMain), lastChecked, MF_BYCOMMAND|MF_UNCHECKED);
       CheckMenuItem(GetMenu(hwndMain), IDM_English, MF_BYCOMMAND|MF_CHECKED);
@@ -5405,7 +5396,7 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       break;
 
     default:
-      if(wmId > IDM_English && wmId < IDM_English+5) {
+      if(wmId > IDM_English && wmId < IDM_English+20) {
           LoadLanguageFile(languageFile[wmId - IDM_English - 1]);
           TranslateMenus(0);
           CheckMenuItem(GetMenu(hwndMain), lastChecked, MF_BYCOMMAND|MF_UNCHECKED);
@@ -6410,9 +6401,6 @@ TypeInMoveDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
   char move[MSG_SIZ];
   HWND hInput;
-  ChessMove moveType;
-  int fromX, fromY, toX, toY;
-  char promoChar;
 
   switch (message) {
   case WM_INITDIALOG:
@@ -6431,38 +6419,8 @@ TypeInMoveDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
     case IDOK:
 
       shiftKey = GetKeyState(VK_SHIFT) < 0; // [HGM] remember last shift status
-      GetDlgItemText(hDlg, OPT_Move, move, sizeof(move));
-      { int n; Board board;
-	// [HGM] FENedit
-	if(gameMode == EditPosition && ParseFEN(board, &n, move) ) {
-		EditPositionPasteFEN(move);
-		EndDialog(hDlg, TRUE);
-		return TRUE;
-	}
-	// [HGM] movenum: allow move number to be typed in any mode
-	if(sscanf(move, "%d", &n) == 1 && n != 0 ) {
-	  ToNrEvent(2*n-1);
-	  EndDialog(hDlg, TRUE);
-	  return TRUE;
-	}
-      }
-      if (gameMode != EditGame && currentMove != forwardMostMove && 
-	gameMode != Training) {
-	DisplayMoveError(_("Displayed move is not current"));
-      } else {
-//	GetDlgItemText(hDlg, OPT_Move, move, sizeof(move)); // moved upstream
-	int ok = ParseOneMove(move, gameMode == EditPosition ? blackPlaysFirst : currentMove, 
-	  &moveType, &fromX, &fromY, &toX, &toY, &promoChar);
-	if(!ok && move[0] >= 'a') { move[0] += 'A' - 'a'; ok = 2; } // [HGM] try also capitalized
-	if (ok==1 || ok && ParseOneMove(move, gameMode == EditPosition ? blackPlaysFirst : currentMove, 
-	  &moveType, &fromX, &fromY, &toX, &toY, &promoChar)) {
-	  if (gameMode != Training)
-	      forwardMostMove = currentMove;
-	  UserMoveEvent(fromX, fromY, toX, toY, promoChar);	
-	} else {
-	  DisplayMoveError(_("Could not parse move"));
-	}
-      }
+      GetDlgItemText(hDlg, OPT_Move, move, sizeof(move));
+      TypeInDoneEvent(move);
       EndDialog(hDlg, TRUE);
       return TRUE;
     case IDCANCEL:
@@ -6480,21 +6438,11 @@ VOID
 PopUpMoveDialog(char firstchar)
 {
     FARPROC lpProc;
-    
-    if ((gameMode == BeginningOfGame && !appData.icsActive) || 
-        gameMode == MachinePlaysWhite || gameMode == MachinePlaysBlack ||
-	gameMode == AnalyzeMode || gameMode == EditGame || 
-	gameMode == EditPosition || gameMode == IcsExamining ||
-	gameMode == IcsPlayingWhite || gameMode == IcsPlayingBlack ||
-	isdigit(firstchar) && // [HGM] movenum: allow typing in of move nr in 'passive' modes
-		( gameMode == AnalyzeFile || gameMode == PlayFromGameFile ||
-		  gameMode == IcsObserving || gameMode == TwoMachinesPlay    ) ||
-	gameMode == Training) {
+
       lpProc = MakeProcInstance((FARPROC)TypeInMoveDialog, hInst);
       DialogBoxParam(hInst, MAKEINTRESOURCE(DLG_TypeInMove),
 	hwndMain, (DLGPROC)lpProc, (LPARAM)firstchar);
       FreeProcInstance(lpProc);
-    }
 }
 
 /*---------------------------------------------------------------------------*\
@@ -7205,10 +7153,10 @@ ConsoleWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
     hwndConsole = hDlg;
     SetFocus(hInput);
     consoleTextWindowProc = (WNDPROC)
-      SetWindowLong(hText, GWL_WNDPROC, (LONG) ConsoleTextSubclass);
+      SetWindowLongPtr(hText, GWLP_WNDPROC, (LONG_PTR) ConsoleTextSubclass);
     SendMessage(hText, EM_SETBKGNDCOLOR, FALSE, consoleBackgroundColor);
     consoleInputWindowProc = (WNDPROC)
-      SetWindowLong(hInput, GWL_WNDPROC, (LONG) ConsoleInputSubclass);
+      SetWindowLongPtr(hInput, GWLP_WNDPROC, (LONG_PTR) ConsoleInputSubclass);
     SendMessage(hInput, EM_SETBKGNDCOLOR, FALSE, consoleBackgroundColor);
     Colorize(ColorNormal, TRUE);
     SendMessage(hInput, EM_SETCHARFORMAT, SCF_ALL, (LPARAM) &consoleCF);
@@ -7254,7 +7202,7 @@ ConsoleWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
    wMask = (WORD) 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
+   SetWindowLongPtr(hText, GWLP_USERDATA, 79); // initialize the text window's width
 
     return FALSE;
 
@@ -7853,6 +7801,7 @@ Enables ncpEnables[] = {
   { IDM_NewChat, MF_BYCOMMAND|MF_GRAYED },
   { IDM_Engine1Options, MF_BYCOMMAND|MF_GRAYED },
   { IDM_Engine2Options, MF_BYCOMMAND|MF_GRAYED },
+  { IDM_Sounds, MF_BYCOMMAND|MF_GRAYED },
   { -1, -1 }
 };
 
@@ -8036,8 +7985,8 @@ SetICSMode()
 {
   HMENU hmenu = GetMenu(hwndMain);
   SetMenuEnables(hmenu, icsEnables);
-  EnableMenuItem(GetSubMenu(hmenu, OPTIONS_POS), ICS_POS,
-    MF_BYPOSITION|MF_ENABLED);
+  EnableMenuItem(GetSubMenu(hmenu, OPTIONS_POS), IDM_IcsOptions,
+    MF_BYCOMMAND|MF_ENABLED);
 #if ZIPPY
   if (appData.zippyPlay) {
     SetMenuEnables(hmenu, zippyEnables);
@@ -8059,8 +8008,6 @@ SetNCPMode()
 {
   HMENU hmenu = GetMenu(hwndMain);
   SetMenuEnables(hmenu, ncpEnables);
-  EnableMenuItem(GetSubMenu(hmenu, OPTIONS_POS), SOUNDS_POS,
-    MF_BYPOSITION|MF_GRAYED);
     DrawMenuBar(hwndMain);
 }