Cesare Tirabassi [Mon, 22 Feb 2010 21:45:51 +0000 (22:45 +0100)]
Fix LP: #525926; conky sigsegv if config file is deleted
Basically, we only relod if the file is modified but still handle the case
where the watch gets lost. Maybe we should just ignore IN_IGNORE altogether?
Nikolas Garofil [Mon, 22 Feb 2010 18:35:36 +0000 (19:35 +0100)]
Fix wrong output when nesting $combine-s
Nikolas Garofil [Mon, 22 Feb 2010 15:50:10 +0000 (16:50 +0100)]
Fix memleak
Nikolas Garofil [Mon, 22 Feb 2010 15:35:25 +0000 (16:35 +0100)]
Fix output of $combine when used in combination with $head
Nikolas Garofil [Thu, 18 Feb 2010 00:33:49 +0000 (01:33 +0100)]
Fix current_mail_spool memleak
Nikolas Garofil [Wed, 17 Feb 2010 19:36:01 +0000 (20:36 +0100)]
Fix memleak in if_match
Pavel Labath [Wed, 17 Feb 2010 18:55:39 +0000 (19:55 +0100)]
Update docs to be consistent with changes in previous commit
Pavel Labath [Wed, 17 Feb 2010 18:43:16 +0000 (19:43 +0100)]
Try to make $if_match better handle stranger inputs
This should fix sf.net #2953283
Ben Kibbey [Sun, 7 Feb 2010 15:46:00 +0000 (10:46 -0500)]
Added AF_UNIX socket support.
Signed-off-by: Brenden Matthews <brenden@diddyinc.com>
Cesare Tirabassi [Wed, 17 Feb 2010 11:38:05 +0000 (12:38 +0100)]
Fix last commit which fails to build when X11 is not enabled
Nikolas Garofil [Fri, 12 Feb 2010 17:57:02 +0000 (18:57 +0100)]
Fix wrong mixer values on some systems (thanks hoffa)
Nikolas Garofil [Fri, 12 Feb 2010 02:03:31 +0000 (03:03 +0100)]
Warn at wrong alignment setting and make sure it's disabled when the windowtype is dock
Pavel Labath [Wed, 3 Feb 2010 21:36:04 +0000 (22:36 +0100)]
Fix compilation without --enable-argb
Bug reported by zaphire
Cesare Tirabassi [Sun, 31 Jan 2010 19:57:02 +0000 (20:57 +0100)]
Replaces commit
44e3708cdb204782d728ddd6a40dec230bb9299c
Thanks to ichelm610x for the patch.
I just added memoization to reduce the impact of the many system calls.
Cesare Tirabassi [Sun, 31 Jan 2010 10:57:09 +0000 (11:57 +0100)]
Extend commit
25680305095bfcedaa46cb017182544183ab743b to the whole cpu object.
This is still a workaround, the underlining starvation issue remains
unsolved.
Brenden Matthews [Sat, 30 Jan 2010 19:12:59 +0000 (11:12 -0800)]
Bump for an RC3, if needed.
Cesare Tirabassi [Sat, 30 Jan 2010 18:24:19 +0000 (19:24 +0100)]
Merge branch '1.8.0' of git.omp.am:/home/omp/git/conky into 1.8.0
Cesare Tirabassi [Sat, 30 Jan 2010 18:23:31 +0000 (19:23 +0100)]
Modify last commit to keep compiler happy since it claims devbuf can never be null (should we really trust gcc that much?)
Pavel Labath [Sat, 30 Jan 2010 16:48:03 +0000 (17:48 +0100)]
Fix small logic error in diskiograph_read/write
Cesare Tirabassi [Sat, 30 Jan 2010 13:19:38 +0000 (14:19 +0100)]
Fix diskio total computation for kernel > 2.6.31 (sf: #2942117)
Brenden Matthews [Tue, 26 Jan 2010 21:05:04 +0000 (13:05 -0800)]
Only ever fork() once.
Brenden Matthews [Tue, 26 Jan 2010 20:37:16 +0000 (12:37 -0800)]
Only pause during startup, not after reload.
Pavel Labath [Sun, 24 Jan 2010 14:34:03 +0000 (15:34 +0100)]
Add optional argument to $acpiacadapter
The exact location of the state information seems hardware dependent, so this adds the option to
specify it manually. (linux only)
Pavel Labath [Tue, 19 Jan 2010 23:01:01 +0000 (00:01 +0100)]
Make conky not crash when drawing on root window
It was failing in XQueryColor because colourmap was NULL. This seemed to help.
Pavel Labath [Sun, 17 Jan 2010 18:35:35 +0000 (19:35 +0100)]
Another off-by-one found by valgrind.
Nikolas Garofil [Sat, 16 Jan 2010 03:01:49 +0000 (04:01 +0100)]
signed to unsigned before comparing
Nikolas Garofil [Sat, 16 Jan 2010 01:30:01 +0000 (02:30 +0100)]
Fix compiling with x11 by setting argb default on
Pavel Labath [Fri, 15 Jan 2010 22:41:04 +0000 (23:41 +0100)]
Fix "off-by-one" bug in hddtemp found by valgrind
Pavel Labath [Thu, 7 Jan 2010 21:27:25 +0000 (22:27 +0100)]
Fix $execbar et al.
Brenden Matthews [Wed, 6 Jan 2010 18:17:40 +0000 (10:17 -0800)]
Fix small logic error in diskio.
Cesare Tirabassi [Tue, 5 Jan 2010 16:08:20 +0000 (17:08 +0100)]
Fix sigsegv if cpu_usage has not yet been populated
Brenden Matthews [Sat, 2 Jan 2010 22:22:46 +0000 (14:22 -0800)]
Fix some minor memleaks, fix crash on reload.
It seems that closing xft fonts on reload is a bad idea, but this seems
to result in a memory leak. As far as I can tell, the leak doesn't grow
beyond the initial allocation however.
Brenden Matthews [Sat, 2 Jan 2010 21:31:09 +0000 (13:31 -0800)]
Added disable_auto_reload option, callback fixes.
There were some issues with reloading and the threaded callback
framework, which I think are mostly resolved now, but may need more
testing.
Brenden Matthews [Sat, 2 Jan 2010 20:12:21 +0000 (12:12 -0800)]
Fix reload problem with ARGB.
Brenden Matthews [Sat, 2 Jan 2010 19:38:44 +0000 (11:38 -0800)]
Improve handling of ARGB visuals a bit.
Brenden Matthews [Sat, 2 Jan 2010 18:43:01 +0000 (10:43 -0800)]
Bump rev.
Brenden Matthews [Sat, 2 Jan 2010 18:39:45 +0000 (10:39 -0800)]
Fix build error for IBM/smapi support.
Cesare Tirabassi [Thu, 31 Dec 2009 22:49:02 +0000 (23:49 +0100)]
The HAPPY NEW YEAR commit
This should close sf #2850092.
Basically, before this change, for strings which includes
SECRIT_MULTILINE_CHAR the computed maximum substring width was getting
summed to the width of the last substring.
The old behaviour is kept but for the case of strings including
SECRIT_MULTILINE_CHAR, for which now the maximum width of all substrings
is taken.
I don't think this will break anything else but blame me if it does ...
(cherry picked from commit
72bbe51a8c323702db76094e27266e67cc1ba5b5)
Cesare Tirabassi [Sun, 27 Dec 2009 22:07:16 +0000 (23:07 +0100)]
Fix some typos in documentation
(cherry picked from commit
c8a99a865adbd862bf74c0ca310fda796601fb5f)
Cesare Tirabassi [Wed, 9 Dec 2009 22:29:44 +0000 (23:29 +0100)]
remove <programlisting> from variables.xml, it only messes the man page and serve no other purpose
(cherry picked from commit
a14cca6592ec506b1a535be43912b4a72b40f11f)
Brenden Matthews [Fri, 1 Jan 2010 23:45:11 +0000 (15:45 -0800)]
Update copyright notices.
Brenden Matthews [Fri, 1 Jan 2010 23:10:29 +0000 (15:10 -0800)]
Bump to release candidate 1.
danielb [Fri, 1 Jan 2010 23:01:51 +0000 (15:01 -0800)]
Add ARGB visual support.
This patch adds the possibility to use a argb visual for the conky
window. Adding a boolean configuration entry 'own_window_argb_visual'.
the 'set_transparent_background' method sets the alpha bytes of the argb
color for transparency, instead of pseudo transparency. This patch
would close following feature request:
https://sourceforge.net/tracker/?func=detail&aid=1563931&group_id=143975&at
id=757311 and would be a workaround for some reported transparency bugs
(https://sourceforge.net/tracker/?func=detail&aid=1968923&group_id=143975&a
tid=757308 for example)
Signed-off-by: Brenden Matthews <brenden@diddyinc.com>
Lassi Selander [Fri, 1 Jan 2010 22:53:31 +0000 (14:53 -0800)]
XMMS2 - fix version check
Adds minimum version check for XMMS2 client libs. I couldn't get it to
check exact version cause pkg-config gets confused with XMMS2's version
number containing spaces.. Anyway it's better than not check at all.
Signed-off-by: Brenden Matthews <brenden@diddyinc.com>
Ben Kibbey [Fri, 1 Jan 2010 22:51:46 +0000 (14:51 -0800)]
$scroll fix for a text length <= length
This fixes $scroll to only scroll when the text length is greater than
the specified length; hopefully without breaking anything.
Signed-off-by: Brenden Matthews <brenden@diddyinc.com>
Ben Kibbey [Fri, 1 Jan 2010 22:49:35 +0000 (14:49 -0800)]
Fix hddtemp with disabled drives.
Some drives are unable to return their temperature when in standby mode.
If there is more than one drive installed then other drives may not be
able to get parsed. This patch will skip over the unparsable output for
the current drive and let others get parsed.
Signed-off-by: Brenden Matthews <brenden@diddyinc.com>
Nikos Ntarmos [Wed, 16 Dec 2009 14:21:44 +0000 (16:21 +0200)]
tolua++ has different naming convention on FreeBSD
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@diddyinc.com>
Phil Sutter [Sun, 13 Dec 2009 02:47:26 +0000 (03:47 +0100)]
simplify this conditional a bit
Phil Sutter [Sat, 12 Dec 2009 23:28:01 +0000 (00:28 +0100)]
fix doc typo and add highlighting for times_in_seconds
Pavel Labath [Fri, 11 Dec 2009 21:54:11 +0000 (22:54 +0100)]
Fix race condition in update_stat()
Pavel Labath [Tue, 8 Dec 2009 19:53:03 +0000 (20:53 +0100)]
Fix linking on OpenBSD
OpenBSD doesn't need librt for clock_gettime, but configure was adding it to LIBS unconditionally.
Bug reported by dovim.
Pavel Labath [Mon, 7 Dec 2009 20:13:04 +0000 (21:13 +0100)]
Remove some strange network related code
Reported by norsetto.
This code disallows network traffic to be 0.
Brenden says it once had a purpose, but noone can think of what would that be atm.
Brenden Matthews [Thu, 26 Nov 2009 18:53:57 +0000 (10:53 -0800)]
Bump version.
Brenden Matthews [Wed, 25 Nov 2009 20:52:44 +0000 (12:52 -0800)]
Add creation functions for certain cairo structures.
Nikolas Garofil [Wed, 25 Nov 2009 15:04:49 +0000 (16:04 +0100)]
Add support for max_text_width configuration setting
Nikolas Garofil [Tue, 24 Nov 2009 12:23:58 +0000 (13:23 +0100)]
Fix: $scroll,$if_running and $apcupsd_lastxfer can now have long arguments if text_buffer_size is increased
Nikolas Garofil [Mon, 23 Nov 2009 11:58:20 +0000 (12:58 +0100)]
Fix: Templates only work when they end with a space or a }
Nikolas Garofil [Mon, 23 Nov 2009 00:04:25 +0000 (01:04 +0100)]
Fix: README contained control chars
Pavel Labath [Sun, 22 Nov 2009 22:30:47 +0000 (23:30 +0100)]
A better fix for the PAGER=vim problem, thanks Phil
Pavel Labath [Sun, 22 Nov 2009 22:20:09 +0000 (23:20 +0100)]
unset PAGER before generating README
apparently, some people like to set PAGER=vim and vim doesn't like when we redirect man output to
a file
Nikolas Garofil [Sun, 22 Nov 2009 22:05:08 +0000 (23:05 +0100)]
Fix building with --disable-x11
Phil Sutter [Sun, 22 Nov 2009 20:12:54 +0000 (21:12 +0100)]
fix new_graph parameters
One should never print into buffers without knowing their size. Although
new_graph consumes only a single char, this may already be too much.
Phil Sutter [Sun, 22 Nov 2009 13:55:22 +0000 (14:55 +0100)]
move get_x11_color() to colours.c
Nikolas Garofil [Sun, 22 Nov 2009 18:51:11 +0000 (19:51 +0100)]
Fix xml syntax docs
Nikolas Garofil [Sun, 22 Nov 2009 13:05:11 +0000 (14:05 +0100)]
Fix compiling with --disable-x11
Phil Sutter [Sun, 22 Nov 2009 00:55:29 +0000 (01:55 +0100)]
implement ASCII gauge and enable all gauge objects for use with no X
Phil Sutter [Sun, 22 Nov 2009 00:19:47 +0000 (01:19 +0100)]
realise seamless integration of new_bar_in_shell
The decision about whether to print ASCII or X11 bar is done from within
specials.c, so all those #ifdef + if () blocks can be dropped. This also
implicitly enables the ASCII bar for some bar printing objects which where
forgotten before.
Nikolas Garofil [Sat, 21 Nov 2009 22:58:02 +0000 (23:58 +0100)]
Bugfix: letting XmbSetWMProperties set the windowtitle causes a memleak with some versions of Xlib
Nikolas Garofil [Sat, 21 Nov 2009 14:50:35 +0000 (15:50 +0100)]
Merge branch 'master' of ssh://git.omp.am/home/omp/git/conky
Nikolas Garofil [Sat, 21 Nov 2009 14:45:00 +0000 (15:45 +0100)]
Fix segfault in X11-related code
Conky sometimes tries to clears part of a window before it's created,
this breaks closing the displaying. For example with this config:
TEXT
$lua
Phil Sutter [Fri, 20 Nov 2009 21:49:57 +0000 (22:49 +0100)]
allow AF_INET6 in libmpdclient since mpd supports it
Thanks to Kaleb Elwert (belak, IRC) who reported the problem and tested
the fix.
Nikolas Garofil [Fri, 20 Nov 2009 14:23:54 +0000 (15:23 +0100)]
Bugfix: Sx in $format_time prints out wrong values when number of seconds ends with a zero and has no numbers behind the point
Phil Sutter [Mon, 16 Nov 2009 00:37:45 +0000 (01:37 +0100)]
simplify conky_version and co. a bit
Phil Sutter [Thu, 12 Nov 2009 23:24:54 +0000 (00:24 +0100)]
voltage: outsource printing code
Phil Sutter [Mon, 9 Nov 2009 22:21:58 +0000 (23:21 +0100)]
xmms2: do 'gg=G' in vim :)
Phil Sutter [Mon, 9 Nov 2009 21:11:06 +0000 (22:11 +0100)]
mpd: outsource printing code
In order to make life a bit easier, the struct mpd_s field "volume" has
been renamed to just "vol" to match the object's name (mpd_vol).
Although format_media_player_time() is probably meant to be used by all
supported media players, it's currently being used by mpd only. So for
now this function can reside statically in mpd.c
Phil Sutter [Thu, 19 Nov 2009 22:59:50 +0000 (23:59 +0100)]
lines, words: outsource code
Phil Sutter [Sun, 8 Nov 2009 18:01:42 +0000 (19:01 +0100)]
smapi: outsource printing code
Phil Sutter [Sun, 8 Nov 2009 16:22:48 +0000 (17:22 +0100)]
ibm: convert to common signature
Phil Sutter [Sun, 8 Nov 2009 15:36:35 +0000 (16:36 +0100)]
mixer: convert to common signature
Phil Sutter [Sun, 8 Nov 2009 13:01:14 +0000 (14:01 +0100)]
{down,up}speedgraph: convert to match common signature
Phil Sutter [Sun, 8 Nov 2009 12:54:42 +0000 (13:54 +0100)]
diskio: convert print functions to match common signature
Phil Sutter [Thu, 19 Nov 2009 22:39:08 +0000 (23:39 +0100)]
cleanup times_in_seconds enhancement
This also adds code to unset the variable before reloading the config.
Phil Sutter [Thu, 19 Nov 2009 22:00:15 +0000 (23:00 +0100)]
xlib: do exit() on IOError instead of abort()
The IOError happens every time I close conky's normal own window, so I
guess the situation is not as abnormal as abort() indicates. Calling
exit() instead should really suffice and give the process a chance to
clean up (by calling destructor routines for instance).
Phil Sutter [Mon, 16 Nov 2009 21:43:59 +0000 (22:43 +0100)]
fix potential buffer overflow when printing top values
Phil Sutter [Mon, 16 Nov 2009 20:31:51 +0000 (21:31 +0100)]
lua: outsource code
Phil Sutter [Mon, 16 Nov 2009 19:58:26 +0000 (20:58 +0100)]
i8k: outsource code
Nikolas Garofil [Thu, 19 Nov 2009 11:32:14 +0000 (12:32 +0100)]
Add support for $pid_read and $pid_write
Nikolas Garofil [Wed, 18 Nov 2009 23:21:49 +0000 (00:21 +0100)]
$format_time treats ( and ) as special chars
Nikolas Garofil [Wed, 18 Nov 2009 23:04:49 +0000 (00:04 +0100)]
Added support for \Sx to $format_time
Nikolas Garofil [Wed, 18 Nov 2009 20:25:05 +0000 (21:25 +0100)]
Make $user_time, $mpd_elapsed and $mpd_length compatible with times_in_seconds
Nikolas Garofil [Wed, 18 Nov 2009 19:27:53 +0000 (20:27 +0100)]
Make sure $format_time only works when times_in_seconds is enabled
Nikolas Garofil [Wed, 18 Nov 2009 19:07:47 +0000 (20:07 +0100)]
Add support for time_in_seconds configuration setting
Nikolas Garofil [Wed, 18 Nov 2009 17:02:10 +0000 (18:02 +0100)]
Fix bug in $pid_cmdline
Nikolas Garofil [Wed, 18 Nov 2009 16:13:20 +0000 (17:13 +0100)]
Fix bug in $pid_nice, $pid_priority, $pid_time, $pid_time_kernelmode and $pid_time_usermode
Nikolas Garofil [Wed, 18 Nov 2009 14:35:35 +0000 (15:35 +0100)]
Added support for $format_time
Nikolas Garofil [Mon, 16 Nov 2009 20:42:55 +0000 (21:42 +0100)]
Fix default config when built without x11
Nikolas Garofil [Mon, 16 Nov 2009 19:19:57 +0000 (20:19 +0100)]
Bugfix: crash when apcupsd isnt running
Phil Sutter [Mon, 16 Nov 2009 01:15:13 +0000 (02:15 +0100)]
fix potential buffer overflow in parse_conky_vars()
Phil Sutter [Mon, 16 Nov 2009 18:52:12 +0000 (19:52 +0100)]
ifblock: fix clash with specials when freeing objects
Murphy hit me again: in my naive attempt to fix the clash between
ifblocks and objects parsing text objects due to the double use of the
'sub' field, I overlooked this problem with reusing the 'special_data'
field. So here comes the real thing (TM), donating ifblocks their own
field for pointing to the jump target.