vim: src/gui_w32.c comparison

comparison src/gui_w32.c @ 16152:8f4eccaaf2c0 v8.1.1081

patch 8.1.1081: MS-Windows: cannot use some fonts commit https://github.com/vim/vim/commit/433a5eb9de861dd01ea3b3dfa3b8fe23527cab54 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Mar 30 16:24:16 2019 +0100 patch 8.1.1081: MS-Windows: cannot use some fonts Problem: MS-Windows: cannot use fonts whose name cannot be represented in the current code page. Solution: Use wide font functions. (Ken Takata, closes #4000)

author	Bram Moolenaar <Bram@vim.org>
date	Sat, 30 Mar 2019 16:30:04 +0100
parents	a246b020984c
children	cd5c83115ec6

comparison

equal deleted inserted replaced

-:6285d4ff3255
+:8f4eccaaf2c0
 typedef int HANDLE;
 typedef int HBITMAP;
 typedef int HBRUSH;
 typedef int HDROP;
 typedef int INT;
-typedef int LOGFONT[];
+typedef int LOGFONTW[];
 typedef int LPARAM;
 typedef int LPCREATESTRUCT;
 typedef int LPCSTR;
 typedef int LPCTSTR;
 typedef int LPRECT;
 #endif
 /*
 * For control IME.
 *
-* These LOGFONT used for IME.
+* These LOGFONTW used for IME.
 */
 #if defined(FEAT_MBYTE_IME) || defined(GLOBAL_IME)
-/* holds LOGFONT for 'guifontwide' if available, otherwise 'guifont' */
+/* holds LOGFONTW for 'guifontwide' if available, otherwise 'guifont' */
-static LOGFONT norm_logfont;
+static LOGFONTW norm_logfont;
 #endif
 #ifdef FEAT_MBYTE_IME
-/* holds LOGFONT for 'guifont' always. */
+/* holds LOGFONTW for 'guifont' always. */
-static LOGFONT sub_logfont;
+static LOGFONTW sub_logfont;
 #endif
 #ifdef FEAT_MBYTE_IME
 static LRESULT _OnImeNotify(HWND hWnd, DWORD dwCommand, DWORD dwData);
 #endif
 GetFontSize(gui.norm_font);
 return OK;
 }
 static GuiFont
-get_font_handle(LOGFONT *lf)
+get_font_handle(LOGFONTW *lf)
 {
 HFONT   font = NULL;
 /* Load the font */
-font = CreateFontIndirect(lf);
+font = CreateFontIndirectW(lf);
 if (font == NULL)
 	return NOFONT;
 return (GuiFont)font;
 GuiFont
 gui_mch_get_font(
 char_u	*name,
 int		giveErrorIfMissing)
 {
-LOGFONT	lf;
+LOGFONTW	lf;
 GuiFont	font = NOFONT;
 if (get_logfont(&lf, name, NULL, giveErrorIfMissing) == OK)
 	font = get_font_handle(&lf);
 if (font == NOFONT && giveErrorIfMissing)
 global_ime_end();
 #endif
 }
 static char_u *
-logfont2name(LOGFONT lf)
+logfont2name(LOGFONTW lf)
 {
 char	*p;
 char	*res;
 char	*charset_name;
 char	*quality_name;
-char	*font_name = lf.lfFaceName;
+char	*font_name;
+font_name = (char *)utf16_to_enc(lf.lfFaceName, NULL);
+if (font_name == NULL)
+	return NULL;
 charset_name = charset_id2name((int)lf.lfCharSet);
-/* Convert a font name from the current codepage to 'encoding'.
-* TODO: Use Wide APIs (including LOGFONTW) instead of ANSI APIs. */
-if (enc_codepage >= 0 && (int)GetACP() != enc_codepage)
-{
-	int	len;
-	acp_to_enc((char_u *)lf.lfFaceName, (int)strlen(lf.lfFaceName),
-						(char_u **)&font_name, &len);
-}
 quality_name = quality_id2name((int)lf.lfQuality);
 res = (char *)alloc((unsigned)(strlen(font_name) + 20
 		    + (charset_name == NULL ? 0 : strlen(charset_name) + 2)));
 if (res != NULL)
 	    STRCAT(p, ":q");
 	    STRCAT(p, quality_name);
 	}
 }
-if (font_name != lf.lfFaceName)
+vim_free(font_name);
-	vim_free(font_name);
 return (char_u *)res;
 }
 #ifdef FEAT_MBYTE_IME
 /*
-* Set correct LOGFONT to IME.  Use 'guifontwide' if available, otherwise use
+* Set correct LOGFONTW to IME.  Use 'guifontwide' if available, otherwise use
 * 'guifont'
 */
 static void
 update_im_font(void)
 {
-LOGFONT	lf_wide;
+LOGFONTW	lf_wide;
 if (p_guifontwide != NULL && *p_guifontwide != NUL
 	    && gui.wide_font != NOFONT
-	    && GetObject((HFONT)gui.wide_font, sizeof(lf_wide), &lf_wide))
+	    && GetObjectW((HFONT)gui.wide_font, sizeof(lf_wide), &lf_wide))
 	norm_logfont = lf_wide;
 else
 	norm_logfont = sub_logfont;
 im_set_font(&norm_logfont);
 }
 * Handler of gui.wide_font (p_guifontwide) changed notification.
 */
 void
 gui_mch_wide_font_changed(void)
 {
-LOGFONT lf;
+LOGFONTW lf;
 #ifdef FEAT_MBYTE_IME
 update_im_font();
 #endif
 gui.wide_bold_font = NOFONT;
 gui_mch_free_font(gui.wide_boldital_font);
 gui.wide_boldital_font = NOFONT;
 if (gui.wide_font
-	&& GetObject((HFONT)gui.wide_font, sizeof(lf), &lf))
+	&& GetObjectW((HFONT)gui.wide_font, sizeof(lf), &lf))
 {
 	if (!lf.lfItalic)
 	{
 	    lf.lfItalic = TRUE;
 	    gui.wide_ital_font = get_font_handle(&lf);
 * Return FAIL if the font could not be loaded, OK otherwise.
 */
 int
 gui_mch_init_font(char_u *font_name, int fontset UNUSED)
 {
-LOGFONT	lf;
+LOGFONTW	lf;
 GuiFont	font = NOFONT;
 char_u	*p;
 /* Load the font */
 if (get_logfont(&lf, font_name, NULL, TRUE) == OK)
 static HIMC (WINAPI *pImmGetContext)(HWND);
 static HIMC (WINAPI *pImmAssociateContext)(HWND, HIMC);
 static BOOL (WINAPI *pImmReleaseContext)(HWND, HIMC);
 static BOOL (WINAPI *pImmGetOpenStatus)(HIMC);
 static BOOL (WINAPI *pImmSetOpenStatus)(HIMC, BOOL);
-static BOOL (WINAPI *pImmGetCompositionFont)(HIMC, LPLOGFONTA);
+static BOOL (WINAPI *pImmGetCompositionFontW)(HIMC, LPLOGFONTW);
-static BOOL (WINAPI *pImmSetCompositionFont)(HIMC, LPLOGFONTA);
+static BOOL (WINAPI *pImmSetCompositionFontW)(HIMC, LPLOGFONTW);
 static BOOL (WINAPI *pImmSetCompositionWindow)(HIMC, LPCOMPOSITIONFORM);
 static BOOL (WINAPI *pImmGetConversionStatus)(HIMC, LPDWORD, LPDWORD);
 static BOOL (WINAPI *pImmSetConversionStatus)(HIMC, DWORD, DWORD);
 static void dyn_imm_load(void);
 #else
 # define pImmGetContext		  ImmGetContext
 # define pImmAssociateContext	  ImmAssociateContext
 # define pImmReleaseContext	  ImmReleaseContext
 # define pImmGetOpenStatus	  ImmGetOpenStatus
 # define pImmSetOpenStatus	  ImmSetOpenStatus
-# define pImmGetCompositionFont   ImmGetCompositionFontA
+# define pImmGetCompositionFontW  ImmGetCompositionFontW
-# define pImmSetCompositionFont   ImmSetCompositionFontA
+# define pImmSetCompositionFontW  ImmSetCompositionFontW
 # define pImmSetCompositionWindow ImmSetCompositionWindow
 # define pImmGetConversionStatus  ImmGetConversionStatus
 # define pImmSetConversionStatus  ImmSetConversionStatus
 #endif
 /*
 * Get Menu Font.
 * Return OK or FAIL.
 */
 static int
-gui_w32_get_menu_font(LOGFONT *lf)
+gui_w32_get_menu_font(LOGFONTW *lf)
 {
-NONCLIENTMETRICS nm;
+NONCLIENTMETRICSW nm;
-nm.cbSize = sizeof(NONCLIENTMETRICS);
+nm.cbSize = sizeof(NONCLIENTMETRICSW);
-if (!SystemParametersInfo(
+if (!SystemParametersInfoW(
 	    SPI_GETNONCLIENTMETRICS,
-	    sizeof(NONCLIENTMETRICS),
+	    sizeof(NONCLIENTMETRICSW),
 	    &nm,
 	    0))
 	return FAIL;
 *lf = nm.lfMenuFont;
 return OK;
 * Set the GUI tabline font to the system menu font
 */
 static void
 set_tabline_font(void)
 {
-LOGFONT	lfSysmenu;
+LOGFONTW	lfSysmenu;
 HFONT	font;
 HWND	hwnd;
 HDC		hdc;
 HFONT	hfntOld;
 TEXTMETRIC	tm;
 if (gui_w32_get_menu_font(&lfSysmenu) != OK)
 	return;
-font = CreateFontIndirect(&lfSysmenu);
+font = CreateFontIndirectW(&lfSysmenu);
 SendMessage(s_tabhwnd, WM_SETFONT, (WPARAM)font, TRUE);
 /*
 * Compute the height of the font used for the tab text
 switch (dwCommand)
 {
 	case IMN_SETOPENSTATUS:
 	    if (pImmGetOpenStatus(hImc))
 	    {
-		pImmSetCompositionFont(hImc, &norm_logfont);
+		pImmSetCompositionFontW(hImc, &norm_logfont);
 		im_set_position(gui.row, gui.col);
 		/* Disable langmap */
 		State &= ~LANGMAP;
 		if (State & INSERT)
 /*
 * set font to IM.
 */
 void
-im_set_font(LOGFONT *lf)
+im_set_font(LOGFONTW *lf)
 {
 HIMC hImc;
 if (pImmGetContext && (hImc = pImmGetContext(s_hwnd)) != (HIMC)0)
 {
-	pImmSetCompositionFont(hImc, lf);
+	pImmSetCompositionFontW(hImc, lf);
 	pImmReleaseContext(s_hwnd, hImc);
 }
 }
 /*
 int		scroll_flag = 0;
 int		vertical;
 int		dlgPaddingX;
 int		dlgPaddingY;
 #ifdef USE_SYSMENU_FONT
-LOGFONT	lfSysmenu;
+LOGFONTW	lfSysmenu;
 int		use_lfSysmenu = FALSE;
 #endif
 garray_T	ga;
 int		l;
 hwnd = GetDesktopWindow();
 hdc = GetWindowDC(hwnd);
 #ifdef USE_SYSMENU_FONT
 if (gui_w32_get_menu_font(&lfSysmenu) == OK)
 {
-	font = CreateFontIndirect(&lfSysmenu);
+	font = CreateFontIndirectW(&lfSysmenu);
 	use_lfSysmenu = TRUE;
 }
 else
 #endif
 font = CreateFont(-DLG_FONT_POINT_SIZE, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	if (use_lfSysmenu)
 	{
 	    /* point size */
 	    *p++ = -MulDiv(lfSysmenu.lfHeight, 72,
 		    GetDeviceCaps(hdc, LOGPIXELSY));
-	    nchar = nCopyAnsiToWideChar(p, lfSysmenu.lfFaceName, FALSE);
+	    wcscpy(p, lfSysmenu.lfFaceName);
+	    nchar = (int)wcslen(lfSysmenu.lfFaceName) + 1;
 	}
 	else
 #endif
 	{
 	    *p++ = DLG_FONT_POINT_SIZE;		// point size
 HDC		    hdc;
 HFONT	    hfontTools = 0;
 DWORD	    dlgFontSize;
 SIZE	    size;
 #ifdef USE_SYSMENU_FONT
-LOGFONT	    lfSysmenu;
+LOGFONTW	    lfSysmenu;
 #endif
 s_usenewlook = FALSE;
 #ifdef USE_SYSMENU_FONT
 if (gui_w32_get_menu_font(&lfSysmenu) == OK)
-	hfontTools = CreateFontIndirect(&lfSysmenu);
+	hfontTools = CreateFontIndirectW(&lfSysmenu);
 else
 #endif
 	hfontTools = CreateFont(-DLG_FONT_POINT_SIZE, 0, 0, 0, 0, 0, 0, 0,
 				0, 0, 0, 0, VARIABLE_PITCH , DLG_FONT_NAME);
 int		padding0, padding1, padding2 = 0;
 int		sepPadding=0;
 int		x;
 int		y;
 #ifdef USE_SYSMENU_FONT
-LOGFONT	lfSysmenu;
+LOGFONTW	lfSysmenu;
 int		use_lfSysmenu = FALSE;
 #endif
 /*
 * If this menu is already torn off, move it to the mouse position.
 hwnd = GetDesktopWindow();
 hdc = GetWindowDC(hwnd);
 #ifdef USE_SYSMENU_FONT
 if (gui_w32_get_menu_font(&lfSysmenu) == OK)
 {
-	font = CreateFontIndirect(&lfSysmenu);
+	font = CreateFontIndirectW(&lfSysmenu);
 	use_lfSysmenu = TRUE;
 }
 else
 #endif
 font = CreateFont(-DLG_FONT_POINT_SIZE, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	if (use_lfSysmenu)
 	{
 	    /* point size */
 	    *p++ = -MulDiv(lfSysmenu.lfHeight, 72,
 		    GetDeviceCaps(hdc, LOGPIXELSY));
-	    nchar = nCopyAnsiToWideChar(p, lfSysmenu.lfFaceName, FALSE);
+	    wcscpy(p, lfSysmenu.lfFaceName);
+	    nchar = (int)wcslen(lfSysmenu.lfFaceName) + 1;
 	}
 	else
 #endif
 	{
 	    *p++ = DLG_FONT_POINT_SIZE;		// point size
 	    = (void *)GetProcAddress(hLibImm, "ImmReleaseContext");
 pImmGetOpenStatus
 	    = (void *)GetProcAddress(hLibImm, "ImmGetOpenStatus");
 pImmSetOpenStatus
 	    = (void *)GetProcAddress(hLibImm, "ImmSetOpenStatus");
-pImmGetCompositionFont
+pImmGetCompositionFontW
-	    = (void *)GetProcAddress(hLibImm, "ImmGetCompositionFontA");
+	    = (void *)GetProcAddress(hLibImm, "ImmGetCompositionFontW");
-pImmSetCompositionFont
+pImmSetCompositionFontW
-	    = (void *)GetProcAddress(hLibImm, "ImmSetCompositionFontA");
+	    = (void *)GetProcAddress(hLibImm, "ImmSetCompositionFontW");
 pImmSetCompositionWindow
 	    = (void *)GetProcAddress(hLibImm, "ImmSetCompositionWindow");
 pImmGetConversionStatus
 	    = (void *)GetProcAddress(hLibImm, "ImmGetConversionStatus");
 pImmSetConversionStatus
 	    || pImmGetContext == NULL
 	    || pImmAssociateContext == NULL
 	    || pImmReleaseContext == NULL
 	    || pImmGetOpenStatus == NULL
 	    || pImmSetOpenStatus == NULL
-	    || pImmGetCompositionFont == NULL
+	    || pImmGetCompositionFontW == NULL
-	    || pImmSetCompositionFont == NULL
+	    || pImmSetCompositionFontW == NULL
 	    || pImmSetCompositionWindow == NULL
 	    || pImmGetConversionStatus == NULL
 	    || pImmSetConversionStatus == NULL)
 {
 	FreeLibrary(hLibImm);

Mercurial > vim

comparison src/gui_w32.c @ 16152:8f4eccaaf2c0 v8.1.1081