Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-27 12:42:41 +00:00
Code Issues Releases Activity
2,099 Commits 5 Branches 46 Tags 22 MiB
2c33e6e565
Commit Graph

2099 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cesare Tirabassi
2c33e6e565 Fix last commit which fails to build when X11 is not enabled 
(cherry picked from commit 925e80ac11)
 2010-02-17 12:43:53 +01:00
Nikolas Garofil
ac6dff791f Fix wrong mixer values on some systems (thanks hoffa) 2010-02-12 18:57:22 +01:00
Nikolas Garofil
656177e0de Warn at wrong alignment setting and make sure it's disabled when the windowtype is dock 2010-02-12 03:04:25 +01:00
Pavel Labath
6526b47b2c Fix compilation without --enable-argb 
Bug reported by zaphire
 2010-02-03 22:38:15 +01:00
Cesare Tirabassi
d2ce1d2909 Replaces commit 44e3708cdb 
Thanks to ichelm610x for the patch.
I just added memoization to reduce the impact of the many system calls.
(cherry picked from commit 1eedf2633b)
 2010-01-31 21:00:37 +01:00
Cesare Tirabassi
da510d34a6 Extend commit 2568030509 to the whole cpu object. 
This is still a workaround, the underlining starvation issue remains
unsolved.
(cherry picked from commit 99fd8ef380)
 2010-01-31 12:00:29 +01:00
Cesare Tirabassi
9e5739e612 Modify last commit to keep compiler happy since it claims devbuf can never be null (should we really trust gcc that much?) 2010-01-30 19:27:01 +01:00
Pavel Labath
44a4ffae91 Merge branch '1.8.0' into 1.8.1 2010-01-30 17:56:22 +01:00
Pavel Labath
fcc6524db2 Fix small logic error in diskiograph_read/write 2010-01-30 17:48:03 +01:00
Cesare Tirabassi
3db07e589f Fix diskio total computation for kernel > 2.6.31 (sf: #2942117) 
(cherry picked from commit 44e3708cdb)
 2010-01-30 14:24:40 +01:00
Brenden Matthews
8cb56def23 Only ever fork() once. 
(cherry picked from commit 000acfe0fd)
 2010-01-30 14:24:06 +01:00
Cesare Tirabassi
44e3708cdb Fix diskio total computation for kernel > 2.6.31 (sf: #2942117) 2010-01-30 14:19:38 +01:00
Brenden Matthews
c5925930c3 Merge branch '1.8.0' into 1.8.1 
Conflicts:
	src/conky.c
 2010-01-26 13:05:59 -08:00
Brenden Matthews
000acfe0fd Only ever fork() once. 2010-01-26 13:05:04 -08:00
Brenden Matthews
61ad0c2159 Only pause during startup, not after reload. 2010-01-26 12:39:15 -08:00
Brenden Matthews
0ae9108874 Only pause during startup, not after reload. 2010-01-26 12:37:16 -08:00
Pavel Labath
60a6194b84 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)
 2010-01-24 16:12:31 +01:00
Pavel Labath
f5363b6539 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)
 2010-01-24 16:11:55 +01:00
Pavel Labath
ecbfe50ac7 Make conky not crash when drawing on root window 
It was failing in XQueryColor because colourmap was NULL. This seemed to help.
 2010-01-20 00:07:34 +01:00
Pavel Labath
fb1ff85d05 Make conky not crash when drawing on root window 
It was failing in XQueryColor because colourmap was NULL. This seemed to help.
 2010-01-20 00:06:16 +01:00
Nikolas Garofil
68416ee1f3 Bump version 2010-01-17 21:39:59 +01:00
Pavel Labath
349f5fc1c6 Another off-by-one found by valgrind. 2010-01-17 19:51:00 +01:00
Pavel Labath
bdc8200a21 Another off-by-one found by valgrind. 2010-01-17 19:49:35 +01:00
Dmitry Marakasov
1fa1476970 Add SMP support for FreeBSD. 
Original patch written by Ivan Klymenko <fidaj@ukr.net>.

Signed-off-by: Brenden Matthews <brenden@diddyinc.com>
 2010-01-16 10:53:19 -08:00
Nikolas Garofil
a218eb70ef signed to unsigned before comparing 2010-01-16 04:01:49 +01:00
Nikolas Garofil
8264fbe05e Fix compiling with x11 by setting argb default on 2010-01-16 02:30:01 +01:00
Pavel Labath
a3aa80cab7 Fix "off-by-one" bug in hddtemp found by valgrind 2010-01-15 23:44:39 +01:00
Pavel Labath
ca9ebd9504 Fix $execbar et al. 2010-01-07 22:27:25 +01:00
Brenden Matthews
dc55c7d0a9 Fix small logic error in diskio. 2010-01-06 10:18:48 -08:00
Cesare Tirabassi
8a93c54abe Fix sigsegv if cpu_usage has not yet been populated 2010-01-05 17:08:20 +01:00
Brenden Matthews
bbb267586a 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.
 2010-01-02 14:43:23 -08:00
Brenden Matthews
82614ebb22 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.
 2010-01-02 13:33:17 -08:00
Brenden Matthews
137c900701 Fix reload problem with ARGB. 2010-01-02 12:12:21 -08:00
Brenden Matthews
62f1e47f4a Improve handling of ARGB visuals a bit. 2010-01-02 11:38:44 -08:00
Brenden Matthews
bc59f90c3c Bump rev. 2010-01-02 10:43:01 -08:00
Brenden Matthews
3ecf91ff9b Fix build error for IBM/smapi support. 2010-01-02 10:39:45 -08:00
Cesare Tirabassi
9ba34190c7 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 72bbe51a8c)
 2010-01-02 14:45:12 +01:00
Cesare Tirabassi
6ea81f0001 Fix some typos in documentation 
(cherry picked from commit c8a99a865a)
 2010-01-02 14:44:18 +01:00
Cesare Tirabassi
507065080d remove <programlisting> from variables.xml, it only messes the man page and serve no other purpose 
(cherry picked from commit a14cca6592)
 2010-01-02 14:43:20 +01:00
Brenden Matthews
f1b69e26a2 Update copyright notices. 2010-01-01 15:45:11 -08:00
Brenden Matthews
909c2903c2 Bump to release candidate 1. 2010-01-01 15:10:29 -08:00
danielb
0de060f8dd 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>
 2010-01-01 15:01:51 -08:00
Lassi Selander
823e4af018 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>
 2010-01-01 14:55:53 -08:00
Ben Kibbey
2e4f58d565 $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>
 2010-01-01 14:55:45 -08:00
Ben Kibbey
c2e8734cb3 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>
 2010-01-01 14:55:39 -08:00
Nikos Ntarmos
e01a157c62 tolua++ has different naming convention on FreeBSD 
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@diddyinc.com>
 2010-01-01 14:31:27 -08:00
Phil Sutter
a94b2ec5a1 simplify this conditional a bit 2009-12-13 03:47:26 +01:00
Phil Sutter
169dbe4921 fix doc typo and add highlighting for times_in_seconds 2009-12-13 03:45:19 +01:00
Pavel Labath
3ed13c3cd1 Fix race condition in update_stat() 2009-12-11 22:57:22 +01:00
Pavel Labath
443c2d12ca Fix linking on OpenBSD 
OpenBSD doesn't need librt for clock_gettime, but configure was adding it to LIBS unconditionally.
Bug reported by dovim.
 2009-12-08 21:03:14 +01:00