Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-20 03:51:18 +00:00
Code Issues Releases Activity
2,481 Commits 5 Branches 46 Tags 22 MiB
a4a08c82b5
Commit Graph

1837 Commits

Author SHA1 Message Date
Pavel Labath
4a68be2494 include <config.h> 
not that we need it much, but...
 2010-02-11 01:43:48 +01:00
Nikolas Garofil
463836ebf9 Combine print_execp and print_exec as much as possible 2010-02-11 01:08:25 +01:00
Nikolas Garofil
f0ed783041 dog^H^H^Hcat should become cat in all exec-related vars 2010-02-10 23:31:35 +01:00
Nikolas Garofil
aea8d3ed52 Combine print_texeci and print_execi as much as possible 2010-02-10 21:23:21 +01:00
Pavel Labath
dfb106ac0e Fix multiple definition error 2010-02-10 21:17:40 +01:00
Pavel Labath
90b30f14f9 Oops, forgot inclusion guards 2010-02-10 19:47:16 +01:00
Nikolas Garofil
c010d7cd00 Let execp use fill_p 2010-02-10 19:45:42 +01:00
Nikolas Garofil
36ad680a98 Let print_execi and print_texeci call fill_p for filling p 2010-02-10 19:04:31 +01:00
Pavel Labath
e4461782ef C++ binding for lua, with some fancy features 
such as being able to throw exceptions across c++-lua boundary. For more details, see comments
in the source code.
 2010-02-10 17:34:09 +01:00
Nikolas Garofil
9fefa79551 Obsolete threaded_exec_caller with help of previous commit 2010-02-10 15:54:50 +01:00
Nikolas Garofil
e017870b58 Combine print_texeci and print_texecpi as much as possible 2010-02-10 15:21:00 +01:00
Nikolas Garofil
456142241c Combine print_execi and print_execpi as much as possible 2010-02-10 15:02:00 +01:00
Nikolas Garofil
b601c21c04 cpp-ify eve.c 2010-02-09 23:12:10 +01:00
Nikolas Garofil
f0eec1e0c5 cpp-ify iconv_tools.c 2010-02-09 22:34:24 +01:00
Nikolas Garofil
886049122c Add missing memory header needed by std::unique_ptr 2010-02-09 17:43:56 +01:00
Nikolas Garofil
332cf86b7b Merge branch 'master' of ssh://git.omp.am/home/omp/git/conky 2010-02-09 16:49:31 +01:00
Pavel Labath
3d70f3a415 Fix `ISO C++ forbids variable length array' errors with maintainer mode enabled 2010-02-09 15:54:55 +01:00
Nikolas Garofil
325a29e438 cpp-ify prss.c 2010-02-09 15:24:58 +01:00
Nikolas Garofil
526e8d346e cpp-ify xmms2.c 2010-02-09 13:38:12 +01:00
Nikolas Garofil
043b12b15a cpp-ify a lot of files 2010-02-09 13:11:56 +01:00
Nikolas Garofil
66a63d9e87 cpp-ify timeinfo.c 2010-02-09 02:24:41 +01:00
Nikolas Garofil
196f6bc796 cpp-ify text_object.c 2010-02-09 02:15:32 +01:00
Nikolas Garofil
9544239a19 cpp-ify read_tcp.c 2010-02-09 02:02:00 +01:00
Nikolas Garofil
d0646bc4bb cpp-ify mboxscan.c 2010-02-09 01:49:51 +01:00
Nikolas Garofil
b49ac8e6d3 cpp-ify template.c 2010-02-09 00:28:33 +01:00
Nikolas Garofil
a5ed45fc7b put same stuff from print_texeci and print_texecpi in a separate function 2010-02-08 16:12:46 +01:00
Nikolas Garofil
223eefcdd7 Forgot one letter in previous commit... 2010-02-07 14:46:22 +01:00
Nikolas Garofil
01e3bb62a2 Implements texecpi variable 2010-02-07 10:29:43 +01:00
Pavel Labath
ff52605930 Fix compilation without --enable-argb 
Bug reported by zaphire
 2010-02-03 22:42:19 +01:00
Cesare Tirabassi
b1b91c80fa 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:01:08 +01:00
Cesare Tirabassi
80c56d099e 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:17:17 +01:00
Cesare Tirabassi
ddec718a62 Fix diskio total computation for kernel > 2.6.31 (sf: #2942117) 
(cherry picked from commit 44e3708cdb)
 2010-01-30 14:32:05 +01:00
Brenden Matthews
a11cf38aaa Only ever fork() once. 2010-01-26 13:06:17 -08:00
Brenden Matthews
5ed1f82ff5 Only pause during startup, not after reload. 2010-01-26 12:38:35 -08:00
Cesare Tirabassi
4264f759bb Fix minor memory leak in mail.cc (see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=566524) 2010-01-24 22:15:52 +01:00
Pavel Labath
1de2a9e6c5 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 15:34:03 +01:00
Pavel Labath
6e89ed7e2d Get $iconv vars working again 2010-01-20 18:17:30 +01:00
Pavel Labath
9bee219adf 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:01:01 +01:00
Pavel Labath
ae4be102b6 Another off-by-one found by valgrind. 2010-01-17 19:51:17 +01:00
Nikolas Garofil
287c38a0b9 Added support for builtin config in cmake 2010-01-17 03:00:51 +01:00
Dmitry Marakasov
5664cc3d13 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:55:20 -08:00
Pavel Labath
3a23eb5f6c Fix "off-by-one" bug in hddtemp found by valgrind 2010-01-15 23:41:04 +01:00
Brenden Matthews
002685c0ce Make timed-thread a lib, rename files. 2010-01-13 10:52:54 -08:00
Pavel Labath
b7028cb9e5 Make weather.cc more c++-ish (and get rid of a leak in the process) 2010-01-13 13:59:24 +01:00
Pavel Labath
c62266a5db Make sure the $exec buffer is null-terminated 2010-01-13 13:34:14 +01:00
Pavel Labath
86e744d334 Fix slightly over-zealous s/// 2010-01-13 10:49:36 +01:00
Brenden Matthews
081d04a059 Pass by value here too. 2010-01-12 10:38:30 -08:00
Brenden Matthews
e0502719a0 Pass function by value to timed_thread::create(). 2010-01-12 10:30:37 -08:00
Pavel Labath
0f3a56ccbe An attempt at making wifi work 
Someone who has iwlib should really test this.
 2010-01-11 01:13:42 +01:00
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
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
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
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
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
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
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
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
c4c2377d0e drop commas at end of enum in top.h 2009-12-28 03:02:06 +01:00
Phil Sutter
dcb35db39d check return value of write() 2009-12-28 03:02:05 +01:00
Phil Sutter
e99118cf2e fix for unused results in tailhead.c 2009-12-28 03:02:05 +01:00
Phil Sutter
1ff3f84068 fix for unused results in mboxscan.c 2009-12-28 03:02:05 +01:00
Phil Sutter
43ee33a28d check return type of dup() in exec.c 2009-12-28 03:02:05 +01:00
Phil Sutter
ac8bb1489d fix for unused results in eve.c 2009-12-28 03:02:05 +01:00
Phil Sutter
6e53e3278d implement a safe_asprintf for timeinfo.c 2009-12-28 03:02:05 +01:00
Phil Sutter
aa95dde706 fix for unused results in smapi.c 2009-12-28 03:02:05 +01:00
Phil Sutter
8662e6630e fix for unused results in linux.c 2009-12-28 03:02:05 +01:00
Phil Sutter
c986aa6346 fix unused result warnings in mail.c 2009-12-28 03:02:05 +01:00
Brenden Matthews
fb33419cd4 Add CMake build support for Lua bindings. 2009-12-17 19:46:26 -08:00
Brenden Matthews
32c5f451b9 Minor build fixes 2009-12-17 18:55:54 -08:00
Brenden Matthews
51ff65ede0 Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-12-17 18:52:05 -08:00
Phil Sutter
0522832350 cleanup apcupsd a bit, fix some whitespace errors 2009-12-17 23:07:15 +01:00
Phil Sutter
9b66a4715b hide smapi internal functions and cleanup header 2009-12-17 22:45:00 +01:00
Phil Sutter
861988be24 font_h could be used uninitialised (so it says) 2009-12-17 22:42:52 +01:00
Phil Sutter
bf1e5108ab we shall not ignore the return value of functions declared with warn_unused_result 2009-12-17 22:42:52 +01:00
Phil Sutter
1724a1fe49 ISO C++ forbids variable length arrays 2009-12-17 22:42:52 +01:00
Phil Sutter
de049dcbde --enable-testing rejects commas at end of enumerator lists 2009-12-17 22:42:47 +01:00
Phil Sutter
4229fbd380 introduce a generic priority queue implementation 2009-12-13 17:10:45 +01:00
Phil Sutter
bb72583a95 simplify this conditional a bit 2009-12-13 03:42:14 +01:00
Phil Sutter
bad6d62b31 little header cleanup in conky.cc 2009-12-13 02:54:48 +01:00
Phil Sutter
8bc17ca311 top: add update callbacks conditionally, drop useless check 2009-12-12 19:50:36 +01:00
Phil Sutter
8045e7f714 drop enum text_object_type and all references to it's members 
After some minor rewrite of the top parser (which was in fact the only
real user of the obj->type field left since introduction of text object
callbacks), there is no need for the obj->type field anymore.
 2009-12-12 15:56:00 +01:00
Phil Sutter
5c86a80614 fix $scroll color reset (add missing callback) 2009-12-12 15:43:39 +01:00
Pavel Labath
52b5fe11ed Fix race condition in update_stat() 2009-12-11 22:54:11 +01:00
Pavel Labath
a49000ba22 Eliminate warnings in mail.c 
PS: functions pop3_thread and imap_thread look ridiculously similar. It may be worth merging them
at some point.
 2009-12-11 21:34:41 +01:00
Nikolas Garofil
6d4ba8b2f4 Fix anonymous enum warning 2009-12-11 17:58:25 +01:00
Brenden Matthews
48e834d1eb More work on CMake build system. 2009-12-10 20:37:56 -08:00
Brenden Matthews
07e2002b03 Build libtcp-portmon as a separate library. 2009-12-10 15:19:13 -08:00
Pavel Labath
316198a0c3 Explicitly cast NULL to the specific type for compilers that (for some unknown reason) require it 2009-12-10 23:42:22 +01:00
Pavel Labath
b4feb01818 Fix memory allocation problem in exec.c 
Bug reported by c0nv1ct.
 2009-12-10 23:09:56 +01:00
Brenden Matthews
b6331b4eb6 Switch some more bits to C++, more CMake changes. 2009-12-09 20:05:32 -08:00
Phil Sutter
475b00e709 drop local definitions of _GNU_SOURCE since it's passed to gcc 2009-12-10 02:03:56 +01:00
Pavel Labath
2790d35e06 Set CXXFLAGS in-line with current CFLAGS settings (autoconf) 
Also, replaced #define _GNU_SOURCE (in config.h) with -D_GNU_SOURCE command-line parameter
because, for some reason g++ defines it implicitly and then complains about multiple definitions.
Also, removed -Winline from C(XX)FLAGS because it causes a lot of warnings for c++ code that
can't be easily removed and are not very significant.
 2009-12-09 23:59:08 +01:00
Pavel Labath
78da8a1946 Update cmake to address portmon change. 2009-12-09 23:59:07 +01:00
Pavel Labath
e9d4e32f8f Replace GHashTable with tr1::unordered_map in tcp_portmon 
This means portmon no longer depends on glib.
 2009-12-09 23:59:07 +01:00
Brenden Matthews
8c9ed7b109 Minor build fixes. 2009-12-07 21:16:11 -08:00
Brenden Matthews
11c76e4c0d More CMake work. 2009-12-07 20:46:49 -08:00
Pavel Labath
b1cbc64f60 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.
 2009-12-07 21:13:04 +01:00
Brenden Matthews
d80cacd4b7 Handle build.h, too. 2009-12-07 11:51:00 -08:00
Brenden Matthews
c5cbb3c38f Produce error if src/config.h exists. 2009-12-07 10:08:01 -08:00
Brenden Matthews
4dcce0b386 Improve platform stuff. 2009-12-07 09:35:43 -08:00
Phil Sutter
4baba32459 replace modulo by bitwise AND for hash table lookups 
This operation is a lot faster, but depends on the hash table size
be a power of 2 (so HTABSIZE - 1 is a row of 1's). Also a define for the
magic value cleans things up a bit.
 2009-12-06 21:49:27 +01:00
Phil Sutter
36f6af922b improve hash_process() by inserting at bucket's top instead of bottom 2009-12-06 17:28:30 +01:00
Brenden Matthews
0406000351 More CMake build work, added Lua support. 2009-12-05 18:45:26 -08:00
Brenden Matthews
07cb6efdaf More work on CMake build system (see README.cmake for instructions). 2009-12-05 12:00:10 -08:00
Phil Sutter
3764c883c7 convert mixer bars to double 2009-12-04 22:18:54 +01:00
Phil Sutter
1160e74d35 convert fs bars to double 2009-12-04 22:18:54 +01:00
Phil Sutter
361e5eba83 convert exec bars to double 2009-12-04 22:18:54 +01:00
Phil Sutter
b2c305a995 convert execbarval to double 2009-12-04 22:18:54 +01:00
Phil Sutter
3361ea907b convert *speedgraphval to double 2009-12-04 22:18:54 +01:00
Phil Sutter
a68a523d40 convert diskiographval_* to double 2009-12-04 22:18:54 +01:00
Phil Sutter
1382915d1e convert loadgraphval to double 2009-12-04 22:18:54 +01:00
Phil Sutter
f74ae19944 convert apcupsd_loadbarval to double 2009-12-04 22:18:54 +01:00
Phil Sutter
c52ee46cc3 convert entropy_barval to double 2009-12-04 22:18:54 +01:00
Phil Sutter
2fc1efa8d5 convert lua_barval to double 2009-12-04 22:18:54 +01:00
Phil Sutter
f1a57e40aa convert audacious_barval to double 2009-12-04 22:18:53 +01:00
Phil Sutter
e2e7c47c48 convert xmms2_barval to double 2009-12-04 22:18:53 +01:00
Phil Sutter
202bbf01ff convert mpd_barval to double 2009-12-04 22:18:53 +01:00
Phil Sutter
9e587ae6d5 convert smapi_bat_barval to double 2009-12-04 22:18:53 +01:00
Phil Sutter
db2b056969 convert swap_barval to double 2009-12-04 22:18:53 +01:00
Phil Sutter
c5a8949784 convert mem_barval to double 2009-12-04 22:18:53 +01:00
Phil Sutter
d46a2cb1b2 convert cpu_barval to double 2009-12-04 22:18:53 +01:00