Commits

Ken Takata committed 0d7a07a

add a new patch: fix-mouse-hidden-in-tabline-and-toolbar.patch

Comments (0)

Files changed (2)

fix-mouse-hidden-in-tabline-and-toolbar.patch

+# HG changeset patch
+# Parent 6fae52d7f74eaf5252eff8b6ddc3d921fb545cab
+
+diff --git a/src/gui_w32.c b/src/gui_w32.c
+--- a/src/gui_w32.c
++++ b/src/gui_w32.c
+@@ -483,11 +483,13 @@
+ static int	s_usenewlook;	    /* emulate W95/NT4 non-bold dialogs */
+ #ifdef FEAT_TOOLBAR
+ static void initialise_toolbar(void);
++static LRESULT CALLBACK toolbar_wndproc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
+ static int get_toolbar_bitmap(vimmenu_T *menu);
+ #endif
+ 
+ #ifdef FEAT_GUI_TABLINE
+ static void initialise_tabline(void);
++static LRESULT CALLBACK tabline_wndproc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
+ #endif
+ 
+ #ifdef FEAT_MBYTE_IME
+@@ -4305,10 +4307,22 @@
+ 		    TOOLBAR_BUTTON_HEIGHT,
+ 		    sizeof(TBBUTTON)
+ 		    );
++    s_toolbar_wndproc = SubclassWindow(s_toolbarhwnd, toolbar_wndproc);
+ 
+     gui_mch_show_toolbar(vim_strchr(p_go, GO_TOOLBAR) != NULL);
+ }
+ 
++    static LRESULT CALLBACK
++toolbar_wndproc(
++    HWND hwnd,
++    UINT uMsg,
++    WPARAM wParam,
++    LPARAM lParam)
++{
++    HandleMouseHide(uMsg, lParam);
++    return CallWindowProc(s_toolbar_wndproc, hwnd, uMsg, wParam, lParam);
++}
++
+     static int
+ get_toolbar_bitmap(vimmenu_T *menu)
+ {
+@@ -4385,6 +4399,7 @@
+ 	    WS_CHILD|TCS_FOCUSNEVER|TCS_TOOLTIPS,
+ 	    CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
+ 	    CW_USEDEFAULT, s_hwnd, NULL, s_hinst, NULL);
++    s_tabline_wndproc = SubclassWindow(s_tabhwnd, tabline_wndproc);
+ 
+     gui.tabline_height = TABLINE_HEIGHT;
+ 
+@@ -4392,6 +4407,17 @@
+     set_tabline_font();
+ # endif
+ }
++
++    static LRESULT CALLBACK
++tabline_wndproc(
++    HWND hwnd,
++    UINT uMsg,
++    WPARAM wParam,
++    LPARAM lParam)
++{
++    HandleMouseHide(uMsg, lParam);
++    return CallWindowProc(s_tabline_wndproc, hwnd, uMsg, wParam, lParam);
++}
+ #endif
+ 
+ #if defined(FEAT_OLE) || defined(FEAT_EVAL) || defined(PROTO)
+diff --git a/src/gui_w48.c b/src/gui_w48.c
+--- a/src/gui_w48.c
++++ b/src/gui_w48.c
+@@ -177,10 +177,12 @@
+ 
+ #ifdef FEAT_TOOLBAR
+ static HWND		s_toolbarhwnd = NULL;
++static WNDPROC		s_toolbar_wndproc = NULL;
+ #endif
+ 
+ #ifdef FEAT_GUI_TABLINE
+ static HWND		s_tabhwnd = NULL;
++static WNDPROC		s_tabline_wndproc = NULL;
+ static int		showing_tabline = 0;
+ #endif
+ 
 cpo-N.diff
 if_perl-use-output.patch
 improve_dos_test.diff
+fix-mouse-hidden-in-tabline-and-toolbar.patch