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

patch 8.0.0447: getting font name does not work on X11

Browse Source 
Problem:    Getting font name does not work on X11.
Solution:   Implement gui_mch_get_fontname() for X11.  Add more GUI tests.
            (Kazunobu Kuriyama)
This commit is contained in:
Bram Moolenaar
2017-03-12 17:10:33 +01:00
parent 454709baff
commit 8774845ce1
11 changed files with 274 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/gui_x11.c
View File

@@ -1992,14 +1992,40 @@ gui_mch_get_font(char_u *name, int giveErrorIfMissing)
#if defined(FEAT_EVAL) || defined(PROTO)
/*
* Return the name of font "font" in allocated memory.
* Don't know how to get the actual name, thus use the provided name.
*/
char_u *
gui_mch_get_fontname(GuiFont font UNUSED, char_u *name)
gui_mch_get_fontname(GuiFont font, char_u *name)
{
if (name == NULL)
return NULL;
return vim_strsave(name);
char_u *ret = NULL;
if (name != NULL && font == NULL)
{
/* In this case, there's no way other than doing this. */
ret = vim_strsave(name);
}
else if (font != NULL)
{
/* In this case, try to retrieve the XLFD corresponding to 'font'->fid;
* if failed, use 'name' unless it's NULL. */
unsigned long value = 0L;
if (XGetFontProperty(font, XA_FONT, &value))
{
char *xa_font_name = NULL;
xa_font_name = XGetAtomName(gui.dpy, value);
if (xa_font_name != NULL)
{
ret = vim_strsave((char_u *)xa_font_name);
XFree(xa_font_name);
}
else if (name != NULL)
ret = vim_strsave(name);
}
else if (name != NULL)
ret = vim_strsave(name);
}
return ret;
}
#endif