Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-20 03:51:18 +00:00
Code Issues Releases Activity
1,903 Commits 5 Branches 46 Tags 22 MiB
f2188a67a1
Commit Graph

1320 Commits

Author SHA1 Message Date
Nikolas Garofil
7807d369ad Let battery_bar work in shell 2009-06-02 19:16:21 +02:00
Nikolas Garofil
1a9d0bdccd Let fs_bar and fs_bar_free work in shell 2009-06-01 16:09:34 +02:00
Nikolas Garofil
faa9086168 Let cpubar work in shell 2009-06-01 15:07:24 +02:00
Nikolas Garofil
0b8b6ccbae Let swapbar work in shell 2009-06-01 13:48:04 +02:00
Nikolas Garofil
bfc791f08b Let membar work in shell 2009-06-01 12:19:25 +02:00
Pavel Labath
0cb91fc3db Fix mouse click coordinates forwarded to the desktop window 
Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-05-31 22:18:12 -06:00
Nikolas Garofil
c3df719716 Created a function to call bars in shell (not only execbar) 
TODO use this function in other places
 2009-06-01 02:23:47 +02:00
Nikolas Garofil
c91e2ed38e Make sure that no X11 stuff is in the binary when not requested 2009-05-31 16:48:16 +02:00
Nikolas Garofil
01bc44aaf6 Don't check if output to X is requested when compiled without X 2009-05-31 16:29:12 +02:00
Brenden Matthews
295203dd4c Fix an issue with reload_config()? 2009-05-30 21:06:49 -06:00
Phil Sutter
533075032a Fix hostname resolution for mpd_host 
When getaddrinfo() returns an IPv6 address, connect() fails since mpd
does not support IPv6. Reproduced by adding the name "localhost" to the
"::1" entry in /etc/hosts.

Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-05-30 19:55:06 -06:00
Alexander Graf
0632693be7 Fix if_existing 
The if_existing with 2 arguments checking whether a file contains a specified
string did not work. This is fixed by this patch.

Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-05-30 16:21:42 -06:00
Brenden Matthews
39071d28e8 Be more graceful when handling IMAP problems. 2009-05-29 23:31:03 -06:00
Brenden Matthews
a31efb7fbe Fix default sizing for bars/graphs/gauges. 
Conflicts:

	src/conky.c
 2009-05-29 14:05:10 -06:00
Nikos Ntarmos
15eb14da5c conf_cookie is there for kFreeBSD as well 
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-05-29 10:57:17 -06:00
Nikos Ntarmos
8553e33763 Include bsd/bsd.h on kFreeBSD 
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-05-29 10:57:17 -06:00
Brenden Matthews
650c39b602 Compilation fixes, fix a segfault on shutdown. 
There was a missing 'break' in a switch/case statement which caused a
segfault on shutdown when using $if_up.
 2009-05-28 21:27:56 -06:00
Nikos Ntarmos
b51d06d178 Gracefully exit from main_loop() 
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-05-28 21:27:56 -06:00
Nikos Ntarmos
c03655bdfa free(3) previously strdup(3)'ed disp 
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-05-28 21:27:56 -06:00
Nikos Ntarmos
613a440fdc XDestroyRegion(3) only for non-NULL regions 
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-05-28 21:27:55 -06:00
Nikos Ntarmos
0c62f02553 XCloseDisplay(3) on re-init_X11() 
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-05-28 21:27:55 -06:00
Nikos Ntarmos
ff72a55691 No need to check for loop variable value 
If the first for-loop succedds in finding the desired interface, it will return to its caller. The only way we drop to the second for-loop is if nothing is found thus far, so no need to check for (i == 16).

Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-05-28 21:27:55 -06:00
Nikos Ntarmos
33451a9420 free(3) previously strndup(3)'ed diskio.dev 
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-05-28 21:27:55 -06:00
Nikos Ntarmos
dc2a8e1de8 free(3) strdup(3)'ed templates array 
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-05-28 21:27:55 -06:00
Nikos Ntarmos
a8300acbc5 free(3) previously strndup(3)'ed netstats.dev 
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-05-28 21:27:55 -06:00
Brenden Matthews
ed5dbc02bb Simplify graph gradient stuff. 2009-05-26 11:44:16 -06:00
Brenden Matthews
d65c33146e OMPtimize the gradient stuff. 2009-05-26 03:14:52 -06:00
Brenden Matthews
b0f37a63e8 Let the graphs be bigger. 2009-05-24 23:31:35 -06:00
Brenden Matthews
35a72f5a95 Fix some minor graph related bugs. 2009-05-24 23:16:36 -06:00
Brenden Matthews
d03df4a367 Allow ~/... and $HOME/... paths for more stuff. 2009-05-24 22:33:47 -06:00
Brenden Matthews
f1cc5cf032 Actually fix hddtemp parsing. 2009-05-24 18:15:05 -06:00
Brenden Matthews
1c4044252c Revert "Fix array bounds problem in hddtemp code." 
This reverts commit d0de7cbd63.
 2009-05-24 18:02:46 -06:00
Brenden Matthews
c92272a943 Fix segfault on reload. 2009-05-24 17:49:50 -06:00
Brenden Matthews
d0de7cbd63 Fix array bounds problem in hddtemp code. 2009-05-24 17:09:38 -06:00
Brenden Matthews
4a08fab0e6 Fix clipping, enable alpha for imlib2. 2009-05-24 16:52:48 -06:00
Brenden Matthews
4ec728fa42 Added fancy new 'temperature gradients' feature. 
See docs for more details on 'temperature gradients', which can be
turned on with the -t switch on graphs.  Also improved parsing of
options with $execgraph and $execigraph, but may cause some breakage.
 2009-05-24 15:53:32 -06:00
Brenden Matthews
ee9364522a Some OpenMP related fixes. 
Fixes for commit 9c331dce49.
 2009-05-24 14:02:33 -06:00
Brenden Matthews
19ca4c071a Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-05-24 13:48:10 -06:00
Brenden Matthews
4bfd545d2f Clip out imlib2 buffer properly. 2009-05-24 13:47:44 -06:00
Joe Myre
7b7d038035 Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-05-24 14:24:07 -05:00
Brenden Matthews
06044bf7e5 Try and fix weirdness with hwmon/i2c/platform options. 2009-05-24 13:07:27 -06:00
Joe Myre
9c331dce49 omped it up 2009-05-24 10:41:35 -05:00
Brenden Matthews
bf2d9de16a Add OpenMP to list of compiled in features (for -v). 2009-05-23 21:18:06 -06:00
Nikos Ntarmos
45e403f553 Allow src/apcupsd.c to compile cleanly on FreeBSD. 
Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-05-23 21:08:32 -06:00
Nikos Ntarmos
12d0d1477f Integrate FreeBSD diskio support. 
This diff moves Linux-specific parts of diskio.c into linux.c and uses
the remaining diskio functions to correctly implement this functionality
for FreeBSD. It also hooks diskio.c to the FreeBSD build.

Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-05-23 21:08:32 -06:00
Nikos Ntarmos
0880c1722d Remove unused variables and rearrange includes. 
Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-05-23 21:08:31 -06:00
Nikos Ntarmos
38d4030e65 conf_cookie valid only for Linux. 
Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-05-23 21:08:31 -06:00
Brenden Matthews
396494d4a0 Fixed parsing of $hwmon? 2009-05-23 21:01:59 -06:00
Brenden Matthews
c9951a3bac Better checking for cases when inotify doesn't work. 2009-05-22 12:48:46 -06:00
Brenden Matthews
0dc7041e6f Fix other parsing bug with hwmon. 2009-05-22 12:30:09 -06:00
Brenden Matthews
1779ef3efd Fix (possibly overkill) hwmon parsing bug. 2009-05-22 12:29:41 -06:00
Brenden Matthews
7f0929d03c Fix imlib2 cache setting. 2009-05-22 11:23:05 -06:00
Brenden Matthews
445fde109c Fix backwards width/height args for image drawing. 2009-05-22 01:39:38 -06:00
Brenden Matthews
3ad217e447 Use original image size when not specified. 2009-05-22 01:18:07 -06:00
Brenden Matthews
b6dea2fce6 Oops, null pointer. 2009-05-20 11:53:43 -06:00
Brenden Matthews
a25e030036 Oh yeah, make sure it compiles without inotify. 
Also removed BSD licensing stuff that pertains to old torsmo code.
 2009-05-19 22:56:33 -06:00
Brenden Matthews
75d1a054be Add message to show the Lua script was reloaded. 2009-05-19 22:51:50 -06:00
Brenden Matthews
011e52650b Added inotify support for reloading Lua scripts automagically. 2009-05-19 22:49:42 -06:00
Brenden Matthews
dd5fbeb41b Improve reload_config() window destruction/creation. 2009-05-19 21:34:43 -06:00
Brenden Matthews
baaba76678 Handle inotify stuff a bit better. 2009-05-19 20:35:02 -06:00
Brenden Matthews
0d3726d352 Oops, remove printf(). 2009-05-19 20:23:44 -06:00
Brenden Matthews
ba0eb5d85d Inotify support. 
Added inotify support to reload the config when modified automatically
on systems that support it
 2009-05-19 17:14:34 -06:00
Brenden Matthews
e05fc3ba38 Don't need a prev ptr in this list. 2009-05-18 15:49:40 -06:00
Filipe Ferreira
5552f4135e Patch to fix rounding error with CPU values. 2009-05-17 23:30:10 -06:00
Brenden Matthews
6477962dc9 Added support for rending images by way of IMLIB2. 2009-05-17 23:11:22 -06:00
Brenden Matthews
ddcc8ceb70 Merge branch 'master' into imlib2 
Conflicts:
	extras/nano/conky.nanorc
	extras/vim/syntax/conkyrc.vim
 2009-05-17 22:11:40 -06:00
Brenden Matthews
6abbbd50f0 Merge branch 'lua' 
Conflicts:
	src/specials.c
 2009-05-17 22:00:44 -06:00
Brenden Matthews
e7bf480d48 Fix null pointer boog in $top stuff. 2009-05-17 21:59:05 -06:00
Brenden Matthews
694b736f64 Merge branch 'master' into lua 2009-05-17 20:58:13 -06:00
Nikolas Garofil
914af765e4 execbar can now be used in the shell even when compiled with x11 support 2009-05-17 13:38:51 +02:00
Brenden Matthews
353f0b6ad7 More work on imlib2 stuff. 
Seems to be some rendering corruption which I'm not sure the reason for,
but other than that I think it works okay.
 2009-05-16 23:47:02 -06:00
Brenden Matthews
1dc7731f6d Merge branch 'master' into imlib2 2009-05-16 22:24:45 -06:00
Brenden Matthews
41e46ffe41 Oops, remove debug printf(). 2009-05-16 22:24:22 -06:00
Brenden Matthews
d26b946b7b Merge branch 'master' into imlib2 2009-05-16 18:37:11 -06:00
Brenden Matthews
72d15db78a Merge branch 'master' into lua 2009-05-16 18:37:04 -06:00
Brenden Matthews
344fa8498d Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-05-16 18:28:19 -06:00
Brenden Matthews
d642a3f659 Fixed comment stuff for real this time? 2009-05-16 18:28:04 -06:00
Nikolas Garofil
94d75cc494 add missing var 2009-05-17 01:33:43 +02:00
Brenden Matthews
f2a69f37ad Merge branch 'master' into lua 2009-05-16 17:08:50 -06:00
Brenden Matthews
debf4ec597 Remove unused var. 2009-05-16 17:08:37 -06:00
Brenden Matthews
dd606eb5ae Merge branch 'master' of git.omp.am:/home/omp/git/conky into lua 
Conflicts:
	src/specials.c
 2009-05-16 17:05:30 -06:00
Brenden Matthews
b661dbf5a7 More lua stuff. 2009-05-16 17:04:26 -06:00
Nikolas Garofil
dae78fb875 Execbar can now also be used on the shell 2009-05-17 00:37:22 +02:00
Brenden Matthews
69718f5b75 Oh my, parse lua output. 2009-05-16 15:06:29 -06:00
Brenden Matthews
72d2aad026 Merge branch 'master' into lua 2009-05-16 14:55:24 -06:00
Brenden Matthews
0e21a804ee Couple minor lua changes. 2009-05-16 14:55:05 -06:00
Toni Spets
453908953f Moved the Lua function calling to it's own function 2009-05-16 20:57:43 +03:00
Toni Spets
da5704fd74 Specifically ask for an integer from Lua for percentage 2009-05-16 20:37:53 +03:00
Nikolas Garofil
3762c5cb10 Use a builtin config without X11-support when compiled without it 
also, make sure X isn't initialised when compiled without x11-support
 2009-05-16 15:57:01 +02:00
Nikolas Garofil
2c35099b82 Bugfix: Segfault when starting with no configfile. 2009-05-16 13:14:45 +02:00
Toni Spets
66ba6e36c9 * Fix leaks 
* Fix HUP behaviour - scripts are now reloaded on HUP
* Remove unneccessary calls to llua_close()
 2009-05-15 23:35:18 +03:00
Toni Spets
b5934e5f69 Remove new lines from ERR messages 2009-05-15 23:01:08 +03:00
Toni Spets
90c9ac2723 Fix old copyright year 
Change all fprintf's to ERR()
 2009-05-15 21:48:11 +03:00
Toni Spets
a64e9f8950 Lua scripting support, initial commit 2009-05-15 21:08:51 +03:00
Brenden Matthews
b4ca1d146f Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-05-13 12:29:09 -06:00
Brenden Matthews
9e79881b5f Fix remove_comments()? 2009-05-13 12:28:53 -06:00
Nikolas Garofil
4db2119a2b Bugfix: segfault with wrong config 
Altough the following configuration is wrong, it should only produce a error
about a missing $endif but instead it also produced a segmentation fault:

TEXT
$if_gw$gw_ip$else
 2009-05-13 20:25:14 +02:00
Brenden Matthews
1b94e22b5c Merge branch 'master' into imlib2 2009-05-12 18:07:20 -06:00
Brenden Matthews
4910d33524 Fix comment removal stuff so that it doesn't break $color. 2009-05-12 18:05:51 -06:00
Brenden Matthews
18b174e967 Merge branch 'master' into imlib2 
Conflicts:
	src/Makefile.am
 2009-05-12 17:52:49 -06:00
Nikolas Garofil
e0b2f75433 Don't check if_gw twice 2009-05-12 20:25:40 +02:00
Phil Sutter
580043075e relying on the return value of scanf when using %n is bad 2009-05-12 00:49:40 +02:00
Phil Sutter
5d69d0378f fix human readable precision calculation 
This bug was quite hard to trigger (happens only with values 9.995-9.999
and 99.95-99.99), but I made it. ;)
 2009-05-12 00:49:40 +02:00
Phil Sutter
322d77942a hwmon: add args for value precalculation 2009-05-12 00:49:40 +02:00
Phil Sutter
ae7996bdd1 fix hwmon for 2.6.29, simplify code a bit 2009-05-12 00:49:40 +02:00
Nikolas Garofil
a01f968677 Bugfix: if_gw only outputs if another gw var is in the if block (sf id 2784627) 2009-05-11 19:47:24 +02:00
Nikolas Garofil
ae1b6c50e6 Remove even more x11-stuff with --disable-x11 2009-05-11 18:37:12 +02:00
Jaromir Smrcek
22601ff864 APC UPS fixes. 2009-05-10 13:37:04 -06:00
Nikolas Garofil
829201517e no x11-stuff for apcupsd when disabled 2009-05-10 21:18:20 +02:00
Brenden Matthews
8cb0027f45 Various fixes. 
Added missing apcupsd.[hc], added apcupsd_loadgauge, fixed compilation
errors, updated docs & syntax stuff.
 2009-05-10 13:11:09 -06:00
Jaromir Smrcek
cf2c61b588 Added support for APC UPS daemon monitoring. 2009-05-10 12:58:06 -06:00
Brenden Matthews
d224810235 Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-05-10 11:52:32 -06:00
Lassi Selander
1399b4483f Fix for previous xmms2 patch. 2009-05-10 11:44:57 -06:00
Nikolas Garofil
c53813a49f no gauges, bars, ... when compiled without X11 2009-05-10 14:14:21 +02:00
Nikolas Garofil
09ad5ce3f1 optimize previous commit (thanks Plague) 2009-05-10 13:44:13 +02:00
Nikolas Garofil
f7568b0753 strcpy shouldn't be used for overlapping strings 2009-05-10 13:14:54 +02:00
Nikolas Garofil
2afe66ed01 Bugfix: removing comments worked only partially 
All lines behind a comment line were also removed, comments should also be able
to start in the middle of line, \# shouldn't be replaced if it's in a comment
 2009-05-10 12:48:22 +02:00
Brenden Matthews
197c4d5bc3 Update docs, remove deprecated code. 2009-05-09 23:30:42 -06:00
Brenden Matthews
80aaadb48f Merge branch 'master' into imlib2 2009-05-09 21:14:39 -06:00
Brenden Matthews
24f97c45c6 Allow the use of '#' for comments within text area (can be escaped with '\#'. 
Also refactored some code relating to the config file loading (since
there was some duplication of code).
 2009-05-09 20:10:55 -06:00
Brenden Matthews
9dc5411681 Fix backwards mail stuff. 2009-05-09 19:20:05 -06:00
Brenden Matthews
db06b5f953 Fix build errors. 2009-05-09 11:20:04 -06:00
Nikolas Garofil
10495ed282 Bugfix: vars related to graphics produced wrong output when not running in X 2009-05-09 14:06:58 +02:00
Brenden Matthews
a45c8c9da4 Add missing source files (genius here). 2009-05-08 14:42:34 -06:00
Brenden Matthews
f7c793a514 Merge branch 'master' into imlib2 2009-05-08 14:38:55 -06:00
Nikolas Garofil
9153318329 Only include disp when needed 2009-05-08 16:04:16 +02:00
Nikolas Garofil
bd99fe5d81 Bugfix: run update_uname also without X11 2009-05-08 14:57:19 +02:00
Brenden Matthews
fdadbbf98e Added top_name_width config option. 2009-05-07 17:49:32 -06:00
Brenden Matthews
a1fc53be97 Merge branch 'master' into imlib2 2009-05-07 12:49:13 -06:00
Nikolas Garofil
c1e47013ef Bugfix: sometimes segfaults with cpubar 2009-05-07 18:44:45 +02:00
Brenden Matthews
31ed5ba178 Some work on imlib2 stuff. 2009-05-05 21:45:05 -06:00
Brenden Matthews
76dedfd563 Merge branch 'master' into imlib2 2009-05-05 17:44:12 -06:00
Brenden Matthews
af55c4afb1 Use a reduction here. 2009-05-05 17:43:45 -06:00
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
eb2b7a4f30 Removed bits about BSD license. 2009-05-04 13:20:42 -06:00
Brenden Matthews
1b24763df1 Add copyright/license stuff to sony.[ch]. 2009-05-04 13:19:44 -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
Brenden Matthews
ea34b2c5e5 Fix xmms2 related compilation error? 2009-04-09 15:33:50 -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
a301b24a8e Fix compile error. 2009-03-29 23:35:42 -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
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
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
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
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
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
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
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
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
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
Phil Sutter
e3ed9c62fb whitespace cleanup 2009-02-22 19:05:52 +01:00
Phil Sutter
2c44e6dccf remove x11 dependency of fonts 
Instead, we just ignore them. Less errors in output, little less
ifdef's.
 2009-02-22 19:04:42 +01:00
Phil Sutter
e28f79a133 split off specials from conky.c 
As a side effect, font and colour specific stuff got outsourced, too.
This is because the apropriate functions are used by conky.c as well as
specials.c, so they should be kept on their own.

In the long term I hope for positive impact on the X11 integration mess.
(Take e.g. the mass of X11 ifdefs cluttering conky.c.) Though this
commit contains no optimisations in this direction, just plain
outsourcing, to ensure minimised (intended: none) changes to conky's
interface behaviour.
 2009-02-22 19:04:33 +01:00
Phil Sutter
3cd87aadf8 fix for building with --disable-x11 2009-02-22 03:08:28 +01:00
Phil Sutter
90a3e8de80 merge tail and head into a single source file 
This allows having the same init-function for both objects. Code size
could be further reduced, as the print-functions share some code, too.
 2009-02-22 03:00:35 +01:00
Phil Sutter
20809f3198 put tail and head code into separate files 
In fact these two objects share a lot of code, so the bigger plan is to
merge them into a single file to share equal code.

This should not change anything to the code flow, besides making conky
startup a bit more robust due to less use of CRIT_ERR.
 2009-02-22 03:00:26 +01:00
Phil Sutter
77c59b260d merge ibm-acpi and smapi together 
Well, not really. I don't dare putting it all together into a single
source file, as that would just not make sense. Instead, this patch
eliminates the --enable-smapi configure option and all related checks,
replacing them with the equivalents from --enable-ibm.
 2009-02-22 02:58:42 +01:00
Phil Sutter
d500f1005a outsource ibm-acpi stuff into it's own source file 
Despite this is actually not much code and could stay inside linux.c as
well, this makes sense as I want to combine smapi and ibm-acpi
functionality. Virtually every user of a notebook made by IBM/Lenovo
will want both, so this should be a feature not a bug.

Besides making the ibm-acpi objects being built optionally, this should
not change anything to the code flow.
 2009-02-22 02:58:29 +01:00
Phil Sutter
4161f90c6f rewrite linux diskio code 
Instead of using a hardcoded maximum number of slots for
stats of different disks, use a linked list. Also since the algorithm to
update each device's counters is the same for updating the totals, share
equal code, which in my eyes not only saves a bunch of LoC, but also
drastically increases readability.
 2009-02-22 02:57:11 +01:00
Phil Sutter
a619cb3e3c fix potential segfault 
The segfault can be triggered by using any diskio object with a
non-existent device, as prepare_diskio_stat() then returns 0 and the
call to obj->data.diskio->current in conky.c:4050 pulls the trigger.

In fact, it's not a problem when the device doesn't exist, as
update_diskio() simply won't fill in any values. So skip the check and
upon device node appearance everything goes it's normal way.

While there, also eliminate double readout of the last line of
/proc/diskstats: after the last line has been read, FEOF is not yet set.
BUT fgets() will return NULL when trying to read the next line. So
better check for fgets()'s return value instead of using feof().

Also strncmp() is useless here, since we really want to compare the full
paths. Besides, text_buffer_size also should be big enough to not make a
difference here.
 2009-02-22 02:55:22 +01:00
Phil Sutter
65c27816c4 fix coding style of the last few patches 
Also, note that free() does not zero the passed pointer. So conditional
freeing always needs to look like this:
| if (var) {
|     free(var);
|     var = 0;
| }
 2009-02-22 02:54:44 +01:00
Brenden Matthews
f92978c5e5 No space between number and units please. 2009-02-17 22:50:43 -07:00
Sattvik
482dd1b82f Null mpd variables should have an empty string patch sf.net id #2564747. 2009-02-17 22:42:08 -07:00
Tamim Khan
d1180b4729 XMMS2 fix and refactoring patch sf.net id #2579357 (thanks Tamim). 2009-02-17 22:29:42 -07:00
Nicolas Sierro
cf77d3f1f9 Extended support for local Maildir patch sf.net id #2561323 (thanks Nicolas). 2009-02-17 22:26:15 -07:00
Martin Tůma
f7aeae2c01 Fix shown battery status patch. 
Fix shown battery status when the battery is not charging any more but is not full charged patch sf.net id #2556056 (thanks Martin).
 2009-02-17 22:19:25 -07:00
Alexander Monakov
24ddc9665e Fix nvidia memory frequency reading patch sf.net id #2493134. 2009-02-17 22:10:15 -07:00
Alexander Monakov
966a05a984 Fix diskio_read/write patch sf.net id #2493084 (thanks Alexander). 2009-02-17 22:04:38 -07:00
Kim Holviala
27bb931e41 Patch by Kim Holviala sf.net id #2484548. 
* change the height of execbar and execibar to be the same as other
		bars have by default (6 pixels)
		* treat mixer values as percentages as they're usually 0-100 (switch
		to spaced_print() with pad_percents)
		* change temp_print() from snprintf() to spaced_print()
		* remove decimals from temp_print() as none of the current sources can
		supply values smaller than 1 degree (C or F, doesn't matter)
		* add a space between number and the unit in human_readable()
		* fix number printing in human_readable()
		* network $upspeed and $downspeed now use human_readable()
 2009-02-17 22:00:23 -07:00
Swoög
b516e19440 Patch to add $battery_short variable. 2009-02-17 21:49:45 -07:00
Brenden Matthews
b4cd98868f Misc compilation fixes. 2009-02-17 21:45:06 -07:00
Nikolas Garofil
1085d2b27e out_to_x can now be turned off 2009-02-15 18:58:03 +01:00
Nikolas Garofil
65bae86ca7 append_file output method 2009-02-12 22:45:18 +01:00
Nikolas Garofil
3a11f1469f overwrite_file output method 2009-02-12 22:35:00 +01:00
Nikolas Garofil
4c25a9680e Added output_to_stderr 2009-02-10 09:43:20 +01:00
Brenden Matthews
c3003dc1a3 Fix my last 'fix'. 2009-02-09 12:36:10 -07:00
Brenden Matthews
850f7dfbc1 Fix warning on older versions of gcc. 2009-02-08 10:29:49 -07:00
Brenden Matthews
5b9d47c039 Couple fixes for the top_time stuff. 2009-02-08 10:13:54 -07:00
Alexander Graf
9da5648d2a better combine top, top_mem and top_time handlers 2009-02-08 17:19:10 +01:00
Alexander Graf
e6c9ff751c Also free process list when ${top_time} is used 2009-02-08 16:16:12 +01:00
Alexander Graf
1ac4104e0b top.c: Allow heavier optimization 
This makes it possible for the compiler to do better optimizations by
adding "static" to functions which do not need to be exported.

Since some of them (e.g. the compare_*() functions) are called very
often, this may decrease conky's need of resources a bit.
 2009-02-08 16:13:45 +01:00
Alexander Graf
04623066d7 Don't do unneeded sp_acopy() calls 2009-02-08 16:05:42 +01:00
Alexander Graf
9c679bf33f Add ${top_time} sorting processes by CPU time 2009-02-07 15:01:50 +01:00
mipas
cd49afbd19 Build fix patch 
This patch fixes build errors on some platforms due to missing includes.
 2008-12-22 20:59:42 -07:00
Phil Sutter
c54b96fb24 simplify declaration of ifblock objects 
Like OBJ_THREAD, OBJ_IF automatically calls obj_be_ifblock_if() when the
object matches.
 2008-12-22 19:43:12 +01:00
Phil Sutter
dd31cc77eb use a global struct moc_s 
Since there is no choice of which moc player to get information from,
all moc objects' data source can be identical. Also hide some internal
data (the thread e.g.). Since from now on there can only be one moc
thread (not highlander ;), we don't need to treat the thread object
specially.

While here, fix indenting.
 2008-12-22 19:36:24 +01:00
Phil Sutter
2f3fb23ff7 separate parsing and interpreting text objects for certain objects 
All objects parsing text into objects formerly parsed and evaluated
their arguments each update interval. This does only make sense when the
parsed text could change between updates, which is the case for execp
and execpi objects, but none of the others. So have them parse the text
when creating them, so each update interval only the output has to be
re-extracted.

In fact, this should give a performance boost when using any of the
affected objects, as parsing the input text is quite expensive since
we're evaluating templates.
 2008-12-22 18:36:44 +01:00
Phil Sutter
2de1840b39 move and add function prototypes to src/conky.c 2008-12-22 17:55:21 +01:00
Phil Sutter
da7bc63996 do not use a global ifblock stack 
Using a global ifblock stack for all parsed ifblock objects causes
problems when doing sub-parsing in objects taking other objects as
parameters, because the possibly non-empty stack at startup leads to
false alarm when checking for stack emptiness after parsing the objects.

Use a void ** as the object to pass around, so callers don't need to
know struct ifblock_stack_obj.
 2008-12-22 17:49:38 +01:00
Phil Sutter
05624868e3 treat mpd opjects as non-threaded 
In fact, they are. But we don't want to treat them as those, because
the rewrite made the only situation when threaded objects matter
uncritical, i.e. when an object calls calling parse_conky_vars().
 2008-12-20 16:17:22 +01:00
Phil Sutter
b31af01d91 add if_match object comparing strings, floats and ints 
In general, argument types should match, but for combined long and
double usage the long is being converted to double before evaluation.

A few examples:
${if_match ${cpu} < 30}
${if_match "asdf" != "qwer"}
${if_match 0.5 < 0.50001}
${if_match 49.999 < 50}
 2008-12-20 16:14:57 +01:00
Phil Sutter
1a35a68bca fix segfault for diskiograph 
The crux is to split args between those for scan_graph() on one hand and
prepare_diskio_stat() on the other hand. To make the code working with
minimal changes, move the yet optional devicename to the end.

General note on graphs:
- for all graphs there exist the optional arguments for scan_graph()
  which come first and are optional (intended duplicate)
- all other args are object specific, and may be optional as well
 2008-12-18 15:18:53 +01:00
Phil Sutter
757983ab56 internal rewrite of mpd support 
Handle mpd internal information inside mpd.c. Use a refcounter to check
if the mpd-information can be freed (maybe useless). Remove the now
useless "full" flag of free_text_objects.
 2008-12-18 13:40:21 +01:00
Brenden Matthews
35a2d09c5f Merge branch 'master' of git://nwl.cc/~n0-1/conky 2008-12-17 17:03:33 -07:00
Phil Sutter
f85c1ea5a6 Make gateway objects also detect routes with missing RTF_GATEWAY flag 
This was a bug, not a feature. From the FreeBSD manpage rtentry(9):

| Vt struct sockaddr *rt_gateway;
|
| The "target" of the route, which can either represent a destination in
| its own right (some protocols will put a link-layer address here), or
| some intermediate stop on the way to that destination (if the
| RTF_GATEWAY flag is set).

So for a default route with "dest" and "mask" both zero, either
RTF_GATEWAY is present, or "gate" is zero.
 2008-12-17 02:37:07 +01:00
Brenden Matthews
479a06508f Possible fix for minor IMAP idle bug. 2008-12-15 21:55:48 -07:00
Itai Zukerman
bb817b2cf7 Patch to allow escaping newlines in the config. 2008-12-15 21:17:56 -07:00
Brenden Matthews
621bad14f8 Merge branch 'master' of git://nwl.cc/~n0-1/conky 2008-12-15 21:01:58 -07:00
Phil Sutter
d321573c2d simplify human_readable 
The only change of behaviour occurs when adjusting the unit of positive
values. For some reason 1000LL was used, which has now been replaced by
1024LL. Usage of abs() and MAX() might be OS dependent, but it should
not be too hard to implement them by hand if they're missing somewhere.
 2008-12-16 03:21:30 +01:00
Phil Sutter
d744f9bfbb make use_spacer an enum 
It was a static int before, holding the (already defined) enum's value,
which doesn't make sense. Also it's used only inside conky.c. Since
enums can't be assigned other values than what are defined, we can skip
checking for illegal spacer value at each invocation of spaced_print,
and then also drop the function name argument, which apparently didn't
make sense at all, because use_spacer is a global option.
 2008-12-16 02:56:26 +01:00
Phil Sutter
0720a4fbc9 simplify diskio stats 
Instead of splitting information, use diskio_stats[0] in diskio.c for
the totals. This saves a few branches, and frees some data from struct
information.
 2008-12-16 02:32:30 +01:00
Brenden Matthews
2b128b7a7c Merge branch 'master' of git://nwl.cc/~n0-1/conky 2008-12-15 18:00:05 -07:00
Phil Sutter
9a85812e06 here comes the big header include rewrite 
Some statics are now defined by configure.ac.in, conky.h got a lot
smaller, which I see as a positive sign.

This patch should not change any functionality, just change what's
defined where. Some features I did/could not test are probably broken,
also compiling for any other OS surely won't complete now. Though I
think fixing these problems is as easy as including some missing
headers.

I've done compile checks with the following configure options:
./configure --enable-eve --enable-rss --enable-smapi
	--enable-wlan --enable-debug --enable-testing

So what needs to be tested is:
- audacious
- BMPx
- xmms2
- nvidia
 2008-12-15 23:12:33 +01:00
Phil Sutter
ec174bedf2 outsource ifblock and text_object helpers 2008-12-15 23:03:39 +01:00
Phil Sutter
ca66a26813 put text_object stuff into an own header 
For now this is only the object type enum and struct text_object, but it
will do to prepare further outsourcing from both conky.c and conky.h.
 2008-12-15 23:03:39 +01:00
Phil Sutter
fb4b8fd005 organise text objects in a linked list 
In fact, this eases code a lot. Even the ifblock handling, which was the
biggest problem of the rewrite, could be cleaned up a lot.
 2008-12-15 23:03:39 +01:00
Phil Sutter
62a6c0cbac have a maximum width for all variable length mpd vars 
Thanks to FreakGuard (IRC) preparing this one.
 2008-12-15 19:40:54 +01:00
Phil Sutter
0f7ac0f5af simplify free_text_objects a bit 2008-12-15 19:40:45 +01:00
Phil Sutter
a98d6e06ac simplify if_existing evaluation 2008-12-15 19:40:37 +01:00
Brenden Matthews
60fc99ef71 Merge branch 'master' of git://nwl.cc/~n0-1/conky 
Conflicts:
	configure.ac.in
 2008-12-14 22:42:20 -07:00
Phil Sutter
334447308f enable DEV_NAME to handle symlinks 
Using a macro is not possible anymore, so have a function dev_name() do
the job. Functionality is the same as the old DEV_NAME, unless the
specified path is a symlink in which case it's being dereferenced first.

To save callers from having to free the returned string, a static local
buffer is used (effectively rendering the function non-reentrant).
 2008-12-14 17:53:31 +01:00
Phil Sutter
1ddb6a88b9 use the builtin config also as a default one 
This depends on fopencookie, which is linux-specific. For BSD, there is
a similar function called funopen, which can be used as a drop-in
replacement.
 2008-12-14 15:45:30 +01:00
Brenden Matthews
650be03fd4 Improve behaviour of $pb_battery. 2008-12-13 20:55:45 -07:00
Brenden Matthews
0a5942a94b Move imap/pop3 stuff into mail.c 2008-12-14 04:22:36 +01:00
Brenden Matthews
77506c0e80 Move imap/pop3 stuff into mail.c 2008-12-13 19:53:05 -07:00
Phil Sutter
5445c8890a fix disk_protect for linux-2.6.27 
The path for the sysfs attribute has changed. Also negative values show
disabled disk protect, so catch this when interpreting the file's
content.
 2008-12-14 02:51:50 +01:00
Phil Sutter
7a6ce89226 implement sample config printing support 
This patch makes Conky print a sample config when being called with the
'-C' flag.

A short test showed an increase of ~10kbytes of the conky binary's size.
 2008-12-12 15:38:01 +01:00
Phil Sutter
19a6e7c925 rewrite tcp-portmon hooks 
Global variables belonging to tcp-portmon are now separated from
conky.c, cleaning up struct information and struct text_object a bit.
 2008-12-11 15:28:21 +01:00
Phil Sutter
4b89c3b17d make semantics of custom strndup() comply with glibc 
From strdup(3):
| If s is longer than n, only n characters are copied, and a
| terminating null byte ('\0') is added.

So allocate at most n+1 bytes and make sure the last one is zero, as
strncpy() doesn't add it itself.

So in fact to allow a maximum space for string dup of 23, strndup() has
to be called like this:
| dup = strndup(src, 23 - 1);

FIXME: Find the critical points in code this change touches and make
sure the invocation there is correct.
 2008-12-11 15:28:21 +01:00
Phil Sutter
f96e77c91b rewrite template engine completely 
Two things that pissed me off about the old one:
* only limited support for nesting templates
* totally broken output when using conditionals inside a template

The later one was the hard one to fix. ;)
It requires to already have the full text substituted before the text
objects are being created from it. Generating only the contained objects
broke, because the conditionals got wrong offsets to jump to.

After that was fixed, full nesting support is realised by simply
repeating the replacement until no more template objects are found.
 2008-12-11 15:28:21 +01:00
Brenden Matthews
5a69344055 Fix call to timed_thread_test(). 2008-12-09 16:37:24 -07:00
Brenden Matthews
dc3ed8df13 Removing old svn keywords. 2008-12-09 16:35:49 -07:00
Brenden Matthews
5a5e7fd8e2 Fix broken cpu usage stuff (due to a previous commit). 2008-12-09 16:15:06 -07:00
Brenden Matthews
a40cfd9702 Add an option to timed_thread_test() to not wait for the interval period (so that IMAP IDLE works better) 2008-12-09 01:37:59 -07:00
Phil Sutter
bb079848b1 rewrite hddtemp 2008-12-08 16:01:15 +01:00
Phil Sutter
a92601f069 fix for renamed DEBUG2 macro (again) 2008-12-08 15:05:29 +01:00
Phil Sutter
92bdce5d1a set conky in dock mode to be withdrawn 
Withdrawn windows are those you get from applications supporting the
'-w' flag, like e.g. gkrellm or all those sweet WindowMaker dockapps
(wmcpu and Co.). In Fluxbox, these windows are drawn into the slit. Most
other window managers put them into their "taskbar", AFAIK.
This patch makes Conky act exactly the same if the following settings
are selected:

| own_window yes
| own_window_type dock
 2008-12-08 01:45:12 +01:00
Phil Sutter
f5259295cf make unit of all temperatures selectable 
This introduces a new configuration variable called "temperature_unit",
specifying the unit of all temperature sensors. To achieve this, each
object outputting a temperature has to call temp_print() like so:
| temp_print(p, p_max_size, <temp val as double>, <unit of val>);
to specify the input temperature unit, either one of the constants
TEMP_CELSIUS or TEMP_FAHRENHEIT.
 2008-12-08 01:45:12 +01:00
Phil Sutter
1a4e4b3b69 fix runtime debugging macros 
Sadly, configure --enable-debug defines the macro DEBUG which conflicts
with the level1 debugging output macro. Rename them to DBG() and DBG2().
 2008-12-08 01:42:19 +01:00
Brenden Matthews
e2c49531f3 Limit $battery_percent to 100 (bug 2145006) 2008-12-07 15:58:40 -07:00
Brenden Matthews
39ba74a590 Don't put unit with hddtemp values for consistency (bug 2133107) 2008-12-07 15:54:40 -07:00
Brenden Matthews
1fcbecf4af Fix broken $execbar (bug 2133709) 2008-12-07 15:49:04 -07:00
Brenden Matthews
5626eade7f Fix last 'fix' 2008-12-07 15:44:10 -07:00
Brenden Matthews
9345e2bb8f Allow more than 9 CPUs for CPU stats (bug 2155500) 2008-12-07 15:34:46 -07:00
Brenden Matthews
6fab949926 Removing $freq_dyn and $freq_dyn_g 
I have decided to remove $freq_dyn and $freq_dyn_g due to license issues
(see sf.net tracker bug #2166612)
 2008-12-07 15:15:57 -07:00
Brenden Matthews
112772e361 Add some more debug messages to imap/pop3 stuff, refactor some pop3 
code, add filename:lineno to DEBUG() macro.
 2008-12-07 01:08:27 -07:00
Erik Waling
51fe4fa419 Fetch volume through Audacious API (thanks Erik) 2008-12-07 00:38:06 -07:00
Cesare Tirabassi
b64203b547 Fix for buffer overflow with $execi (thanks Cesare) 2008-12-07 00:31:53 -07:00
Lassi Selander
20b2d2f464 Adds a variable if_xmms2_connected to hide objects when xmms2d is not 
running (thanks Lassi)
 2008-12-07 00:22:05 -07:00
Pavol Rusnak
e4e9cf4311 Fix for wrong usage of strncat (thanks Pavol) 2008-12-07 00:18:34 -07:00
Phil
d1b139f8e2 since DEV_NAME() is used when calling, this check is needless 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1274 7f574dfc-610e-0410-a909-a81674777703
 2008-12-06 19:10:27 +00:00
Phil
c4b98f0762 Add debugging output at runtime 
The new command line option '-D' ('--debug') increases debugging level by one.
For debugging output a user could be interested in, use the macros DEBUG() and
DEBUG2(). Functionality is equal to the ERR() macro. DEBUG2() prints stuff only
if debugging level is greater one, which means that '--debug' has been
specified more than once. This patch also includes usage of the macros for the
new template object (as debugging syntax errors in templates is one thing a
user potentially needs to do).


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1273 7f574dfc-610e-0410-a909-a81674777703
 2008-11-30 20:53:20 +00:00
Phil
ecb3004c0f improve template support 
* handle escaped characters in parameters to the template object, too
* add samples to the documentation
* do some code cleanup by outsourcing the string substitution into it's
  own function


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1271 7f574dfc-610e-0410-a909-a81674777703
 2008-11-29 13:02:42 +00:00
Phil
ce5eb880e7 add support for template objects 
Basically you can define a template like this:

| template0 \1:\n   ${fs_free \2} / ${fs_used \2}

and use it later like this:

| ${template0 root /}
| ${template0 boot /boot}

which is exactly the same as the following:

| root:
|    ${fs_free /} / ${fs_used /}
| boot:
|    ${fs_free /boot} / ${fs_used /boot}

hope you like it, I do already. :)


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1270 7f574dfc-610e-0410-a909-a81674777703
 2008-11-29 01:34:54 +00:00
Phil
820e0d24c4 fix my own fix 
The second parameter is optional, so have conky act accordingly. This time I
tested using either two or three params and it worked flawlessly.


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1269 7f574dfc-610e-0410-a909-a81674777703
 2008-11-04 23:25:28 +00:00
Phil
f44003e07c fix a potential segfault 
* happened when passing wrong arguments to ${scroll}, particularly with only
  one instead of the mandatory two unsigned ints
* as it's not clear whether %n will change the value returned by sscanf or not,
  use a solution that works in both situations (%n incrementing the return
  value or not)


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1268 7f574dfc-610e-0410-a909-a81674777703
 2008-11-04 21:42:48 +00:00
Brenden Matthews
4be537a020 * Added $if_mpd_playing patch (thanks tarpman) 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1267 7f574dfc-610e-0410-a909-a81674777703
 2008-10-08 11:44:27 +00:00
Brenden Matthews
1ab4b8ec51 * Applied OpenBSD patches 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1266 7f574dfc-610e-0410-a909-a81674777703
 2008-10-08 11:41:16 +00:00
Brenden Matthews
e5fd6f8027 add openbsd.h to EXTRA_DIST 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1264 7f574dfc-610e-0410-a909-a81674777703
 2008-10-01 18:12:02 +00:00
Brenden Matthews
bb74efed2e remove quality debugging code 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1263 7f574dfc-610e-0410-a909-a81674777703
 2008-09-29 01:38:57 +00:00
Brenden Matthews
7ea81e1913 add $mixer docs 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1262 7f574dfc-610e-0410-a909-a81674777703
 2008-09-29 01:37:33 +00:00
Brenden Matthews
c5fcc5c6f1 handle BYE from server when idling (IMAP stuff) 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1261 7f574dfc-610e-0410-a909-a81674777703
 2008-09-26 21:29:02 +00:00
Brenden Matthews
1849db04e1 respect IMAP IDLE timeout period 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1260 7f574dfc-610e-0410-a909-a81674777703
 2008-09-26 21:09:48 +00:00
Brenden Matthews
ae92753584 close socket before exiting thread 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1259 7f574dfc-610e-0410-a909-a81674777703
 2008-09-25 18:29:04 +00:00
Brenden Matthews
3115cd8389 improving IMAP IDLE support, more 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1258 7f574dfc-610e-0410-a909-a81674777703
 2008-09-25 04:01:47 +00:00
Brenden Matthews
e80ec4cc5f improving IMAP IDLE support 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1257 7f574dfc-610e-0410-a909-a81674777703
 2008-09-25 03:11:24 +00:00
Brenden Matthews
c15287e798 fix small bug in imap idle stuff 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1256 7f574dfc-610e-0410-a909-a81674777703
 2008-09-24 21:04:29 +00:00
Brenden Matthews
39270e951f add $Id$ to moc stuff 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1255 7f574dfc-610e-0410-a909-a81674777703
 2008-09-24 20:56:09 +00:00
Brenden Matthews
dfc4d44203 oops; forgot to add moc.[ch] 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1253 7f574dfc-610e-0410-a909-a81674777703
 2008-09-24 20:53:58 +00:00
Brenden Matthews
7de6c1d061 * Introduced (buggy) support for IMAP IDLE 
* Added support for MOC (the console audio player) (thanks henux)
* Added scroll step patch (thanks asto)


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1252 7f574dfc-610e-0410-a909-a81674777703
 2008-09-24 06:59:45 +00:00
Brenden Matthews
0c2c9dd038 * Added small patch to support negative values (such as negative disk capacity) (thanks hinokind) 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1251 7f574dfc-610e-0410-a909-a81674777703
 2008-09-12 05:03:38 +00:00
Brenden Matthews
6769495e10 * Improve Conky's overall interval timing 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1250 7f574dfc-610e-0410-a909-a81674777703
 2008-09-12 03:01:33 +00:00
Brenden Matthews
8bb6b479a8 * Improve timed_thread timing 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1249 7f574dfc-610e-0410-a909-a81674777703
 2008-09-11 22:27:19 +00:00
Brenden Matthews
0c59779528 maybe fix missing include bug (http://bugs.gentoo.org/show_bug.cgi?id=235233) 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1247 7f574dfc-610e-0410-a909-a81674777703
 2008-09-11 15:44:48 +00:00
Brenden Matthews
7996b9d05c oops, remove debug stuff 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1246 7f574dfc-610e-0410-a909-a81674777703
 2008-09-11 03:22:37 +00:00
Brenden Matthews
4ca31d2ce4 * Improved hddtemp support 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1245 7f574dfc-610e-0410-a909-a81674777703
 2008-09-11 03:21:39 +00:00
Brenden Matthews
068f6b5b09 * Fixed bug with freq_dyn on x86_64 (thanks Miroslav) 
* Fixed buffer overflow in update_net_stats() (thanks Miroslav)
* Small fix for nvidia mem freq (thanks Cezary)

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1244 7f574dfc-610e-0410-a909-a81674777703
 2008-09-08 04:48:13 +00:00
Phil
56ba0250ab fix error reporting for battery_* variables 
* reproduce with a config displaying stuff for BAT0 and BAT1
  while only BAT0 is installed: the call to get_battery_stuff()
  for the existent BAT0 will reset the static variable rep and
  the errors for BAT1 will be reported over and over again
* this fix is not perfect: if both batteries are missing, only
  the first errors will be reported; but better than flooding the
  terminal


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1243 7f574dfc-610e-0410-a909-a81674777703
 2008-09-01 23:46:48 +00:00
Phil
3adb16ea40 another indentation (and some whitespace) fixup 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1242 7f574dfc-610e-0410-a909-a81674777703
 2008-09-01 23:08:09 +00:00
Phil
36e34a3c8d enable max length argument for mpd_smart 
* this also fixes mpd_title for changing lengths, e.g.
  ${mpd_title 2} ${mpd_title 3} ${mpd_title 4}


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1241 7f574dfc-610e-0410-a909-a81674777703
 2008-09-01 22:30:54 +00:00
Phil
e873442ec5 fix indenting in construct_text_object() 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1240 7f574dfc-610e-0410-a909-a81674777703
 2008-09-01 22:05:24 +00:00
Brenden Matthews
740eca5cf2 * Fix compile error when MPD support not enabled 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1236 7f574dfc-610e-0410-a909-a81674777703
 2008-08-14 17:10:41 +00:00
Roman Bogorodskiy
6a5691ab70 We continue our good old tradition of breaking FreeBSD 
code right before the release. This time, somebody refactored
the code to use freebsd.h, but forgot to include
freebsd.h to EXTRA_DIST, so the resulting tarball was
missing it and non-buildable on FreeBSD, thank you, kind man,
for doing it, please keep up breaking FreeBSD port, it's a 
great pleasure for me to fix it all the time, and don't
even think to drop me email or ask me on IRC, I like
surprises very much.


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1235 7f574dfc-610e-0410-a909-a81674777703
 2008-08-07 06:07:50 +00:00
Brenden Matthews
6cbffa71ef remove hardcoded retry stuff; put -Werror back in (who the fk removed that?) 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1234 7f574dfc-610e-0410-a909-a81674777703
 2008-08-05 18:43:24 +00:00
Brenden Matthews
961b70b6e6 * Add option to specify number of retries for IMAP/POP3 stuff (via -r) 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1233 7f574dfc-610e-0410-a909-a81674777703
 2008-08-05 18:00:30 +00:00
Phil
d23271777d little simplification and improvement of $nvidia 
* check only the unique part of the argument
* print temperatures like all others (%.1f)
* do argument parsing in nvidia.c (so all specific stuff is at one place)
* little header cleanup


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1231 7f574dfc-610e-0410-a909-a81674777703
 2008-08-03 13:27:00 +00:00
Brenden Matthews
c5dbd0afa9 add missing xmms2.h to dist 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1229 7f574dfc-610e-0410-a909-a81674777703
 2008-07-30 02:03:42 +00:00
Brenden Matthews
1577667a70 s/kiB/KiB/g 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1227 7f574dfc-610e-0410-a909-a81674777703
 2008-07-20 02:05:11 +00:00
Brenden Matthews
b9bdafb0df improve last fix a bit 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1226 7f574dfc-610e-0410-a909-a81674777703
 2008-07-17 03:14:37 +00:00
Brenden Matthews
69ff93d0ea * Fixed bug with $if_empty and $mpd_* vars (sf.net #2008752) 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1225 7f574dfc-610e-0410-a909-a81674777703
 2008-07-17 02:38:04 +00:00
Brenden Matthews
ae4bd7cdf9 fix missing include 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1224 7f574dfc-610e-0410-a909-a81674777703
 2008-07-15 01:05:37 +00:00
Nikolas Garofil
23321c408d made defines of some literal values and defines to configure.ac.in 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1223 7f574dfc-610e-0410-a909-a81674777703
 2008-07-12 10:25:05 +00:00
Nikolas Garofil
8745d71edf Proper indenting for eve-code, made a define of the default netdev, and moved some defines to configure.ac.in 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1222 7f574dfc-610e-0410-a909-a81674777703
 2008-07-12 01:22:40 +00:00
Nikolas Garofil
47462b5d1e solve warnings 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1221 7f574dfc-610e-0410-a909-a81674777703
 2008-07-09 23:05:48 +00:00
Philip Kovacs
b58d412441 removed gnulib completely. use a simple getnameinfo function check for --enable-portmon. 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1218 7f574dfc-610e-0410-a909-a81674777703
 2008-07-07 20:09:37 +00:00
Nikolas Garofil
9094035f8e Fix bug in optional normal/log argument for graphs 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1217 7f574dfc-610e-0410-a909-a81674777703
 2008-07-06 13:04:29 +00:00
Nikolas Garofil
97de8557b2 Made log/normal argument for graphs optional 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1216 7f574dfc-610e-0410-a909-a81674777703
 2008-07-06 10:56:59 +00:00
Roman Bogorodskiy
67d66b03eb - Use u_int instead of unsigned long for storing 
vm related values returned by sysctl
- Minor style fix in preproccessor comments


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1215 7f574dfc-610e-0410-a909-a81674777703
 2008-07-06 09:25:28 +00:00
Philip Kovacs
a2775d30d1 --libtool version of gnulib installed 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1211 7f574dfc-610e-0410-a909-a81674777703
 2008-07-03 23:28:51 +00:00
Philip Kovacs
5619ce52ad adjust #includes 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1208 7f574dfc-610e-0410-a909-a81674777703
 2008-07-01 19:43:24 +00:00
Nikolas Garofil
fec88c0429 Compilation with --enable-testing works by removing stdio.h 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1207 7f574dfc-610e-0410-a909-a81674777703
 2008-07-01 17:33:21 +00:00
Philip Kovacs
c7c822426c latest gnulib sources 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1206 7f574dfc-610e-0410-a909-a81674777703
 2008-07-01 14:46:13 +00:00
Nikolas Garofil
72f416212f configure option for mathfunctions 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1204 7f574dfc-610e-0410-a909-a81674777703
 2008-07-01 11:13:40 +00:00
Philip Kovacs
5ce58e014e Add libgnu convenience lib, modules stdio and getaddrinfo. 
We now make no assumption about availability of functions
such as snprintf and getnameinfo.  If the target machine 
doesnt have them, libgnu provides them.



git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1203 7f574dfc-610e-0410-a909-a81674777703
 2008-07-01 01:26:02 +00:00
Philip Kovacs
003785e754 Remove recently added _POSIX_C_SOURCE 200112L as it conflicts 
with feature requirements for glibc when using snprintf.


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1200 7f574dfc-610e-0410-a909-a81674777703
 2008-06-30 00:56:01 +00:00
Nikolas Garofil
5884358016 Get rid of obsolete gethostbyaddr and getservbyport 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1199 7f574dfc-610e-0410-a909-a81674777703
 2008-06-29 09:26:15 +00:00
Brenden Matthews
35e1932ad1 fix missing entries in Makefile.am 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1198 7f574dfc-610e-0410-a909-a81674777703
 2008-06-29 00:27:09 +00:00
Brenden Matthews
896863e2d8 Added support for EVE-Online skill monitoring (thanks Asbjørn); fixed up/downspeedgraph segfault 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1197 7f574dfc-610e-0410-a909-a81674777703
 2008-06-28 20:14:04 +00:00
Brenden Matthews
66079c5585 Added sysfs AC adapter support patch (thanks Byron); Small compilation error fix 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1196 7f574dfc-610e-0410-a909-a81674777703
 2008-06-28 19:17:49 +00:00
Phil
7f09a767f0 (re)define FALSE and TRUE, non-existent on my system 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1195 7f574dfc-610e-0410-a909-a81674777703
 2008-06-25 21:06:54 +00:00
Phil
28478344ab two new smapi variables and a bit of documentation improvement 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1194 7f574dfc-610e-0410-a909-a81674777703
 2008-06-25 10:08:27 +00:00
Nikolas Garofil
312d3d6de8 Merge with conky1-extra, Changelog contains the changes 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1193 7f574dfc-610e-0410-a909-a81674777703
 2008-06-21 20:37:58 +00:00
Nikolas Garofil
c1c34ae443 'inline' removed from functions that are called from different files 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1187 7f574dfc-610e-0410-a909-a81674777703
 2008-06-21 14:18:44 +00:00
Kevin Lyles
54120a3d83 Re-arranged some if statements to reduce redundancy 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1185 7f574dfc-610e-0410-a909-a81674777703
 2008-06-21 09:25:37 +00:00
Kevin Lyles
02dad6a2cb Consolidated all barnum code into get_barnum 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1184 7f574dfc-610e-0410-a909-a81674777703
 2008-06-21 09:25:29 +00:00
Kevin Lyles
bca75f302c Consolidated all popen calls (and repeated surrounding code) into read_exec 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1183 7f574dfc-610e-0410-a909-a81674777703
 2008-06-21 09:25:22 +00:00
Kevin Lyles
415d927a0e Removed some redundancies between imap and pop3 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1182 7f574dfc-610e-0410-a909-a81674777703
 2008-06-21 09:25:16 +00:00
Kevin Lyles
9a6f79b0e2 Renamed all my_infos to the more-descriptive tmp_info 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1181 7f574dfc-610e-0410-a909-a81674777703
 2008-06-21 09:25:03 +00:00
Kevin Lyles
e7e874ac61 Renamed more global variables with global_ prefix 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1180 7f574dfc-610e-0410-a909-a81674777703
 2008-06-21 09:24:56 +00:00
Kevin Lyles
e528397a02 Replaced the global text_object array and count with a text_object_list 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1179 7f574dfc-610e-0410-a909-a81674777703
 2008-06-21 09:24:51 +00:00
Kevin Lyles
01ca7ad07a Added comments to a couple of non-obvious lines (to me, anyway) 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1178 7f574dfc-610e-0410-a909-a81674777703
 2008-06-21 09:24:39 +00:00
Kevin Lyles
d79958ac84 Split help output into a separate function 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1171 7f574dfc-610e-0410-a909-a81674777703
 2008-06-19 19:59:30 +00:00
Kevin Lyles
5a8b03fba7 Moved global diskio variables into info 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1170 7f574dfc-610e-0410-a909-a81674777703
 2008-06-19 19:58:07 +00:00
Kevin Lyles
2fd832f6b0 Refactored out some redundancy in the tab conversion code 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1169 7f574dfc-610e-0410-a909-a81674777703
 2008-06-19 19:57:12 +00:00
Kevin Lyles
6d4829ca83 Removed some redundancy in mpd_elapsed and mpd_length 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1168 7f574dfc-610e-0410-a909-a81674777703
 2008-06-19 19:56:30 +00:00
Kevin Lyles
9ffbf32b1d Changed addr to print "No Address" when there is no address 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1167 7f574dfc-610e-0410-a909-a81674777703
 2008-06-19 19:54:31 +00:00
Kevin Lyles
bb80900ca6 Refactored format_seconds and format_seconds_short 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1165 7f574dfc-610e-0410-a909-a81674777703
 2008-06-19 07:04:11 +00:00
Kevin Lyles
40f2fcfd7b Fixed compilation issues with --enable-testing 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1164 7f574dfc-610e-0410-a909-a81674777703
 2008-06-19 06:17:53 +00:00
Nikolas Garofil
2e2765393e magic nums to defines and don't check ut_name and ut_line length because it can't be larger then UT_NAMESIZE and UT_LINESIZE 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1162 7f574dfc-610e-0410-a909-a81674777703
 2008-06-17 20:44:06 +00:00
Nikolas Garofil
6472addc09 3 Bufferoverflows in a struct utmp 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1161 7f574dfc-610e-0410-a909-a81674777703
 2008-06-16 20:12:39 +00:00
Philip Kovacs
d036b5de5c move audacious defs into header 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1159 7f574dfc-610e-0410-a909-a81674777703
 2008-06-16 19:40:28 +00:00
Philip Kovacs
6bb956c6e0 restore audacious functionality broken by previous header spliting commits. 
headers are for interfaces and typedefs, not data.


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1157 7f574dfc-610e-0410-a909-a81674777703
 2008-06-15 20:17:37 +00:00
Kevin Lyles
c72a564cea Removed all trailing whitespace 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1156 7f574dfc-610e-0410-a909-a81674777703
 2008-06-15 18:38:33 +00:00
Roman Bogorodskiy
00b26c0834 More or less working on FreeBSD now. 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1155 7f574dfc-610e-0410-a909-a81674777703
 2008-06-15 07:08:52 +00:00
Kevin Lyles
610b0b628d Split conky.h into several smaller header files 
In order to do this correctly:
	Removed duplicate includes
	Fixed mpd functions to accept mpd_s instead of information
	Freed mpd.h of any need to include conky.h (mpd.c still includes it for the constants)



git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1154 7f574dfc-610e-0410-a909-a81674777703
 2008-06-14 18:41:12 +00:00
Kevin Lyles
59704d5e3e Moved struct process to top.h 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1153 7f574dfc-610e-0410-a909-a81674777703
 2008-06-14 05:32:46 +00:00
Nikolas Garofil
83bf37fe85 Bugfix: execgraph scale 0-0 instead of 0-100 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1149 7f574dfc-610e-0410-a909-a81674777703
 2008-06-08 20:39:07 +00:00
Nikolas Garofil
26bea66044 Bugfix: didn't work 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1143 7f574dfc-610e-0410-a909-a81674777703
 2008-06-08 11:16:51 +00:00
Nikolas Garofil
a306817910 Bugfix: same text multiple times caused by if-family 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1141 7f574dfc-610e-0410-a909-a81674777703
 2008-06-07 19:11:29 +00:00
Nikolas Garofil
538dbe4e91 Bugfix: DEV_NAME tried to read uninitialised mem 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1139 7f574dfc-610e-0410-a909-a81674777703
 2008-06-07 12:34:07 +00:00
Nikolas Garofil
b24e258165 small changes to let code compile with enable-testing 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1134 7f574dfc-610e-0410-a909-a81674777703
 2008-06-06 12:14:15 +00:00
Nikolas Garofil
3969388b4a Bugfix: Lines printed to STDOUT with out_to_console were printed twice 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1127 7f574dfc-610e-0410-a909-a81674777703
 2008-06-04 22:35:02 +00:00
Nikolas Garofil
a9624c80cc Bugfix: chars followed by backspace should not be displayed 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1126 7f574dfc-610e-0410-a909-a81674777703
 2008-06-04 08:51:15 +00:00
Nikolas Garofil
07269f678d Bugfix: gw_iface with a empty routingtable no longer causes a crash 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1124 7f574dfc-610e-0410-a909-a81674777703
 2008-06-04 08:09:49 +00:00
Brenden Matthews
8f8d5c1c8c * Added --quiet patch (thanks sceptik) 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1123 7f574dfc-610e-0410-a909-a81674777703
 2008-06-03 21:01:40 +00:00
Brenden Matthews
7ff7c1083c * Added NVIDIA Graficcard support patch (thanks meissna) 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1122 7f574dfc-610e-0410-a909-a81674777703
 2008-06-03 20:46:15 +00:00
Phil
bd6196c6b0 configurable if_up, may check for: 
* IFF_UP flag,
* IFF_UP and IFF_RUNNING flags or
* IFF_UP, IFF_RUNNING flags and assigned address


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1121 7f574dfc-610e-0410-a909-a81674777703
 2008-05-30 11:30:58 +00:00
Brenden Matthews
a7da3b17bc docs; small code simplification 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1119 7f574dfc-610e-0410-a909-a81674777703
 2008-05-06 22:41:28 +00:00
Brenden Matthews
c70e1ead9f updating docs, syntax highlighting, code formatting 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1118 7f574dfc-610e-0410-a909-a81674777703
 2008-05-06 21:44:23 +00:00
Roman Bogorodskiy
947dfb558d Small portion of FreeBSD fixes: 
- diskio.c is not needed for freebsd
- sync cpu freq related functions prototypes
- cleanup #indef's

It still doesn't compile on FreeBSD though.


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1117 7f574dfc-610e-0410-a909-a81674777703
 2008-05-03 12:30:05 +00:00
Brenden Matthews
fda6b66eb9 * own_window_type dock patch (thanks Morgan). 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1115 7f574dfc-610e-0410-a909-a81674777703
 2008-04-29 21:31:04 +00:00
Brenden Matthews
fcb1260a39 exclude reserved IPs with if_up 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1113 7f574dfc-610e-0410-a909-a81674777703
 2008-04-22 22:59:04 +00:00
Brenden Matthews
39a00f4cfa fixed hddtemp problems as well as some other misc things 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1112 7f574dfc-610e-0410-a909-a81674777703
 2008-04-22 22:54:22 +00:00
Brenden Matthews
5c01c5991e fixed crash on realloc due to use of strncpy 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1111 7f574dfc-610e-0410-a909-a81674777703
 2008-04-22 21:54:49 +00:00
Brenden Matthews
1dafa537d4 add missing math.h include 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1110 7f574dfc-610e-0410-a909-a81674777703
 2008-04-17 20:46:29 +00:00
Brenden Matthews
5c32bc6bc8 include stdarg.h for va_start/va_end 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1109 7f574dfc-610e-0410-a909-a81674777703
 2008-04-17 20:40:53 +00:00
Brenden Matthews
feca8d2fb5 add missing include 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1107 7f574dfc-610e-0410-a909-a81674777703
 2008-04-16 01:36:55 +00:00
Brenden Matthews
801cf11545 * Added patch for the following (thanks larsko): 
* New $loadgraph to show a graph of load averages,
* add "show_graph_scale" option to turn off/on the showing of the
current max value for the graph,
* minor code fixes,
* update nano and vim syntax highlighting stuff.

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1104 7f574dfc-610e-0410-a909-a81674777703
 2008-04-13 04:10:35 +00:00
Brenden Matthews
4d7ecc7951 * Getting rid of goto usage throughout code. 
* Fix bug due to usage of gethostbyname() in threads (which is not
	reentrant) by using gethostbyname_r() when available.
	* Added patch for battery_time problem on 2.6.24 (thanks wedge).
	* Added patch to fix broken xmms2 stuff (thanks sleipner).
	* Added patch to fix SIGHUP/SIGUSR1 segfault (thanks norsetto).
	* Added patch to improve $if_up (thanks Aseem).


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1103 7f574dfc-610e-0410-a909-a81674777703
 2008-04-10 22:45:45 +00:00
Brenden Matthews
77f8e9bba7 define our own strndup() when its not available (thanks to Pippijn for the idea) 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1101 7f574dfc-610e-0410-a909-a81674777703
 2008-04-02 19:46:09 +00:00
Brenden Matthews
a6a4a4c548 * Replacing strdup() with strndup() throughout 
(this is probably going to break a few things)

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1100 7f574dfc-610e-0410-a909-a81674777703
 2008-04-02 18:44:49 +00:00
Brenden Matthews
d46bcb0945 * Added patch to use mail_spool correctly (thanks Kapil) 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1099 7f574dfc-610e-0410-a909-a81674777703
 2008-04-02 18:29:08 +00:00
Brenden Matthews
fa94cac75f * Fixed segfault when configuration doesn't contain TEXT block (thanks 
Pippijn).

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1098 7f574dfc-610e-0410-a909-a81674777703
 2008-04-02 02:12:57 +00:00
Brenden Matthews
011f03b50d docs 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1097 7f574dfc-610e-0410-a909-a81674777703
 2008-04-01 21:37:49 +00:00
Brenden Matthews
c6c02f6cf9 capitalization consistency 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1096 7f574dfc-610e-0410-a909-a81674777703
 2008-04-01 06:10:58 +00:00