Commit: f6bc80e7256fb00dcf5e86cf2881f94a04ee37d1 - vim-ktakata-mq (hg)

K.Takata's patch queue for Vim

Commit MetaInfo

• Revision: f6bc80e7256fb00dcf5e86cf2881f94a04ee37d1 (tree)
• Time: 2022-01-23 03:58:23
• Author: K.Takata <kentkt@csc....>
• Commiter: K.Takata

Log Message

Add a new patch

Change Summary

• modified: series
• add: win32-remove-oldlook.patch

Incremental Difference

diff -r 5077b7f98781 -r f6bc80e7256f series
--- a/series	Sat Jan 22 22:43:28 2022 +0900
+++ b/series	Sun Jan 23 03:58:23 2022 +0900
@@ -29,4 +29,5 @@
 add-testing-option-7970.patch
 wip-win32-vimdir-encoding.patch #+wip
 win32-directwrite-ambiwidth-auto.patch
+win32-remove-oldlook.patch
 fix-config_cache-removal.patch #+rejected

diff -r 5077b7f98781 -r f6bc80e7256f win32-remove-oldlook.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/win32-remove-oldlook.patch	Sun Jan 23 03:58:23 2022 +0900
@@ -0,0 +1,256 @@
+# HG changeset patch
+# Parent  83199336e36f99b25c8cc04567bebf5e1f341446
+
+diff --git a/src/gui_w32.c b/src/gui_w32.c
+--- a/src/gui_w32.c
++++ b/src/gui_w32.c
+@@ -206,14 +206,12 @@ gui_mch_set_rendering_options(char_u *s)
+ // Some parameters for dialog boxes.  All in pixels.
+ #define DLG_PADDING_X		10
+ #define DLG_PADDING_Y		10
+-#define DLG_OLD_STYLE_PADDING_X	5
+-#define DLG_OLD_STYLE_PADDING_Y	5
+ #define DLG_VERT_PADDING_X	4	// For vertical buttons
+ #define DLG_VERT_PADDING_Y	4
+ #define DLG_ICON_WIDTH		34
+ #define DLG_ICON_HEIGHT		34
+ #define DLG_MIN_WIDTH		150
+-#define DLG_FONT_NAME		"MS Sans Serif"
++#define DLG_FONT_NAME		"MS Shell Dlg"
+ #define DLG_FONT_POINT_SIZE	8
+ #define DLG_MIN_MAX_WIDTH	400
+ #define DLG_MIN_MAX_HEIGHT	400
+@@ -4160,7 +4158,6 @@ static int dialog_default_button = -1;
+ // Intellimouse support
+ static int mouse_scroll_lines = 0;
+ 
+-static int	s_usenewlook;	    // emulate W95/NT4 non-bold dialogs
+ #ifdef FEAT_TOOLBAR
+ static void initialise_toolbar(void);
+ static void update_toolbar_size(void);
+@@ -7038,20 +7035,13 @@ gui_mch_dialog(
+     }
+     else
+ # endif
+-    font = CreateFont(-DLG_FONT_POINT_SIZE, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+-		      VARIABLE_PITCH, DLG_FONT_NAME);
+-    if (s_usenewlook)
+-    {
+-	oldFont = SelectFont(hdc, font);
+-	dlgPaddingX = DLG_PADDING_X;
+-	dlgPaddingY = DLG_PADDING_Y;
+-    }
+-    else
+-    {
+-	oldFont = SelectFont(hdc, GetStockObject(SYSTEM_FONT));
+-	dlgPaddingX = DLG_OLD_STYLE_PADDING_X;
+-	dlgPaddingY = DLG_OLD_STYLE_PADDING_Y;
+-    }
++	font = CreateFont(-DLG_FONT_POINT_SIZE, 0, 0, 0, 0, 0, 0, 0,
++			0, 0, 0, 0, VARIABLE_PITCH, DLG_FONT_NAME);
++
++    oldFont = SelectFont(hdc, font);
++    dlgPaddingX = DLG_PADDING_X;
++    dlgPaddingY = DLG_PADDING_Y;
++
+     GetTextMetrics(hdc, &fontInfo);
+     fontHeight = fontInfo.tmHeight;
+ 
+@@ -7212,10 +7202,7 @@ gui_mch_dialog(
+ 	dlgwidth = DLG_MIN_WIDTH;	// Don't allow a really thin dialog!
+ 
+     // start to fill in the dlgtemplate information.  addressing by WORDs
+-    if (s_usenewlook)
+-	lStyle = DS_MODALFRAME | WS_CAPTION |DS_3DLOOK| WS_VISIBLE |DS_SETFONT;
+-    else
+-	lStyle = DS_MODALFRAME | WS_CAPTION |DS_3DLOOK| WS_VISIBLE;
++    lStyle = DS_MODALFRAME | WS_CAPTION | DS_3DLOOK | WS_VISIBLE | DS_SETFONT;
+ 
+     add_long(lStyle);
+     add_long(0);	// (lExtendedStyle)
+@@ -7257,26 +7244,23 @@ gui_mch_dialog(
+ 				   : (LPSTR)("Vim "VIM_VERSION_MEDIUM)), TRUE);
+     p += nchar;
+ 
+-    if (s_usenewlook)
+-    {
+-	// do the font, since DS_3DLOOK doesn't work properly
++    // do the font, since DS_3DLOOK doesn't work properly
+ # ifdef USE_SYSMENU_FONT
+-	if (use_lfSysmenu)
+-	{
+-	    // point size
+-	    *p++ = -MulDiv(lfSysmenu.lfHeight, 72,
+-		    GetDeviceCaps(hdc, LOGPIXELSY));
+-	    wcscpy(p, lfSysmenu.lfFaceName);
+-	    nchar = (int)wcslen(lfSysmenu.lfFaceName) + 1;
+-	}
+-	else
++    if (use_lfSysmenu)
++    {
++	// point size
++	*p++ = -MulDiv(lfSysmenu.lfHeight, 72,
++		GetDeviceCaps(hdc, LOGPIXELSY));
++	wcscpy(p, lfSysmenu.lfFaceName);
++	nchar = (int)wcslen(lfSysmenu.lfFaceName) + 1;
++    }
++    else
+ # endif
+-	{
+-	    *p++ = DLG_FONT_POINT_SIZE;		// point size
+-	    nchar = nCopyAnsiToWideChar(p, DLG_FONT_NAME, FALSE);
+-	}
+-	p += nchar;
+-    }
++    {
++	*p++ = DLG_FONT_POINT_SIZE;		// point size
++	nchar = nCopyAnsiToWideChar(p, DLG_FONT_NAME, FALSE);
++    }
++    p += nchar;
+ 
+     buttonYpos = msgheight + 2 * dlgPaddingY;
+ 
+@@ -7619,23 +7603,20 @@ tearoff_callback(
+ 
+ 
+ /*
+- * Decide whether to use the "new look" (small, non-bold font) or the "old
+- * look" (big, clanky font) for dialogs, and work out a few values for use
+- * later accordingly.
++ * Computes the dialog base units based on the current dialog font.
++ * We don't use the GetDialogBaseUnits() API, because we don't use the
++ * (old-style) system font.
+  */
+     static void
+ get_dialog_font_metrics(void)
+ {
+     HDC		    hdc;
+     HFONT	    hfontTools = 0;
+-    DWORD	    dlgFontSize;
+     SIZE	    size;
+ #ifdef USE_SYSMENU_FONT
+     LOGFONTW	    lfSysmenu;
+ #endif
+ 
+-    s_usenewlook = FALSE;
+-
+ #ifdef USE_SYSMENU_FONT
+     if (gui_w32_get_menu_font(&lfSysmenu) == OK)
+ 	hfontTools = CreateFontIndirectW(&lfSysmenu);
+@@ -7644,31 +7625,20 @@ get_dialog_font_metrics(void)
+ 	hfontTools = CreateFont(-DLG_FONT_POINT_SIZE, 0, 0, 0, 0, 0, 0, 0,
+ 				0, 0, 0, 0, VARIABLE_PITCH, DLG_FONT_NAME);
+ 
+-    if (hfontTools)
+-    {
+-	hdc = GetDC(s_hwnd);
+-	SelectObject(hdc, hfontTools);
+-	/*
+-	 * GetTextMetrics() doesn't return the right value in
+-	 * tmAveCharWidth, so we have to figure out the dialog base units
+-	 * ourselves.
+-	 */
+-	GetTextExtentPoint(hdc,
+-		"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz",
+-		52, &size);
+-	ReleaseDC(s_hwnd, hdc);
+-
+-	s_dlgfntwidth = (WORD)((size.cx / 26 + 1) / 2);
+-	s_dlgfntheight = (WORD)size.cy;
+-	s_usenewlook = TRUE;
+-    }
+-
+-    if (!s_usenewlook)
+-    {
+-	dlgFontSize = GetDialogBaseUnits();	// fall back to big old system
+-	s_dlgfntwidth = LOWORD(dlgFontSize);
+-	s_dlgfntheight = HIWORD(dlgFontSize);
+-    }
++    hdc = GetDC(s_hwnd);
++    SelectObject(hdc, hfontTools);
++    /*
++     * GetTextMetrics() doesn't return the right value in
++     * tmAveCharWidth, so we have to figure out the dialog base units
++     * ourselves.
++     */
++    GetTextExtentPoint(hdc,
++	    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz",
++	    52, &size);
++    ReleaseDC(s_hwnd, hdc);
++
++    s_dlgfntwidth = (WORD)((size.cx / 26 + 1) / 2);
++    s_dlgfntheight = (WORD)size.cy;
+ }
+ 
+ #if defined(FEAT_MENU) && defined(FEAT_TEAROFF)
+@@ -7747,12 +7717,10 @@ gui_mch_tearoff(
+     }
+     else
+ # endif
+-    font = CreateFont(-DLG_FONT_POINT_SIZE, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+-		      VARIABLE_PITCH, DLG_FONT_NAME);
+-    if (s_usenewlook)
+-	oldFont = SelectFont(hdc, font);
+-    else
+-	oldFont = SelectFont(hdc, GetStockObject(SYSTEM_FONT));
++	font = CreateFont(-DLG_FONT_POINT_SIZE, 0, 0, 0, 0, 0, 0, 0,
++			0, 0, 0, 0, VARIABLE_PITCH, DLG_FONT_NAME);
++
++    oldFont = SelectFont(hdc, font);
+ 
+     // Calculate width of a single space.  Used for padding columns to the
+     // right width.
+@@ -7809,10 +7777,7 @@ gui_mch_tearoff(
+     dlgwidth += 2 * TEAROFF_PADDING_X + TEAROFF_BUTTON_PAD_X;
+ 
+     // start to fill in the dlgtemplate information.  addressing by WORDs
+-    if (s_usenewlook)
+-	lStyle = DS_MODALFRAME | WS_CAPTION| WS_SYSMENU |DS_SETFONT| WS_VISIBLE;
+-    else
+-	lStyle = DS_MODALFRAME | WS_CAPTION| WS_SYSMENU | WS_VISIBLE;
++    lStyle = DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_SETFONT | WS_VISIBLE;
+ 
+     lExtendedStyle = WS_EX_TOOLWINDOW|WS_EX_STATICEDGE;
+     *p++ = LOWORD(lStyle);
+@@ -7842,26 +7807,23 @@ gui_mch_tearoff(
+ 			    : (LPSTR)("Vim "VIM_VERSION_MEDIUM)), TRUE);
+     p += nchar;
+ 
+-    if (s_usenewlook)
+-    {
+-	// do the font, since DS_3DLOOK doesn't work properly
++    // do the font, since DS_3DLOOK doesn't work properly
+ # ifdef USE_SYSMENU_FONT
+-	if (use_lfSysmenu)
+-	{
+-	    // point size
+-	    *p++ = -MulDiv(lfSysmenu.lfHeight, 72,
+-		    GetDeviceCaps(hdc, LOGPIXELSY));
+-	    wcscpy(p, lfSysmenu.lfFaceName);
+-	    nchar = (int)wcslen(lfSysmenu.lfFaceName) + 1;
+-	}
+-	else
++    if (use_lfSysmenu)
++    {
++	// point size
++	*p++ = -MulDiv(lfSysmenu.lfHeight, 72,
++		GetDeviceCaps(hdc, LOGPIXELSY));
++	wcscpy(p, lfSysmenu.lfFaceName);
++	nchar = (int)wcslen(lfSysmenu.lfFaceName) + 1;
++    }
++    else
+ # endif
+-	{
+-	    *p++ = DLG_FONT_POINT_SIZE;		// point size
+-	    nchar = nCopyAnsiToWideChar(p, DLG_FONT_NAME, FALSE);
+-	}
+-	p += nchar;
+-    }
++    {
++	*p++ = DLG_FONT_POINT_SIZE;		// point size
++	nchar = nCopyAnsiToWideChar(p, DLG_FONT_NAME, FALSE);
++    }
++    p += nchar;
+ 
+     /*
+      * Loop over all the items in the menu.