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
Brenden Matthews [Mon, 16 Mar 2009 20:13:33 +0000 (14:13 -0600)]
Fix wacky net speed values on startup.
Brenden Matthews [Mon, 16 Mar 2009 19:40:22 +0000 (13:40 -0600)]
Make gauge stuff look a little less funny.
Brenden Matthews [Mon, 16 Mar 2009 19:21:09 +0000 (13:21 -0600)]
Unbreak alias stuff.
It was broken by commit
98c64d8b3ea93a5a3ee098783b1399982f8c97a2, I did
a lowsy job of checking the patch over.
Brenden Matthews [Mon, 16 Mar 2009 04:14:07 +0000 (22:14 -0600)]
Update docs for $if_running.
Brenden Matthews [Mon, 16 Mar 2009 02:03:12 +0000 (20:03 -0600)]
Update configure.ac.in for 1.7.x.
Brenden Matthews [Mon, 16 Mar 2009 01:37:11 +0000 (19:37 -0600)]
Updating changelog.
aner [Wed, 11 Mar 2009 00:37:24 +0000 (17:37 -0700)]
I added Gagues to monitor variables
Signed-off-by: Brenden Matthews <brenden@rty.ca>
Nikos Ntarmos [Mon, 16 Mar 2009 01:11:49 +0000 (19:11 -0600)]
Disk i/o support on FreeBSD patch.
Patch sf.net id #2657227 (thanks Nikos).
Brenden Matthews [Mon, 16 Mar 2009 01:01:06 +0000 (19:01 -0600)]
Updating changelog.
Ali Polatel [Wed, 25 Feb 2009 21:16:05 +0000 (23:16 +0200)]
Add extra_newline option for awesome's wiboxes
Hi Brenden,
Below is an updated patch, it works for me with the master.
p.s: don't forget to use git-am to apply the patch ;p
Signed-off-by: Brenden Matthews <brenden@rty.ca>
Brenden Matthews [Mon, 16 Mar 2009 00:34:40 +0000 (18:34 -0600)]
Fix compilation errors.
I hope I didn't break the alias stuff.
Nikolas Garofil [Sun, 15 Mar 2009 16:39:53 +0000 (17:39 +0100)]
fix use_spacer in default config (sf.net id #2638653)
Nikolas Garofil [Sun, 15 Mar 2009 16:09:35 +0000 (17:09 +0100)]
fix problems with negative numbers (sf.net id #2644593) (thanks Zhoushen Huang)
Nikolas Garofil [Sun, 15 Mar 2009 00:17:32 +0000 (01:17 +0100)]
bugfix: segfault when nothing x11-related is mentioned before TEXT
Nikolas Garofil [Sat, 7 Mar 2009 14:12:09 +0000 (15:12 +0100)]
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
Phil Sutter [Sun, 1 Mar 2009 20:12:46 +0000 (21:12 +0100)]
update README and manpage
Phil Sutter [Sun, 1 Mar 2009 20:06:23 +0000 (21:06 +0100)]
fix padding of $processes
Padding to 4 digits allows for max 9999 processes, which should really
be more than enough for systems running conky. ;)
Phil Sutter [Sun, 1 Mar 2009 20:03:49 +0000 (21:03 +0100)]
fix padding in temp_print
Phil Sutter [Sun, 1 Mar 2009 19:53:47 +0000 (20:53 +0100)]
introduce percent_print() for printing percentages
Phil Sutter [Sun, 1 Mar 2009 19:24:22 +0000 (20:24 +0100)]
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.
Nikolas Garofil [Sun, 1 Mar 2009 14:10:01 +0000 (15:10 +0100)]
if_updatenr added
Phil Sutter [Tue, 24 Feb 2009 23:22:31 +0000 (00:22 +0100)]
move the custom defined memrchr to the right place
And make it static, as tailhead.c is the only user of it.
Phil Sutter [Mon, 23 Feb 2009 22:28:12 +0000 (23:28 +0100)]
Phil Sutter [Sun, 22 Feb 2009 17:55:39 +0000 (18:55 +0100)]
add help text for --print-config option
While here, fix also -C for builds with --disable-x11.
Phil Sutter [Sun, 22 Feb 2009 17:35:47 +0000 (18:35 +0100)]
whitespace cleanup
Phil Sutter [Sun, 22 Feb 2009 17:21:15 +0000 (18:21 +0100)]
remove x11 dependency of fonts
Instead, we just ignore them. Less errors in output, little less
ifdef's.
Phil Sutter [Sun, 22 Feb 2009 16:53:30 +0000 (17:53 +0100)]
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.
Phil Sutter [Sun, 22 Feb 2009 16:40:45 +0000 (17:40 +0100)]
add doxygen support
Since we have no doxygen compatible code comments (we hardly have
comments at all ;) there is not much documentation to be extracted. But
this is still useful, as doxy generates us nice callgraphs showing the
internal code flow chaos. :)
Usage is as follows: after having run ./autogen.sh, doxygen can be
triggered by simply issuing 'make doxy'. This will generate a doxy
config if none exists, and preset some stuff inside (especially
parsing of undocumented stuff). Before all consecutive invocations, the
doxy config (named 'Doxyfile') can be customised to one's personal
needs.
Phil Sutter [Sun, 22 Feb 2009 02:07:14 +0000 (03:07 +0100)]
fix for building with --disable-x11
Phil Sutter [Mon, 5 Jan 2009 12:11:13 +0000 (13:11 +0100)]
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.
Phil Sutter [Mon, 5 Jan 2009 00:27:07 +0000 (01:27 +0100)]
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.
Phil Sutter [Sat, 3 Jan 2009 23:25:15 +0000 (00:25 +0100)]
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.
Phil Sutter [Sat, 3 Jan 2009 23:00:52 +0000 (00:00 +0100)]
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.
Phil Sutter [Thu, 25 Dec 2008 15:36:29 +0000 (16:36 +0100)]
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.
Phil Sutter [Thu, 25 Dec 2008 14:06:38 +0000 (15:06 +0100)]
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.
Phil Sutter [Sat, 21 Feb 2009 23:37:15 +0000 (00:37 +0100)]
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;
| }
Brenden Matthews [Wed, 18 Feb 2009 05:50:43 +0000 (22:50 -0700)]
No space between number and units please.
Sattvik [Wed, 18 Feb 2009 05:42:08 +0000 (22:42 -0700)]
Null mpd variables should have an empty string patch sf.net id #2564747.
Tamim Khan [Wed, 18 Feb 2009 05:29:42 +0000 (22:29 -0700)]
XMMS2 fix and refactoring patch sf.net id #2579357 (thanks Tamim).
Nicolas Sierro [Wed, 18 Feb 2009 05:26:15 +0000 (22:26 -0700)]
Extended support for local Maildir patch sf.net id #2561323 (thanks Nicolas).
Martin Tůma [Wed, 18 Feb 2009 05:19:25 +0000 (22:19 -0700)]
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).
Carpathia [Wed, 18 Feb 2009 05:14:59 +0000 (22:14 -0700)]
Patch to clarify things in conky.conf sf.net id #2548805 (thanks Carpathia).
Alexander Monakov [Wed, 18 Feb 2009 05:10:15 +0000 (22:10 -0700)]
Fix nvidia memory frequency reading patch sf.net id #2493134.
Alexander Monakov [Wed, 18 Feb 2009 05:04:38 +0000 (22:04 -0700)]
Fix diskio_read/write patch sf.net id #2493084 (thanks Alexander).
Kim Holviala [Wed, 18 Feb 2009 05:00:23 +0000 (22:00 -0700)]
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()