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

Merge pull request #47 from damluk/1.9.1

Browse Source 
Check if a font has been loaded instead of adding it multiple times
This commit is contained in:
Brenden Matthews 2014-06-17 17:23:33 -07:00
commit ab826d98db
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/specials.c
View File

@ -330,6 +330,15 @@ void new_gauge(struct text_object *obj, char *p, int p_max_size, int usage)
}
#ifdef X11
int find_font(char *name)
{
int i;
for (i = 0; i < font_count; i++)
if (strncmp(name, fonts[i].name, DEFAULT_TEXT_BUFFER_SIZE) == EQUAL)
return i;
return 0;
}
void new_font(char *buf, char *args)
{
if ((output_methods & TO_X) == 0)
@ -337,6 +346,12 @@ void new_font(char *buf, char *args)
if (args) {
struct special_t *s = new_special(buf, FONT);
int index;
if (index = find_font(args))
{
s->font_added = index;
return;
}
if (s->font_added > font_count || !s->font_added || (strncmp(args, fonts[s->font_added].name, DEFAULT_TEXT_BUFFER_SIZE) != EQUAL) ) {
int tmp = selected_font;