thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.3.782

Browse Source 
Problem:    Windows: IME composition may use a wrong font.
Solution:   Use 'guifontwide' for IME when it is set. (Taro Muraoka)
This commit is contained in:
Bram Moolenaar
2013-01-23 18:37:40 +01:00
parent 4593396625
commit 0f2721223e
6 changed files with 51 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/gui_w48.c
View File

@@ -323,10 +323,15 @@ static void TrackUserActivity __ARGS((UINT uMsg));
/*
* For control IME.
*
* These LOGFONT used for IME.
*/
#ifdef FEAT_MBYTE
# ifdef USE_IM_CONTROL
/* holds LOGFONT for 'guifontwide' if available, otherwise 'guifont' */
static LOGFONT norm_logfont;
/* holds LOGFONT for 'guifont' always. */
static LOGFONT sub_logfont;
# endif
#endif
@@ -3090,6 +3095,39 @@ logfont2name(LOGFONT lf)
return res;
}
#ifdef FEAT_MBYTE_IME
/*
* Set correct LOGFONT to IME. Use 'guifontwide' if available, otherwise use
* 'guifont'
*/
static void
update_im_font()
{
LOGFONT lf_wide;
if (p_guifontwide != NULL && *p_guifontwide != NUL
&& get_logfont(&lf_wide, p_guifontwide, NULL, TRUE) == OK)
norm_logfont = lf_wide;
else
norm_logfont = sub_logfont;
im_set_font(&norm_logfont);
}
#endif
#ifdef FEAT_MBYTE
/*
* Handler of gui.wide_font (p_guifontwide) changed notification.
*/
void
gui_mch_wide_font_changed()
{
# ifdef FEAT_MBYTE_IME
update_im_font();
# endif
}
#endif
/*
* Initialise vim to use the font with the given name.
* Return FAIL if the font could not be loaded, OK otherwise.
@@ -3112,9 +3150,10 @@ gui_mch_init_font(char_u *font_name, int fontset)
font_name = lf.lfFaceName;
#if defined(FEAT_MBYTE_IME) || defined(GLOBAL_IME)
norm_logfont = lf;
sub_logfont = lf;
#endif
#ifdef FEAT_MBYTE_IME
im_set_font(&lf);
update_im_font();
#endif
gui_mch_free_font(gui.norm_font);
gui.norm_font = font;