Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-18 11:05:18 +00:00
Code Issues Releases Activity
3,145 Commits 5 Branches 46 Tags 22 MiB
3b4b9abd97
Commit Graph

285 Commits

Author SHA1 Message Date
Pavel Labath
b713536dad make draw_shades/outline lua settings 2010-03-05 14:10:47 +01:00
Pavel Labath
22931c2c67 make draw_(graph_)borders lua settings 2010-03-05 14:06:15 +01:00
Pavel Labath
147d16e763 make show_graph_scale/range lua settings 
PS: at some point a would like to make these per-graph settings, instead of global ones
 2010-03-05 13:37:52 +01:00
Pavel Labath
021d6f98c7 make background a lua setting 2010-03-05 13:33:22 +01:00
Pavel Labath
fe9c0609cc Make display a lua setting 2010-03-04 18:31:28 +01:00
Pavel Labath
70d53b770f Merge branch 'master' into lua-config 
Conflicts:
	src/conky.cc
 2010-03-04 18:23:46 +01:00
Pavel Labath
d93dc72e6d Random C++ification: to_real_path() and current_config 2010-03-04 17:40:20 +01:00
Pavel Labath
241f336f0f Merge remote branch 'origin/master' into lua-config 2010-03-02 20:33:58 +01:00
Pavel Labath
4a4172c92d Make own_window_hints a lua setting 2010-03-02 20:30:15 +01:00
Cesare Tirabassi
0336b5d67d Fix sf: #2961602 
Add missing --quiet option and optional arguments to --pause and --interval
(cherry picked from commit a9e5820a34)
 2010-03-02 20:29:36 +01:00
Pavel Labath
a810804a6b make own_window_colour a lua setting 2010-02-28 15:51:01 +01:00
Pavel Labath
a4a08c82b5 make own_window_argb_value a lua setting 2010-02-27 22:28:33 +01:00
Pavel Labath
f6aa8a558f range_checking_accessors class. makes sure setting's value belongs to a specified range 2010-02-27 15:15:25 +01:00
Pavel Labath
4a5304b395 Make own_window_type a lua setting 2010-02-26 18:48:57 +01:00
Pavel Labath
518045eaf6 make own_window_transparent a lua setting 2010-02-26 18:38:15 +01:00
Pavel Labath
94be4f6eb9 make own_window_argb_visual a lua setting 2010-02-26 18:29:46 +01:00
Pavel Labath
1960a511fd Make own_window_title a lua setting 2010-02-26 18:09:55 +01:00
Pavel Labath
fad11cabe1 make own_window_class a lua setting 2010-02-26 17:42:56 +01:00
Pavel Labath
efac83e814 make own_window a lua setting 2010-02-26 14:37:34 +01:00
Nikolas Garofil
fb00ff8fa9 print_version to cpp 2010-02-26 01:17:27 +01:00
Pavel Labath
12e98c7da5 Port out_to_x setting to lua-config 2010-02-25 22:28:34 +01:00
Pavel Labath
d22369333d Merge remote branch 'origin/master' into lua-config 2010-02-25 21:53:31 +01:00
Pavel Labath
9cf26becf2 Change lua::stack_sentry semantics. Using it should be much simpler now 2010-02-25 16:24:50 +01:00
Nikolas Garofil
cb11cf675a Use isutf() 2010-02-25 07:07:00 +01:00
Nikolas Garofil
6c25f335c4 Shrink code by using more c++ in main() 2010-02-24 22:06:06 +01:00
Pavel Labath
80b049d1c0 Port 'alignment' setting to lua. 2010-02-24 20:51:33 +01:00
Pavel Labath
568c372920 Make modifying settings from C++ a bit easier 2010-02-24 20:27:16 +01:00
Pavel Labath
454f4a12a8 A special class for enum settings, which automatically prints error messages 2010-02-24 18:38:23 +01:00
Pavel Labath
8c6c0aa995 Merge remote branch 'origin/master' into lua-config 
Conflicts:
	src/CMakeLists.txt
 2010-02-24 18:10:22 +01:00
Nikolas Garofil
f236523f30 Use free_and_zero in conky.cc and core.cc where appropriate 2010-02-23 22:06:04 +01:00
Nikolas Garofil
397a7a252a Fix removing the config and sending a SIGUSR1 results in segfault 
This re-implements the fix of the previous commit because that one
assumed that only overwriting the configfile can cause the config
to reload
 2010-02-23 02:58:44 +01:00
Cesare Tirabassi
8be18483e3 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?
(cherry picked from commit 085c39d394)
 2010-02-22 22:48:59 +01:00
Nikolas Garofil
e50ec9ded6 Fix $combine reading unallocated memory 2010-02-22 13:02:24 +01:00
Nikolas Garofil
b88d69dbfc Implement fix from previous commit in another way to fix a leak that happens when conky closes 2010-02-21 20:15:08 +01:00
Nikolas Garofil
31e22acb4b Fix crash with (for example): conky -s '${combine $uptime $uptime}' 2010-02-21 19:26:11 +01:00
Nikolas Garofil
cbc5aaad91 Shrink code by adding free_and_zero() 2010-02-20 15:28:05 +01:00
Nikolas Garofil
a2a9ed054d Shrink code by letting a separate function handle the resetting of optind 2010-02-20 14:34:40 +01:00
Nikolas Garofil
99b5352cff Add --for-scripts support 2010-02-20 02:25:38 +01:00
Nikolas Garofil
0627946ca1 Make hiding ncurses memleaks optional and disable it by default 2010-02-19 13:21:40 +01:00
Nikolas Garofil
f695ed58d9 Hide false memleaks in a debugbuild 
This makes sure valgrind doesn't show false memleaks that are caused by ncurses
instead of our code when we do a 'Debug' build. There is a also a disadvantage:
When your ncurses library is not build with the '--disable-leaks' option (this
is the case in the default version of ncurses of most distro's) and you build
conky with ncurses and debug turned on then you will see a segmentation fault
when you stop conky. On the other hand people that want to build conky as a
debug build with ncurses support will probably also have a ncurses with
--disable-leaks ...
 2010-02-19 00:09:24 +01:00
Nikolas Garofil
9b1a89e617 Fix current_mail_spool memleak 2010-02-18 01:25:32 +01:00
Pavel Labath
07746cdd5a Merge remote branch 'origin/master' into lua-config 2010-02-17 22:53:39 +01:00
Pavel Labath
c61376b60b A framework for registering config settins 
similar to the one for data sources.
 2010-02-17 22:52:19 +01:00
Nikolas Garofil
afffe49977 Undo efb39867c7 , memleaks were falsely reported by valgrind 2010-02-17 14:49:06 +01:00
Nikolas Garofil
549e9740ff Fix previous commit which breaks building with X11 2010-02-17 13:21:07 +01:00
Cesare Tirabassi
26fc643ffb Fix commit 2c8ef724e6 which fails to build when X11 is not enabled 2010-02-17 12:51:11 +01:00
Nikolas Garofil
efb39867c7 Fix 3 memleaks in ncurses-related code 2010-02-16 19:20:48 +01:00
Nikolas Garofil
c06e54157f Fix building in ncurses 2010-02-16 17:00:33 +01:00
Nikolas Garofil
53af0f379f Fix multiple definitions when building in FreeBSD 2010-02-14 22:58:02 +01:00
Nikolas Garofil
8db1e1a2a2 Make sure that conky.cc compiles in FreeBSD 2010-02-14 14:00:26 +01:00
Pavel Labath
fa02cdceab An object-oriented api for accessing data sources from lua 2010-02-13 17:00:20 +01:00
Pavel Labath
851e8b8ef0 Merge remote branch 'origin/master' into lua-config 2010-02-12 18:44:09 +01:00
Pavel Labath
f59a198a04 export functions for accessing data sources to lua 
this adds some code to main() which tests these features and then exits, so it's normal that
conky doesn't work anymore.
 2010-02-12 18:39:01 +01:00
Nikolas Garofil
0f399a18e8 Warn at wrong alignment setting 2010-02-12 01:58:30 +01:00
Nikolas Garofil
2c8ef724e6 Make sure alignment is disabled when the windowtype is dock 2010-02-12 00:39:50 +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
Pavel Labath
6e89ed7e2d Get $iconv vars working again 2010-01-20 18:17:30 +01:00
Nikolas Garofil
287c38a0b9 Added support for builtin config in cmake 2010-01-17 03:00:51 +01:00
Brenden Matthews
002685c0ce Make timed-thread a lib, rename files. 2010-01-13 10:52:54 -08:00
Pavel Labath
86e744d334 Fix slightly over-zealous s/// 2010-01-13 10:49:36 +01: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
3ab853af65 fix for a fatal X11 error (possible creation of zero-sized window) 2010-01-10 22:07:52 +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
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
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
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
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
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
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
Brenden Matthews
32c5f451b9 Minor build fixes 2009-12-17 18:55:54 -08: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
bad6d62b31 little header cleanup in conky.cc 2009-12-13 02:54:48 +01:00
Nikolas Garofil
6d4ba8b2f4 Fix anonymous enum warning 2009-12-11 17:58:25 +01:00
Brenden Matthews
b6331b4eb6 Switch some more bits to C++, more CMake changes. 2009-12-09 20:05:32 -08:00