1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-27 12:42:41 +00:00
Commit Graph

2322 Commits

Author SHA1 Message Date
Pavel Labath
47509b38bd An attempt at making lua bindings work 2010-01-11 00:35:22 +01:00
Phil Sutter
bdda06f4ea fix segfaults in CRIT_ERR condition
- pthread_join() on uninitialised threads causes segfault
- XFreeFont() dislikes font being zero
2010-01-10 22:09:33 +01:00
Phil Sutter
3ab853af65 fix for a fatal X11 error (possible creation of zero-sized window) 2010-01-10 22:07:52 +01:00
Phil Sutter
0bdff28f69 fix smapi move to C++ 2010-01-10 22:06:01 +01:00
Phil Sutter
081f5e1699 make imlib2.c a C++ source, as it uses the C++ symbol 'to_real_path()' 2010-01-10 22:04:15 +01:00
Phil Sutter
b4a73e166e add missing BUILD_IBM define to config.h.in 2010-01-10 22:01:04 +01:00
Pavel Labath
e554e6ff67 If we want a function to change the object, we need to pass it by reference 2010-01-07 19:50:00 +01:00
Pavel Labath
4c2d634f07 Unbreak weather and iostats
The weather still doesn't quite work for me though.
2010-01-07 19:14:53 +01:00
Brenden Matthews
3e3dd16367 Update modelines and stuff. 2010-01-06 19:45:19 -08:00
Brenden Matthews
7e78f036f0 Use consistent naming for build option macros.
Probably have broken some build features with this commit.
2010-01-06 18:39:44 -08:00
Pavel Labath
79be66b15a Fix building of iostats. 2010-01-06 21:11:58 +01:00
Pavel Labath
d61c545973 "Port" nvidia code to c++ 2010-01-06 20:57:13 +01:00
Brenden Matthews
9b46a61ae6 Don't include non-existent files. 2010-01-06 11:33:42 -08:00
Brenden Matthews
5d20ed4b8c Fix small logic error in diskio. 2010-01-06 10:18:32 -08:00
Cesare Tirabassi
2568030509 Fix sigsegv if cpu_usage has not yet been populated (seen on 1.8.0_rc1) 2010-01-05 16:59:50 +01:00
Brenden Matthews
7ff762e4af Resolve issues with timed_thread rewrite WIP. 2010-01-04 19:21:12 -08:00
Brenden Matthews
620e9876a4 C++ conversions WIP.
Currently stuck on an issue with g++ and using '%lli' with printf/scanf.
2010-01-04 19:21:12 -08:00
Brenden Matthews
d3a8c4d22e timed_thread
Convert everything (everything? maybe missed some stuff) from old
timed_thread to new timed_thread.
2010-01-04 19:21:12 -08:00
Brenden Matthews
01ac47d082 Implement timed_thread rewrite in C++.
Rewrote timed_thread library in C++ using fancy new C++0x features.  The
main reason for this is to phase out poor encapsulation and C-style
function pointers.
2010-01-04 19:21:12 -08:00
Brenden Matthews
58cbbf57a3 Coulpe minor build fixes. 2010-01-04 18:43:40 -08:00
Brenden Matthews
b8a678728c Remove automake build system, fix defconfig.h. 2010-01-04 18:07:49 -08:00
Cesare Tirabassi
36b6facaf5 Remove compiler warning about uninitialized variable 2010-01-03 18:52:22 +01:00
Cesare Tirabassi
c73f320798 There is no need to have glib for rss 2010-01-03 18:46:09 +01:00
Brenden Matthews
9acf0bb4c0 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:44:20 -08:00
Brenden Matthews
39f01e216b 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 14:44:12 -08:00
Brenden Matthews
19303af8da Fix reload problem with ARGB. 2010-01-02 12:12:46 -08:00
Ben Kibbey
c00e7b0a42 Fixes $xmms2_percent and a couple other build fixes.
Signed-off-by: Brenden Matthews <brenden@diddyinc.com>
2010-01-02 11:50:53 -08:00
Ben Kibbey
29f833ee05 Fix nvidia support with CMake.
Signed-off-by: Brenden Matthews <brenden@diddyinc.com>
2010-01-02 11:49:43 -08:00
Ben Kibbey
ed5e86eb88 Fix the quiet command line option.
Signed-off-by: Brenden Matthews <brenden@diddyinc.com>
2010-01-02 11:48:50 -08:00
Brenden Matthews
0f5f2a1afe Improve handling of ARGB visuals a bit.
Conflicts:

	src/conky.cc
2010-01-02 11:43:29 -08:00
Brenden Matthews
2951f5571c Add missing copyright notices. 2010-01-01 15:49:41 -08:00
Brenden Matthews
cf9e498b24 Update copyright notices. 2010-01-01 15:46:17 -08:00
Brenden Matthews
1ff8b3ee4b CMake support for 6c5fa44660. 2010-01-01 15:06:54 -08:00
danielb
6c5fa44660 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:03:40 -08:00
Brenden Matthews
b3270cd8ba Apply 42d2e90ba1 to cmake. 2010-01-01 14:54:56 -08:00
Lassi Selander
42d2e90ba1 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:53:31 -08:00
Ben Kibbey
87e422c224 $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:51:46 -08:00
Ben Kibbey
6e6a1f59e8 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:50:42 -08:00
Nikos Ntarmos
c7bf4092a4 Pattern substitution is a bash-ism; use sed instead.
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@diddyinc.com>
2010-01-01 14:43:05 -08:00
Brenden Matthews
d7f008e868 tolua++ has different naming convention on FreeBSD 2010-01-01 14:33:42 -08:00
Brenden Matthews
3efe71520f Deprecate autotools, update docs to reflect cmake build system. 2010-01-01 14:08:57 -08:00
Brenden Matthews
d92c2e6dab Minor CMake fixes.
- Only enable pedantic flags with MAINTAINER_MODE enabled
 - Hide APP_* vars.
2010-01-01 13:50:12 -08:00
Brenden Matthews
4d7d2b27f3 Minor build fix. 2010-01-01 13:45:16 -08:00
Cesare Tirabassi
72bbe51a8c 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 ...
2009-12-31 23:49:02 +01:00
Phil Sutter
db2282968f parse the -D flag as early as possible
In fact, this will make -D being parsed at least before the conkyrc is
being read, allowing for debug-output from inside the config-parser. :)
2009-12-29 00:18:12 +01:00
Phil Sutter
6f587402d8 cosmetic fixup session
- kill trailing whitespace (grep -n ' $' src/*.{c,cc,h})
- eliminate space before tab (grep -n ' 	' src/*.{c,cc,h})
  (insert tab by pressing CTRL-v first)
- little indenting fixup in configure.ac.in (we indent using tabs, not
  spaces)

note: this should not change the actual code at all - if it does, feel
free to blame me personally ;)
2009-12-28 21:32:07 +01:00
Phil Sutter
7d92e46533 include llua.h where it's really needed 2009-12-28 21:31:49 +01:00
Phil Sutter
46bd87b05e move extract_object_args_to_sub() to a more convenient place 2009-12-28 03:02:06 +01:00
Phil Sutter
0d2770ab33 fix check for iwlib and output some more detailed errors 2009-12-28 03:02:06 +01:00
Phil Sutter
c4c2377d0e drop commas at end of enum in top.h 2009-12-28 03:02:06 +01:00