Mercurial > vim

comparison src/gui_x11.c @ 46:46d39f2eff86 v7.0027

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.0027
author vimboss
date Fri, 31 Dec 2004 21:01:02 +0000
parents 410fa1a31baf
children 8c25f10d49e7
comparison
equal deleted inserted replaced
45:e474bae3795f 46:46d39f2eff86
1832 { 1832 {
1833 XFontStruct *font = NULL; 1833 XFontStruct *font = NULL;
1834 1834
1835 #ifdef FEAT_XFONTSET 1835 #ifdef FEAT_XFONTSET
1836 XFontSet fontset = NULL; 1836 XFontSet fontset = NULL;
1837 1837 #endif
1838
1839 #ifdef FEAT_GUI_MOTIF
1840 /* A font name equal "*" is indicating, that we should activate the font
1841 * selection dialogue to get a new font name. So let us do it here. */
1842 if (font_name != NULL && STRCMP(font_name, "*") == 0)
1843 font_name = gui_xm_select_font(hl_get_font_name());
1844 #endif
1845
1846 #ifdef FEAT_XFONTSET
1838 if (do_fontset) 1847 if (do_fontset)
1839 { 1848 {
1840 /* If 'guifontset' is set, VIM treats all font specifications as if 1849 /* If 'guifontset' is set, VIM treats all font specifications as if
1841 * they were fontsets, and 'guifontset' becomes the default. */ 1850 * they were fontsets, and 'guifontset' becomes the default. */
1842 if (font_name != NULL) 1851 if (font_name != NULL)
1934 XFreeFont(gui.dpy, (XFontStruct *)gui.boldital_font); 1943 XFreeFont(gui.dpy, (XFontStruct *)gui.boldital_font);
1935 gui.boldital_font = NOFONT; 1944 gui.boldital_font = NOFONT;
1936 } 1945 }
1937 } 1946 }
1938 1947
1948 #ifdef FEAT_GUI_MOTIF
1949 gui_motif_synch_fonts();
1950 #endif
1951
1939 return OK; 1952 return OK;
1940 } 1953 }
1941 1954
1942 /* 1955 /*
1943 * Get a font structure for highlighting. 1956 * Get a font structure for highlighting.
1986 return NOFONT; 1999 return NOFONT;
1987 } 2000 }
1988 return (GuiFont)font; 2001 return (GuiFont)font;
1989 } 2002 }
1990 2003
2004 #if defined(FEAT_EVAL) || defined(PROTO)
1991 /* 2005 /*
1992 * Return the name of font "font" in allocated memory. 2006 * Return the name of font "font" in allocated memory.
1993 * Don't know how to get the actual name, thus use the provided name. 2007 * Don't know how to get the actual name, thus use the provided name.
1994 */ 2008 */
1995 /*ARGSUSED*/ 2009 /*ARGSUSED*/
2000 { 2014 {
2001 if (name == NULL) 2015 if (name == NULL)
2002 return NULL; 2016 return NULL;
2003 return vim_strsave(name); 2017 return vim_strsave(name);
2004 } 2018 }
2019 #endif
2005 2020
2006 int 2021 int
2007 gui_mch_adjust_charsize() 2022 gui_mch_adjust_charsize()
2008 { 2023 {
2009 #ifdef FEAT_XFONTSET 2024 #ifdef FEAT_XFONTSET