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.
Phil Sutter [Sun, 15 Nov 2009 03:48:56 +0000 (04:48 +0100)]
drop leftover freq_dynamic code in freebsd.c and openbsd.c
As the comment states, those functions were originally copied from
linux.c; in fact just the code which has been removed due to licensing
issues.
Pavel Labath [Mon, 16 Nov 2009 17:17:16 +0000 (18:17 +0100)]
IPv6 support for $tcp_portmon
In theory, this may fail to compile on ancient systems that don't have IPv6 types (struct
sockaddr_in6 et al.) available. If it turns out that such systems are still in use, the best way
to solve it would be to provide dummy declarations via configure tests.
Nikolas Garofil [Mon, 16 Nov 2009 16:37:25 +0000 (17:37 +0100)]
fix minor mistake in docs
Nikolas Garofil [Mon, 16 Nov 2009 15:59:41 +0000 (16:59 +0100)]
Use seconds instead of centiseconds as unit for $pid_time_kernelmode, $pid_time_usermode and $pid_time
Nikolas Garofil [Mon, 16 Nov 2009 14:30:57 +0000 (15:30 +0100)]
Added support for $pid_time_usermode, $pid_time_kernelmode and $pid_time
Nikolas Garofil [Mon, 16 Nov 2009 14:01:43 +0000 (15:01 +0100)]
Add support for $pid_nice and $pid_priority
Nikolas Garofil [Mon, 16 Nov 2009 08:54:17 +0000 (09:54 +0100)]
Added support for $pid_threads and $pid_thread_list
Nikolas Garofil [Mon, 16 Nov 2009 07:39:05 +0000 (08:39 +0100)]
Bugfix: make sure $else works correct and without memleaks
Nikolas Garofil [Sun, 15 Nov 2009 23:21:49 +0000 (00:21 +0100)]
Fix invalid free for all $if_-vars
Nikolas Garofil [Sun, 15 Nov 2009 22:45:33 +0000 (23:45 +0100)]
fix invalid free in if_up
Pavel Labath [Sun, 15 Nov 2009 22:00:14 +0000 (23:00 +0100)]
Forgot to set top_running when $running_processes is used
Nikolas Garofil [Sun, 15 Nov 2009 18:44:37 +0000 (19:44 +0100)]
Added support for $pid_vmpeak, $pid_vmsize, $pid_vmlck, $pid_vmhwm, $pid_vmrss, $pid_vmdata, $pid_vmstk, $pid_vmexe, $pid_vmlib, $pid_vmpte
Pavel Labath [Sun, 15 Nov 2009 16:56:07 +0000 (17:56 +0100)]
Fix ChangeLog messup
Pavel Labath [Sun, 15 Nov 2009 16:42:59 +0000 (17:42 +0100)]
Rename $running_processes to $running_threads, implement real $running_processes
Nikolas Garofil [Sun, 15 Nov 2009 16:46:41 +0000 (17:46 +0100)]
Added support for $gid_name
Nikolas Garofil [Sun, 15 Nov 2009 16:21:55 +0000 (17:21 +0100)]
Added support for $uid_name
Nikolas Garofil [Sun, 15 Nov 2009 13:49:55 +0000 (14:49 +0100)]
Added support for $pid_uid, $pid_euid, $pid_suid, $pid_fsuid, $pid_gid, $pid_egid, $pid_sgid and $pid_fsgid
Nikolas Garofil [Sun, 15 Nov 2009 12:26:40 +0000 (13:26 +0100)]
Add support for $pid_parent
Phil Sutter [Sat, 14 Nov 2009 15:47:04 +0000 (16:47 +0100)]
yet another fix for FreeBSD (somehow sneaked through last time)
Phil Sutter [Sun, 15 Nov 2009 00:43:30 +0000 (01:43 +0100)]
print which features are unsupported at the end of configure
Phil Sutter [Sat, 14 Nov 2009 03:19:51 +0000 (04:19 +0100)]
fix compiling for freebsd
Tested using default options, lua disabled as only lua50 available in
7.2-RELEASE.
Phil Sutter [Sat, 14 Nov 2009 02:09:07 +0000 (03:09 +0100)]
add generated files for profiling to clean list
Nikolas Garofil [Sat, 14 Nov 2009 23:51:38 +0000 (00:51 +0100)]
argument of $cmdline_to_pid doesnt have to be the full commandline
Nikolas Garofil [Sat, 14 Nov 2009 21:17:41 +0000 (22:17 +0100)]
fix last commit
Nikolas Garofil [Sat, 14 Nov 2009 21:07:54 +0000 (22:07 +0100)]
Make it possible to use other vars as arguments for the $pid-vars, add support for $pid_state_short, add support for $cmdline_to_pid
Cesare Tirabassi [Sat, 14 Nov 2009 14:58:06 +0000 (15:58 +0100)]
Merge branch 'master' of git.omp.am:/home/omp/git/conky
Cesare Tirabassi [Sat, 14 Nov 2009 14:57:45 +0000 (15:57 +0100)]
Refactoring of commit
363cf1ab7390a113c64390357dede0e452b91a58
The problem with the original commit was that some session-managers set
stdin to /dev/null for the processes they launch, therefore the variable
wasn't very effective.
This commit change the variable conky_user_time to user_time.
This variable has a mandatory argument, a console identifier
(eg. tty7, pts/0, etc.).
Once called, this will list how long the user for the given console has been
logged in for.
This commit also allows multiple user_time to be specified for different
consoles, as well as correctly handle a conky restart.
Nikolas Garofil [Sat, 14 Nov 2009 14:08:41 +0000 (15:08 +0100)]
Shrink proc.c
Nikolas Garofil [Sat, 14 Nov 2009 12:58:07 +0000 (13:58 +0100)]
Support for $pid_state
Pavel Labath [Sat, 14 Nov 2009 11:22:02 +0000 (12:22 +0100)]
own_window_colour documentation fix
the manpage says the hex color string should include the '#', but that's not true (not now,
anyway). Also, the syntax highlighting is wrong, but i don't know how to fix that.
Nikolas Garofil [Sat, 14 Nov 2009 01:37:00 +0000 (02:37 +0100)]
Add middle_middle to the docs