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

diff --git a/winboard/winboard.c b/winboard/winboard.c
index 34832f0..50d82dd 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -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 */
@@ -652,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);
 
@@ -3796,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);
   }   
   
@@ -3842,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;
@@ -3910,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);
      }
   }
 
@@ -3946,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;
 }
@@ -4063,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);
 }
@@ -4075,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)
@@ -4135,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)
@@ -4272,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;
     }
@@ -4581,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();
     }
@@ -4839,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();
@@ -5006,7 +5010,7 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       break;
 
     case IDM_TypeInMove:
-      PopUpMoveDialog('\000');
+      TypeInEvent('\000');
       break;
 
     case IDM_TypeInName:
@@ -6397,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:
@@ -6418,36 +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)) {
-	  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:
@@ -6465,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);
-    }
 }
 
 /*---------------------------------------------------------------------------*\