mirror of
https://github.com/Llewellynvdm/conky.git
synced 2025-01-13 11:15:27 +00:00
docs; small code simplification
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1119 7f574dfc-610e-0410-a909-a81674777703
This commit is contained in:
parent
c70e1ead9f
commit
a7da3b17bc
10
README
10
README
@ -697,11 +697,11 @@ VARIABLES
|
|||||||
|
|
||||||
|
|
||||||
downspeed net
|
downspeed net
|
||||||
Download speed in kilobytes
|
Download speed in KiB
|
||||||
|
|
||||||
|
|
||||||
downspeedf net
|
downspeedf net
|
||||||
Download speed in kilobytes with one decimal
|
Download speed in KiB with one decimal
|
||||||
|
|
||||||
|
|
||||||
downspeedgraph net (height),(width) (gradient colour 1) (gradient
|
downspeedgraph net (height),(width) (gradient colour 1) (gradient
|
||||||
@ -1376,11 +1376,11 @@ VARIABLES
|
|||||||
|
|
||||||
|
|
||||||
upspeed net
|
upspeed net
|
||||||
Upload speed in kilobytes
|
Upload speed in KiB
|
||||||
|
|
||||||
|
|
||||||
upspeedf net
|
upspeedf net
|
||||||
Upload speed in kilobytes with one decimal
|
Upload speed in KiB with one decimal
|
||||||
|
|
||||||
|
|
||||||
upspeedgraph net (height),(width) (gradient colour 1) (gradient colour
|
upspeedgraph net (height),(width) (gradient colour 1) (gradient colour
|
||||||
@ -1575,4 +1575,4 @@ AUTHORS
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
2008-03-31 conky(1)
|
2008-05-06 conky(1)
|
||||||
|
10
doc/conky.1
10
doc/conky.1
@ -5,7 +5,7 @@
|
|||||||
\\$2 \(la\\$1\(ra\\$3
|
\\$2 \(la\\$1\(ra\\$3
|
||||||
..
|
..
|
||||||
.if \n(.g .mso www.tmac
|
.if \n(.g .mso www.tmac
|
||||||
.TH conky 1 2008-03-31 "" ""
|
.TH conky 1 2008-05-06 "" ""
|
||||||
.SH NAME
|
.SH NAME
|
||||||
conky \- A system monitor for X originally based on the torsmo code, but more kickass. It just keeps on given'er. Yeah.
|
conky \- A system monitor for X originally based on the torsmo code, but more kickass. It just keeps on given'er. Yeah.
|
||||||
.SH SYNOPSIS
|
.SH SYNOPSIS
|
||||||
@ -657,11 +657,11 @@ Disk protection status, if supported (needs kernel-patch). Prints either "frozen
|
|||||||
|
|
||||||
.TP
|
.TP
|
||||||
\fB\*(T<\fBdownspeed\fR\*(T>\fR \*(T<\fBnet\fR\*(T>
|
\fB\*(T<\fBdownspeed\fR\*(T>\fR \*(T<\fBnet\fR\*(T>
|
||||||
Download speed in kilobytes
|
Download speed in KiB
|
||||||
|
|
||||||
.TP
|
.TP
|
||||||
\fB\*(T<\fBdownspeedf\fR\*(T>\fR \*(T<\fBnet\fR\*(T>
|
\fB\*(T<\fBdownspeedf\fR\*(T>\fR \*(T<\fBnet\fR\*(T>
|
||||||
Download speed in kilobytes with one decimal
|
Download speed in KiB with one decimal
|
||||||
|
|
||||||
.TP
|
.TP
|
||||||
\fB\*(T<\fBdownspeedgraph\fR\*(T>\fR \*(T<\fBnet (height),(width) (gradient colour 1) (gradient colour 2) (scale)\fR\*(T>
|
\fB\*(T<\fBdownspeedgraph\fR\*(T>\fR \*(T<\fBnet (height),(width) (gradient colour 1) (gradient colour 2) (scale)\fR\*(T>
|
||||||
@ -1224,11 +1224,11 @@ for debugging
|
|||||||
|
|
||||||
.TP
|
.TP
|
||||||
\fB\*(T<\fBupspeed\fR\*(T>\fR \*(T<\fBnet\fR\*(T>
|
\fB\*(T<\fBupspeed\fR\*(T>\fR \*(T<\fBnet\fR\*(T>
|
||||||
Upload speed in kilobytes
|
Upload speed in KiB
|
||||||
|
|
||||||
.TP
|
.TP
|
||||||
\fB\*(T<\fBupspeedf\fR\*(T>\fR \*(T<\fBnet\fR\*(T>
|
\fB\*(T<\fBupspeedf\fR\*(T>\fR \*(T<\fBnet\fR\*(T>
|
||||||
Upload speed in kilobytes with one decimal
|
Upload speed in KiB with one decimal
|
||||||
|
|
||||||
.TP
|
.TP
|
||||||
\fB\*(T<\fBupspeedgraph\fR\*(T>\fR \*(T<\fBnet (height),(width) (gradient colour 1) (gradient colour 2) (scale)\fR\*(T>
|
\fB\*(T<\fBupspeedgraph\fR\*(T>\fR \*(T<\fBnet (height),(width) (gradient colour 1) (gradient colour 2) (scale)\fR\*(T>
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
<firstname>Brenden</firstname>
|
<firstname>Brenden</firstname>
|
||||||
<surname>Matthews</surname>
|
<surname>Matthews</surname>
|
||||||
</author>
|
</author>
|
||||||
<date>2008-03-31</date>
|
<date>2008-05-06</date>
|
||||||
</refentryinfo>
|
</refentryinfo>
|
||||||
|
|
||||||
<refmeta>
|
<refmeta>
|
||||||
|
@ -6566,7 +6566,6 @@ static void draw_string(const char *s)
|
|||||||
int i, i2, pos, width_of_s;
|
int i, i2, pos, width_of_s;
|
||||||
int max = 0;
|
int max = 0;
|
||||||
int added;
|
int added;
|
||||||
char space[2];
|
|
||||||
|
|
||||||
if (s[0] == '\0') {
|
if (s[0] == '\0') {
|
||||||
return;
|
return;
|
||||||
@ -6583,9 +6582,8 @@ static void draw_string(const char *s)
|
|||||||
pos = 0;
|
pos = 0;
|
||||||
added = 0;
|
added = 0;
|
||||||
|
|
||||||
snprintf(space, 2, " ");
|
|
||||||
#ifdef X11
|
#ifdef X11
|
||||||
max = ((text_width - width_of_s) / get_string_width(space));
|
max = ((text_width - width_of_s) / get_string_width(" "));
|
||||||
#endif /* X11 */
|
#endif /* X11 */
|
||||||
/* This code looks for tabs in the text and coverts them to spaces.
|
/* This code looks for tabs in the text and coverts them to spaces.
|
||||||
* The trick is getting the correct number of spaces, and not going
|
* The trick is getting the correct number of spaces, and not going
|
||||||
|
Loading…
Reference in New Issue
Block a user