Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-09-30 05:59:07 +00:00
Code Issues Releases Activity
2,472 Commits 5 Branches 46 Tags 22 MiB
d22369333d
Commit Graph

2472 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pavel Labath
d22369333d Merge remote branch 'origin/master' into lua-config 2010-02-25 21:53:31 +01:00
Pavel Labath
54630eb39e Header housekeeping: remove unneeded extern "C", add modelines, add inclusion guards 
hopefully, this doesn't break anything
 2010-02-25 21:50:50 +01:00
Pavel Labath
724fb2585c Refactor default getters/setter for setting and make them more useful 
Adding features AND reducing code size.... yeah
 2010-02-25 21:11:39 +01:00
Pavel Labath
f51927241f Add lua_isboolean/toboolean wrappers 2010-02-25 21:10:40 +01:00
Pavel Labath
da3ef0d2c0 Use a named enum for lua types 2010-02-25 16:47:00 +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
Nikolas Garofil
e7ed9a5060 Revert "Use "using namespace std;" and remove all std::'s" 
This reverts commit 41e80b9833.
 2010-02-24 20:10:26 +01:00
Nikolas Garofil
41e80b9833 Use "using namespace std;" and remove all std::'s 
I'm doing this because otherwise i'll will forget to add all those
std::'s and will lose a LOT of time finding the problems.
If you don't agree, undo this patch...
...but i hope you won't :)
 2010-02-24 19:39:45 +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
63133c19d6 cpp-ify conf_cookie.c 2010-02-24 15:37:20 +01:00
Nikolas Garofil
c1648e6558 Use free_and_zero in [u-z]*.cc where appropriate 2010-02-24 12:04:28 +01:00
Nikolas Garofil
da76381300 Use free_and_zero in [st]*.cc where appropriate 2010-02-24 11:52:59 +01:00
Nikolas Garofil
4afe96b9ce cpp-ify prioqueue.c and use free_and_zero in [p-r]*.cc where appropriate 2010-02-24 02:46:45 +01:00
Nikolas Garofil
6092d063c9 Use free_and_zero in [m-o]*.cc where appropriate 2010-02-24 02:14:20 +01:00
Nikolas Garofil
1fa465efb6 Use free_and_zero in l*.cc where appropriate 2010-02-24 01:51:02 +01:00
Pavel Labath
a2110d44d7 Include guard fail 2010-02-23 23:59:03 +01:00
Nikolas Garofil
72d581279a Use free_and_zero in [d-k]*.cc where appropriate 2010-02-23 23:13:11 +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
Pavel Labath
c9447ddb8e Put zero in free_and_zero 2010-02-23 19:36:47 +01:00
Nikolas Garofil
45dfe4994d Use template for free_and_zero 2010-02-23 16:31:17 +01:00
Nikolas Garofil
c51972b5e2 Use free_and_zero in ccurl_common.cc where appropriate 2010-02-23 15:48:18 +01:00
Pavel Labath
1e49ea9274 Safer version of free_and_zero 2010-02-23 15:13:49 +01:00
Pavel Labath
d7d8bb84ea Add missing include 2010-02-23 15:07:12 +01:00
Nikolas Garofil
0e80e2908a Use free_and_zero in ccurl_thread.cc where appropriate 2010-02-23 14:54:03 +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
c2c58cd8d7 Use free_and_zero where possible in bmpx.cc 2010-02-22 22:03:14 +01:00
Nikolas Garofil
ad1b72ed94 Fix wrong output when nesting $combine-s 2010-02-22 19:27:05 +01:00
Nikolas Garofil
44a9e75290 Fix output of $combine when used in combination with $head 2010-02-22 16:30:37 +01:00
Nikolas Garofil
ade4f3fc0c Minimize change in free_text_objects introduced by b88d69dbfc 2010-02-22 14:22:24 +01:00
Nikolas Garofil
15e84fcfa1 Fix last memleak in $combine 2010-02-22 14:08:38 +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
d184efb418 When using without argument, make sure that it shows the essid of the first device that has one instead of using the default network device (because most of the times this will be a non-wireless device) 2010-02-21 15:12:38 +01:00
Nikolas Garofil
d91214e290 Fix using the wireless-vars 2010-02-20 17:59:51 +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
Caleb Spare
c7fa36a5f2 $memwithbuffers object and bar (sf.net #2954143) 
I've added $memwithbuffers to complement $mem, $memeasyfree, etc. This
variable indicates the used system memory, regardless of buffers/caches. If
the "no_buffers" option is set to "no", it will be the same as $mem. The
reason I find this change useful is that I like to display both the total
used system memory and the memory being used by applications.

I've also included a memwithbuffersbar, which is the same as membar except
that it uses $memwithbuffers as the size instead of $mem.

Signed-off-by: Pavel Labath <pavelo@centrum.sk>
 2010-02-18 18:32:25 +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