1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-09-30 14:09:13 +00:00
Commit Graph

513 Commits

Author SHA1 Message Date
Brenden Matthews
8fbb3a9cfe Merge branch 'master' into imlib2 2009-05-05 17:36:38 -06:00
Brenden Matthews
fde096c435 Added some completely pointless OpenMP optimizations(?) 2009-05-05 17:36:12 -06:00
Brenden Matthews
d6e5a6491f Merge branch 'master' into imlib2 2009-05-04 13:22:51 -06:00
Brenden Matthews
0d31ff0f4f Missing files, fix last commit.
Added sony.[ch] stuff, as well as the important change from commit
3dd1738fb9
2009-05-04 13:15:46 -06:00
Brenden Matthews
f6fe653401 Revert "Combine can now use other chars to seperate vars (used to be only space)"
This reverts commit 3dd1738fb9.
2009-05-04 13:13:51 -06:00
Nikolas Garofil
3dd1738fb9 Combine can now use other chars to seperate vars (used to be only space)
Also undid the last change because sony.h was not included, feel free to submit
it again if you include this file and other sourcefiles needed (there is also
no definition of get_sony_fanspeed). If sony systems already have this file and
a definition of this function, please update the configure file so that support
for this is disabled by default and can be enabled by sony owners.
2009-05-04 12:58:52 +02:00
Yeon-Hyeong Yang
f8a6a4035c Added Sony VAIO fanspeed info (thanks Yeon-Hyeong).
Also removed the README and man page from the repo, as they don't really
need to be there and just cause conflicts.
2009-05-03 21:23:59 -06:00
Brenden Matthews
a98a927116 Merge branch 'master' into imlib2
Conflicts:
	configure.ac.in
	src/conky.c
2009-05-01 23:29:21 -06:00
Brenden Matthews
27fff0d9cb Fixed $texeci regression. 2009-05-01 23:05:06 -06:00
Yeon-Hyeong Yang
68ea7a7859 Added diskio_avg_samples patch (thanks Yeon-Hyeong) 2009-05-01 17:03:59 -06:00
Brenden Matthews
e8e6d1c819 Few misc doc related things.
Added the (incomplete) check_docs.py, to 'synchronize' the docs with the
code, as well as vim/nano syntax stuff.

Removed some unused OBJ_* stuff from text_objects.h, and updated docs
with some missing things.  Also removed a couple deprecated objects
which were still documented.
2009-05-01 16:53:50 -06:00
Nikolas Garofil
e05e9ece8e Added the combine variable 2009-04-30 21:05:59 +02:00
Jérôme Plût
ff9154216b Make ALSA mixers available on Linux, and added $if_mixer_mute. 2009-04-28 10:56:49 -06:00
Brenden Matthews
2dfc0ee6b4 Fix minor environment variable bug. 2009-04-28 10:54:43 -06:00
Brenden Matthews
d1b6548c55 Minor for for mail args parsing. 2009-04-28 10:19:28 -06:00
Lassi Selander
49aee8707a Various XMMS2 updates (thanks Lassi). 2009-04-28 10:02:24 -06:00
Phil Sutter
fb8ccd7a05 fix for enviroment variable expansion 2009-04-26 22:49:46 +02:00
Nikolas Garofil
6bc19d0396 Workaround for the problem that $goto only moves the first rss-item by making
it possible to specify the number of spaces you want in front of each rss-item
2009-04-19 00:42:01 +02:00
Nikolas Garofil
86b91db305 Bugfix: compilation without X11 broke after latest patches 2009-04-13 14:42:31 +02:00
Brenden Matthews
506f6ecc3b Special default & gauge fixes. 2009-04-09 20:10:08 -06:00
Brenden Matthews
38ee788da4 Added default_bar/graph/gauge_size config options (thanks wire64 for the idea) 2009-04-09 16:00:40 -06:00
Or Cohen
b6e691e8ac Minor fix for fs_used_perc, fs_free and fs_free_perc 2009-04-09 15:34:12 -06:00
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
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
f05829ad9a Update copyright stuff, fix conky.conf weirdness. 2009-03-29 22:55:51 -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
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
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
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
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
Nikolas Garofil
37c460ed05 Fix: make sure compiling without X11 works 2009-03-17 18:36:46 +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
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
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
513752626e Fix compilation errors.
I hope I didn't break the alias stuff.
2009-03-15 18:35:45 -06: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
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
ed42437dfc introduce percent_print() for printing percentages 2009-03-01 20:53:47 +01:00
Phil Sutter
44c5a10e04 rewrite human_readable() to minimise padding
Also fix spaced_print(): when given a width of e.g. 3, output at least 3
characters, not 2 as it was before.
2009-03-01 20:24:22 +01:00
Nikolas Garofil
09ac943a3a if_updatenr added 2009-03-01 15:10:01 +01:00
Phil Sutter
a9a59e5d28 move the custom defined memrchr to the right place
And make it static, as tailhead.c is the only user of it.
2009-02-25 00:23:56 +01:00
Phil Sutter
745eec145f fix 966a05a984 2009-02-23 23:28:12 +01:00
Phil Sutter
64af164666 add help text for --print-config option
While here, fix also -C for builds with --disable-x11.
2009-02-22 19:05:53 +01:00