1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-05 12:57:59 +00:00
Commit Graph

1437 Commits

Author SHA1 Message Date
Phil Sutter
7001e95186 be consistent when parsing args of cpu objects
The inconsistent naming of the cpu parameter in the docs led me to this,
so I also simplified parsing by introducing the macro SCAN_CPU(). Note
that this introduces a syntactical change to the config: the cpuN
argument now has to be passed at first position to $cpugraph.
2009-04-04 01:25:33 +02:00
Nikos Ntarmos
45ee67ae7e fs_free -> fs_used in conky.conf for consistency (feature request #2633000)
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-04-01 16:55:29 -06:00
Nikos Ntarmos
f91faa64b8 Add X11 display argument/conf entry (FR #2474243)
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-04-01 16:46:16 -06:00
Brenden Matthews
508df32b5a Don't need debian stuff either. 2009-03-29 23:37:49 -06:00
Brenden Matthews
e276de100d Don't really need ebuilds in here anymore. 2009-03-29 23:37:21 -06:00
Brenden Matthews
a301b24a8e Fix compile error. 2009-03-29 23:35:42 -06:00
Brenden Matthews
9f6c13e16a Fix charset of changelog. 2009-03-29 23:18:17 -06:00
Brenden Matthews
595b22fcce Don't strip control chars from man page.
If you're using `less' to view the readme, it should display properly.
If we run the man page through `col', it results in weird characters
hanging around.
2009-03-29 22:56:29 -06:00
Brenden Matthews
f05829ad9a Update copyright stuff, fix conky.conf weirdness. 2009-03-29 22:55:51 -06:00
Brenden Matthews
edc8857b4f Update changelog. 2009-03-29 21:32:24 -06:00
Brenden Matthews
0d4f9499eb Fixed bug in template stuff. 2009-03-29 20:27:38 -06:00
Nikos Ntarmos
99a496b3ea Adding if_up support for FreeBSD.
Moved interface_up(...) from linux.{c.h} to common.{c,h} and taught it
to check for ENXIO as well to make it work on FreeBSD.

Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
2009-03-29 01:25:57 +01:00
Nikos Ntarmos
50bac84006 Bringing FreeBSD up to date with latest commits
Several things were broken after the switch to 1.7-rc branches. This
diff fixes all compilations issues and updates some functions that were
left empty previously.

Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
2009-03-29 01:25:51 +01:00
Nikos Ntarmos
15bd2ca5ec sysfs is a Linux-only feature.
Moving sysfs-related functions and defs out of common.h and into
linux.h, as sysfs exists only on Linux, and updating openbsd.c,
netbsd.c, and freebsd.c accordingly.

Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
2009-03-29 01:25:48 +01:00
Nikos Ntarmos
b3a91362de Extra includes to fix compiling on FreeBSD
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
2009-03-29 01:25:43 +01:00
Nikos Ntarmos
d9923abaa9 Fix FOPENCOOKIE detection glitch
Using AM_CONDITIONAL's inside an if block is considered "confusing" by
the automake manual[1] and in fact leads to configure code that won't
work unless fopencookie actually exists in a system.

[1] http://sources.redhat.com/automake/automake.html#Conditionals

Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
2009-03-29 01:25:39 +01:00
Nikos Ntarmos
b1da4bfdaa Fix a typo and teach linux code to use data
Typo: __LINUX__ was used in a conditional code block, while the rest of
      the code uses __linux__

data: free_text_objects(...) #define's 'data' to be 'obj->data' to make
	  the code more compact. The linux-specific parts of the code still
	  used obj->data, which should expand to obj->obj->data, which is
	  wrong.

Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
2009-03-29 01:25:33 +01:00
Phil Sutter
e7559ad5be update README and manpage 2009-03-24 01:25:56 +01:00
Phil Sutter
2c3d57d841 add eval object, evaluating it's args
This object makes use of the possibility to escape dollar signs in TEXT.
Take the following example in the conkyrc:
| $${downspeed ${gw_iface}}
will be evaluated to (assuming the gw_iface is eth0):
| ${downspeed eth0}
and finally interpreted to print the gateway interface's downspeed rate.
2009-03-24 01:25:13 +01:00
Phil Sutter
12a40fd0a9 fix dollar escape in TEXT
The idea found in the code is any double dollar ($$) is being treated as
explicit dollar sign ($) instead of the start of a text object
reference. Due to missing update of the 's' variable, when creating a
text object for the text following the second dollar sign, the later was
prepended, leading to a double dollar in the output.
2009-03-24 00:40:22 +01:00
Phil Sutter
363bed34ac fix temporary printing of "(null)" for mpd vars
To minimise the chance of printing variables in an undefined state, call
free() as late as possible (i.e., right before strdup()'ing the new
value).
2009-03-23 23:46:10 +01:00
Brenden Matthews
4c77eed1c3 Couple minor fixes.
Make X11_initialise() work as it should, clarified IBM/Lenovo aka smapi
support in configure script.
2009-03-19 13:42:21 -06:00
Brenden Matthews
5378d13cfb some imlib2 work 2009-03-18 22:02:25 -06:00
Brenden Matthews
d399a128c9 Make print_config() stuff match configure. 2009-03-18 00:29:01 -06:00
Brenden Matthews
c8e2437f1e Regenerate docs. 2009-03-17 23:27:54 -06:00
newclearman
3d56128925 Adds the docs for the gauges
Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-03-17 23:27:47 -06:00
Nikolas Garofil
37c460ed05 Fix: make sure compiling without X11 works 2009-03-17 18:36:46 +01:00
Brenden Matthews
293f6ad7e2 Fix possible mem leak with net stats. 2009-03-16 15:56:37 -06:00
Brenden Matthews
b18628ad98 Update changelog. 2009-03-16 15:32:01 -06:00
Nikolas Garofil
2d524ce450 Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-03-16 21:21:11 +01:00
Nikolas Garofil
a074cb972a No limits for environment variables
Use dynamic allocated memory for skey and svalue,
allocate the length of value so that there are no limits,
but don't use the %a gnu extension to maintain compatibility
2009-03-16 21:14:22 +01:00
Brenden Matthews
613df97a6c Fix wacky net speed values on startup. 2009-03-16 14:14:18 -06:00
Brenden Matthews
c5e8f97619 Make gauge stuff look a little less funny. 2009-03-16 13:40:22 -06:00
Brenden Matthews
41b62122f5 Unbreak alias stuff.
It was broken by commit 98c64d8b3e, I did
a lowsy job of checking the patch over.
2009-03-16 13:22:22 -06:00
Brenden Matthews
21e9964c5a Update docs for $if_running. 2009-03-15 22:14:07 -06:00
Brenden Matthews
c2b1728af9 Update configure.ac.in for 1.7.x. 2009-03-15 20:03:12 -06:00
Brenden Matthews
c5946e227d Updating changelog. 2009-03-15 19:37:11 -06:00
aner
98c64d8b3e I added Gagues to monitor variables
Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-03-15 19:36:11 -06:00
Nikos Ntarmos
e275b05242 Disk i/o support on FreeBSD patch.
Patch sf.net id #2657227 (thanks Nikos).
2009-03-15 19:11:49 -06:00
Brenden Matthews
1aa8f6ada4 Updating changelog. 2009-03-15 19:01:06 -06:00
Ali Polatel
c1cf1232e0 Add extra_newline option for awesome's wiboxes
Hi Brenden,
Below is an updated patch, it works for me with the master.

p.s: don't forget to use git-am to apply the patch ;p

Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-03-15 18:56:23 -06:00
Brenden Matthews
513752626e Fix compilation errors.
I hope I didn't break the alias stuff.
2009-03-15 18:35:45 -06:00
Nikolas Garofil
1f51863616 fix use_spacer in default config (sf.net id #2638653) 2009-03-15 17:39:53 +01:00
Nikolas Garofil
8bcc287958 fix problems with negative numbers (sf.net id #2644593) (thanks Zhoushen Huang) 2009-03-15 17:09:35 +01:00
Nikolas Garofil
9c0f04bc10 bugfix: segfault when nothing x11-related is mentioned before TEXT 2009-03-15 01:17:32 +01:00
Nikolas Garofil
d1baa243a8 Added alias configfile setting
This patch is written by a anonymous author, see patch on sf.net
id #2663691 . I changed it a bit so that it can't overwrite
existing environment variables and updated the docs and syntaxfiles
2009-03-07 15:12:09 +01:00
Phil Sutter
ecabc1a29b update README and manpage 2009-03-01 21:12:46 +01:00
Phil Sutter
72e217fae2 fix padding of $processes
Padding to 4 digits allows for max 9999 processes, which should really
be more than enough for systems running conky. ;)
2009-03-01 21:12:16 +01:00
Phil Sutter
e6a9c02d11 fix padding in temp_print 2009-03-01 21:03:49 +01:00
Phil Sutter
ed42437dfc introduce percent_print() for printing percentages 2009-03-01 20:53:47 +01:00