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

diff --git a/winboard/winboard.c b/winboard/winboard.c
index c7aebcf..e6fcb8b 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -4703,7 +4703,6 @@ HDCDrawPosition(HDC hdc, BOOLEAN repaint, Board board)
 	GetDIBits(tmphdc,bufferBitmap,0,b.bmHeight,pData,(BITMAPINFO*)&bih,DIB_RGB_COLORS);
 //	fprintf(diagFile, "%8x\n", (int) pData);
 
-#if 1
 	wb = b.bmWidthBytes;
 	// count colors
 	for(i=0; i<wb*(b.bmHeight - boardRect.top + OUTER_MARGIN)>>2; i++) {
@@ -4751,7 +4750,6 @@ HDCDrawPosition(HDC hdc, BOOLEAN repaint, Board board)
 	// write bitmap data
 	for(i=0; i<wb*(b.bmHeight - boardRect.top + OUTER_MARGIN); i++) 
 		fputc(pData[i], diagFile);
-#endif
      }
   }
 
@@ -5458,6 +5456,29 @@ LoadGameDialog(HWND hwnd, char* title)
   }
 }
 
+void UpdateICSWidth(HWND hText)
+{
+	HDC hdc;
+	TEXTMETRIC tm;
+	RECT rc;
+	HFONT hfont, hold_font;
+	
+	// get the text metrics
+	hdc = GetDC(hText);
+	hfont = CreateFontIndirect(&font[boardSize][CONSOLE_FONT]->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);
+
+	// update the width
+	ics_update_width((rc.right-rc.left) / tm.tmAveCharWidth);
+}
+
 VOID
 ChangedConsoleFont()
 {
@@ -5497,6 +5518,7 @@ ChangedConsoleFont()
   paraf.dxOffset = WRAP_INDENT;
   SendMessage(hText, EM_SETPARAFORMAT, 0, (LPARAM) &paraf);
   SendMessage(hText, EM_EXSETSEL, 0, (LPARAM)&sel);
+  UpdateICSWidth(hText);
 }
 
 /*---------------------------------------------------------------------------*\
@@ -8101,12 +8123,15 @@ 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:
@@ -8115,21 +8140,18 @@ ConsoleWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
       ENLINK *pLink = (ENLINK*)lParam;
       if (pLink->msg == WM_LBUTTONUP)
       {
-          TEXTRANGE tr;
-
-          tr.chrg = pLink->chrg;
-          tr.lpstrText = malloc(1+tr.chrg.cpMax-tr.chrg.cpMin);
-          hText = GetDlgItem(hDlg, OPT_ConsoleText);
-          SendMessage(hText, EM_GETTEXTRANGE, 0, (LPARAM)&tr);
-          ShellExecute(NULL, "open", tr.lpstrText, NULL, NULL, SW_SHOW);
-          free(tr.lpstrText);
+        TEXTRANGE tr;
+
+        tr.chrg = pLink->chrg;
+        tr.lpstrText = malloc(1+tr.chrg.cpMax-tr.chrg.cpMin);
+        SendMessage(hText, EM_GETTEXTRANGE, 0, (LPARAM)&tr);
+        ShellExecute(NULL, "open", tr.lpstrText, NULL, NULL, SW_SHOW);
+        free(tr.lpstrText);
       }
     }
     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);
@@ -8157,7 +8179,7 @@ ConsoleWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
       wp.rcNormalPosition.bottom = wpConsole.y + wpConsole.height;
       SetWindowPlacement(hDlg, &wp);
     }
-#if 1
+
    // [HGM] Chessknight's change 2004-07-13
    else { /* Determine Defaults */
        WINDOWPLACEMENT wp;
@@ -8176,7 +8198,12 @@ ConsoleWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
        wp.rcNormalPosition.bottom = wpConsole.y + wpConsole.height;
        SetWindowPlacement(hDlg, &wp);
     }
-#endif
+
+   // Allow hText to highlight URLs and send notifications on them
+   wMask = SendMessage(hText, EM_GETEVENTMASK, 0, 0L);
+   SendMessage(hText, EM_SETEVENTMASK, 0, wMask | ENM_LINK);
+   SendMessage(hText, EM_AUTOURLDETECT, TRUE, 0L);
+
     return FALSE;
 
   case WM_SETFOCUS:
@@ -8236,6 +8263,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 );
   }
 
@@ -8246,18 +8274,10 @@ ConsoleWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 VOID
 ConsoleCreate()
 {
-  HWND hCons, hText;
-  WORD wMask;
+  HWND hCons;
   if (hwndConsole) return;
   hCons = CreateDialog(hInst, szConsoleName, 0, NULL);
   SendMessage(hCons, WM_INITDIALOG, 0, 0);
-
-
-  // make the text item in the console do URL links
-  hText = GetDlgItem(hCons, OPT_ConsoleText);
-  wMask = SendMessage(hText, EM_GETEVENTMASK, 0, 0L);
-  SendMessage(hText, EM_SETEVENTMASK, 0, wMask | ENM_LINK);
-  SendMessage(hText, EM_AUTOURLDETECT, TRUE, 0L);
 }