Phil Sutter [Tue, 12 May 2009 20:50:43 +0000 (22:50 +0200)]
add interesting parts of my latest commits to the changelog
Nikolas Garofil [Tue, 12 May 2009 18:25:40 +0000 (20:25 +0200)]
Don't check if_gw twice
Phil Sutter [Mon, 11 May 2009 23:58:41 +0000 (01:58 +0200)]
add documentation about --print-config
Phil Sutter [Mon, 11 May 2009 23:31:47 +0000 (01:31 +0200)]
add system-wide config to FILES section
Phil Sutter [Sun, 10 May 2009 23:25:25 +0000 (01:25 +0200)]
relying on the return value of scanf when using %n is bad
Phil Sutter [Sun, 10 May 2009 22:52:15 +0000 (00:52 +0200)]
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. ;)
Phil Sutter [Sun, 10 May 2009 22:22:02 +0000 (00:22 +0200)]
hwmon: add args for value precalculation
Phil Sutter [Sun, 10 May 2009 20:47:47 +0000 (22:47 +0200)]
fix hwmon for 2.6.29, simplify code a bit
Nikolas Garofil [Mon, 11 May 2009 17:47:24 +0000 (19:47 +0200)]
Bugfix: if_gw only outputs if another gw var is in the if block (sf id 2784627)
Nikolas Garofil [Mon, 11 May 2009 16:37:12 +0000 (18:37 +0200)]
Remove even more x11-stuff with --disable-x11
Brenden Matthews [Sun, 10 May 2009 19:41:37 +0000 (13:41 -0600)]
Ammend AUTHORS.
Jaromir Smrcek [Sun, 10 May 2009 19:37:04 +0000 (13:37 -0600)]
APC UPS fixes.
Brenden Matthews [Sun, 10 May 2009 19:24:31 +0000 (13:24 -0600)]
Add note to git readme about doc generation.
Nikolas Garofil [Sun, 10 May 2009 19:18:20 +0000 (21:18 +0200)]
no x11-stuff for apcupsd when disabled
Brenden Matthews [Sun, 10 May 2009 19:11:09 +0000 (13:11 -0600)]
Various fixes.
Added missing apcupsd.[hc], added apcupsd_loadgauge, fixed compilation
errors, updated docs & syntax stuff.
Jaromir Smrcek [Sun, 10 May 2009 18:58:06 +0000 (12:58 -0600)]
Added support for APC UPS daemon monitoring.
Brenden Matthews [Sun, 10 May 2009 17:59:30 +0000 (11:59 -0600)]
Revert "autogen.sh needs README"
This reverts commit
1d37629bfbc506eb32415b4bbbbd7d639e7b0276.
Conflicts:
README.git-version
Brenden Matthews [Sun, 10 May 2009 17:52:32 +0000 (11:52 -0600)]
Merge branch 'master' of git.omp.am:/home/omp/git/conky
Brenden Matthews [Sun, 10 May 2009 17:52:03 +0000 (11:52 -0600)]
Modified autogen.sh so we shouldn't need the README in the git repo.
Lassi Selander [Sun, 10 May 2009 17:44:57 +0000 (11:44 -0600)]
Fix for previous xmms2 patch.
Nikolas Garofil [Sun, 10 May 2009 12:14:21 +0000 (14:14 +0200)]
no gauges, bars, ... when compiled without X11
Nikolas Garofil [Sun, 10 May 2009 11:44:13 +0000 (13:44 +0200)]
optimize previous commit (thanks Plague)
Nikolas Garofil [Sun, 10 May 2009 11:14:54 +0000 (13:14 +0200)]
strcpy shouldn't be used for overlapping strings
Nikolas Garofil [Sun, 10 May 2009 10:48:22 +0000 (12:48 +0200)]
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
Brenden Matthews [Sun, 10 May 2009 05:30:42 +0000 (23:30 -0600)]
Update docs, remove deprecated code.
Brenden Matthews [Sun, 10 May 2009 05:25:11 +0000 (23:25 -0600)]
Finish with check_docs.py.
This script checks consistency of docs, and automatically updates the
nano and vim syntax files.
Brenden Matthews [Sun, 10 May 2009 04:14:10 +0000 (22:14 -0600)]
Make docs aboot gap/position stuff easier to find.
Brenden Matthews [Sun, 10 May 2009 02:10:55 +0000 (20:10 -0600)]
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).
Brenden Matthews [Sun, 10 May 2009 01:20:05 +0000 (19:20 -0600)]
Fix backwards mail stuff.
Brenden Matthews [Sat, 9 May 2009 18:00:09 +0000 (12:00 -0600)]
Only enable OpenMP stuff for gcc >=4.3.
Brenden Matthews [Sat, 9 May 2009 17:20:04 +0000 (11:20 -0600)]
Fix build errors.
Nikolas Garofil [Sat, 9 May 2009 12:06:58 +0000 (14:06 +0200)]
Bugfix: vars related to graphics produced wrong output when not running in X
Nikolas Garofil [Fri, 8 May 2009 14:04:16 +0000 (16:04 +0200)]
Only include disp when needed
Nikolas Garofil [Fri, 8 May 2009 12:57:19 +0000 (14:57 +0200)]
Bugfix: run update_uname also without X11
Brenden Matthews [Thu, 7 May 2009 23:49:32 +0000 (17:49 -0600)]
Added top_name_width config option.
Brenden Matthews [Thu, 7 May 2009 19:18:24 +0000 (13:18 -0600)]
Specify that imap/pop3 interval is in seconds.
Brenden Matthews [Thu, 7 May 2009 19:16:26 +0000 (13:16 -0600)]
Fix for imap docs.
Brenden Matthews [Thu, 7 May 2009 18:48:54 +0000 (12:48 -0600)]
Update changelog for last commit.
Nikolas Garofil [Thu, 7 May 2009 16:44:45 +0000 (18:44 +0200)]
Bugfix: sometimes segfaults with cpubar
Brenden Matthews [Tue, 5 May 2009 23:43:45 +0000 (17:43 -0600)]
Use a reduction here.
Brenden Matthews [Tue, 5 May 2009 23:36:12 +0000 (17:36 -0600)]
Added some completely pointless OpenMP optimizations(?)
Nikolas Garofil [Tue, 5 May 2009 16:46:46 +0000 (18:46 +0200)]
autogen.sh needs README
Brenden Matthews [Mon, 4 May 2009 19:20:42 +0000 (13:20 -0600)]
Removed bits about BSD license.
Brenden Matthews [Mon, 4 May 2009 19:19:44 +0000 (13:19 -0600)]
Add copyright/license stuff to sony.[ch].
Brenden Matthews [Mon, 4 May 2009 19:15:46 +0000 (13:15 -0600)]
Missing files, fix last commit.
Added sony.[ch] stuff, as well as the important change from commit
3dd1738fb9e16831166e70201078164d551c7ffc
Brenden Matthews [Mon, 4 May 2009 19:13:51 +0000 (13:13 -0600)]
Revert "Combine can now use other chars to seperate vars (used to be only space)"
This reverts commit
3dd1738fb9e16831166e70201078164d551c7ffc.
Nikolas Garofil [Mon, 4 May 2009 10:58:52 +0000 (12:58 +0200)]
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.
Yeon-Hyeong Yang [Mon, 4 May 2009 03:23:59 +0000 (21:23 -0600)]
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.
Brenden Matthews [Sat, 2 May 2009 05:05:06 +0000 (23:05 -0600)]
Fixed $texeci regression.
Brenden Matthews [Fri, 1 May 2009 23:12:09 +0000 (17:12 -0600)]
Fix changelog.
Needed to make sure the stuff that went in after 1.7.0 is not below the
'1.7.0 released' entry.
Yeon-Hyeong Yang [Fri, 1 May 2009 23:03:59 +0000 (17:03 -0600)]
Added diskio_avg_samples patch (thanks Yeon-Hyeong)
Brenden Matthews [Fri, 1 May 2009 22:37:04 +0000 (16:37 -0600)]
Conky 1.7.0 "Hungry Hobo" released!
Brenden Matthews [Fri, 1 May 2009 22:22:08 +0000 (16:22 -0600)]
Bump docs.
Brenden Matthews [Fri, 1 May 2009 22:20:06 +0000 (16:20 -0600)]
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.
Nikolas Garofil [Thu, 30 Apr 2009 19:05:59 +0000 (21:05 +0200)]
Added the combine variable
Brenden Matthews [Tue, 28 Apr 2009 21:21:20 +0000 (15:21 -0600)]
Why do we still have a kdevelop file in here?
Brenden Matthews [Tue, 28 Apr 2009 21:20:58 +0000 (15:20 -0600)]
Disable config-output on FreeBSD.
Jérôme Plût [Tue, 28 Apr 2009 16:56:49 +0000 (10:56 -0600)]
Make ALSA mixers available on Linux, and added $if_mixer_mute.
Brenden Matthews [Tue, 28 Apr 2009 16:54:43 +0000 (10:54 -0600)]
Fix minor environment variable bug.
Brenden Matthews [Tue, 28 Apr 2009 16:19:28 +0000 (10:19 -0600)]
Minor for for mail args parsing.
Lassi Selander [Tue, 28 Apr 2009 16:02:24 +0000 (10:02 -0600)]
Various XMMS2 updates (thanks Lassi).
Phil Sutter [Sun, 26 Apr 2009 20:38:03 +0000 (22:38 +0200)]
fix for enviroment variable expansion
Nikolas Garofil [Sat, 18 Apr 2009 22:42:01 +0000 (00:42 +0200)]
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
Nikolas Garofil [Mon, 13 Apr 2009 12:42:31 +0000 (14:42 +0200)]
Bugfix: compilation without X11 broke after latest patches
Brenden Matthews [Fri, 10 Apr 2009 02:18:19 +0000 (20:18 -0600)]
Update docs.
Brenden Matthews [Fri, 10 Apr 2009 02:10:08 +0000 (20:10 -0600)]
Special default & gauge fixes.
Brenden Matthews [Thu, 9 Apr 2009 23:07:21 +0000 (17:07 -0600)]
Clarify $tab arguments.
Brenden Matthews [Thu, 9 Apr 2009 22:00:40 +0000 (16:00 -0600)]
Added default_bar/graph/gauge_size config options (thanks wire64 for the idea)
Or Cohen [Thu, 9 Apr 2009 21:28:45 +0000 (15:28 -0600)]
Minor fix for fs_used_perc, fs_free and fs_free_perc
Brenden Matthews [Thu, 9 Apr 2009 21:20:10 +0000 (15:20 -0600)]
Fix xmms2 related compilation error?
Phil Sutter [Fri, 3 Apr 2009 23:19:49 +0000 (01:19 +0200)]
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.
Nikos Ntarmos [Wed, 1 Apr 2009 16:04:20 +0000 (19:04 +0300)]
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>
Nikos Ntarmos [Wed, 1 Apr 2009 17:06:31 +0000 (20:06 +0300)]
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>
Brenden Matthews [Mon, 30 Mar 2009 05:37:49 +0000 (23:37 -0600)]
Don't need debian stuff either.
Brenden Matthews [Mon, 30 Mar 2009 05:37:21 +0000 (23:37 -0600)]
Don't really need ebuilds in here anymore.
Brenden Matthews [Mon, 30 Mar 2009 05:35:42 +0000 (23:35 -0600)]
Fix compile error.
Brenden Matthews [Mon, 30 Mar 2009 05:17:56 +0000 (23:17 -0600)]
Fix charset of changelog.
Brenden Matthews [Mon, 30 Mar 2009 04:56:29 +0000 (22:56 -0600)]
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.
Brenden Matthews [Mon, 30 Mar 2009 04:55:30 +0000 (22:55 -0600)]
Update copyright stuff, fix conky.conf weirdness.
Brenden Matthews [Mon, 30 Mar 2009 03:32:24 +0000 (21:32 -0600)]
Update changelog.
Brenden Matthews [Mon, 30 Mar 2009 02:26:16 +0000 (20:26 -0600)]
Fixed bug in template stuff.
Nikos Ntarmos [Sat, 28 Mar 2009 23:15:20 +0000 (01:15 +0200)]
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>
Nikos Ntarmos [Sat, 28 Mar 2009 19:53:02 +0000 (21:53 +0200)]
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>
Nikos Ntarmos [Sat, 28 Mar 2009 19:46:20 +0000 (21:46 +0200)]
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>
Nikos Ntarmos [Sat, 28 Mar 2009 17:53:35 +0000 (19:53 +0200)]
Extra includes to fix compiling on FreeBSD
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Nikos Ntarmos [Sat, 28 Mar 2009 17:49:56 +0000 (19:49 +0200)]
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>
Nikos Ntarmos [Sat, 28 Mar 2009 17:47:53 +0000 (19:47 +0200)]
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>
Phil Sutter [Tue, 24 Mar 2009 00:25:56 +0000 (01:25 +0100)]
update README and manpage
Phil Sutter [Mon, 23 Mar 2009 23:27:51 +0000 (00:27 +0100)]
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.
Phil Sutter [Mon, 23 Mar 2009 23:29:07 +0000 (00:29 +0100)]
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.
Phil Sutter [Mon, 23 Mar 2009 22:42:59 +0000 (23:42 +0100)]
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).
Brenden Matthews [Thu, 19 Mar 2009 19:40:49 +0000 (13:40 -0600)]
Couple minor fixes.
Make X11_initialise() work as it should, clarified IBM/Lenovo aka smapi
support in configure script.
Brenden Matthews [Wed, 18 Mar 2009 06:29:01 +0000 (00:29 -0600)]
Make print_config() stuff match configure.
Brenden Matthews [Wed, 18 Mar 2009 05:26:56 +0000 (23:26 -0600)]
Regenerate docs.
newclearman [Thu, 19 Mar 2009 07:20:38 +0000 (00:20 -0700)]
Adds the docs for the gauges
Signed-off-by: Brenden Matthews <brenden@rty.ca>
Nikolas Garofil [Tue, 17 Mar 2009 17:36:46 +0000 (18:36 +0100)]
Fix: make sure compiling without X11 works
Brenden Matthews [Mon, 16 Mar 2009 21:56:37 +0000 (15:56 -0600)]
Fix possible mem leak with net stats.
Brenden Matthews [Mon, 16 Mar 2009 21:31:42 +0000 (15:31 -0600)]
Update changelog.
Nikolas Garofil [Mon, 16 Mar 2009 20:21:11 +0000 (21:21 +0100)]
Merge branch 'master' of git.omp.am:/home/omp/git/conky
Nikolas Garofil [Mon, 16 Mar 2009 20:14:22 +0000 (21:14 +0100)]
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