vim: src/gui_w32.c comparison

comparison src/gui_w32.c @ 843:9f279ebda751 v7.0f01

updated for version 7.0f01

author	vimboss
date	Tue, 25 Apr 2006 22:13:59 +0000
parents	a209672376fd
children	8cd729851562

comparison

equal deleted inserted replaced

-:a209672376fd
+:9f279ebda751
 #ifdef FEAT_BEVAL
 # define ID_BEVAL_TOOLTIP   200
 # define BEVAL_TEXT_LEN	    MAXPATHL
-#ifndef UINT_PTR
+#if _MSC_VER < 1300
+/* Work around old versions of basetsd.h which wrongly declare
+* UINT_PTR as unsigned long */
 # define UINT_PTR UINT
 #endif
 static void make_tooltip __ARGS((BalloonEval *beval, char *text, POINT pt));
 static void delete_tooltip __ARGS((BalloonEval *beval));
 static UINT_PTR	    BevalTimerId = 0;
 static DWORD	    LastActivity = 0;
 /*
 * excerpts from headers since this may not be presented
-* in the extremelly old compilers
+* in the extremely old compilers
 */
 #include <pshpack1.h>
 typedef struct _DllVersionInfo
 {
 }
 else
 	_OnScroll(hwnd, hwndCtl, zDelta >= 0 ? SB_PAGEUP : SB_PAGEDOWN, 0);
 }
+#ifdef USE_SYSMENU_FONT
+/*
+* Get Menu Font.
+* Return OK or FAIL.
+*/
+static int
+gui_w32_get_menu_font(LOGFONT *lf)
+{
+NONCLIENTMETRICS nm;
+nm.cbSize = sizeof(NONCLIENTMETRICS);
+if (!SystemParametersInfo(
+	    SPI_GETNONCLIENTMETRICS,
+	    sizeof(NONCLIENTMETRICS),
+	    &nm,
+	    0))
+	return FAIL;
+*lf = nm.lfMenuFont;
+return OK;
+}
+#endif
+#if defined(FEAT_GUI_TABLINE) && defined(USE_SYSMENU_FONT)
+/*
+* Set the GUI tabline font to the system menu font
+*/
+static void
+set_tabline_font(void)
+{
+LOGFONT	lfSysmenu;
+HFONT	font;
+HWND	hwnd;
+HDC		hdc;
+HFONT	hfntOld;
+TEXTMETRIC	tm;
+if (gui_w32_get_menu_font(&lfSysmenu) != OK)
+	return;
+font = CreateFontIndirect(&lfSysmenu);
+SendMessage(s_tabhwnd, WM_SETFONT, (WPARAM)font, TRUE);
+/*
+* Compute the height of the font used for the tab text
+*/
+hwnd = GetDesktopWindow();
+hdc = GetWindowDC(hwnd);
+hfntOld = SelectFont(hdc, font);
+GetTextMetrics(hdc, &tm);
+SelectFont(hdc, hfntOld);
+ReleaseDC(hwnd, hdc);
+/*
+* The space used by the tab border and the space between the tab label
+* and the tab border is included as 7.
+*/
+gui.tabline_height = tm.tmHeight + tm.tmInternalLeading + 7;
+}
+#endif
 /*
 * Invoked when a setting was changed.
 */
 static LRESULT CALLBACK
 _OnSettingChange(UINT n)
 {
 if (n == SPI_SETWHEELSCROLLLINES)
 	SystemParametersInfo(SPI_GETWHEELSCROLLLINES, 0,
 		&mouse_scroll_lines, 0);
+#if defined(FEAT_GUI_TABLINE) && defined(USE_SYSMENU_FONT)
+if (n == SPI_SETNONCLIENTMETRICS)
+	set_tabline_font();
+#endif
 return 0;
 }
 #if 0	/* disabled, a gap appears below and beside the window, and the window
 	   can be moved (in a strange way) */
 				    wstr = enc_to_ucs2(NameBuff, NULL);
 				    if (wstr != NULL)
 				    {
 					int wlen;
-					wlen = (wcslen(wstr) + 1)
+					wlen = ((int)wcslen(wstr) + 1)
 							      * sizeof(WCHAR);
 					if (tt_text_len < wlen)
 					{
 					    tt_text = vim_realloc(tt_text,
 									wlen);
 				if (wstr == NULL)
 #  endif
 				{
 				    int len;
-				    len = STRLEN(NameBuff) + 1;
+				    len = (int)STRLEN(NameBuff) + 1;
 				    if (tt_text_len < len)
 				    {
 					tt_text = vim_realloc(tt_text, len);
 					if (tt_text != NULL)
 					    tt_text_len = len;
 "IDR_VIM_ERROR",
 "IDR_VIM_ALERT",
 "IDR_VIM_INFO",
 "IDR_VIM_QUESTION"
 };
-#ifdef USE_SYSMENU_FONT
-/*
-* Get Menu Font.
-* Return OK or FAIL.
-*/
-static int
-gui_w32_get_menu_font(LOGFONT *lf)
-{
-NONCLIENTMETRICS nm;
-nm.cbSize = sizeof(NONCLIENTMETRICS);
-if (!SystemParametersInfo(
-	    SPI_GETNONCLIENTMETRICS,
-	    sizeof(NONCLIENTMETRICS),
-	    &nm,
-	    0))
-	return FAIL;
-*lf = nm.lfMenuFont;
-return OK;
-}
-#endif
 int
 gui_mch_dialog(
 int		 type,
 char_u	*title,
 #if defined(FEAT_GUI_TABLINE) || defined(PROTO)
 static void
 initialise_tabline(void)
 {
-# ifdef USE_SYSMENU_FONT
-LOGFONT    lfSysmenu;
-# endif
 InitCommonControls();
 s_tabhwnd = CreateWindow(WC_TABCONTROL, "Vim tabline",
 	    WS_CHILD|TCS_FOCUSNEVER|TCS_TOOLTIPS,
 	    CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
 	    CW_USEDEFAULT, s_hwnd, NULL, s_hinst, NULL);
+gui.tabline_height = TABLINE_HEIGHT;
 # ifdef USE_SYSMENU_FONT
-if (gui_w32_get_menu_font(&lfSysmenu) == OK)
+set_tabline_font();
-{
-	HFONT font = CreateFontIndirect(&lfSysmenu);
-	SendMessage(s_tabhwnd, WM_SETFONT, (WPARAM) font, TRUE);
-}
 # endif
 }
 #endif
 #if defined(FEAT_OLE) || defined(FEAT_EVAL) || defined(PROTO)
 {
 // TRACE0("gui_mch_enable_beval_area |||");
 if (beval == NULL)
 	return;
 // TRACE0("gui_mch_enable_beval_area {{{");
-BevalTimerId = SetTimer(s_textArea, 0, p_bdlay / 2,
+BevalTimerId = SetTimer(s_textArea, 0, p_bdlay / 2, BevalTimerProc);
-						   (TIMERPROC)BevalTimerProc);
 // TRACE0("gui_mch_enable_beval_area }}}");
 }
 void
 gui_mch_post_balloon(beval, mesg)

Mercurial > vim

comparison src/gui_w32.c @ 843:9f279ebda751 v7.0f01