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

* Fixed messed up percentages (fs_free_perc, fs_used_perc, mpd_percent).

Browse Source 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1053 7f574dfc-610e-0410-a909-a81674777703
This commit is contained in:
Brenden Matthews 2008-03-28 23:17:01 +00:00
parent 8de47c132d
commit 60985a41e7
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
# $Id$ # $Id$
2008-03-28
* Fixed messed up percentages (fs_free_perc, fs_used_perc, mpd_percent).
2008-03-24 2008-03-24
* Fixed for specifying a non-existent configuration file. * Fixed for specifying a non-existent configuration file.
* Added disk_protect. * Added disk_protect.

12
src/conky.c
View File

@ -5070,8 +5070,8 @@ static void generate_text_internal(char *p, int p_max_size,
OBJ(fs_free_perc) { OBJ(fs_free_perc) {
if (obj->data.fs != NULL) { if (obj->data.fs != NULL) {
if (obj->data.fs->size) { if (obj->data.fs->size) {
spaced_print(p, p_max_size, "%*d", pad_percents, spaced_print(p, p_max_size, "%*d", 4, "fs_free_perc",
"fs_free_perc", (int) ((obj->data.fs->avail * 100) / pad_percents, (int) ((obj->data.fs->avail * 100) /
obj->data.fs->size)); obj->data.fs->size));
} else { } else {
snprintf(p, p_max_size, "0"); snprintf(p, p_max_size, "0");
@ -5108,8 +5108,8 @@ static void generate_text_internal(char *p, int p_max_size,
OBJ(fs_used_perc) { OBJ(fs_used_perc) {
if (obj->data.fs != NULL) { if (obj->data.fs != NULL) {
if (obj->data.fs->size) { if (obj->data.fs->size) {
spaced_print(p, 4, "%*d", pad_percents, spaced_print(p, 4, "%*d", 4, "fs_used_perc",
"fs_used_perc", 100 - ((int) ((obj->data.fs->avail * 100) / pad_percents, 100 - ((int) ((obj->data.fs->avail * 100) /
obj->data.fs->size))); obj->data.fs->size)));
} else { } else {
snprintf(p, p_max_size, "0"); snprintf(p, p_max_size, "0");
@ -5639,8 +5639,8 @@ static void generate_text_internal(char *p, int p_max_size,
} }
} }
OBJ(mpd_percent) { OBJ(mpd_percent) {
spaced_print(p, p_max_size, "%*d", pad_percents, spaced_print(p, p_max_size, "%*d", 4, "mpd_percent",
"mpd_percent", (int) (cur->mpd.progress * 100)); pad_percents, (int) (cur->mpd.progress * 100));
} }
OBJ(mpd_bar) { OBJ(mpd_bar) {
new_bar(p, obj->data.pair.a, obj->data.pair.b, new_bar(p, obj->data.pair.a, obj->data.pair.b,