X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.c;h=1539f4283b9122810ebb39eada940d8311c8fa57;hb=4aed6e1fe3f9c75dbb37ab41e81aed204bba602f;hp=2069301c845b920cbdf34d19edd8c4ebf7b34536;hpb=a02eb1349bbc0ad33bf36648b4c5b7d2ce197928;p=xboard.git

diff --git a/winboard/winboard.c b/winboard/winboard.c
index 2069301..1539f42 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, 2011, 2012 Free Software Foundation, Inc.
+ * 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
  *
  * Enhancements Copyright 2005 Alessandro Scotti
  *
@@ -109,7 +109,6 @@ VOID NewVariantPopup(HWND hwnd);
 int FinishMove P((ChessMove moveType, int fromX, int fromY, int toX, int toY,
 		   /*char*/int promoChar));
 void DisplayMove P((int moveNumber));
-Boolean ParseFEN P((Board board, int *blackPlaysFirst, char *fen));
 void ChatPopUp P((char *s));
 typedef struct {
   ChessSquare piece;  
@@ -187,6 +186,7 @@ Boolean alwaysOnTop = FALSE;
 RECT boardRect;
 COLORREF lightSquareColor, darkSquareColor, whitePieceColor, 
   blackPieceColor, highlightSquareColor, premoveHighlightColor;
+COLORREF markerColor[8] = { 0x00FFFF, 0x0000FF, 0x00FF00, 0xFF0000, 0xFFFF00, 0xFF00FF, 0xFFFFFF, 0x000000 };
 HPALETTE hPal;
 ColorClass currentColorClass;
 
@@ -197,7 +197,7 @@ static HBITMAP pieceBitmap[3][(int) BlackPawn]; /* [HGM] nr of bitmaps referred
 static HBRUSH lightSquareBrush, darkSquareBrush,
   blackSquareBrush, /* [HGM] for band between board and holdings */
   explodeBrush,     /* [HGM] atomic */
-  markerBrush,      /* [HGM] markers */
+  markerBrush[8],   /* [HGM] markers */
   whitePieceBrush, blackPieceBrush, iconBkgndBrush /*, outlineBrush*/;
 static POINT gridEndpoints[(BOARD_RANKS + BOARD_FILES + 2) * 2];
 static DWORD gridVertexCounts[BOARD_RANKS + BOARD_FILES + 2];
@@ -222,6 +222,7 @@ static struct { int x; int y; int mode; } backTextureSquareInfo[BOARD_RANKS][BOA
 #if __GNUC__ && !defined(_winmajor)
 #define oldDialog 0 /* cygwin doesn't define _winmajor; mingw does */
 #else
+
 #if defined(_winmajor)
 #define oldDialog (_winmajor < 4)
 #else
@@ -1063,6 +1064,7 @@ InitInstance(HINSTANCE hInstance, int nCmdShow, LPSTR lpCmdLine)
 
   if (SearchPath(NULL, "WinBoard.exe", NULL, MSG_SIZ, installDir, &filepart)) {
     *filepart = NULLCHAR;
+    SetCurrentDirectory(installDir);
   } else {
     GetCurrentDirectory(MSG_SIZ, installDir);
   }
@@ -1116,6 +1118,7 @@ InitInstance(HINSTANCE hInstance, int nCmdShow, LPSTR lpCmdLine)
   InitDrawingColors();
   screenHeight = GetSystemMetrics(SM_CYSCREEN);
   screenWidth = GetSystemMetrics(SM_CXSCREEN);
+  InitPosition(0); // to set nr of ranks and files, which might be non-default through command-line args
   for (ibs = (int) NUM_SIZES - 1; ibs >= 0; ibs--) {
     /* Compute window size for each board size, and use the largest
        size that fits on this screen as the default. */
@@ -2161,6 +2164,7 @@ InsertInPalette(COLORREF color)
 VOID
 InitDrawingColors()
 {
+  int i;
   if (pLogPal == NULL) {
     /* Allocate enough memory for a logical palette with
      * PALETTESIZE entries and set the size and version fields
@@ -2192,8 +2196,9 @@ InitDrawingColors()
   blackPieceBrush = CreateSolidBrush(blackPieceColor);
   iconBkgndBrush = CreateSolidBrush(GetSysColor(COLOR_BACKGROUND));
   explodeBrush = CreateSolidBrush(highlightSquareColor); // [HGM] atomic
-  markerBrush = CreateSolidBrush(premoveHighlightColor); // [HGM] markers
-  /* [AS] Force rendering of the font-based pieces */
+    for(i=0; i<8;i++) markerBrush[i] = CreateSolidBrush(markerColor[i]); // [HGM] markers
+
+   /* [AS] Force rendering of the font-based pieces */
   if( fontBitmapSquareSize > 0 ) {
     fontBitmapSquareSize = 0;
   }
@@ -2258,6 +2263,7 @@ InitDrawingSizes(BoardSize boardSize, int flags)
 
   /* [HGM] call with -2 uses old size (for if nr of files, ranks changes) */
   if(boardSize == (BoardSize)(-2) ) boardSize = oldBoardSize;
+  if(boardSize == -1) return;     // no size defined yet; abort (to allow early call of InitPosition)
   oldBoardSize = boardSize;
 
   if(boardSize != SizeMiddling && boardSize != SizePetite && boardSize != SizeBulky && !appData.useFont)
@@ -2266,13 +2272,13 @@ InitDrawingSizes(BoardSize boardSize, int flags)
        && (boardSize < SizePetite || boardSize > SizeBulky) // Archbishop and Chancellor available in entire middle range
       || (v == VariantShogi && boardSize != SizeModerate)   // Japanese-style Shogi
       ||  v == VariantKnightmate || v == VariantSChess || v == VariantXiangqi || v == VariantSpartan
-      ||  v == VariantShatranj || v == VariantMakruk || v == VariantGreat || v == VariantFairy ) {
+      ||  v == VariantShatranj || v == VariantMakruk || v == VariantGreat || v == VariantFairy || v == VariantLion ) {
       if(boardSize < SizeMediocre) boardSize = SizePetite; else
       if(boardSize > SizeModerate) boardSize = SizeBulky;  else
                                    boardSize = SizeMiddling;
     }
   }
-  if(!appData.useFont && boardSize == SizePetite && (v == VariantShogi || v == VariantKnightmate)) boardSize = SizeMiddling; // no Unicorn in Petite
+  if(!appData.useFont && boardSize == SizePetite && (v == VariantKnightmate)) boardSize = SizeMiddling; // no Unicorn in Petite
 
   oldRect.left = wpMain.x; //[HGM] placement: remember previous window params
   oldRect.top = wpMain.y;
@@ -2622,6 +2628,9 @@ InitDrawingSizes(BoardSize boardSize, int flags)
     pieceBitmap[0][WhiteUnicorn] = DoLoadBitmap(hInst, "u", squareSize, "s");
     pieceBitmap[1][WhiteUnicorn] = DoLoadBitmap(hInst, "u", squareSize, "o");
     pieceBitmap[2][WhiteUnicorn] = DoLoadBitmap(hInst, "u", squareSize, "w");
+    pieceBitmap[0][WhiteLion] = DoLoadBitmap(hInst, "ln", squareSize, "s");
+    pieceBitmap[1][WhiteLion] = DoLoadBitmap(hInst, "ln", squareSize, "o");
+    pieceBitmap[2][WhiteLion] = DoLoadBitmap(hInst, "ln", squareSize, "w");
 
     if(gameInfo.variant == VariantShogi) { /* promoted Gold represemtations */
       pieceBitmap[0][WhiteCannon] = DoLoadBitmap(hInst, "wp", squareSize, "s");
@@ -3243,6 +3252,9 @@ BOOL HasHighlightInfo()
     }
 
     return result;
+
+
+
 }
 
 BOOL IsDrawArrowEnabled()
@@ -3434,6 +3446,7 @@ DrawBoardOnDC(HDC hdc, Board board, HDC tmphdc)
             DisplayHoldingsCount(hdc, x, y, flipView, (int) board[row][column]);
       else if( column == BOARD_RGHT) /* right align */
             DisplayHoldingsCount(hdc, x, y, !flipView, (int) board[row][column]);
+      else if( piece == DarkSquare) DisplayHoldingsCount(hdc, x, y, 0, 0);
       else
       if (appData.monoMode) {
         if (piece == EmptySquare) {
@@ -3616,7 +3629,7 @@ void DrawSeekDot(int x, int y, int color)
 {
 	int square = color & 0x80;
 	HBRUSH oldBrush = SelectObject(hdcSeek, 
-			color == 0 ? markerBrush : color == 1 ? darkSquareBrush : explodeBrush);
+			color == 0 ? markerBrush[1] : color == 1 ? darkSquareBrush : explodeBrush);
 	color &= 0x7F;
 	if(square)
 	    Rectangle(hdcSeek, boardRect.left+x - squareSize/9, boardRect.top+y - squareSize/9,
@@ -3909,8 +3922,7 @@ HDCDrawPosition(HDC hdc, BOOLEAN repaint, Board board)
   for (row = 0; row < BOARD_HEIGHT; row++) {
     for (column = 0; column < BOARD_WIDTH; column++) {
 	if (marker[row][column]) { // marker changes only occur with full repaint!
-	    HBRUSH oldBrush = SelectObject(hdcmem, 
-			marker[row][column] == 2 ? markerBrush : explodeBrush);
+	    HBRUSH oldBrush = SelectObject(hdcmem, markerBrush[marker[row][column]-1]);
 	    SquareToPos(row, column, &x, &y);
 	    Ellipse(hdcmem, x + squareSize/4, y + squareSize/4,
 		  	  x + 3*squareSize/4, y + 3*squareSize/4);
@@ -4257,6 +4269,7 @@ MouseEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
   }
 
   shiftKey = GetKeyState(VK_SHIFT) < 0; // [HGM] remember last shift status
+  controlKey = GetKeyState(VK_CONTROL) < 0; // [HGM] remember last shift status
 
   switch (message) {
   case WM_LBUTTONDOWN:
@@ -4265,8 +4278,10 @@ MouseEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       } else if (PtInRect((LPRECT) &blackRect, pt)) {
 	ClockClick(!flipClock); break;
       }
+    if(dragging) { // [HGM] lion: don't destroy dragging info if we are already dragging
       dragInfo.start.x = dragInfo.start.y = -1;
       dragInfo.from = dragInfo.start;
+    }
     if(fromX == -1 && frozen) { // not sure where this is for
 		fromX = fromY = -1; 
       DrawPosition(forceFullRepaint || FALSE, NULL); /* [AS] */
@@ -4286,7 +4301,7 @@ MouseEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
     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)
+	&& (wParam & MK_LBUTTON || dragging == 2)
 	&& dragInfo.from.x >= 0) 
     {
       BOOL full_repaint = FALSE;
@@ -4295,7 +4310,7 @@ MouseEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 	dragInfo.pos = pt;
       }
       if (appData.highlightDragging) {
-	SetHighlights(fromX, fromY, x, y);
+	HoverEvent(highlightInfo.sq[1].x, highlightInfo.sq[1].y, x, y);
         if( IsDrawArrowEnabled() && (x < 0 || x >= BOARD_WIDTH || y < 0 || y >= BOARD_HEIGHT) ) {
             full_repaint = TRUE;
         }
@@ -4679,7 +4694,6 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
   FILE *f;
   UINT number;
   char fileTitle[MSG_SIZ];
-  char buf[MSG_SIZ];
   static SnapData sd;
   static int peek=0;
 
@@ -4754,6 +4768,7 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       nnew = RealizePalette(hdc);
       if (nnew > 0) {
 	paletteChanged = TRUE;
+
         InvalidateRect(hwnd, &boardRect, FALSE);
       }
       ReleaseDC(hwnd, hdc);
@@ -5096,6 +5111,7 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       break;
 
     case IDM_Rematch:
+
       RematchEvent();
       break;
 
@@ -6253,6 +6269,7 @@ StartupDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 	SwapEngines(singleList); // temporarily swap first and second, to load a second 'first', ...
 	ParseArgs(StringGet, &p);
 	SwapEngines(singleList); // ... and then make it 'second'
+
 	appData.noChessProgram = FALSE;
 	appData.icsActive = FALSE;
       } else if (IsDlgButtonChecked(hDlg, OPT_ChessServer)) {
@@ -6842,6 +6859,7 @@ SaveInHistory(char *cmd)
   histIn = (histIn + 1) % HISTORY_SIZE;
   if (history[histIn] != NULL) {
     free(history[histIn]);
+
     history[histIn] = NULL;
   }
   histP = histIn;
@@ -8708,6 +8726,13 @@ EditCommentPopUp(int index, char *title, char *str)
 }
 
 
+int
+Roar()
+{
+  MyPlaySound(&sounds[(int)SoundRoar]);
+  return 1;
+}
+
 VOID
 RingBell()
 {
@@ -8865,6 +8890,7 @@ DisplayBlackClock(long timeRemaining, int highlight)
   HDC hdc;
   char *flag = blackFlag && gameMode == TwoMachinesPlay ? "(!)" : "";
 
+
   if(appData.noGUI) return;
   hdc = GetDC(hwndMain);
   if (!IsIconic(hwndMain)) {
@@ -9883,16 +9909,23 @@ AnimateMove(board, fromX, fromY, toX, toY)
      int toY;
 {
   ChessSquare piece;
+  int x = toX, y = toY;
   POINT start, finish, mid;
   POINT frames[kFactor * 2 + 1];
   int nFrames, n;
 
+  if(killX >= 0 && IS_LION(board[fromY][fromX])) Roar();
+
   if (!appData.animate) return;
   if (doingSizing) return;
   if (fromY < 0 || fromX < 0) return;
   piece = board[fromY][fromX];
   if (piece >= EmptySquare) return;
 
+  if(killX >= 0) toX = killX, toY = killY; // [HGM] lion: first to kill square
+
+again:
+
   ScreenSquare(fromX, fromY, &start);
   ScreenSquare(toX, toY, &finish);
 
@@ -9931,6 +9964,9 @@ AnimateMove(board, fromX, fromY, toX, toY)
   }
   animInfo.pos = finish;
   DrawPosition(FALSE, NULL);
+
+  if(toX != x || toY != y) { fromX = toX; fromY = toY; toX = x; toY = y; goto again; } // second leg
+
   animInfo.piece = EmptySquare;
   Explode(board, fromX, fromY, toX, toY);
 }
@@ -10032,6 +10068,6 @@ ActivateTheme (int new)
    InitTextures();
    if(new) InitDrawingColors();
    fontBitmapSquareSize = 0; // request creation of new font pieces
-   InitDrawingSizes(-2, 0);
+   InitDrawingSizes(boardSize, 0);
    InvalidateRect(hwndMain, NULL, TRUE);
 }