Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-27 04:32:55 +00:00
Code Issues Releases Activity

Clarify fs free stats.

Browse Source
This commit is contained in:
Brenden Matthews 2009-06-10 11:31:24 -06:00
parent 7cbc8dc13f
commit da65a4bcf8
2 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
doc/variables.xml
View File

@ -1094,7 +1094,8 @@
</term> </term>
<listitem>Bar that shows how much space is free on a file <listitem>Bar that shows how much space is free on a file
system. height is the height in pixels. fs is any file on system. height is the height in pixels. fs is any file on
that file system. that file system. This uses f_bfree (as per man 2 statfs)
if it's available, or f_bavail as a fallback.
<para /></listitem> <para /></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
@ -1104,7 +1105,9 @@
</command> </command>
<option>(fs)</option> <option>(fs)</option>
</term> </term>
<listitem>Free space on a file system available for users. <listitem>Free space on a file system. This uses f_bfree
(as per man 2 statfs) if it's available, or f_bavail as a
fallback.
<para /></listitem> <para /></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
@ -1114,8 +1117,9 @@
</command> </command>
<option>(fs)</option> <option>(fs)</option>
</term> </term>
<listitem>Free percentage of space on a file system <listitem>Free percentage of space on a file system. This
available for users. uses f_bfree (as per man 2 statfs) if it's available, or
f_bavail as a fallback.
<para /></listitem> <para /></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
@ -1145,7 +1149,8 @@
</command> </command>
<option>(fs)</option> <option>(fs)</option>
</term> </term>
<listitem>File system used space. <listitem>File system used space. This uses f_bfree (as per
man 2 statfs) if it's available, or f_bavail as a fallback.
<para /></listitem> <para /></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
@ -1155,7 +1160,9 @@
</command> </command>
<option>(fs)</option> <option>(fs)</option>
</term> </term>
<listitem>Percent of file system used space. <listitem>Percent of file system used space. This uses
f_bfree (as per man 2 statfs) if it's available, or
f_bavail as a fallback.
<para /></listitem> <para /></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>

26
src/conky.c
View File

@ -4327,13 +4327,19 @@ static void generate_text_internal(char *p, int p_max_size,
#ifdef X11 #ifdef X11
if(output_methods & TO_X) { if(output_methods & TO_X) {
new_bar(p, obj->data.fsbar.w, obj->data.fsbar.h, new_bar(p, obj->data.fsbar.w, obj->data.fsbar.h,
(int) (255 - obj->data.fsbar.fs->avail * 255 / (int) (255 - (obj->data.fs->free ?
obj->data.fs->size)); obj->data.fs->free :
obj->data.fsbar.fs->avail) * 255 /
obj->data.fs->size));
}else{ }else{
#endif /* X11 */ #endif /* X11 */
if(!obj->data.fsbar.w) obj->data.fsbar.w = DEFAULT_BAR_WIDTH_NO_X; if(!obj->data.fsbar.w) obj->data.fsbar.w = DEFAULT_BAR_WIDTH_NO_X;
new_bar_in_shell(p, p_max_size, new_bar_in_shell(p, p_max_size, (int) (100 -
(int) (100 - obj->data.fsbar.fs->avail * 100 / obj->data.fs->size), obj->data.fsbar.w); (obj->data.fs->free ?
obj->data.fs->free :
obj->data.fsbar.fs->avail) * 100 /
obj->data.fs->size),
obj->data.fsbar.w);
#ifdef X11 #ifdef X11
} }
#endif /* X11 */ #endif /* X11 */
@ -4391,13 +4397,17 @@ static void generate_text_internal(char *p, int p_max_size,
#ifdef X11 #ifdef X11
if(output_methods & TO_X) { if(output_methods & TO_X) {
new_bar(p, obj->data.fsbar.w, obj->data.fsbar.h, new_bar(p, obj->data.fsbar.w, obj->data.fsbar.h,
(int) (obj->data.fsbar.fs->avail * 255 / (int) ((obj->data.fs->free ?
obj->data.fs->size)); obj->data.fs->free :
obj->data.fsbar.fs->avail) * 255 /
obj->data.fs->size));
}else{ }else{
#endif /* X11 */ #endif /* X11 */
if(!obj->data.fsbar.w) obj->data.fsbar.w = DEFAULT_BAR_WIDTH_NO_X; if(!obj->data.fsbar.w) obj->data.fsbar.w = DEFAULT_BAR_WIDTH_NO_X;
new_bar_in_shell(p, p_max_size, new_bar_in_shell(p, p_max_size, (int)
(int) (obj->data.fsbar.fs->avail * 100 / obj->data.fs->size), obj->data.fsbar.w); ((obj->data.fs->free ? obj->data.fs->free :
obj->data.fsbar.fs->avail) * 100 /
obj->data.fs->size), obj->data.fsbar.w);
#ifdef X11 #ifdef X11
} }
#endif /* X11 */ #endif /* X11 */