X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.c;h=917a532a1ea842a5a34c2abb585b5c0c9c2c6a8d;hb=35f89898c92a8709618e2db77b11cbedfd7fc48c;hp=0016e7a926a07f23e3362ed556d0a6a8612c07bf;hpb=f610658c8c9e9c0df5c77d546849c47162b7997a;p=xboard.git

diff --git a/winboard/winboard.c b/winboard/winboard.c
index 0016e7a..917a532 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 Free Software Foundation, Inc.
+ * 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
  *
  * Enhancements Copyright 2005 Alessandro Scotti
  *
@@ -92,6 +92,9 @@
 #include "help.h"
 #include "wsnap.h"
 
+#define SLASH '/'
+#define DATADIR "~~"
+
 //void InitEngineUCI( const char * iniDir, ChessProgramState * cps );
 
   int myrandom(void);
@@ -100,14 +103,15 @@
 extern int whiteFlag, blackFlag;
 Boolean flipClock = FALSE;
 extern HANDLE chatHandle[];
-extern int ics_type;
+extern enum ICS_TYPE ics_type;
 
+int  MySearchPath P((char *installDir, char *name, char *fullname));
+int  MyGetFullPathName P((char *name, char *fullname));
 void DisplayHoldingsCount(HDC hdc, int x, int y, int align, int copyNumber);
 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;  
@@ -162,7 +166,7 @@ BoardSize boardSize;
 Boolean chessProgram;
 //static int boardX, boardY;
 int  minX, minY; // [HGM] placement: volatile limits on upper-left corner
-int squareSize, lineGap, minorSize;
+int squareSize, lineGap, minorSize, border;
 static int winW, winH;
 static RECT messageRect, whiteRect, blackRect, leftLogoRect, rightLogoRect; // [HGM] logo
 static int logoHeight = 0;
@@ -185,6 +189,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;
 
@@ -195,7 +200,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];
@@ -220,6 +225,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
@@ -249,7 +255,7 @@ Boolean barbaric; // flag indicating if translation is needed
 #define ABOUTBOX -1  /* not sure why these are needed */
 #define ABOUTBOX2 -1
 
-int dialogItems[][41	] = {
+int dialogItems[][42] = {
 { ABOUTBOX, IDOK, OPT_MESS, 400 }, 
 { DLG_TimeControl, IDC_Babble, OPT_TCUseMoves, OPT_TCUseInc, OPT_TCUseFixed, 
   OPT_TCtext1, OPT_TCtext2, OPT_TCitext1, OPT_TCitext2, OPT_TCftext, GPB_Factors,   IDC_Factor1, IDC_Factor2, IDOK, IDCANCEL }, 
@@ -294,7 +300,7 @@ int dialogItems[][41	] = {
   OPT_ChooseTellColor, OPT_ChooseChallengeColor, OPT_ChooseRequestColor,
   OPT_ChooseSeekColor, OPT_ChooseNormalColor, OPT_ChooseBackgroundColor,
   OPT_DefaultColors, OPT_DontColorize, IDC_Boxes, GPB_Colors, GPB_Premove,
-  GPB_General, GPB_Alarm }, 
+  GPB_General, GPB_Alarm, OPT_AutoCreate }, 
 { DLG_BoardOptions, IDOK, IDCANCEL, OPT_SizeTiny, OPT_SizeTeeny, OPT_SizeDinky,
   OPT_SizePetite, OPT_SizeSlim, OPT_SizeSmall, OPT_SizeMediocre, OPT_SizeMiddling,
   OPT_SizeAverage, OPT_SizeModerate, OPT_SizeMedium, OPT_SizeBulky, OPT_SizeLarge,
@@ -302,7 +308,7 @@ int dialogItems[][41	] = {
   OPT_ChooseLightSquareColor, OPT_ChooseDarkSquareColor, OPT_ChooseWhitePieceColor,
   OPT_ChooseBlackPieceColor, OPT_ChooseHighlightSquareColor, OPT_ChoosePremoveHighlightColor,
   OPT_Monochrome, OPT_AllWhite, OPT_UpsideDown, OPT_DefaultBoardColors, GPB_Colors,
-  IDC_Light, IDC_Dark, IDC_White, IDC_Black, IDC_High, IDC_PreHigh, GPB_Size, OPT_Bitmaps, OPT_PieceFont }, 
+  IDC_Light, IDC_Dark, IDC_White, IDC_Black, IDC_High, IDC_PreHigh, GPB_Size, OPT_Bitmaps, OPT_PieceFont, OPT_Grid }, 
 { DLG_NewVariant, IDOK, IDCANCEL, OPT_VariantNormal, OPT_VariantFRC, OPT_VariantWildcastle,
   OPT_VariantNocastle, OPT_VariantLosers, OPT_VariantGiveaway, OPT_VariantSuicide,
   OPT_Variant3Check, OPT_VariantTwoKings, OPT_VariantAtomic, OPT_VariantCrazyhouse,
@@ -435,7 +441,7 @@ TranslateOneMenu(int i, HMENU subMenu)
             info.dwTypeData = buf;
             info.cch = sizeof(buf);
             GetMenuItemInfo(subMenu, j, TRUE, &info);
-            if(i < 10) {
+            if(i < 10) {
                 if(menuText[i][j]) safeStrCpy(buf, menuText[i][j], sizeof(buf)/sizeof(buf[0]) );
                 else menuText[i][j] = strdup(buf); // remember original on first change
             }
@@ -492,6 +498,30 @@ TranslateMenus(int addLanguage)
 
 #endif
 
+#define IDM_RecentEngines 3000
+
+void
+RecentEngineMenu (char *s)
+{
+    if(appData.icsActive) return;
+    if(appData.recentEngines > 0 && *s) { // feature is on, and list non-empty
+	HMENU mainMenu = GetMenu(hwndMain);
+	HMENU subMenu = GetSubMenu(mainMenu, 5); // Engine menu
+	int i=IDM_RecentEngines;
+	recentEngines = strdup(appData.recentEngineList); // remember them as they are in menu
+	AppendMenu(subMenu, MF_SEPARATOR, (UINT_PTR) 0, NULL);
+	while(*s) {
+	  char *p = strchr(s, '\n');
+	  if(p == NULL) return; // malformed!
+	  *p = NULLCHAR;
+	  AppendMenu(subMenu, MF_ENABLED|MF_STRING|MF_UNCHECKED, (UINT_PTR) i++, (LPCTSTR) s);
+	  *p = '\n';
+	  s = p+1;
+	}
+    }
+}
+
+
 typedef struct {
   char *name;
   int squareSize;
@@ -737,7 +767,8 @@ void ThawUI()
 #define JAWS_INIT
 #define JAWS_ARGS
 #define JAWS_ALT_INTERCEPT
-#define JAWS_KB_NAVIGATION
+#define JAWS_KBUP_NAVIGATION
+#define JAWS_KBDOWN_NAVIGATION
 #define JAWS_MENU_ITEMS
 #define JAWS_SILENCE
 #define JAWS_REPLAY
@@ -979,8 +1010,14 @@ LoadLogo(ChessProgramState *cps, int n, Boolean ics)
       }
   } else if(appData.autoLogo) {
       if(ics) { // [HGM] logo: in ICS mode second can be used for ICS
-	sprintf(buf, "logos\\%s.bmp", appData.icsHost);
-	cps->programLogo = LoadImage( 0, buf, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE );
+	char *opponent = "";
+	if(gameMode == IcsPlayingWhite) opponent = gameInfo.black;
+	if(gameMode == IcsPlayingBlack) opponent = gameInfo.white;
+	sprintf(buf, "logos\\%s\\%s.bmp", appData.icsHost, opponent);
+	if(!*opponent || !(cps->programLogo = LoadImage( 0, buf, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE ))) {
+	    sprintf(buf, "logos\\%s.bmp", appData.icsHost);
+	    cps->programLogo = LoadImage( 0, buf, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE );
+	}
       } else
       if(appData.directory[n] && appData.directory[n][0]) {
         SetCurrentDirectory(appData.directory[n]);
@@ -997,6 +1034,7 @@ InitTextures()
   backTextureSquareSize = 0; // kludge to force recalculation of texturemode
   
   if( appData.liteBackTextureFile && appData.liteBackTextureFile[0] != NULLCHAR && appData.liteBackTextureFile[0] != '*' ) {
+      if(liteBackTexture) DeleteObject(liteBackTexture);
       liteBackTexture = LoadImage( 0, appData.liteBackTextureFile, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE );
       liteBackTextureMode = appData.liteBackTextureMode;
 
@@ -1006,6 +1044,7 @@ InitTextures()
   }
   
   if( appData.darkBackTextureFile && appData.darkBackTextureFile[0] != NULLCHAR && appData.darkBackTextureFile[0] != '*' ) {
+      if(darkBackTexture) DeleteObject(darkBackTexture);
       darkBackTexture = LoadImage( 0, appData.darkBackTextureFile, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE );
       darkBackTextureMode = appData.darkBackTextureMode;
 
@@ -1028,6 +1067,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);
   }
@@ -1081,6 +1121,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. */
@@ -1094,6 +1135,7 @@ InitInstance(HINSTANCE hInstance, int nCmdShow, LPSTR lpCmdLine)
   }
 
   InitDrawingSizes(boardSize, 0);
+  RecentEngineMenu(appData.recentEngineList);
   InitMenuChecks();
   buttonCount = GetSystemMetrics(SM_CMOUSEBUTTONS);
 
@@ -1138,15 +1180,6 @@ InitInstance(HINSTANCE hInstance, int nCmdShow, LPSTR lpCmdLine)
                  0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE);
 #endif
     ShowWindow(hwndConsole, nCmdShow);
-    if(appData.chatBoxes) { // [HGM] chat: open chat boxes
-      char buf[MSG_SIZ], *p = buf, *q;
-	safeStrCpy(buf, appData.chatBoxes, sizeof(buf)/sizeof(buf[0]) );
-      do {
-	q = strchr(p, ';');
-	if(q) *q++ = 0;
-	if(*p) ChatPopUp(p);
-      } while(p=q);
-    }
     SetActiveWindow(hwndConsole);
   }
   if(!appData.noGUI)   UpdateWindow(hwnd);  else ShowWindow(hwnd, SW_MINIMIZE);
@@ -1177,6 +1210,7 @@ InitMenuChecks()
 
 #define OPTCHAR "/"
 #define SEPCHAR "="
+#define TOPLEVEL 0
 
 #include "args.h"
 
@@ -1251,6 +1285,7 @@ ParseFontName(char *name, MyFontParams *mfp)
     p = q + 1;
   } else {
     q = mfp->faceName;
+
     while (*p && !isdigit(*p)) {
       *q++ = *p++;
       if (q - mfp->faceName >= sizeof(mfp->faceName))
@@ -2087,9 +2122,15 @@ void CreatePiecesFromFont()
 HBITMAP
 DoLoadBitmap(HINSTANCE hinst, char *piece, int squareSize, char *suffix)
 {
-  char name[128];
+  char name[128], buf[MSG_SIZ];
 
     snprintf(name, sizeof(name)/sizeof(name[0]), "%s%d%s", piece, squareSize, suffix);
+  if(appData.pieceDirectory[0]) {
+    HBITMAP res;
+    snprintf(buf, MSG_SIZ, "%s\\%s.bmp", appData.pieceDirectory, name);
+    res = LoadImage( 0, buf, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE );
+    if(res) return res;
+  }
   if (gameInfo.event &&
       strcmp(gameInfo.event, "Easter Egg Hunt") == 0 &&
       strcmp(name, "k80s") == 0) {
@@ -2126,6 +2167,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
@@ -2157,8 +2199,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;
   }
@@ -2216,12 +2259,29 @@ InitDrawingSizes(BoardSize boardSize, int flags)
   RECT crect, wrect, oldRect;
   int offby;
   LOGBRUSH logbrush;
+  VariantClass v = gameInfo.variant;
 
   int suppressVisibleEffects = 0; // [HGM] kludge to request updating sizeInfo only
   if((int)boardSize >= 1000 ) { boardSize -= 1000; suppressVisibleEffects = 1; }
 
   /* [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)
+  { // correct board size to one where built-in pieces exist
+    if((v == VariantCapablanca || v == VariantGothic || v == VariantGrand || v == VariantCapaRandom || v == VariantJanus || v == VariantSuper)
+       && (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 == VariantLion ) {
+      if(boardSize < SizeMediocre) boardSize = SizePetite; else
+      if(boardSize > SizeModerate) boardSize = SizeBulky;  else
+                                   boardSize = SizeMiddling;
+    }
+  }
+  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;
@@ -2233,6 +2293,7 @@ InitDrawingSizes(BoardSize boardSize, int flags)
   squareSize = sizeInfo[boardSize].squareSize;
   lineGap = sizeInfo[boardSize].lineGap;
   minorSize = 0; /* [HGM] Kludge to see if demagnified pieces need to be shifted  */
+  border = appData.useBorder && appData.border[0] ? squareSize/2 : 0;
 
   if( appData.overrideLineGap >= 0 && appData.overrideLineGap <= 5 ) {
       lineGap = appData.overrideLineGap;
@@ -2257,8 +2318,8 @@ InitDrawingSizes(BoardSize boardSize, int flags)
     DrawMenuBar(hwndMain);
   }
 
-  boardWidth  = BoardWidth(boardSize, BOARD_WIDTH);
-  boardHeight = BoardWidth(boardSize, BOARD_HEIGHT);
+  boardWidth  = BoardWidth(boardSize, BOARD_WIDTH) + 2*border;
+  boardHeight = BoardWidth(boardSize, BOARD_HEIGHT) + 2*border;
 
   /* Get text area sizes */
   hdc = GetDC(hwndMain);
@@ -2330,7 +2391,6 @@ InitDrawingSizes(BoardSize boardSize, int flags)
 
   sizeInfo[boardSize].cliWidth = boardRect.right + OUTER_MARGIN;
   sizeInfo[boardSize].cliHeight = boardRect.bottom + OUTER_MARGIN;
-  oldBoardSize = boardSize;
   oldTinyLayout = tinyLayout;
   winW = 2 * GetSystemMetrics(SM_CXFRAME) + boardRect.right + OUTER_MARGIN;
   winH = 2 * GetSystemMetrics(SM_CYFRAME) + GetSystemMetrics(SM_CYMENU) +
@@ -2430,20 +2490,20 @@ InitDrawingSizes(BoardSize boardSize, int flags)
 
     /* [HGM] Loop had to be split in part for vert. and hor. lines */
     for (i = 0; i < BOARD_HEIGHT + 1; i++) {
-      gridEndpoints[i*2].x = boardRect.left + lineGap / 2;
+      gridEndpoints[i*2].x = boardRect.left + lineGap / 2 + border;
       gridEndpoints[i*2].y = gridEndpoints[i*2 + 1].y =
-	boardRect.top + lineGap / 2 + (i * (squareSize + lineGap));
+	boardRect.top + lineGap / 2 + (i * (squareSize + lineGap)) + border;
       gridEndpoints[i*2 + 1].x = boardRect.left + lineGap / 2 +
-        BOARD_WIDTH * (squareSize + lineGap);
+        BOARD_WIDTH * (squareSize + lineGap) + border;
       gridVertexCounts[i*2] = gridVertexCounts[i*2 + 1] = 2;
     }
     for (i = 0; i < BOARD_WIDTH + 1; i++) {
-      gridEndpoints[i*2 + BOARD_HEIGHT*2 + 2].y = boardRect.top + lineGap / 2;
+      gridEndpoints[i*2 + BOARD_HEIGHT*2 + 2].y = boardRect.top + lineGap / 2 + border;
       gridEndpoints[i*2 + BOARD_HEIGHT*2 + 2].x =
         gridEndpoints[i*2 + 1 + BOARD_HEIGHT*2 + 2].x = boardRect.left +
-	lineGap / 2 + (i * (squareSize + lineGap));
+	lineGap / 2 + (i * (squareSize + lineGap)) + border;
       gridEndpoints[i*2 + 1 + BOARD_HEIGHT*2 + 2].y =
-        boardRect.top + BOARD_HEIGHT * (squareSize + lineGap);
+        boardRect.top + BOARD_HEIGHT * (squareSize + lineGap) + border;
       gridVertexCounts[i*2] = gridVertexCounts[i*2 + 1] = 2;
     }
   }
@@ -2571,6 +2631,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");
@@ -2696,11 +2759,11 @@ VOID
 SquareToPos(int row, int column, int * x, int * y)
 {
   if (flipView) {
-    *x = boardRect.left + lineGap + ((BOARD_WIDTH-1)-column) * (squareSize + lineGap);
-    *y = boardRect.top + lineGap + row * (squareSize + lineGap);
+    *x = boardRect.left + lineGap + ((BOARD_WIDTH-1)-column) * (squareSize + lineGap) + border;
+    *y = boardRect.top + lineGap + row * (squareSize + lineGap) + border;
   } else {
-    *x = boardRect.left + lineGap + column * (squareSize + lineGap);
-    *y = boardRect.top + lineGap + ((BOARD_HEIGHT-1)-row) * (squareSize + lineGap);
+    *x = boardRect.left + lineGap + column * (squareSize + lineGap) + border;
+    *y = boardRect.top + lineGap + ((BOARD_HEIGHT-1)-row) * (squareSize + lineGap) + border;
   }
 }
 
@@ -2727,15 +2790,23 @@ DrawCoordsOnDC(HDC hdc)
   y = boardRect.top + lineGap;
   x = boardRect.left + lineGap + gameInfo.holdingsWidth*(squareSize + lineGap);
 
+  if(border) {
+    SetTextAlign(hdc, TA_RIGHT|TA_TOP);
+    x += border - lineGap - 4; y += squareSize - 6;
+  } else
   SetTextAlign(hdc, TA_LEFT|TA_TOP);
   for (i = 0; i < BOARD_HEIGHT; i++) {
     str[0] = files[start + i];
-    ExtTextOut(hdc, x + 2, y + 1, 0, NULL, str, 1, NULL);
+    ExtTextOut(hdc, x + 2 - (border ? gameInfo.holdingsWidth * (squareSize + lineGap) : 0), y + 1, 0, NULL, str, 1, NULL);
     y += squareSize + lineGap;
   }
 
   start = flipView ? 23-(BOARD_RGHT-BOARD_LEFT) : 23;
 
+  if(border) {
+    SetTextAlign(hdc, TA_LEFT|TA_TOP);
+    x += -border + 4; y += border - squareSize + 6;
+  } else
   SetTextAlign(hdc, TA_RIGHT|TA_BOTTOM);
   for (i = 0; i < BOARD_RGHT - BOARD_LEFT; i++) {
     str[0] = ranks[start + i];
@@ -2772,14 +2843,14 @@ DrawHighlightOnDC(HDC hdc, BOOLEAN on, int x, int y, int pen)
   if (lineGap == 0) return;
   if (flipView) {
     x1 = boardRect.left +
-      lineGap/2 + ((BOARD_WIDTH-1)-x) * (squareSize + lineGap);
+      lineGap/2 + ((BOARD_WIDTH-1)-x) * (squareSize + lineGap) + border;
     y1 = boardRect.top +
-      lineGap/2 + y * (squareSize + lineGap);
+      lineGap/2 + y * (squareSize + lineGap) + border;
   } else {
     x1 = boardRect.left +
-      lineGap/2 + x * (squareSize + lineGap);
+      lineGap/2 + x * (squareSize + lineGap) + border;
     y1 = boardRect.top +
-      lineGap/2 + ((BOARD_HEIGHT-1)-y) * (squareSize + lineGap);
+      lineGap/2 + ((BOARD_HEIGHT-1)-y) * (squareSize + lineGap) + border;
   }
   hPen = pen ? premovePen : highlightPen;
   oldPen = SelectObject(hdc, on ? hPen : gridPen);
@@ -2857,7 +2928,9 @@ DrawPieceOnDC(HDC hdc, ChessSquare piece, int color, int sqcolor, int x, int y,
     BitBlt(hdc, x, y, squareSize, squareSize, tmphdc, 0, 0,
 	   sqcolor ? SRCCOPY : NOTSRCCOPY);
   } else {
+    HBRUSH xBrush = whitePieceBrush;
     tmpSize = squareSize;
+    if(appData.pieceDirectory[0]) xBrush = GetStockObject(WHITE_BRUSH);
     if(minorSize &&
         ((piece >= (int)WhiteNightrider && piece <= WhiteGrasshopper) ||
          (piece >= (int)BlackNightrider && piece <= BlackGrasshopper))  ) {
@@ -2870,7 +2943,7 @@ DrawPieceOnDC(HDC hdc, ChessSquare piece, int color, int sqcolor, int x, int y,
     if (color || appData.allWhite ) {
       oldBitmap = SelectObject(tmphdc, PieceBitmap(piece, WHITE_PIECE));
       if( color )
-              oldBrush = SelectObject(hdc, whitePieceBrush);
+              oldBrush = SelectObject(hdc, xBrush);
       else    oldBrush = SelectObject(hdc, blackPieceBrush);
       if(appData.upsideDown && color==flipView)
         StretchBlt(hdc, x+tmpSize, y+tmpSize, -tmpSize, -tmpSize, tmphdc, 0, 0, tmpSize, tmpSize, 0x00B8074A);
@@ -2882,6 +2955,18 @@ DrawPieceOnDC(HDC hdc, ChessSquare piece, int color, int sqcolor, int x, int y,
         StretchBlt(hdc, x+tmpSize, y+tmpSize, -tmpSize, -tmpSize, tmphdc, 0, 0, tmpSize, tmpSize, SRCAND);
       else
         BitBlt(hdc, x, y, tmpSize, tmpSize, tmphdc, 0, 0, SRCAND);
+    } else if(appData.pieceDirectory[0]) {
+      oldBitmap = SelectObject(tmphdc, PieceBitmap(piece, WHITE_PIECE));
+      oldBrush = SelectObject(hdc, xBrush);
+      if(appData.upsideDown && color==flipView)
+        StretchBlt(hdc, x+tmpSize, y+tmpSize, -tmpSize, -tmpSize, tmphdc, 0, 0, tmpSize, tmpSize, 0x00B8074A);
+      else
+        BitBlt(hdc, x, y, tmpSize, tmpSize, tmphdc, 0, 0, 0x00B8074A);
+      SelectObject(tmphdc, PieceBitmap(piece, SOLID_PIECE));
+      if(appData.upsideDown && color==flipView)
+        StretchBlt(hdc, x+tmpSize, y+tmpSize, -tmpSize, -tmpSize, tmphdc, 0, 0, tmpSize, tmpSize, SRCAND);
+      else
+        BitBlt(hdc, x, y, tmpSize, tmpSize, tmphdc, 0, 0, SRCAND);
     } else {
       /* Use square color for details of black pieces */
       oldBitmap = SelectObject(tmphdc, PieceBitmap(piece, SOLID_PIECE));
@@ -3170,6 +3255,9 @@ BOOL HasHighlightInfo()
     }
 
     return result;
+
+
+
 }
 
 BOOL IsDrawArrowEnabled()
@@ -3269,6 +3357,40 @@ BOOL DrawPositionNeedsFullRepaint()
     return result;
 }
 
+static HBITMAP borderBitmap;
+
+VOID
+DrawBackgroundOnDC(HDC hdc)
+{
+  
+  BITMAP bi;
+  HDC tmphdc;
+  HBITMAP hbm;
+  static char oldBorder[MSG_SIZ];
+  int w = 600, h = 600, mode;
+
+  if(strcmp(appData.border, oldBorder)) { // load new one when old one no longer valid
+    strncpy(oldBorder, appData.border, MSG_SIZ-1);
+    borderBitmap = LoadImage( 0, appData.border, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE );	
+  }
+  if(borderBitmap == NULL) { // loading failed, use white
+    FillRect( hdc, &boardRect, whitePieceBrush );
+    return;
+  }
+  tmphdc = CreateCompatibleDC(hdc);
+  hbm = SelectObject(tmphdc, borderBitmap);
+  if( GetObject( borderBitmap, sizeof(bi), &bi ) > 0 ) {
+            w = bi.bmWidth;
+            h = bi.bmHeight;
+  }
+  mode = SetStretchBltMode(hdc, COLORONCOLOR);
+  StretchBlt(hdc, boardRect.left, boardRect.top, boardRect.right - boardRect.left, 
+                  boardRect.bottom - boardRect.top, tmphdc, 0, 0, w, h, SRCCOPY);
+  SetStretchBltMode(hdc, mode);
+  SelectObject(tmphdc, hbm);
+  DeleteDC(tmphdc);
+}
+
 VOID
 DrawBoardOnDC(HDC hdc, Board board, HDC tmphdc)
 {
@@ -3327,6 +3449,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) {
@@ -3509,7 +3632,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,
@@ -3520,6 +3643,14 @@ void DrawSeekDot(int x, int y, int color)
 	    SelectObject(hdcSeek, oldBrush);
 }
 
+void DrawSeekOpen()
+{
+}
+
+void DrawSeekClose()
+{
+}
+
 VOID
 HDCDrawPosition(HDC hdc, BOOLEAN repaint, Board board)
 {
@@ -3779,6 +3910,7 @@ HDCDrawPosition(HDC hdc, BOOLEAN repaint, Board board)
 	Ellipse(hdcmem, x-r, y-r, x+r, y+r);
 	SelectObject(hdcmem, oldBrush);
   } else {
+    if(border) DrawBackgroundOnDC(hdcmem);
     DrawGridOnDC(hdcmem);
     if(nr == 0) { // [HGM] dual: decide which highlights to draw
 	DrawHighlightsOnDC(hdcmem, &highlightInfo, HIGHLIGHT_PEN);
@@ -3793,8 +3925,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);
@@ -4032,11 +4163,11 @@ PaintProc(HWND hwnd)
 int EventToSquare(x, limit)
      int x, limit;
 {
-  if (x <= 0)
+  if (x <= border)
     return -2;
-  if (x < lineGap)
+  if (x < lineGap + border)
     return -1;
-  x -= lineGap;
+  x -= lineGap + border;
   if ((x % (squareSize + lineGap)) >= squareSize)
     return -1;
   x /= (squareSize + lineGap);
@@ -4141,16 +4272,19 @@ 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:
       if (PtInRect((LPRECT) &whiteRect, pt)) {
-        ClockClick(flipClock);
+        ClockClick(flipClock); break;
       } else if (PtInRect((LPRECT) &blackRect, pt)) {
-	ClockClick(!flipClock);
+	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] */
@@ -4170,7 +4304,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;
@@ -4179,7 +4313,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;
         }
@@ -4227,9 +4361,9 @@ MouseEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
     if(y == -2) {
       /* [HGM] right mouse button in clock area edit-game mode ups clock */
       if (PtInRect((LPRECT) &whiteRect, pt)) {
-          if (gameMode == EditGame || GetKeyState(VK_SHIFT) < 0) AdjustClock(flipClock, 1);
+          if (GetKeyState(VK_SHIFT) < 0) AdjustClock(flipClock, 1);
       } else if (PtInRect((LPRECT) &blackRect, pt)) {
-          if (gameMode == EditGame || GetKeyState(VK_SHIFT) < 0) AdjustClock(!flipClock, 1);
+          if (GetKeyState(VK_SHIFT) < 0) AdjustClock(!flipClock, 1);
       }
       break;
     }
@@ -4255,7 +4389,7 @@ MouseEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       }
       break;
     case 2:
-      SetCapture(hwndMain);
+      SetCapture(hwndMain);
       break;
     case 1:
       hmenu = LoadMenu(hInst, "DropPieceMenu");
@@ -4314,6 +4448,8 @@ ButtonProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
   return CallWindowProc(buttonDesc[i].wndproc, hwnd, message, wParam, lParam);
 }
 
+static int promoStyle;
+
 /* Process messages for Promotion dialog box */
 LRESULT CALLBACK
 Promotion(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
@@ -4344,13 +4480,9 @@ Promotion(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
          PieceToChar(BlackMarshall) != '~')   ) ?
 	       SW_SHOW : SW_HIDE);
     /* [HGM] Hide B & R button in Shogi, use Q as promote, N as defer */
-    ShowWindow(GetDlgItem(hDlg, PB_Rook),
-       gameInfo.variant != VariantShogi ?
-	       SW_SHOW : SW_HIDE);
-    ShowWindow(GetDlgItem(hDlg, PB_Bishop), 
-       gameInfo.variant != VariantShogi ?
-	       SW_SHOW : SW_HIDE);
-    if(gameInfo.variant == VariantShogi) {
+    ShowWindow(GetDlgItem(hDlg, PB_Rook),   !promoStyle ? SW_SHOW : SW_HIDE);
+    ShowWindow(GetDlgItem(hDlg, PB_Bishop), !promoStyle ? SW_SHOW : SW_HIDE);
+    if(promoStyle) {
         SetDlgItemText(hDlg, PB_Queen, "YES");
         SetDlgItemText(hDlg, PB_Knight, "NO");
         SetWindowText(hDlg, "Promote?");
@@ -4371,7 +4503,7 @@ Promotion(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
       promoChar = gameInfo.variant == VariantSuper ? PieceToChar(BlackSilver) : PieceToChar(BlackKing);
       break;
     case PB_Queen:
-      promoChar = gameInfo.variant == VariantShogi ? '+' : ToLower(PieceToChar(WhiteOnMove(currentMove) ? WhiteQueen : BlackQueen));
+      promoChar = promoStyle ? '+' : ToLower(PieceToChar(WhiteOnMove(currentMove) ? WhiteQueen : BlackQueen));
       break;
     case PB_Rook:
       promoChar = ToLower(PieceToChar(WhiteOnMove(currentMove) ? WhiteRook : BlackRook));
@@ -4388,7 +4520,8 @@ Promotion(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
       promoChar = ToLower(PieceToChar(WhiteOnMove(currentMove) ? WhiteAngel : BlackAngel));
       break;
     case PB_Knight:
-      promoChar = gameInfo.variant == VariantShogi ? '=' : PieceToChar(WhiteOnMove(currentMove) ? WhiteKnight : BlackKnight);
+      promoChar = gameInfo.variant == VariantShogi ? '=' : promoStyle ? NULLCHAR : 
+                  ToLower(PieceToChar(WhiteOnMove(currentMove) ? WhiteKnight : BlackKnight));
       break;
     default:
       return FALSE;
@@ -4419,20 +4552,13 @@ PromotionPopup(HWND hwnd)
 }
 
 void
-PromotionPopUp()
+PromotionPopUp(char choice)
 {
+  promoStyle = (choice == '+');
   DrawPosition(TRUE, NULL);
   PromotionPopup(hwndMain);
 }
 
-/* Toggle ShowThinking */
-VOID
-ToggleShowThinking()
-{
-  appData.showThinking = !appData.showThinking;
-  ShowThinkingEvent();
-}
-
 VOID
 LoadGameDialog(HWND hwnd, char* title)
 {
@@ -4571,8 +4697,8 @@ 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;
 
   switch (message) {
 
@@ -4600,7 +4726,23 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
     MouseEvent(hwnd, message, wParam, lParam);
     break;
 
-  JAWS_KB_NAVIGATION
+  case WM_KEYUP:
+    if((char)wParam == '\b') {
+      ForwardEvent(); peek = 0;
+    }
+
+    JAWS_KBUP_NAVIGATION
+
+    break;
+
+  case WM_KEYDOWN:
+    if((char)wParam == '\b') {
+      if(!peek) BackwardEvent(), peek = 1;
+    }
+
+    JAWS_KBDOWN_NAVIGATION
+
+    break;
 
   case WM_CHAR:
     
@@ -4629,6 +4771,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);
@@ -4745,6 +4888,10 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       }
       break;
 
+    case IDM_CreateBook:
+      CreateBookEvent();
+      break;
+
     case IDM_CopyGame:
       CopyGameToClipboard();
       break;
@@ -4887,52 +5034,13 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       break;
 
     case IDM_AnalysisMode:
-      if (!first.analysisSupport) {
-        snprintf(buf, MSG_SIZ, _("%s does not support analysis"), first.tidy);
-        DisplayError(buf, 0);
-      } else {
+      if(AnalyzeModeEvent()) {
 	SAY("analyzing current position");
-        /* [DM] icsEngineAnlyze [HGM] Why is this front-end??? */
-        if (appData.icsActive) {
-               if (gameMode != IcsObserving) {
-		 snprintf(buf, MSG_SIZ, "You are not observing a game");
-                       DisplayError(buf, 0);
-                       /* secure check */
-                       if (appData.icsEngineAnalyze) {
-                               if (appData.debugMode) 
-                                       fprintf(debugFP, "Found unexpected active ICS engine analyze \n");
-                               ExitAnalyzeMode();
-                               ModeHighlight();
-                               break;
-                       }
-                       break;
-               } else {
-                       /* if enable, user want disable icsEngineAnalyze */
-                       if (appData.icsEngineAnalyze) {
-                               ExitAnalyzeMode();
-                               ModeHighlight();
-                               break;
-                       }
-                       appData.icsEngineAnalyze = TRUE;
-                       if (appData.debugMode) fprintf(debugFP, "ICS engine analyze starting...\n");
-               }
-        } 
-	if (!appData.showThinking) ToggleShowThinking();
-	AnalyzeModeEvent();
       }
       break;
 
     case IDM_AnalyzeFile:
-      if (!first.analysisSupport) {
-        char buf[MSG_SIZ];
-	  snprintf(buf, MSG_SIZ, _("%s does not support analysis"), first.tidy);
-        DisplayError(buf, 0);
-      } else {
-	if (!appData.showThinking) ToggleShowThinking();
-	AnalyzeFileEvent();
-//	LoadGameDialog(hwnd, _("Analyze Game from File"));
-	AnalysisPeriodicEvent(1);
-      }
+      AnalyzeFileEvent();
       break;
 
     case IDM_IcsClient:
@@ -4963,9 +5071,12 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       EditTagsPopUp(firstChessProgramNames, &firstChessProgramNames);
       break;
 
-    case IDM_EditProgs2:
-     LoadEnginePopUp(hwndMain);
-//      EditTagsPopUp(secondChessProgramNames, &secondChessProgramNames);
+    case IDM_LoadProg1:
+     LoadEnginePopUp(hwndMain, 0);
+      break;
+
+    case IDM_LoadProg2:
+     LoadEnginePopUp(hwndMain, 1);
       break;
 
     case IDM_EditServers:
@@ -5003,6 +5114,7 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       break;
 
     case IDM_Rematch:
+
       RematchEvent();
       break;
 
@@ -5119,6 +5231,10 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       BoardOptionsPopup(hwnd);
       break;
 
+    case IDM_ThemeOptions:
+      ThemeOptionsPopup(hwnd);
+      break;
+
     case IDM_EnginePlayOptions:
       EnginePlayOptionsPopup(hwnd);
       break;
@@ -5434,6 +5550,9 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       break;
 
     default:
+      if(wmId >= IDM_RecentEngines && wmId < IDM_RecentEngines + appData.recentEngines)
+          RecentEngineEvent(wmId - IDM_RecentEngines);
+      else
       if(wmId > IDM_English && wmId < IDM_English+20) {
           LoadLanguageFile(languageFile[wmId - IDM_English - 1]);
           TranslateMenus(0);
@@ -6145,13 +6264,15 @@ StartupDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
         safeStrCpy(buf, "/fcp=", sizeof(buf)/sizeof(buf[0]) );
 	GetDlgItemText(hDlg, OPT_ChessEngineName, buf + strlen(buf), sizeof(buf) - strlen(buf));
         p = buf;
+	comboLine = strdup(p+5); // [HGM] recent: remember complete line of first combobox
 	ParseArgs(StringGet, &p);
 	safeStrCpy(buf, singleList ? "/fcp=" : "/scp=", sizeof(buf)/sizeof(buf[0]) );
 	GetDlgItemText(hDlg, OPT_SecondChessEngineName, buf + strlen(buf), sizeof(buf) - strlen(buf));
-        p = buf;
+        p = buf;
 	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)) {
@@ -6458,10 +6579,10 @@ TypeInMoveDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 
   case WM_COMMAND:
     switch (LOWORD(wParam)) {
-    case IDOK:
+    case IDOK:
 
       shiftKey = GetKeyState(VK_SHIFT) < 0; // [HGM] remember last shift status
-      GetDlgItemText(hDlg, OPT_Move, move, sizeof(move));
+      GetDlgItemText(hDlg, OPT_Move, move, sizeof(move));
       TypeInDoneEvent(move);
       EndDialog(hDlg, TRUE);
       return TRUE;
@@ -6729,6 +6850,7 @@ GothicPopUp(char *title, VariantClass variant)
 static char *history[HISTORY_SIZE];
 int histIn = 0, histP = 0;
 
+
 VOID
 SaveInHistory(char *cmd)
 {
@@ -6741,6 +6863,7 @@ SaveInHistory(char *cmd)
   histIn = (histIn + 1) % HISTORY_SIZE;
   if (history[histIn] != NULL) {
     free(history[histIn]);
+
     history[histIn] = NULL;
   }
   histP = histIn;
@@ -7424,7 +7547,7 @@ DisplayHoldingsCount(HDC hdc, int x, int y, int rightAlign, int copyNumber)
   HFONT oldFont;
   RECT rect;
 
-  if(copyNumber > 1)
+  if(copyNumber > 1)
     snprintf(buf, sizeof(buf)/sizeof(buf[0]),"%d", copyNumber); else buf[0] = 0;
 
   oldFg = SetTextColor(hdc, RGB(255, 255, 255)); /* white */
@@ -7456,6 +7579,7 @@ DisplayAClock(HDC hdc, int timeRemaining, int highlight,
   COLORREF oldFg, oldBg;
   HFONT oldFont;
 
+  if (twoBoards && partnerUp) return;
   if (appData.clockMode) {
     if (tinyLayout)
       snprintf(buf, sizeof(buf)/sizeof(buf[0]), "%c %s %s", color[0], TimeString(timeRemaining), flagFell);
@@ -7550,6 +7674,7 @@ DoWriteFile(HANDLE hFile, char *buf, int count, DWORD *outCount,
       else
 	err = GetLastError();
     }
+
   }
   return err;
 }
@@ -7820,7 +7945,8 @@ Enables icsEnables[] = {
   { IDM_MoveNow, MF_BYCOMMAND|MF_GRAYED },
   { IDM_Hint, MF_BYCOMMAND|MF_GRAYED },
   { IDM_Book, MF_BYCOMMAND|MF_GRAYED },
-  { IDM_EditProgs2, MF_BYCOMMAND|MF_GRAYED },
+  { IDM_LoadProg1, MF_BYCOMMAND|MF_GRAYED },
+  { IDM_LoadProg2, MF_BYCOMMAND|MF_GRAYED },
   { IDM_IcsOptions, MF_BYCOMMAND|MF_ENABLED },
   { IDM_Engine1Options, MF_BYCOMMAND|MF_GRAYED },
   { IDM_Engine2Options, MF_BYCOMMAND|MF_GRAYED },
@@ -8174,8 +8300,8 @@ DisplayMessage(char *str1, char *str2)
     if (len > remain) len = remain;
     strncat(messageText, str2, len);
   }
-  messageText[MESSAGE_TEXT_MAX - 1] = NULLCHAR;
-  safeStrCpy(lastMsg, messageText, MSG_SIZ);
+  messageText[MESSAGE_TEXT_MAX - 1] = NULLCHAR;
+  safeStrCpy(lastMsg, messageText, MSG_SIZ);
 
   if (hwndMain == NULL || IsIconic(hwndMain)) return;
 
@@ -8414,6 +8540,7 @@ HWND gameListOptionsDialog;
 
 // low-level front-end: clear text edit / list widget
 void
+
 GLT_ClearList()
 {
     SendDlgItemMessage( gameListOptionsDialog, IDC_GameListTags, LB_RESETCONTENT, 0, 0 );
@@ -8535,7 +8662,19 @@ DisplayIcsInteractionTitle(char *str)
   char consoleTitle[MSG_SIZ];
 
     snprintf(consoleTitle, MSG_SIZ, "%s: %s", szConsoleTitle, str);
-  SetWindowText(hwndConsole, consoleTitle);
+    SetWindowText(hwndConsole, consoleTitle);
+
+    if(appData.chatBoxes) { // [HGM] chat: open chat boxes
+      char buf[MSG_SIZ], *p = buf, *q;
+	safeStrCpy(buf, appData.chatBoxes, sizeof(buf)/sizeof(buf[0]) );
+      do {
+	q = strchr(p, ';');
+	if(q) *q++ = 0;
+	if(*p) ChatPopUp(p);
+      } while(p=q);
+    }
+
+    SetActiveWindow(hwndMain);
 }
 
 void
@@ -8593,6 +8732,13 @@ EditCommentPopUp(int index, char *title, char *str)
 }
 
 
+int
+Roar()
+{
+  MyPlaySound(&sounds[(int)SoundRoar]);
+  return 1;
+}
+
 VOID
 RingBell()
 {
@@ -8750,6 +8896,7 @@ DisplayBlackClock(long timeRemaining, int highlight)
   HDC hdc;
   char *flag = blackFlag && gameMode == TwoMachinesPlay ? "(!)" : "";
 
+
   if(appData.noGUI) return;
   hdc = GetDC(hwndMain);
   if (!IsIconic(hwndMain)) {
@@ -9153,6 +9300,7 @@ OpenTCP(char *host, char *port, ProcRef *pr)
   ChildProc *cp;
   int err;
   SOCKET s;
+
   struct sockaddr_in sa, mysa;
   struct hostent FAR *hp;
   unsigned short uport;
@@ -9655,7 +9803,7 @@ CmailSigHandlerCallBack(InputSourceRef isr, VOIDSTAR closure,
 /* see wedittags.c for Edit Tags functions */
 
 
-VOID
+int
 ICSInitScript()
 {
   FILE *f;
@@ -9667,8 +9815,10 @@ ICSInitScript()
     if (f != NULL) {
       ProcessICSInitScript(f);
       fclose(f);
+      return TRUE;
     }
   }
+  return FALSE;
 }
 
 
@@ -9765,16 +9915,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);
 
@@ -9813,6 +9970,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);
 }
@@ -9824,11 +9984,11 @@ ScreenSquare(column, row, pt)
      int column; int row; POINT * pt;
 {
   if (flipView) {
-    pt->x = lineGap + ((BOARD_WIDTH-1)-column) * (squareSize + lineGap);
-    pt->y = lineGap + row * (squareSize + lineGap);
+    pt->x = lineGap + ((BOARD_WIDTH-1)-column) * (squareSize + lineGap) + border;
+    pt->y = lineGap + row * (squareSize + lineGap) + border;
   } else {
-    pt->x = lineGap + column * (squareSize + lineGap);
-    pt->y = lineGap + ((BOARD_HEIGHT-1)-row) * (squareSize + lineGap);
+    pt->x = lineGap + column * (squareSize + lineGap) + border;
+    pt->y = lineGap + ((BOARD_HEIGHT-1)-row) * (squareSize + lineGap) + border;
   }
 }
 
@@ -9896,3 +10056,24 @@ int flock(int fid, int code)
     }
     return 0;
 }
+
+char *
+Col2Text (int n)
+{
+    static int i=0;
+    static char col[8][20];
+    COLORREF color = *(COLORREF *) colorVariable[n];
+    i = i+1 & 7;
+    snprintf(col[i], 20, "#%02lx%02lx%02lx", color&0xff, (color>>8)&0xff, (color>>16)&0xff);
+    return col[i];
+}
+
+void
+ActivateTheme (int new)
+{   // Redo initialization of features depending on options that can occur in themes
+   InitTextures();
+   if(new) InitDrawingColors();
+   fontBitmapSquareSize = 0; // request creation of new font pieces
+   InitDrawingSizes(boardSize, 0);
+   InvalidateRect(hwndMain, NULL, TRUE);
+}