X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.c;h=884c85cc0ae5e3cc7c8d3903936692cb72f6c5b1;hb=bdd61153a00af769f75d1f20d7938642592cbce9;hp=e6fcb8b170b478ff489b084ef69d5e09a1fbb699;hpb=ce931eec108e83cedc54f5f0ce28a19efb70e5bb;p=xboard.git

diff --git a/winboard/winboard.c b/winboard/winboard.c
index e6fcb8b..884c85c 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -1392,6 +1392,7 @@ 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 },
 
   // [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
@@ -5462,6 +5463,7 @@ void UpdateICSWidth(HWND hText)
 	TEXTMETRIC tm;
 	RECT rc;
 	HFONT hfont, hold_font;
+	LONG old_width, new_width;
 	
 	// get the text metrics
 	hdc = GetDC(hText);
@@ -5476,7 +5478,13 @@ void UpdateICSWidth(HWND hText)
 	SendMessage(hText, EM_GETRECT, 0, (LPARAM)&rc);
 
 	// update the width
-	ics_update_width((rc.right-rc.left) / tm.tmAveCharWidth);
+	new_width = (rc.right-rc.left) / tm.tmAveCharWidth;
+	old_width = GetWindowLong(hText, GWL_USERDATA);
+	if (new_width != old_width)
+	{
+		ics_update_width(new_width);
+		SetWindowLong(hText, GWL_USERDATA, new_width);
+	}
 }
 
 VOID
@@ -8203,6 +8211,7 @@ ConsoleWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
    wMask = 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;
 
@@ -9534,6 +9543,11 @@ DrawPosition(int fullRedraw, Board board)
   HDCDrawPosition(NULL, (BOOLEAN) fullRedraw, board); 
 }
 
+void NotifyFrontendLogin()
+{
+	if (hwndConsole)
+		UpdateICSWidth(GetDlgItem(hwndConsole, OPT_ConsoleText));
+}
 
 VOID
 ResetFrontEnd()