Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-02-04 13:08:31 +00:00
Code Issues Releases Activity

cleaning up

Browse Source 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1018 7f574dfc-610e-0410-a909-a81674777703
This commit is contained in:
Brenden Matthews 2008-03-20 19:22:29 +00:00
parent a76c4fb437
commit e48d5ce71e
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/conky.c
View File

@ -207,14 +207,13 @@ int addfont(const char *data_in)
memset(fonts, 0, sizeof(struct font_list)); memset(fonts, 0, sizeof(struct font_list));
} }
fonts = realloc(fonts, (sizeof(struct font_list) * (font_count + 1))); fonts = realloc(fonts, (sizeof(struct font_list) * (font_count + 1)));
memset(fonts + (sizeof(struct font_list) * font_count), 0, sizeof(struct font_list)); memset(&fonts[font_count], 0, sizeof(struct font_list));
if (fonts == NULL) { if (fonts == NULL) {
CRIT_ERR("realloc in addfont"); CRIT_ERR("realloc in addfont");
} }
// must account for null terminator // must account for null terminator
if (strlen(data_in) < DEFAULT_TEXT_BUFFER_SIZE) { if (strlen(data_in) < DEFAULT_TEXT_BUFFER_SIZE) {
strncpy(fonts[font_count].name, data_in, DEFAULT_TEXT_BUFFER_SIZE); strncpy(fonts[font_count].name, data_in, DEFAULT_TEXT_BUFFER_SIZE);
printf("adding font %s\n", fonts[font_count].name);
#ifdef XFT #ifdef XFT
fonts[font_count].font_alpha = 0xffff; fonts[font_count].font_alpha = 0xffff;
#endif #endif
@ -271,19 +270,15 @@ static void load_fonts()
for (i = 0; i <= font_count; i++) { for (i = 0; i <= font_count; i++) {
#ifdef XFT #ifdef XFT
/* load Xft font */ /* load Xft font */
/* if (use_xft && fonts[i].xftfont) { if (use_xft && fonts[i].xftfont) {
continue; continue;
} else*/ if (use_xft) { } else if (use_xft) {
/* if (fonts[i].xftfont != NULL && selected_font == 0) { /* if (fonts[i].xftfont != NULL && selected_font == 0) {
XftFontClose(display, fonts[i].xftfont); XftFontClose(display, fonts[i].xftfont);
} */ } */
if (fonts[i].xftfont) {
printf("lol, %i\n", fonts[i].xftfont);
}
fonts[i].xftfont = XftFontOpenName(display, screen, fonts[i].xftfont = XftFontOpenName(display, screen,
fonts[i].name); fonts[i].name);
if (fonts[i].xftfont != NULL) { if (fonts[i].xftfont != NULL) {
printf("loaded %s, %i\n", fonts[i].name, font_count);
continue; continue;
} }
@ -308,7 +303,7 @@ static void load_fonts()
XFreeFont(display, fonts[i].font); XFreeFont(display, fonts[i].font);
} */ } */
if ((fonts[i].font = XLoadQueryFont(display, fonts[i].name)) == NULL) { if (!fonts[i].font || (fonts[i].font = XLoadQueryFont(display, fonts[i].name)) == NULL) {
ERR("can't load font '%s'", fonts[i].name); ERR("can't load font '%s'", fonts[i].name);
if ((fonts[i].font = XLoadQueryFont(display, "fixed")) == NULL) { if ((fonts[i].font = XLoadQueryFont(display, "fixed")) == NULL) {
CRIT_ERR("can't load font '%s'", "fixed"); CRIT_ERR("can't load font '%s'", "fixed");