Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-17 10:35:10 +00:00
Code Issues Releases Activity

xft fix

Browse Source 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@54 7f574dfc-610e-0410-a909-a81674777703
This commit is contained in:
Brenden Matthews 2005-08-04 05:44:39 +00:00
parent 710f4f4822
commit 8252c37c75
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Conky.kdevelop
View File

@ -21,7 +21,7 @@
<mainprogram>conky</mainprogram>
<directoryradio>build</directoryradio>
<customdirectory>/</customdirectory>
<programargs/>
<programargs></programargs>
<terminal>false</terminal>
<autocompile>true</autocompile>
<envvars/>
@ -48,7 +48,7 @@
<f77flags/>
</optimized>
<debug>
<configargs>--enable-debug=full --prefix=/usr --enable-mpd --disable-xft --enable-seti --enable-double-buffer --enable-own-window --enable-metar --enable-mldonkey</configargs>
<configargs>--enable-debug=full --prefix=/usr --enable-mpd --enable-xft --enable-seti --enable-double-buffer --enable-own-window --enable-metar --enable-mldonkey</configargs>
<builddir>debug</builddir>
<ccompiler>kdevgccoptions</ccompiler>
<cxxcompiler>kdevgppoptions</cxxcompiler>

9
conky.c
View File

@ -75,7 +75,6 @@ struct font_list *fonts = NULL;
int addfont(const char *data_in)
{
//printf("setting additional font %s\n");
if (font_count > MAX_FONTS) {
CRIT_ERR("you don't need that many fonts, sorry.");
}
@ -102,7 +101,6 @@ int addfont(const char *data_in)
void set_first_font(const char *data_in)
{
//printf("setting first font %s\n");
if (font_count < 0) {
if ((fonts = (struct font_list*)malloc(sizeof(struct font_list))) == NULL) {
CRIT_ERR("malloc");
@ -130,9 +128,9 @@ static void load_fonts()
#ifdef XFT
/* load Xft font */
if (use_xft) {
if (fonts[i].xftfont != NULL)
if (fonts[i].xftfont != NULL && font_count < 1) {
XftFontClose(display, fonts[i].xftfont);
}
if ((fonts[i].xftfont =
XftFontOpenName(display, screen, fonts[i].name)) != NULL)
continue;
@ -2964,8 +2962,7 @@ static void draw_line(char *s)
}
w = specials[special_index].width;
if (w == 0)
w = text_start_x +
text_width - cur_x - 1;
w = text_start_x + text_width - cur_x - 1;
if (w < 0)
w = 0;
XSetLineAttributes(display,