X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.c;h=482beca11a6e222cd86fe30c73e1bc05baafbc4f;hb=ca87afb87619efbaa94fe045670bc916e9ffe3ec;hp=af08df3834642002b69e306194e992480085c9ec;hpb=3ee26c011464ede33114f0d166cca0e8fb1f86b2;p=xboard.git

diff --git a/winboard/winboard.c b/winboard/winboard.c
index af08df3..482beca 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;
 
@@ -8733,6 +8742,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 }
 };
 
@@ -8742,6 +8752,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 },
@@ -8749,6 +8760,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 }
 };
 
@@ -8757,6 +8770,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
@@ -8777,6 +8791,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 }
 };