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

Merge branch 'master' of git.omp.am:/home/omp/git/conky

Browse Source
This commit is contained in:
Brenden Matthews 2009-06-06 12:20:13 -06:00
commit 8e81d4e816
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/conky.c
View File

@ -3612,8 +3612,18 @@ static void generate_text_internal(char *p, int p_max_size,
} }
} }
OBJ(wireless_link_bar) { OBJ(wireless_link_bar) {
new_bar(p, obj->a, obj->b, ((double) obj->data.net->link_qual / #ifdef X11
obj->data.net->link_qual_max) * 255.0); if(output_methods & TO_X) {
new_bar(p, obj->a, obj->b, ((double) obj->data.net->link_qual /
obj->data.net->link_qual_max) * 255.0);
}else{
#endif /* X11 */
if(!obj->a) obj->a = DEFAULT_BAR_WIDTH_NO_X;
new_bar_in_shell(p, p_max_size, ((double) obj->data.net->link_qual /
obj->data.net->link_qual_max) * 100.0, obj->a);
#ifdef X11
}
#endif /* X11 */
} }
#endif /* HAVE_IWLIB */ #endif /* HAVE_IWLIB */

2
src/text_object.h
View File

@ -177,9 +177,7 @@ enum text_object_type {
OBJ_wireless_link_qual, OBJ_wireless_link_qual,
OBJ_wireless_link_qual_max, OBJ_wireless_link_qual_max,
OBJ_wireless_link_qual_perc, OBJ_wireless_link_qual_perc,
#ifdef X11
OBJ_wireless_link_bar, OBJ_wireless_link_bar,
#endif /* X11 */
#endif /* __linux__ */ #endif /* __linux__ */
#if defined(__FreeBSD__) || defined(__linux__) #if defined(__FreeBSD__) || defined(__linux__)
OBJ_if_up, OBJ_if_up,