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

K.Takata's patch queue for Vim

Commit MetaInfo

• Revision: b626e8c95346e304bedc1cd8cc87ca2d7b41b9d7 (tree)
• Zeit: 2022-01-22 12:23:20
• Autor: K.Takata <kentkt@csc....>
• Commiter: K.Takata

Log Message

Add a new patch

Ändern Zusammenfassung

• modified: series
• add: win32-always-enable-multiline-balloon.patch

Diff

diff -r 1093a6380f17 -r b626e8c95346 series
--- a/series	Fri Jan 21 20:48:53 2022 +0900
+++ b/series	Sat Jan 22 12:23:20 2022 +0900
@@ -29,4 +29,5 @@
 add-testing-option-7970.patch
 wip-win32-vimdir-encoding.patch #+wip
 win32-directwrite-ambiwidth-auto.patch
+win32-always-enable-multiline-balloon.patch
 fix-config_cache-removal.patch #+rejected

diff -r 1093a6380f17 -r b626e8c95346 win32-always-enable-multiline-balloon.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/win32-always-enable-multiline-balloon.patch	Sat Jan 22 12:23:20 2022 +0900
@@ -0,0 +1,184 @@
+# HG changeset patch
+# Parent  6b740aadb2c5924e54c721142e598660406c3c21
+
+diff --git a/src/evalfunc.c b/src/evalfunc.c
+--- a/src/evalfunc.c
++++ b/src/evalfunc.c
+@@ -5104,8 +5104,7 @@ f_has(typval_T *argvars, typval_T *rettv
+ #endif
+ 		},
+ 	{"balloon_multiline",
+-#if defined(FEAT_BEVAL_GUI) && !defined(FEAT_GUI_MSWIN)
+-			// MS-Windows requires runtime check, see below
++#ifdef FEAT_BEVAL_GUI
+ 		1
+ #else
+ 		0
+@@ -6079,10 +6078,6 @@ f_has(typval_T *argvars, typval_T *rettv
+ 	{
+ 	    // intentionally empty
+ 	}
+-#if defined(FEAT_BEVAL) && defined(FEAT_GUI_MSWIN)
+-	else if (STRICMP(name, "balloon_multiline") == 0)
+-	    n = multiline_balloon_available();
+-#endif
+ #ifdef VIMDLL
+ 	else if (STRICMP(name, "filterpipe") == 0)
+ 	    n = gui.in_use || gui.starting;
+@@ -6261,9 +6256,6 @@ f_has(typval_T *argvars, typval_T *rettv
+ dynamic_feature(char_u *feature)
+ {
+     return (feature == NULL
+-#if defined(FEAT_BEVAL) && defined(FEAT_GUI_MSWIN)
+-	    || STRICMP(feature, "balloon_multiline") == 0
+-#endif
+ #if defined(FEAT_GUI) && defined(FEAT_BROWSE)
+ 	    || (STRICMP(feature, "browse") == 0 && !gui.in_use)
+ #endif
+diff --git a/src/gui_w32.c b/src/gui_w32.c
+--- a/src/gui_w32.c
++++ b/src/gui_w32.c
+@@ -8561,89 +8561,13 @@ gui_mch_destroy_sign(void *sign)
+  * 5) WM_NOTIFY:TTN_POP destroys created tooltip
+  */
+ 
+-/*
+- * determine whether installed Common Controls support multiline tooltips
+- * (i.e. their version is >= 4.70
+- */
+-    int
+-multiline_balloon_available(void)
+-{
+-    HINSTANCE hDll;
+-    static char comctl_dll[] = "comctl32.dll";
+-    static int multiline_tip = MAYBE;
+-
+-    if (multiline_tip != MAYBE)
+-	return multiline_tip;
+-
+-    hDll = GetModuleHandle(comctl_dll);
+-    if (hDll != NULL)
+-    {
+-	DLLGETVERSIONPROC pGetVer;
+-	pGetVer = (DLLGETVERSIONPROC)GetProcAddress(hDll, "DllGetVersion");
+-
+-	if (pGetVer != NULL)
+-	{
+-	    DLLVERSIONINFO dvi;
+-	    HRESULT hr;
+-
+-	    ZeroMemory(&dvi, sizeof(dvi));
+-	    dvi.cbSize = sizeof(dvi);
+-
+-	    hr = (*pGetVer)(&dvi);
+-
+-	    if (SUCCEEDED(hr)
+-		    && (dvi.dwMajorVersion > 4
+-			|| (dvi.dwMajorVersion == 4
+-						&& dvi.dwMinorVersion >= 70)))
+-	    {
+-		multiline_tip = TRUE;
+-		return multiline_tip;
+-	    }
+-	}
+-	else
+-	{
+-	    // there is chance we have ancient CommCtl 4.70
+-	    // which doesn't export DllGetVersion
+-	    DWORD dwHandle = 0;
+-	    DWORD len = GetFileVersionInfoSize(comctl_dll, &dwHandle);
+-	    if (len > 0)
+-	    {
+-		VS_FIXEDFILEINFO *ver;
+-		UINT vlen = 0;
+-		void *data = alloc(len);
+-
+-		if ((data != NULL
+-			&& GetFileVersionInfo(comctl_dll, 0, len, data)
+-			&& VerQueryValue(data, "\\", (void **)&ver, &vlen)
+-			&& vlen
+-			&& HIWORD(ver->dwFileVersionMS) > 4)
+-			|| ((HIWORD(ver->dwFileVersionMS) == 4
+-			    && LOWORD(ver->dwFileVersionMS) >= 70)))
+-		{
+-		    vim_free(data);
+-		    multiline_tip = TRUE;
+-		    return multiline_tip;
+-		}
+-		vim_free(data);
+-	    }
+-	}
+-    }
+-    multiline_tip = FALSE;
+-    return multiline_tip;
+-}
+-
+     static void
+ make_tooltip(BalloonEval *beval, char *text, POINT pt)
+ {
+-    TOOLINFOW	*pti;
+-    int		ToolInfoSize;
+-
+-    if (multiline_balloon_available())
+-	ToolInfoSize = sizeof(TOOLINFOW_NEW);
+-    else
+-	ToolInfoSize = sizeof(TOOLINFOW);
+-
+-    pti = alloc(ToolInfoSize);
++    TOOLINFOW_NEW   *pti;
++    RECT	    rect;
++
++    pti = alloc(sizeof(TOOLINFOW_NEW));
+     if (pti == NULL)
+ 	return;
+ 
+@@ -8655,30 +8579,19 @@ make_tooltip(BalloonEval *beval, char *t
+     SetWindowPos(beval->balloon, HWND_TOPMOST, 0, 0, 0, 0,
+ 	    SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
+ 
+-    pti->cbSize = ToolInfoSize;
++    pti->cbSize = sizeof(TOOLINFOW_NEW);
+     pti->uFlags = TTF_SUBCLASS;
+     pti->hwnd = beval->target;
+     pti->hinst = 0; // Don't use string resources
+     pti->uId = ID_BEVAL_TOOLTIP;
+ 
+-    if (multiline_balloon_available())
+-    {
+-	RECT rect;
+-	TOOLINFOW_NEW *ptin = (TOOLINFOW_NEW *)pti;
+-	pti->lpszText = LPSTR_TEXTCALLBACKW;
+-	beval->tofree = enc_to_utf16((char_u*)text, NULL);
+-	ptin->lParam = (LPARAM)beval->tofree;
+-	// switch multiline tooltips on
+-	if (GetClientRect(s_textArea, &rect))
+-	    SendMessageW(beval->balloon, TTM_SETMAXTIPWIDTH, 0,
+-		    (LPARAM)rect.right);
+-    }
+-    else
+-    {
+-	// do this old way
+-	beval->tofree = enc_to_utf16((char_u*)text, NULL);
+-	pti->lpszText = (LPWSTR)beval->tofree;
+-    }
++    pti->lpszText = LPSTR_TEXTCALLBACKW;
++    beval->tofree = enc_to_utf16((char_u*)text, NULL);
++    pti->lParam = (LPARAM)beval->tofree;
++    // switch multiline tooltips on
++    if (GetClientRect(s_textArea, &rect))
++	SendMessageW(beval->balloon, TTM_SETMAXTIPWIDTH, 0,
++		(LPARAM)rect.right);
+ 
+     // Limit ballooneval bounding rect to CursorPos neighbourhood.
+     pti->rect.left = pt.x - 3;
+diff --git a/src/proto/gui_w32.pro b/src/proto/gui_w32.pro
+--- a/src/proto/gui_w32.pro
++++ b/src/proto/gui_w32.pro
+@@ -91,7 +91,6 @@ void gui_mch_set_foreground(void);
+ void gui_mch_drawsign(int row, int col, int typenr);
+ void *gui_mch_register_sign(char_u *signfile);
+ void gui_mch_destroy_sign(void *sign);
+-int multiline_balloon_available(void);
+ void gui_mch_disable_beval_area(BalloonEval *beval);
+ void gui_mch_enable_beval_area(BalloonEval *beval);
+ void gui_mch_post_balloon(BalloonEval *beval, char_u *mesg);