X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.c;h=bdcd19a979e290dca794a7d0e0195de464613f2f;hb=18fe8fec4c8638dccb0c59c781a9ad900ddb3043;hp=6c5d0eeab93d5c43af9a24d79920ee0cccaff1e8;hpb=e833cd22af38d0042dd3e5e6ccf7914fb18cf767;p=xboard.git

diff --git a/winboard/winboard.c b/winboard/winboard.c
index 6c5d0ee..bdcd19a 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -80,13 +80,11 @@
 #endif
 
 #include "common.h"
-#include "winboard.h"
 #include "frontend.h"
 #include "backend.h"
+#include "winboard.h"
 #include "moves.h"
 #include "wclipbrd.h"
-#include "wgamelist.h"
-#include "wedittags.h"
 #include "woptions.h"
 #include "wsockerr.h"
 #include "defaults.h"
@@ -158,10 +156,10 @@ char installDir[MSG_SIZ];
 
 BoardSize boardSize;
 BOOLEAN chessProgram;
-static int boardX, boardY;
+//static int boardX, boardY;
 int  minX, minY; // [HGM] placement: volatile limits on upper-left corner
 static int squareSize, lineGap, minorSize;
-static int winWidth, winHeight, winW, winH;
+static int winW, winH;
 static RECT messageRect, whiteRect, blackRect, leftLogoRect, rightLogoRect; // [HGM] logo
 static int logoHeight = 0;
 static char messageText[MESSAGE_TEXT_MAX];
@@ -181,8 +179,6 @@ char *secondChessProgramNames;
 #define PALETTESIZE 256
 
 HINSTANCE hInst;          /* current instance */
-HWND hwndMain = NULL;        /* root window*/
-HWND hwndConsole = NULL;
 BOOLEAN alwaysOnTop = FALSE;
 RECT boardRect;
 COLORREF lightSquareColor, darkSquareColor, whitePieceColor, 
@@ -197,8 +193,8 @@ static HBRUSH lightSquareBrush, darkSquareBrush,
   blackSquareBrush, /* [HGM] for band between board and holdings */
   explodeBrush,     /* [HGM] atomic */
   whitePieceBrush, blackPieceBrush, iconBkgndBrush /*, outlineBrush*/;
-static POINT gridEndpoints[(BOARD_SIZE + 1) * 4];
-static DWORD gridVertexCounts[(BOARD_SIZE + 1) * 2];
+static POINT gridEndpoints[(BOARD_RANKS + BOARD_FILES + 2) * 2];
+static DWORD gridVertexCounts[BOARD_RANKS + BOARD_FILES + 2];
 static HPEN gridPen = NULL;
 static HPEN highlightPen = NULL;
 static HPEN premovePen = NULL;
@@ -220,7 +216,7 @@ static HBITMAP darkBackTexture = NULL;
 static int liteBackTextureMode = BACK_TEXTURE_MODE_PLAIN;
 static int darkBackTextureMode = BACK_TEXTURE_MODE_PLAIN;
 static int backTextureSquareSize = 0;
-static struct { int x; int y; int mode; } backTextureSquareInfo[BOARD_SIZE][BOARD_SIZE];
+static struct { int x; int y; int mode; } backTextureSquareInfo[BOARD_RANKS][BOARD_FILES];
 
 #if __GNUC__ && !defined(_winmajor)
 #define oldDialog 0 /* cygwin doesn't define _winmajor; mingw does */
@@ -346,15 +342,7 @@ static char *commentTitle;
 static char *commentText;
 static int commentIndex;
 static Boolean editComment = FALSE;
-HWND commentDialog = NULL;
-BOOLEAN commentDialogUp = FALSE;
-static int commentX, commentY, commentH, commentW;
 
-static char *analysisTitle;
-static char *analysisText;
-HWND analysisDialog = NULL;
-BOOLEAN analysisDialogUp = FALSE;
-static int analysisX, analysisY, analysisH, analysisW;
 
 char errorTitle[MSG_SIZ];
 char errorMessage[2*MSG_SIZ];
@@ -424,37 +412,27 @@ VOID UpdateSampleText(HWND hDlg, int id, MyColorizeAttribs *mca);
 int NewGameFRC();
 int GameListOptions();
 
-HWND moveHistoryDialog = NULL;
-BOOLEAN moveHistoryDialogUp = FALSE;
-
-WindowPlacement wpMoveHistory;
+int dummy; // [HGM] for obsolete args
 
+HWND hwndMain = NULL;        /* root window*/
+HWND hwndConsole = NULL;
+HWND commentDialog = NULL;
+HWND moveHistoryDialog = NULL;
 HWND evalGraphDialog = NULL;
-BOOLEAN evalGraphDialogUp = FALSE;
-
-WindowPlacement wpEvalGraph;
-
 HWND engineOutputDialog = NULL;
-BOOLEAN engineOutputDialogUp = FALSE;
+HWND gameListDialog = NULL;
+HWND editTagsDialog = NULL;
+
+int commentUp = FALSE;
 
+WindowPlacement wpMain;
+WindowPlacement wpConsole;
+WindowPlacement wpComment;
+WindowPlacement wpMoveHistory;
+WindowPlacement wpEvalGraph;
 WindowPlacement wpEngineOutput;
 WindowPlacement wpGameList;
-WindowPlacement wpConsole;
-
-VOID MoveHistoryPopUp();
-VOID MoveHistoryPopDown();
-VOID MoveHistorySet( char movelist[][2*MOVE_LEN], int first, int last, int current, ChessProgramStats_Move * pvInfo );
-BOOL MoveHistoryIsUp();
-
-VOID EvalGraphSet( int first, int last, int current, ChessProgramStats_Move * pvInfo );
-VOID EvalGraphPopUp();
-VOID EvalGraphPopDown();
-BOOL EvalGraphIsUp();
-
-VOID EngineOutputPopUp();
-VOID EngineOutputPopDown();
-BOOL EngineOutputIsUp();
-VOID EngineOutputUpdate( FrontEndProgramStats * stats );
+WindowPlacement wpTags;
 
 VOID EngineOptionsPopup(); // [HGM] settings
 
@@ -861,15 +839,15 @@ InitInstance(HINSTANCE hInstance, int nCmdShow, LPSTR lpCmdLine)
   InitBackEnd2();
 
   /* Make the window visible; update its client area; and return "success" */
-  EnsureOnScreen(&boardX, &boardY, minX, minY);
+  EnsureOnScreen(&wpMain.x, &wpMain.y, minX, minY);
   wp.length = sizeof(WINDOWPLACEMENT);
   wp.flags = 0;
   wp.showCmd = nCmdShow;
   wp.ptMaxPosition.x = wp.ptMaxPosition.y = 0;
-  wp.rcNormalPosition.left = boardX;
-  wp.rcNormalPosition.right = boardX + winWidth;
-  wp.rcNormalPosition.top = boardY;
-  wp.rcNormalPosition.bottom = boardY + winHeight;
+  wp.rcNormalPosition.left = wpMain.x;
+  wp.rcNormalPosition.right = wpMain.x + wpMain.width;
+  wp.rcNormalPosition.top = wpMain.y;
+  wp.rcNormalPosition.bottom = wpMain.y + wpMain.height;
   SetWindowPlacement(hwndMain, &wp);
 
   if(!appData.noGUI) SetWindowPos(hwndMain, alwaysOnTop ? HWND_TOPMOST : HWND_NOTOPMOST,
@@ -1392,30 +1370,33 @@ ArgDescriptor argDescriptors[] = {
   { "firstNPS", ArgInt, (LPVOID) &appData.firstNPS, FALSE },
   { "secondNPS", ArgInt, (LPVOID) &appData.secondNPS, FALSE },
   { "noGUI", ArgTrue, (LPVOID) &appData.noGUI, FALSE },
-
+  { "keepLineBreaksICS", ArgBoolean, (LPVOID) &appData.noJoin, TRUE },
+  { "wrapContinuationSequence", ArgString, (LPVOID) &appData.wrapContSeq, FALSE },
+  { "useInternalWrap", ArgTrue, (LPVOID) &appData.useInternalWrap, FALSE }, /* noJoin usurps this if set */
+  
   // [HGM] placement: put all window layouts last in ini file, but man X,Y before all others
   { "minX", ArgZ, (LPVOID) &minX, FALSE }, // [HGM] placement: to make suer auxialary windows can be placed
   { "minY", ArgZ, (LPVOID) &minY, FALSE },
-  { "winWidth",  ArgInt, (LPVOID) &winWidth,  TRUE }, // [HGM] placement: dummies to remember right & bottom
-  { "winHeight", ArgInt, (LPVOID) &winHeight, TRUE }, //       for attaching auxiliary windows to them
-  { "x", ArgInt, (LPVOID) &boardX, TRUE },
-  { "y", ArgInt, (LPVOID) &boardY, TRUE },
+  { "winWidth",  ArgInt, (LPVOID) &wpMain.width,  TRUE }, // [HGM] placement: dummies to remember right & bottom
+  { "winHeight", ArgInt, (LPVOID) &wpMain.height, TRUE }, //       for attaching auxiliary windows to them
+  { "x", ArgInt, (LPVOID) &wpMain.x, TRUE },
+  { "y", ArgInt, (LPVOID) &wpMain.y, TRUE },
   { "icsX", ArgX,   (LPVOID) &wpConsole.x, TRUE },
   { "icsY", ArgY,   (LPVOID) &wpConsole.y, TRUE },
   { "icsW", ArgInt, (LPVOID) &wpConsole.width, TRUE },
   { "icsH", ArgInt, (LPVOID) &wpConsole.height, TRUE },
-  { "analysisX", ArgX,   (LPVOID) &analysisX, FALSE }, // [HGM] placement: analysis window no longer exists
-  { "analysisY", ArgY,   (LPVOID) &analysisY, FALSE }, //       provided for compatibility with old ini files
-  { "analysisW", ArgInt, (LPVOID) &analysisW, FALSE },
-  { "analysisH", ArgInt, (LPVOID) &analysisH, FALSE },
-  { "commentX", ArgX,   (LPVOID) &commentX, TRUE },
-  { "commentY", ArgY,   (LPVOID) &commentY, TRUE },
-  { "commentW", ArgInt, (LPVOID) &commentW, TRUE },
-  { "commentH", ArgInt, (LPVOID) &commentH, TRUE },
-  { "tagsX", ArgX,   (LPVOID) &editTagsX, TRUE },
-  { "tagsY", ArgY,   (LPVOID) &editTagsY, TRUE },
-  { "tagsW", ArgInt, (LPVOID) &editTagsW, TRUE },
-  { "tagsH", ArgInt, (LPVOID) &editTagsH, TRUE },
+  { "analysisX", ArgX,   (LPVOID) &dummy, FALSE }, // [HGM] placement: analysis window no longer exists
+  { "analysisY", ArgY,   (LPVOID) &dummy, FALSE }, //       provided for compatibility with old ini files
+  { "analysisW", ArgInt, (LPVOID) &dummy, FALSE },
+  { "analysisH", ArgInt, (LPVOID) &dummy, FALSE },
+  { "commentX", ArgX,   (LPVOID) &wpComment.x, TRUE },
+  { "commentY", ArgY,   (LPVOID) &wpComment.y, TRUE },
+  { "commentW", ArgInt, (LPVOID) &wpComment.width, TRUE },
+  { "commentH", ArgInt, (LPVOID) &wpComment.height, TRUE },
+  { "tagsX", ArgX,   (LPVOID) &wpTags.x, TRUE },
+  { "tagsY", ArgY,   (LPVOID) &wpTags.y, TRUE },
+  { "tagsW", ArgInt, (LPVOID) &wpTags.width, TRUE },
+  { "tagsH", ArgInt, (LPVOID) &wpTags.height, TRUE },
   { "gameListX", ArgX,   (LPVOID) &wpGameList.x, TRUE },
   { "gameListY", ArgY,   (LPVOID) &wpGameList.y, TRUE },
   { "gameListW", ArgInt, (LPVOID) &wpGameList.width, TRUE },
@@ -1493,6 +1474,10 @@ ParseFontName(char *name, MyFontParams *mfp)
   mfp->italic = (strchr(p, 'i') != NULL);
   mfp->underline = (strchr(p, 'u') != NULL);
   mfp->strikeout = (strchr(p, 's') != NULL);
+  mfp->charset = DEFAULT_CHARSET;
+  q = strchr(p, 'c');
+  if (q)
+    mfp->charset = (BYTE) atoi(q+1);
 }
 
 /* Color name parser.
@@ -1770,16 +1755,16 @@ ParseArgs(GetFunc get, void *cl)
       break;
 
     case ArgX:
-      *(int *) ad->argLoc = atoi(argValue) + boardX; // [HGM] placement: translate stored relative to absolute 
+      *(int *) ad->argLoc = atoi(argValue) + wpMain.x; // [HGM] placement: translate stored relative to absolute 
       break;
 
     case ArgY:
-      *(int *) ad->argLoc = atoi(argValue) + boardY; // (this is really kludgey, it should be done where used...)
+      *(int *) ad->argLoc = atoi(argValue) + wpMain.y; // (this is really kludgey, it should be done where used...)
       break;
 
     case ArgZ:
       *(int *) ad->argLoc = atoi(argValue);
-      EnsureOnScreen(&boardX, &boardY, minX, minY); 
+      EnsureOnScreen(&wpMain.x, &wpMain.y, minX, minY); 
       break;
 
     case ArgFloat:
@@ -1867,7 +1852,7 @@ LFfromMFP(LOGFONT* lf, MyFontParams *mfp)
   lf->lfItalic = mfp->italic;
   lf->lfUnderline = mfp->underline;
   lf->lfStrikeOut = mfp->strikeout;
-  lf->lfCharSet = DEFAULT_CHARSET;
+  lf->lfCharSet = mfp->charset;
   lf->lfOutPrecision = OUT_DEFAULT_PRECIS;
   lf->lfClipPrecision = CLIP_DEFAULT_PRECIS;
   lf->lfQuality = DEFAULT_QUALITY;
@@ -2043,20 +2028,16 @@ InitAppData(LPSTR lpCmdLine)
   dcb.StopBits = ONESTOPBIT;
   settingsFileName = SETTINGS_FILE;
   saveSettingsOnExit = TRUE;
-  boardX = CW_USEDEFAULT;
-  boardY = CW_USEDEFAULT;
-  analysisX = CW_USEDEFAULT; 
-  analysisY = CW_USEDEFAULT; 
-  analysisW = CW_USEDEFAULT;
-  analysisH = CW_USEDEFAULT;
-  commentX = CW_USEDEFAULT; 
-  commentY = CW_USEDEFAULT; 
-  commentW = CW_USEDEFAULT;
-  commentH = CW_USEDEFAULT;
-  editTagsX = CW_USEDEFAULT; 
-  editTagsY = CW_USEDEFAULT; 
-  editTagsW = CW_USEDEFAULT;
-  editTagsH = CW_USEDEFAULT;
+  wpMain.x = CW_USEDEFAULT;
+  wpMain.y = CW_USEDEFAULT;
+  wpComment.x = CW_USEDEFAULT; 
+  wpComment.y = CW_USEDEFAULT; 
+  wpComment.width = CW_USEDEFAULT;
+  wpComment.height = CW_USEDEFAULT;
+  wpTags.x = CW_USEDEFAULT; 
+  wpTags.y = CW_USEDEFAULT; 
+  wpTags.width = CW_USEDEFAULT;
+  wpTags.height = CW_USEDEFAULT;
   icsTextMenuString = ICS_TEXT_MENU_DEFAULT;
   icsNames = ICS_NAMES;
   firstChessProgramNames = FCP_NAMES;
@@ -2186,9 +2167,9 @@ InitAppData(LPSTR lpCmdLine)
   ParseArgs(StringGet, &lpCmdLine);
 
   /* [HGM] make sure board size is acceptable */
-  if(appData.NrFiles > BOARD_SIZE ||
-     appData.NrRanks > BOARD_SIZE   )
-      DisplayFatalError("Recompile with BOARD_SIZE > 12, to support this size", 0, 2);
+  if(appData.NrFiles > BOARD_FILES ||
+     appData.NrRanks > BOARD_RANKS   )
+      DisplayFatalError("Recompile with BOARD_RANKS or BOARD_FILES, to support this size", 0, 2);
 
   /* [HGM] After parsing the options from the .ini file, and overruling them
    * with options from the command line, we now make an even higher priority
@@ -2297,16 +2278,49 @@ InitMenuChecks()
 				     MF_CHECKED : MF_UNCHECKED));
 }
 
+// [HGM] args: these two cases taken out to stay in front-end
+      void SaveFontArg(FILE *f, ArgDescriptor *ad)
+      {
+        int bs;
+	for (bs=0; bs<NUM_SIZES; bs++) {
+	  MyFontParams *mfp = &font[bs][(int) ad->argLoc]->mfp;
+          fprintf(f, "/size=%s ", sizeInfo[bs].name);
+	  fprintf(f, "/%s=\"%s:%g%s%s%s%s%sc%d\"\n",
+	    ad->argName, mfp->faceName, mfp->pointSize,
+            mfp->bold || mfp->italic || mfp->underline || mfp->strikeout ? " " : "",
+	    mfp->bold ? "b" : "",
+	    mfp->italic ? "i" : "",
+	    mfp->underline ? "u" : "",
+	    mfp->strikeout ? "s" : "",
+            (int)mfp->charset);
+	}
+      }
+
+      void SaveAttribsArg(FILE *f, ArgDescriptor *ad)
+      {
+	MyTextAttribs* ta = &textAttribs[(ColorClass)ad->argLoc];
+	fprintf(f, "/%s=\"%s%s%s%s%s#%02lx%02lx%02lx\"\n", ad->argName,
+          (ta->effects & CFE_BOLD) ? "b" : "",
+          (ta->effects & CFE_ITALIC) ? "i" : "",
+          (ta->effects & CFE_UNDERLINE) ? "u" : "",
+          (ta->effects & CFE_STRIKEOUT) ? "s" : "",
+          (ta->effects) ? " " : "",
+	  ta->color&0xff, (ta->color >> 8)&0xff, (ta->color >> 16)&0xff);
+      }
+
+int MainWindowUp()
+{ // [HGM] args: allows testing if main window is realized from back-end
+  return hwndMain != NULL;
+}
 
 VOID
 SaveSettings(char* name)
 {
   FILE *f;
   ArgDescriptor *ad;
-  WINDOWPLACEMENT wp;
   char dir[MSG_SIZ];
 
-  if (!hwndMain) return;
+  if (!MainWindowUp()) return;
 
   GetCurrentDirectory(MSG_SIZ, dir);
   SetCurrentDirectory(installDir);
@@ -2324,83 +2338,23 @@ SaveSettings(char* name)
   fprintf(f, "; Use a shortcut, an @indirection file, or a .bat file instead.\n");
   fprintf(f, ";\n");
 
-  wp.length = sizeof(WINDOWPLACEMENT);
-  GetWindowPlacement(hwndMain, &wp);
-  boardX = wp.rcNormalPosition.left;
-  boardY = wp.rcNormalPosition.top;
-
-  if (hwndConsole) {
-    GetWindowPlacement(hwndConsole, &wp);
-    wpConsole.x = wp.rcNormalPosition.left;
-    wpConsole.y = wp.rcNormalPosition.top;
-    wpConsole.width = wp.rcNormalPosition.right - wp.rcNormalPosition.left;
-    wpConsole.height = wp.rcNormalPosition.bottom - wp.rcNormalPosition.top;
-  }
-
-  if (analysisDialog) {
-    GetWindowPlacement(analysisDialog, &wp);
-    analysisX = wp.rcNormalPosition.left;
-    analysisY = wp.rcNormalPosition.top;
-    analysisW = wp.rcNormalPosition.right - wp.rcNormalPosition.left;
-    analysisH = wp.rcNormalPosition.bottom - wp.rcNormalPosition.top;
-  }
-
-  if (commentDialog) {
-    GetWindowPlacement(commentDialog, &wp);
-    commentX = wp.rcNormalPosition.left;
-    commentY = wp.rcNormalPosition.top;
-    commentW = wp.rcNormalPosition.right - wp.rcNormalPosition.left;
-    commentH = wp.rcNormalPosition.bottom - wp.rcNormalPosition.top;
-  }
-
-  if (editTagsDialog) {
-    GetWindowPlacement(editTagsDialog, &wp);
-    editTagsX = wp.rcNormalPosition.left;
-    editTagsY = wp.rcNormalPosition.top;
-    editTagsW = wp.rcNormalPosition.right - wp.rcNormalPosition.left;
-    editTagsH = wp.rcNormalPosition.bottom - wp.rcNormalPosition.top;
-  }
-
-  if (gameListDialog) {
-    GetWindowPlacement(gameListDialog, &wp);
-    wpGameList.x = wp.rcNormalPosition.left;
-    wpGameList.y = wp.rcNormalPosition.top;
-    wpGameList.width = wp.rcNormalPosition.right - wp.rcNormalPosition.left;
-    wpGameList.height = wp.rcNormalPosition.bottom - wp.rcNormalPosition.top;
-  }
+  GetActualPlacement(hwndMain, &wpMain);
+  GetActualPlacement(hwndConsole, &wpConsole);
+  GetActualPlacement(commentDialog, &wpComment);
+  GetActualPlacement(editTagsDialog, &wpTags);
+  GetActualPlacement(gameListDialog, &wpGameList);
 
   /* [AS] Move history */
   wpMoveHistory.visible = MoveHistoryIsUp();
-  
-  if( moveHistoryDialog ) {
-    GetWindowPlacement(moveHistoryDialog, &wp);
-    wpMoveHistory.x = wp.rcNormalPosition.left;
-    wpMoveHistory.y = wp.rcNormalPosition.top;
-    wpMoveHistory.width = wp.rcNormalPosition.right - wp.rcNormalPosition.left;
-    wpMoveHistory.height = wp.rcNormalPosition.bottom - wp.rcNormalPosition.top;
-  }
+  GetActualPlacement(moveHistoryDialog, &wpMoveHistory);
 
   /* [AS] Eval graph */
   wpEvalGraph.visible = EvalGraphIsUp();
-
-  if( evalGraphDialog ) {
-    GetWindowPlacement(evalGraphDialog, &wp);
-    wpEvalGraph.x = wp.rcNormalPosition.left;
-    wpEvalGraph.y = wp.rcNormalPosition.top;
-    wpEvalGraph.width = wp.rcNormalPosition.right - wp.rcNormalPosition.left;
-    wpEvalGraph.height = wp.rcNormalPosition.bottom - wp.rcNormalPosition.top;
-  }
+  GetActualPlacement(evalGraphDialog, &wpEvalGraph);
 
   /* [AS] Engine output */
   wpEngineOutput.visible = EngineOutputIsUp();
-
-  if( engineOutputDialog ) {
-    GetWindowPlacement(engineOutputDialog, &wp);
-    wpEngineOutput.x = wp.rcNormalPosition.left;
-    wpEngineOutput.y = wp.rcNormalPosition.top;
-    wpEngineOutput.width = wp.rcNormalPosition.right - wp.rcNormalPosition.left;
-    wpEngineOutput.height = wp.rcNormalPosition.bottom - wp.rcNormalPosition.top;
-  }
+  GetActualPlacement(engineOutputDialog, &wpEngineOutput);
 
   for (ad = argDescriptors; ad->argName != NULL; ad++) {
     if (!ad->save) continue;
@@ -2436,10 +2390,10 @@ SaveSettings(char* name)
       fprintf(f, "/%s=%d\n", ad->argName, *(int *)ad->argLoc);
       break;
     case ArgX:
-      fprintf(f, "/%s=%d\n", ad->argName, *(int *)ad->argLoc - boardX); // [HGM] placement: stor relative value
+      fprintf(f, "/%s=%d\n", ad->argName, *(int *)ad->argLoc - wpMain.x); // [HGM] placement: stor relative value
       break;
     case ArgY:
-      fprintf(f, "/%s=%d\n", ad->argName, *(int *)ad->argLoc - boardY);
+      fprintf(f, "/%s=%d\n", ad->argName, *(int *)ad->argLoc - wpMain.y);
       break;
     case ArgFloat:
       fprintf(f, "/%s=%g\n", ad->argName, *(float *)ad->argLoc);
@@ -2462,16 +2416,7 @@ SaveSettings(char* name)
       }
       break;
     case ArgAttribs:
-      {
-	MyTextAttribs* ta = &textAttribs[(ColorClass)ad->argLoc];
-	fprintf(f, "/%s=\"%s%s%s%s%s#%02lx%02lx%02lx\"\n", ad->argName,
-          (ta->effects & CFE_BOLD) ? "b" : "",
-          (ta->effects & CFE_ITALIC) ? "i" : "",
-          (ta->effects & CFE_UNDERLINE) ? "u" : "",
-          (ta->effects & CFE_STRIKEOUT) ? "s" : "",
-          (ta->effects) ? " " : "",
-	  ta->color&0xff, (ta->color >> 8)&0xff, (ta->color >> 16)&0xff);
-      }
+      SaveAttribsArg(f, ad);
       break;
     case ArgFilename:
       if (strchr(*(char **)ad->argLoc, '\"')) {
@@ -2485,20 +2430,7 @@ SaveSettings(char* name)
 	      sizeInfo[*(BoardSize *)ad->argLoc].name);
       break;
     case ArgFont:
-      {
-        int bs;
-	for (bs=0; bs<NUM_SIZES; bs++) {
-	  MyFontParams *mfp = &font[bs][(int) ad->argLoc]->mfp;
-          fprintf(f, "/size=%s ", sizeInfo[bs].name);
-	  fprintf(f, "/%s=\"%s:%g%s%s%s%s%s\"\n",
-	    ad->argName, mfp->faceName, mfp->pointSize,
-            mfp->bold || mfp->italic || mfp->underline || mfp->strikeout ? " " : "",
-	    mfp->bold ? "b" : "",
-	    mfp->italic ? "i" : "",
-	    mfp->underline ? "u" : "",
-	    mfp->strikeout ? "s" : "");
-	}
-      }
+      SaveFontArg(f, ad);
       break;
     case ArgCommSettings:
       PrintCommSettings(f, ad->argName, (DCB *)ad->argLoc);
@@ -3024,7 +2956,7 @@ void CreatePiecesFromFont()
                 }
                 else if( strstr(lf.lfFaceName,"GC2004D") != NULL ) {
                     /* Good Companion (Some characters get warped as literal :-( */
-                    char s[] = "1cmWG0ñueOS¯®oYI23wgQU";
+                    char s[] = "1cmWG0??S??oYI23wgQU";
                     s[0]=0xB9; s[1]=0xA9; s[6]=0xB1; s[11]=0xBB; s[12]=0xAB; s[17]=0xB3;
                     SetCharTable(pieceToFontChar, s);
                 }
@@ -3192,10 +3124,10 @@ 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;
 
-  oldRect.left = boardX; //[HGM] placement: remember previous window params
-  oldRect.top = boardY;
-  oldRect.right = boardX + winWidth;
-  oldRect.bottom = boardY + winHeight;
+  oldRect.left = wpMain.x; //[HGM] placement: remember previous window params
+  oldRect.top = wpMain.y;
+  oldRect.right = wpMain.x + wpMain.width;
+  oldRect.bottom = wpMain.y + wpMain.height;
 
   tinyLayout = sizeInfo[boardSize].tinyLayout;
   smallLayout = sizeInfo[boardSize].smallLayout;
@@ -3303,49 +3235,49 @@ InitDrawingSizes(BoardSize boardSize, int flags)
   winH = 2 * GetSystemMetrics(SM_CYFRAME) + GetSystemMetrics(SM_CYMENU) +
     GetSystemMetrics(SM_CYCAPTION) + boardRect.bottom + OUTER_MARGIN;
   if(suppressVisibleEffects) return; // [HGM] when called for filling sizeInfo only
-  winWidth = winW;  // [HGM] placement: set through temporary which can used by initial sizing choice
-  winHeight = winH; //       without disturbing window attachments
+  wpMain.width = winW;  // [HGM] placement: set through temporary which can used by initial sizing choice
+  wpMain.height = winH; //       without disturbing window attachments
   GetWindowRect(hwndMain, &wrect);
-  SetWindowPos(hwndMain, NULL, 0, 0, winWidth, winHeight,
+  SetWindowPos(hwndMain, NULL, 0, 0, wpMain.width, wpMain.height,
 	       SWP_NOCOPYBITS|SWP_NOZORDER|SWP_NOMOVE);
 
   // [HGM] placement: let attached windows follow size change.
-  ReattachAfterSize( &oldRect, winWidth, winHeight, moveHistoryDialog, &wpMoveHistory );
-  ReattachAfterSize( &oldRect, winWidth, winHeight, evalGraphDialog, &wpEvalGraph );
-  ReattachAfterSize( &oldRect, winWidth, winHeight, engineOutputDialog, &wpEngineOutput );
-  ReattachAfterSize( &oldRect, winWidth, winHeight, gameListDialog, &wpGameList );
-  ReattachAfterSize( &oldRect, winWidth, winHeight, hwndConsole, &wpConsole );
+  ReattachAfterSize( &oldRect, wpMain.width, wpMain.height, moveHistoryDialog, &wpMoveHistory );
+  ReattachAfterSize( &oldRect, wpMain.width, wpMain.height, evalGraphDialog, &wpEvalGraph );
+  ReattachAfterSize( &oldRect, wpMain.width, wpMain.height, engineOutputDialog, &wpEngineOutput );
+  ReattachAfterSize( &oldRect, wpMain.width, wpMain.height, gameListDialog, &wpGameList );
+  ReattachAfterSize( &oldRect, wpMain.width, wpMain.height, hwndConsole, &wpConsole );
 
   /* compensate if menu bar wrapped */
   GetClientRect(hwndMain, &crect);
   offby = boardRect.bottom + OUTER_MARGIN - crect.bottom;
-  winHeight += offby;
+  wpMain.height += offby;
   switch (flags) {
   case WMSZ_TOPLEFT:
     SetWindowPos(hwndMain, NULL, 
-                 wrect.right - winWidth, wrect.bottom - winHeight, 
-                 winWidth, winHeight, SWP_NOCOPYBITS|SWP_NOZORDER);
+                 wrect.right - wpMain.width, wrect.bottom - wpMain.height, 
+                 wpMain.width, wpMain.height, SWP_NOCOPYBITS|SWP_NOZORDER);
     break;
 
   case WMSZ_TOPRIGHT:
   case WMSZ_TOP:
     SetWindowPos(hwndMain, NULL, 
-                 wrect.left, wrect.bottom - winHeight, 
-                 winWidth, winHeight, SWP_NOCOPYBITS|SWP_NOZORDER);
+                 wrect.left, wrect.bottom - wpMain.height, 
+                 wpMain.width, wpMain.height, SWP_NOCOPYBITS|SWP_NOZORDER);
     break;
 
   case WMSZ_BOTTOMLEFT:
   case WMSZ_LEFT:
     SetWindowPos(hwndMain, NULL, 
-                 wrect.right - winWidth, wrect.top, 
-                 winWidth, winHeight, SWP_NOCOPYBITS|SWP_NOZORDER);
+                 wrect.right - wpMain.width, wrect.top, 
+                 wpMain.width, wpMain.height, SWP_NOCOPYBITS|SWP_NOZORDER);
     break;
 
   case WMSZ_BOTTOMRIGHT:
   case WMSZ_BOTTOM:
   case WMSZ_RIGHT:
   default:
-    SetWindowPos(hwndMain, NULL, 0, 0, winWidth, winHeight,
+    SetWindowPos(hwndMain, NULL, 0, 0, wpMain.width, wpMain.height,
                SWP_NOCOPYBITS|SWP_NOZORDER|SWP_NOMOVE);
     break;
   }
@@ -4206,7 +4138,7 @@ BOOL DrawPositionNeedsFullRepaint()
         but animation is fast enough that it's difficult to notice.
     */
     if( animInfo.piece == EmptySquare ) {
-        if( (appData.highlightLastMove || appData.highlightDragging) && IsDrawArrowEnabled() && HasHighlightInfo() ) {
+        if( (appData.highlightLastMove || appData.highlightDragging) && IsDrawArrowEnabled() /*&& HasHighlightInfo()*/ ) {
             result = TRUE;
         }
     }
@@ -4226,8 +4158,8 @@ DrawBoardOnDC(HDC hdc, Board board, HDC tmphdc)
   if( liteBackTexture != NULL || darkBackTexture != NULL ) {
       static int backTextureBoardSize; /* [HGM] boardsize: also new texture if board format changed */
       if( backTextureSquareSize != squareSize 
-       || backTextureBoardSize != BOARD_WIDTH+BOARD_SIZE*BOARD_HEIGHT) {
-	  backTextureBoardSize = BOARD_WIDTH+BOARD_SIZE*BOARD_HEIGHT;
+       || backTextureBoardSize != BOARD_WIDTH+BOARD_FILES*BOARD_HEIGHT) {
+	  backTextureBoardSize = BOARD_WIDTH+BOARD_FILES*BOARD_HEIGHT;
           backTextureSquareSize = squareSize;
           RebuildTextureSquareInfo();
       }
@@ -4838,8 +4770,8 @@ PaintProc(HWND hwnd)
  * The offset boardRect.left or boardRect.top must already have been
  *   subtracted from x.
  */
-int
-EventToSquare(int x)
+int EventToSquare(x, limit)
+     int x, limit;
 {
   if (x <= 0)
     return -2;
@@ -4849,7 +4781,7 @@ EventToSquare(int x)
   if ((x % (squareSize + lineGap)) >= squareSize)
     return -1;
   x /= (squareSize + lineGap);
-  if (x >= BOARD_SIZE)
+    if (x >= limit)
     return -2;
   return x;
 }
@@ -4891,6 +4823,24 @@ SetupDropMenu(HMENU hmenu)
   }
 }
 
+void DragPieceBegin(int x, int y)
+{
+      dragInfo.lastpos.x = boardRect.left + x;
+      dragInfo.lastpos.y = boardRect.top + y;
+      dragInfo.from.x = fromX;
+      dragInfo.from.y = fromY;
+      dragInfo.start = dragInfo.from;
+      SetCapture(hwndMain);
+}
+
+void DragPieceEnd(int x, int y)
+{
+    ReleaseCapture();
+    dragInfo.start.x = dragInfo.start.y = -1;
+    dragInfo.from = dragInfo.start;
+    dragInfo.pos = dragInfo.lastpos = dragInfo.start;
+}
+
 /* Event handler for mouse messages */
 VOID
 MouseEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
@@ -4899,11 +4849,7 @@ MouseEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
   POINT pt;
   static int recursive = 0;
   HMENU hmenu;
-//  BOOLEAN needsRedraw = FALSE;
-  BOOLEAN saveAnimate;
   BOOLEAN forceFullRepaint = IsFullRepaintPreferrable(); /* [AS] */
-  static BOOLEAN sameAgain = FALSE, promotionChoice = FALSE;
-  ChessMove moveType;
 
   if (recursive) {
     if (message == WM_MBUTTONUP) {
@@ -4919,8 +4865,8 @@ MouseEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
   
   pt.x = LOWORD(lParam);
   pt.y = HIWORD(lParam);
-  x = EventToSquare(pt.x - boardRect.left);
-  y = EventToSquare(pt.y - boardRect.top);
+  x = EventToSquare(pt.x - boardRect.left, BOARD_WIDTH);
+  y = EventToSquare(pt.y - boardRect.top, BOARD_HEIGHT);
   if (!flipView && y >= 0) {
     y = BOARD_HEIGHT - 1 - y;
   }
@@ -4930,29 +4876,6 @@ MouseEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 
   switch (message) {
   case WM_LBUTTONDOWN:
-    if(promotionChoice) { // we are waiting for a click to indicate promotion piece
-	promotionChoice = FALSE; // only one chance: if click not OK it is interpreted as cancel
-	if(appData.debugMode) fprintf(debugFP, "promotion click, x=%d, y=%d\n", x, y);
-	if(gameInfo.holdingsWidth && 
-		(WhiteOnMove(currentMove) 
-			? x == BOARD_WIDTH-1 && y < gameInfo.holdingsSize && y > 0
-			: x == 0 && y >= BOARD_HEIGHT - gameInfo.holdingsSize && y < BOARD_HEIGHT-1) ) {
-	    // click in right holdings, for determining promotion piece
-	    ChessSquare p = boards[currentMove][y][x];
-	    if(appData.debugMode) fprintf(debugFP, "square contains %d\n", (int)p);
-	    if(p != EmptySquare) {
-		FinishMove(WhitePromotionQueen, fromX, fromY, toX, toY, ToLower(PieceToChar(p)));
-		fromX = fromY = -1;
-		break;
-	    }
-	}
-	DrawPosition(FALSE, boards[currentMove]);
-	break;
-    }
-    ErrorPopDown();
-    sameAgain = FALSE;
-    if (y == -2) {
-      /* Downclick vertically off board; check if on clock */
       if (PtInRect((LPRECT) &whiteRect, pt)) {
         if (gameMode == EditPosition) {
 	  SetWhiteToPlayEvent();
@@ -4972,198 +4895,20 @@ MouseEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
           AdjustClock(!flipClock, -1);
 	}
       }
-      if (!appData.highlightLastMove) {
-        ClearHighlights();
-	DrawPosition((int) (forceFullRepaint || FALSE), NULL);
-      }
-      fromX = fromY = -1;
       dragInfo.start.x = dragInfo.start.y = -1;
       dragInfo.from = dragInfo.start;
-      break;
-    } else if (x < 0 || y < 0
-      /* [HGM] block clicks between board and holdings */
-              || x == BOARD_LEFT-1 || x == BOARD_RGHT
-              || (x == BOARD_LEFT-2 && y < BOARD_HEIGHT-gameInfo.holdingsSize)
-              || (x == BOARD_RGHT+1 && y >= gameInfo.holdingsSize)
-	/* EditPosition, empty square, or different color piece;
-	   click-click move is possible */
-                               ) {
-      break;
-    } else if (fromX == x && fromY == y) {
-      /* Downclick on same square again */
-      ClearHighlights();
-      DrawPosition(forceFullRepaint || FALSE, NULL);
-      sameAgain = TRUE;  
-    } else if (fromX != -1 &&
-               x != BOARD_LEFT-2 && x != BOARD_RGHT+1 
-                                                                        ) {
-      /* Downclick on different square. */
-      /* [HGM] if on holdings file, should count as new first click ! */
-      /* [HGM] <sameColor> now always do UserMoveTest(), and check colors there */
-	toX = x;
-	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, FALSE);
-	if(moveType == AmbiguousMove) { /* [HGM] Edit-Position move executed */
+    if(fromX == -1 && frozen) { // not sure where this is for
 		fromX = fromY = -1; 
-		ClearHighlights();
-		DrawPosition(FALSE, boards[currentMove]);
-		break; 
-	} 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) &&
-              appData.alwaysPromoteToQueen)) {
-                  FinishMove(moveType, fromX, fromY, toX, toY, 'q');
-                  if (!appData.highlightLastMove) {
-                      ClearHighlights();
-                      DrawPosition(forceFullRepaint || FALSE, NULL);
-                  }
-          } else
-          if (moveType == WhitePromotionQueen || moveType == BlackPromotionQueen ) {
-                  SetHighlights(fromX, fromY, toX, toY);
-                  DrawPosition(forceFullRepaint || FALSE, NULL);
-                  /* [HGM] <popupFix> Popup calls FinishMove now.
-                     If promotion to Q is legal, all are legal! */
-		  if(gameInfo.variant == VariantSuper || gameInfo.variant == VariantGreat)
-		  { ChessSquare p = boards[currentMove][fromY][fromX], q = boards[currentMove][toY][toX];
-		    // kludge to temporarily execute move on display, without promoting yet
-		    promotionChoice = TRUE;
-		    boards[currentMove][fromY][fromX] = EmptySquare; // move Pawn to 8th rank
-		    boards[currentMove][toY][toX] = p;
-		    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);
-		  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 {
-                 ClearHighlights();
-             }
-             FinishMove(moveType, fromX, fromY, toX, toY, NULLCHAR);
-             if (appData.animate && !appData.highlightLastMove) {
-                  ClearHighlights();
-                  DrawPosition(forceFullRepaint || FALSE, NULL);
-             }
-          }
-          fromX = fromY = -1;
-	noClear:
-	  break;
-        }
-        if (gotPremove && moveType != Comment) {
-	    SetPremoveHighlights(fromX, fromY, toX, toY);
-//            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)) {
-      fromX = x;
-      fromY = y;
-      dragInfo.lastpos = pt;
-      dragInfo.from.x = fromX;
-      dragInfo.from.y = fromY;
-      dragInfo.start = dragInfo.from;
-      SetCapture(hwndMain);
-    } else {
-      fromX = fromY = -1;
-      dragInfo.start.x = dragInfo.start.y = -1;
-      dragInfo.from = dragInfo.start;
       DrawPosition(forceFullRepaint || FALSE, NULL); /* [AS] */
+      break;
     }
+      LeftClick(Press, pt.x - boardRect.left, pt.y - boardRect.top);
+      DrawPosition(TRUE, NULL);
     break;
 
   case WM_LBUTTONUP:
-    ReleaseCapture();
-    if (fromX == -1) break;
-    if (x == fromX && y == fromY) {
-      dragInfo.from.x = dragInfo.from.y = -1;
-      /* Upclick on same square */
-      if (sameAgain) {
-	/* Clicked same square twice: abort click-click move */
-	fromX = fromY = -1;
-	gotPremove = 0;
-	ClearPremoveHighlights();
-      } else {
-	/* First square clicked: start click-click move */
-	SetHighlights(fromX, fromY, -1, -1);
-      }
-      DrawPosition(forceFullRepaint || FALSE, NULL);
-    } else if (dragInfo.from.x < 0 || dragInfo.from.y < 0) {
-      /* Errant click; ignore */
-      break;
-    } else {
-      /* Finish drag move. */
-    if (appData.debugMode) {
-        fprintf(debugFP, "release\n");
-    }
-      dragInfo.from.x = dragInfo.from.y = -1;
-      toX = x;
-      toY = y;
-      saveAnimate = appData.animate; /* sorry, Hawk :) */
-      appData.animate = appData.animate && !appData.animateDragging;
-      moveType = UserMoveTest(fromX, fromY, toX, toY, NULLCHAR, TRUE);
-      if(moveType == AmbiguousMove) { /* [HGM] Edit-Position move executed */
-		fromX = fromY = -1; 
-		ClearHighlights();
-		DrawPosition(FALSE, boards[currentMove]);
-		appData.animate = saveAnimate;
-		break; 
-      } else 
-      if(moveType != ImpossibleMove) {
-          /* [HGM] use move type to determine if move is promotion.
-             Knight is Shogi kludge for mandatory promotion, Queen means choice */
-          if (moveType == WhitePromotionKnight || moveType == BlackPromotionKnight ||
-            ((moveType == WhitePromotionQueen || moveType == BlackPromotionQueen) &&
-              appData.alwaysPromoteToQueen)) 
-               FinishMove(moveType, fromX, fromY, toX, toY, 'q');
-          else 
-          if (moveType == WhitePromotionQueen || moveType == BlackPromotionQueen ) {
-               DrawPosition(forceFullRepaint || FALSE, NULL);
-		  if(gameInfo.variant == VariantSuper || gameInfo.variant == VariantGreat)
-		  { ChessSquare p = boards[currentMove][fromY][fromX], q = boards[currentMove][toY][toX];
-		    // kludge to temporarily execute move on display, wthout promotng yet
-		    promotionChoice = TRUE;
-		    boards[currentMove][fromY][fromX] = EmptySquare; // move Pawn to 8th rank
-		    boards[currentMove][toY][toX] = p;
-		    DrawPosition(FALSE, boards[currentMove]);
-		    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 */
-          } else {
-	    if(saveAnimate /* ^$!%@#$!$ */  && gameInfo.variant == VariantAtomic 
-			  && (boards[currentMove][toY][toX] != EmptySquare || 
-					moveType == WhiteCapturesEnPassant || 
-					moveType == BlackCapturesEnPassant   ) )
-		AnimateAtomicCapture(fromX, fromY, toX, toY, 20);
-	    FinishMove(moveType, fromX, fromY, toX, toY, NULLCHAR);
-	  }
-      }
-      if (gotPremove) SetPremoveHighlights(fromX, fromY, toX, toY);
-      appData.animate = saveAnimate;
-      fromX = fromY = -1;
-      if (appData.highlightDragging && !appData.highlightLastMove) {
-	ClearHighlights();
-      }
-      if (appData.animate || appData.animateDragging ||
-	  appData.highlightDragging || gotPremove) {
-	DrawPosition(forceFullRepaint || FALSE, NULL);
-      }
-    }
-    dragInfo.start.x = dragInfo.start.y = -1; 
-    dragInfo.pos = dragInfo.lastpos = dragInfo.start;
+      LeftClick(Release, pt.x - boardRect.left, pt.y - boardRect.top);
+      DrawPosition(TRUE, NULL);
     break;
 
   case WM_MOUSEMOVE:
@@ -5173,7 +4918,6 @@ MouseEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
     {
       BOOL full_repaint = FALSE;
 
-      sameAgain = FALSE; /* [HGM] if we drag something around, do keep square selected */
       if (appData.animateDragging) {
 	dragInfo.pos = pt;
       }
@@ -5398,7 +5142,8 @@ Promotion(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
        only show the popup when we are already sure the move is valid or
        legal. We pass a faulty move type, but the kludge is that FinishMove
        will figure out it is a promotion from the promoChar. */
-    FinishMove(NormalMove, fromX, fromY, toX, toY, promoChar);
+    UserMoveEvent(fromX, fromY, toX, toY, promoChar);
+    fromX = fromY = -1;
     if (!appData.highlightLastMove) {
       ClearHighlights();
       DrawPosition(FALSE, NULL);
@@ -5420,6 +5165,13 @@ PromotionPopup(HWND hwnd)
   FreeProcInstance(lpProc);
 }
 
+void
+PromotionPopUp()
+{
+  DrawPosition(TRUE, NULL);
+  PromotionPopup(hwndMain);
+}
+
 /* Toggle ShowThinking */
 VOID
 ToggleShowThinking()
@@ -5456,6 +5208,57 @@ LoadGameDialog(HWND hwnd, char* title)
   }
 }
 
+int get_term_width()
+{
+    HDC hdc;
+    TEXTMETRIC tm;
+    RECT rc;
+    HFONT hfont, hold_font;
+    LOGFONT lf;
+    HWND hText;
+
+    if (hwndConsole)
+        hText = GetDlgItem(hwndConsole, OPT_ConsoleText);
+    else
+        return 79;
+
+    // get the text metrics
+    hdc = GetDC(hText);
+    lf = font[boardSize][CONSOLE_FONT]->lf;
+    if (consoleCF.dwEffects & CFE_BOLD)
+        lf.lfWeight = FW_BOLD;
+    if (consoleCF.dwEffects & CFE_ITALIC)
+        lf.lfItalic = TRUE;
+    if (consoleCF.dwEffects & CFE_STRIKEOUT)
+        lf.lfStrikeOut = TRUE;
+    if (consoleCF.dwEffects & CFE_UNDERLINE)
+        lf.lfUnderline = TRUE;
+    hfont = CreateFontIndirect(&lf);
+    hold_font = SelectObject(hdc, hfont);
+    GetTextMetrics(hdc, &tm);
+    SelectObject(hdc, hold_font);
+    DeleteObject(hfont);
+    ReleaseDC(hText, hdc);
+
+    // get the rectangle
+    SendMessage(hText, EM_GETRECT, 0, (LPARAM)&rc);
+
+    return (rc.right-rc.left) / tm.tmAveCharWidth;
+}
+
+void UpdateICSWidth(HWND hText)
+{
+    LONG old_width, new_width;
+
+    new_width = get_term_width(hText, FALSE);
+    old_width = GetWindowLong(hText, GWL_USERDATA);
+    if (new_width != old_width)
+    {
+        ics_update_width(new_width);
+        SetWindowLong(hText, GWL_USERDATA, new_width);
+    }
+}
+
 VOID
 ChangedConsoleFont()
 {
@@ -5495,6 +5298,7 @@ ChangedConsoleFont()
   paraf.dxOffset = WRAP_INDENT;
   SendMessage(hText, EM_SETPARAFORMAT, 0, (LPARAM) &paraf);
   SendMessage(hText, EM_EXSETSEL, 0, (LPARAM)&sel);
+  UpdateICSWidth(hText);
 }
 
 /*---------------------------------------------------------------------------*\
@@ -5548,7 +5352,7 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
     
     JAWS_ALT_INTERCEPT
 
-    if (appData.icsActive && (char)wParam > ' ' && !((char)wParam >= '1' && (char)wParam <= '9')) { 
+    if (appData.icsActive && ((char)wParam == '\r' || (char)wParam > ' ' && !((char)wParam >= '1' && (char)wParam <= '9'))) { 
 	// [HGM] movenum: for non-zero digits we always do type-in dialog
 	HWND h = GetDlgItem(hwndConsole, OPT_ConsoleInput);
 	if (IsIconic(hwndConsole)) ShowWindow(hwndConsole, SW_RESTORE);
@@ -5599,14 +5403,12 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
     switch (wmId) {
     case IDM_NewGame:
       ResetGameEvent();
-      AnalysisPopDown();
       SAY("new game enter a move to play against the computer with white");
       break;
 
     case IDM_NewGameFRC:
       if( NewGameFRC() == 0 ) {
         ResetGameEvent();
-        AnalysisPopDown();
       }
       break;
 
@@ -5902,7 +5704,7 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       break;
 
     case IDM_EditComment:
-      if (commentDialogUp && editComment) {
+      if (commentUp && editComment) {
 	CommentPopDown();
       } else {
 	EditCommentEvent();
@@ -6374,18 +6176,18 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
             RECT rcMain;
 
 //            GetWindowRect( hwnd, &rcMain ); //[HGM] sticky: in XP this returned new position, not old
-	    rcMain.left   = boardX;           //              replace by these 4 lines to reconstruct old rect
-	    rcMain.right  = boardX + winWidth;
-	    rcMain.top    = boardY;
-	    rcMain.bottom = boardY + winHeight;
+	    rcMain.left   = wpMain.x;           //              replace by these 4 lines to reconstruct old rect
+	    rcMain.right  = wpMain.x + wpMain.width;
+	    rcMain.top    = wpMain.y;
+	    rcMain.bottom = wpMain.y + wpMain.height;
             
             ReattachAfterMove( &rcMain, lpwp->x, lpwp->y, moveHistoryDialog, &wpMoveHistory );
             ReattachAfterMove( &rcMain, lpwp->x, lpwp->y, evalGraphDialog, &wpEvalGraph );
             ReattachAfterMove( &rcMain, lpwp->x, lpwp->y, engineOutputDialog, &wpEngineOutput );
             ReattachAfterMove( &rcMain, lpwp->x, lpwp->y, gameListDialog, &wpGameList );
             ReattachAfterMove( &rcMain, lpwp->x, lpwp->y, hwndConsole, &wpConsole );
-	    boardX = lpwp->x;
-            boardY = lpwp->y;
+	    wpMain.x = lpwp->x;
+            wpMain.y = lpwp->y;
         }
     }
     break;
@@ -7148,18 +6950,18 @@ CommentDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
       GetClientRect(hDlg, &rect);
       sizeX = rect.right;
       sizeY = rect.bottom;
-      if (commentX != CW_USEDEFAULT && commentY != CW_USEDEFAULT &&
-	  commentW != CW_USEDEFAULT && commentH != CW_USEDEFAULT) {
+      if (wpComment.x != CW_USEDEFAULT && wpComment.y != CW_USEDEFAULT &&
+	  wpComment.width != CW_USEDEFAULT && wpComment.height != CW_USEDEFAULT) {
 	WINDOWPLACEMENT wp;
-	EnsureOnScreen(&commentX, &commentY, 0, 0);
+	EnsureOnScreen(&wpComment.x, &wpComment.y, 0, 0);
 	wp.length = sizeof(WINDOWPLACEMENT);
 	wp.flags = 0;
 	wp.showCmd = SW_SHOW;
 	wp.ptMaxPosition.x = wp.ptMaxPosition.y = 0;
-	wp.rcNormalPosition.left = commentX;
-	wp.rcNormalPosition.right = commentX + commentW;
-	wp.rcNormalPosition.top = commentY;
-	wp.rcNormalPosition.bottom = commentY + commentH;
+	wp.rcNormalPosition.left = wpComment.x;
+	wp.rcNormalPosition.right = wpComment.x + wpComment.width;
+	wp.rcNormalPosition.top = wpComment.y;
+	wp.rcNormalPosition.bottom = wpComment.y + wpComment.height;
 	SetWindowPlacement(hDlg, &wp);
 
 	GetClientRect(hDlg, &rect);
@@ -7258,14 +7060,14 @@ EitherCommentPopUp(int index, char *title, char *str, BOOLEAN edit)
 
   if (commentDialog) {
     SendMessage(commentDialog, WM_INITDIALOG, 0, 0);
-    if (!commentDialogUp) ShowWindow(commentDialog, SW_SHOW);
+    if (!commentUp) ShowWindow(commentDialog, SW_SHOW);
   } else {
     lpProc = MakeProcInstance((FARPROC)CommentDialog, hInst);
     CreateDialog(hInst, MAKEINTRESOURCE(DLG_EditComment),
 		 hwndMain, (DLGPROC)lpProc);
     FreeProcInstance(lpProc);
   }
-  commentDialogUp = TRUE;
+  commentUp = TRUE;
 }
 
 
@@ -7308,13 +7110,8 @@ TypeInMoveDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 	}
 	// [HGM] movenum: allow move number to be typed in any mode
 	if(sscanf(move, "%d", &n) == 1 && n != 0 ) {
-	  currentMove = 2*n-1;
-	  if(currentMove > forwardMostMove)  currentMove = forwardMostMove;
-	  if(currentMove < backwardMostMove) currentMove = backwardMostMove;
+	  ToNrEvent(2*n-1);
 	  EndDialog(hDlg, TRUE);
-	  DrawPosition(TRUE, boards[currentMove]);
-	  if(currentMove > backwardMostMove) DisplayMove(currentMove - 1);
-	  else DisplayMessage("", "");
 	  return TRUE;
 	}
       }
@@ -7538,7 +7335,7 @@ GothicDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
   case WM_INITDIALOG:
     GetWindowRect(hDlg, &rChild);
 
-    SetWindowPos(hDlg, NULL, boardX, boardY-height, winWidth, height,
+    SetWindowPos(hDlg, NULL, wpMain.x, wpMain.y-height, wpMain.width, height,
                                                              SWP_NOZORDER);
 
     /* 
@@ -8099,14 +7896,16 @@ LRESULT CALLBACK
 ConsoleWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
   static SnapData sd;
-  static HWND hText, hInput /*, hFocus*/;
-//  InputSource *is = consoleInputSource;
+  HWND hText, hInput;
   RECT rect;
   static int sizeX, sizeY;
   int newSizeX, newSizeY;
   MINMAXINFO *mmi;
   WORD wMask;
 
+  hText = GetDlgItem(hDlg, OPT_ConsoleText);
+  hInput = GetDlgItem(hDlg, OPT_ConsoleInput);
+
   switch (message) {
   case WM_NOTIFY:
     if (((NMHDR*)lParam)->code == EN_LINK)
@@ -8126,8 +7925,6 @@ ConsoleWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
     break;
   case WM_INITDIALOG: /* message: initialize dialog box */
     hwndConsole = hDlg;
-    hText = GetDlgItem(hDlg, OPT_ConsoleText);
-    hInput = GetDlgItem(hDlg, OPT_ConsoleInput);
     SetFocus(hInput);
     consoleTextWindowProc = (WNDPROC)
       SetWindowLong(hText, GWL_WNDPROC, (LONG) ConsoleTextSubclass);
@@ -8159,10 +7956,10 @@ ConsoleWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
    // [HGM] Chessknight's change 2004-07-13
    else { /* Determine Defaults */
        WINDOWPLACEMENT wp;
-       wpConsole.x = winWidth + 1;
-       wpConsole.y = boardY;
-       wpConsole.width = screenWidth -  winWidth;
-       wpConsole.height = winHeight;
+       wpConsole.x = wpMain.width + 1;
+       wpConsole.y = wpMain.y;
+       wpConsole.width = screenWidth -  wpMain.width;
+       wpConsole.height = wpMain.height;
        EnsureOnScreen(&wpConsole.x, &wpConsole.y, 0, 0);
        wp.length = sizeof(WINDOWPLACEMENT);
        wp.flags = 0;
@@ -8176,9 +7973,10 @@ ConsoleWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
     }
 
    // Allow hText to highlight URLs and send notifications on them
-   wMask = SendMessage(hText, EM_GETEVENTMASK, 0, 0L);
+   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
 
     return FALSE;
 
@@ -8239,6 +8037,7 @@ ConsoleWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
     return OnMoving( &sd, hDlg, wParam, lParam );
 
   case WM_EXITSIZEMOVE:
+  	UpdateICSWidth(hText);
     return OnExitSizeMove( &sd, hDlg, wParam, lParam );
   }
 
@@ -8689,6 +8488,13 @@ typedef struct {
 } Enables;
 
 VOID
+GreyRevert(Boolean grey)
+{ // [HGM] vari: for retracting variations in local mode
+  HMENU hmenu = GetMenu(hwndMain);
+  EnableMenuItem(hmenu, IDM_Revert, MF_BYCOMMAND|(grey ? MF_GRAYED : MF_ENABLED));
+}
+
+VOID
 SetMenuEnables(HMENU hmenu, Enables *enab)
 {
   while (enab->item > 0) {
@@ -8708,6 +8514,7 @@ Enables gnuEnables[] = {
   { IDM_StopExamining, MF_BYCOMMAND|MF_GRAYED },
   { IDM_StopObserving, MF_BYCOMMAND|MF_GRAYED },
   { IDM_Revert, MF_BYCOMMAND|MF_GRAYED },
+  { IDM_NewChat, MF_BYCOMMAND|MF_GRAYED },
   { -1, -1 }
 };
 
@@ -8717,6 +8524,7 @@ Enables icsEnables[] = {
   { IDM_MachineWhite, MF_BYCOMMAND|MF_GRAYED },
   { IDM_MachineBlack, MF_BYCOMMAND|MF_GRAYED },
   { IDM_TwoMachines, MF_BYCOMMAND|MF_GRAYED },
+  { IDM_MachineBoth, MF_BYCOMMAND|MF_GRAYED },
   { IDM_AnalysisMode, MF_BYCOMMAND|MF_ENABLED },
   { IDM_AnalyzeFile, MF_BYCOMMAND|MF_GRAYED },
   { IDM_TimeControl, MF_BYCOMMAND|MF_GRAYED },
@@ -8724,6 +8532,8 @@ Enables icsEnables[] = {
   { IDM_Hint, MF_BYCOMMAND|MF_GRAYED },
   { IDM_Book, MF_BYCOMMAND|MF_GRAYED },
   { IDM_IcsOptions, MF_BYCOMMAND|MF_ENABLED },
+  { IDM_Engine1Options, MF_BYCOMMAND|MF_GRAYED },
+  { IDM_Engine2Options, MF_BYCOMMAND|MF_GRAYED },
   { -1, -1 }
 };
 
@@ -8732,6 +8542,7 @@ Enables zippyEnables[] = {
   { IDM_MoveNow, MF_BYCOMMAND|MF_ENABLED },
   { IDM_Hint, MF_BYCOMMAND|MF_ENABLED },
   { IDM_Book, MF_BYCOMMAND|MF_ENABLED },
+  { IDM_Engine1Options, MF_BYCOMMAND|MF_ENABLED },
   { -1, -1 }
 };
 #endif
@@ -8752,6 +8563,10 @@ Enables ncpEnables[] = {
   { IDM_TimeControl, MF_BYCOMMAND|MF_GRAYED },
   { IDM_Hint, MF_BYCOMMAND|MF_GRAYED },
   { IDM_Book, MF_BYCOMMAND|MF_GRAYED },
+  { IDM_MachineBoth, MF_BYCOMMAND|MF_GRAYED },
+  { IDM_NewChat, MF_BYCOMMAND|MF_GRAYED },
+  { IDM_Engine1Options, MF_BYCOMMAND|MF_GRAYED },
+  { IDM_Engine2Options, MF_BYCOMMAND|MF_GRAYED },
   { -1, -1 }
 };
 
@@ -9509,6 +9324,11 @@ DrawPosition(int fullRedraw, Board board)
   HDCDrawPosition(NULL, (BOOLEAN) fullRedraw, board); 
 }
 
+void NotifyFrontendLogin()
+{
+	if (hwndConsole)
+		UpdateICSWidth(GetDlgItem(hwndConsole, OPT_ConsoleText));
+}
 
 VOID
 ResetFrontEnd()
@@ -9542,7 +9362,7 @@ CommentPopDown(void)
   if (commentDialog) {
     ShowWindow(commentDialog, SW_HIDE);
   }
-  commentDialogUp = FALSE;
+  commentUp = FALSE;
 }
 
 VOID
@@ -10474,6 +10294,11 @@ RemoveInputSource(InputSourceRef isr)
   }
 }
 
+int no_wrap(char *message, int count)
+{
+    ConsoleOutput(message, count, FALSE);
+    return count;
+}
 
 int
 OutputToProcess(ProcRef pr, char *message, int count, int *outError)
@@ -10482,11 +10307,32 @@ OutputToProcess(ProcRef pr, char *message, int count, int *outError)
   int outCount = SOCKET_ERROR;
   ChildProc *cp = (ChildProc *) pr;
   static OVERLAPPED ovl;
+  static int line = 0;
 
-  if (pr == NoProc) {
-    ConsoleOutput(message, count, FALSE);
-    return count;
-  } 
+  if (pr == NoProc)
+  {
+    if (appData.noJoin || !appData.useInternalWrap)
+      return no_wrap(message, count);
+    else
+    {
+      int width = get_term_width();
+      int len = wrap(NULL, message, count, width, &line);
+      char *msg = malloc(len);
+      int dbgchk;
+
+      if (!msg)
+        return no_wrap(message, count);
+      else
+      {
+        dbgchk = wrap(msg, message, count, width, &line);
+        if (dbgchk != len && appData.debugMode)
+            fprintf(debugFP, "wrap(): dbgchk(%d) != len(%d)\n", dbgchk, len);
+        ConsoleOutput(msg, len, FALSE);
+        free(msg);
+        return len;
+      }
+    }
+  }
 
   if (ovl.hEvent == NULL) {
     ovl.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
@@ -10570,131 +10416,6 @@ StartAnalysisClock()
 		                        (UINT) 2000, NULL);
 }
 
-LRESULT CALLBACK
-AnalysisDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
-{
-  static HANDLE hwndText;
-  RECT rect;
-  static int sizeX, sizeY;
-  int newSizeX, newSizeY, flags;
-  MINMAXINFO *mmi;
-
-  switch (message) {
-  case WM_INITDIALOG: /* message: initialize dialog box */
-    /* Initialize the dialog items */
-    hwndText = GetDlgItem(hDlg, OPT_AnalysisText);
-    SetWindowText(hDlg, analysisTitle);
-    SetDlgItemText(hDlg, OPT_AnalysisText, analysisText);
-    /* Size and position the dialog */
-    if (!analysisDialog) {
-      analysisDialog = hDlg;
-      flags = SWP_NOZORDER;
-      GetClientRect(hDlg, &rect);
-      sizeX = rect.right;
-      sizeY = rect.bottom;
-      if (analysisX != CW_USEDEFAULT && analysisY != CW_USEDEFAULT &&
-	  analysisW != CW_USEDEFAULT && analysisH != CW_USEDEFAULT) {
-	WINDOWPLACEMENT wp;
-	EnsureOnScreen(&analysisX, &analysisY, 0, 0);
-	wp.length = sizeof(WINDOWPLACEMENT);
-	wp.flags = 0;
-	wp.showCmd = SW_SHOW;
-	wp.ptMaxPosition.x = wp.ptMaxPosition.y = 0;
-	wp.rcNormalPosition.left = analysisX;
-	wp.rcNormalPosition.right = analysisX + analysisW;
-	wp.rcNormalPosition.top = analysisY;
-	wp.rcNormalPosition.bottom = analysisY + analysisH;
-	SetWindowPlacement(hDlg, &wp);
-
-	GetClientRect(hDlg, &rect);
-	newSizeX = rect.right;
-	newSizeY = rect.bottom;
-        ResizeEditPlusButtons(hDlg, hwndText, sizeX, sizeY,
-			      newSizeX, newSizeY);
-	sizeX = newSizeX;
-	sizeY = newSizeY;
-      }
-    }
-    return FALSE;
-
-  case WM_COMMAND: /* message: received a command */
-    switch (LOWORD(wParam)) {
-    case IDCANCEL:
-      if (appData.icsActive && appData.icsEngineAnalyze) { /* [DM] icsEngineAnalyze */
-          ExitAnalyzeMode();
-          ModeHighlight();
-          return TRUE;
-      }
-      EditGameEvent();
-      return TRUE;
-    default:
-      break;
-    }
-    break;
-
-  case WM_SIZE:
-    newSizeX = LOWORD(lParam);
-    newSizeY = HIWORD(lParam);
-    ResizeEditPlusButtons(hDlg, hwndText, sizeX, sizeY, newSizeX, newSizeY);
-    sizeX = newSizeX;
-    sizeY = newSizeY;
-    break;
-
-  case WM_GETMINMAXINFO:
-    /* Prevent resizing window too small */
-    mmi = (MINMAXINFO *) lParam;
-    mmi->ptMinTrackSize.x = 100;
-    mmi->ptMinTrackSize.y = 100;
-    break;
-  }
-  return FALSE;
-}
-
-VOID
-AnalysisPopUp(char* title, char* str)
-{
-  FARPROC lpProc;
-  char *p, *q;
-
-  /* [AS] */
-  EngineOutputPopUp();
-  return;
-
-  if (str == NULL) str = "";
-  p = (char *) malloc(2 * strlen(str) + 2);
-  q = p;
-  while (*str) {
-    if (*str == '\n') *q++ = '\r';
-    *q++ = *str++;
-  }
-  *q = NULLCHAR;
-  if (analysisText != NULL) free(analysisText);
-  analysisText = p;
-
-  if (analysisDialog) {
-    SetWindowText(analysisDialog, title);
-    SetDlgItemText(analysisDialog, OPT_AnalysisText, analysisText);
-    ShowWindow(analysisDialog, SW_SHOW);
-  } else {
-    analysisTitle = title;
-    lpProc = MakeProcInstance((FARPROC)AnalysisDialog, hInst);
-    CreateDialog(hInst, MAKEINTRESOURCE(DLG_Analysis),
-		 hwndMain, (DLGPROC)lpProc);
-    FreeProcInstance(lpProc);
-  }
-  analysisDialogUp = TRUE;  
-}
-
-VOID
-AnalysisPopDown()
-{
-  if (analysisDialog) {
-    ShowWindow(analysisDialog, SW_HIDE);
-  }
-  analysisDialogUp = FALSE;  
-}
-
-
 VOID
 SetHighlights(int fromX, int fromY, int toX, int toY)
 {
@@ -10899,8 +10620,3 @@ HistorySet( char movelist[][2*MOVE_LEN], int first, int last, int current )
 
     EvalGraphSet( first, last, current, pvInfoList );
 }
-
-void SetProgramStats( FrontEndProgramStats * stats )
-{
-    EngineOutputUpdate( stats );
-}