Pavel Labath
d93dc72e6d
Random C++ification: to_real_path() and current_config
2010-03-04 17:40:20 +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
2ad1809f87
s/substract/subtract/
2010-02-28 14:05:28 +01:00
Nikolas Garofil
fb00ff8fa9
print_version to cpp
2010-02-26 01:17:27 +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
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
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
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
Nikolas Garofil
a1a73c23cb
Fix memleak in if_match
2010-02-17 20:26:50 +01:00
Pavel Labath
2585fabc52
Try to make $if_match better handle stranger inputs
...
This should fix sf.net #2953283
2010-02-17 19:44:02 +01:00
Ben Kibbey
d56a862467
Added AF_UNIX socket support.
...
Signed-off-by: Brenden Matthews <brenden@diddyinc.com>
2010-02-17 09:32:54 -08:00
Nikolas Garofil
3ceb8cb570
Add support for scrolling in the other direction
2010-02-17 17:49:03 +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
b9a7b0e33e
Fix last memleaks in scroll
...
This fix reverts reverts a part of commit 08122354a9
this is necessary because that commit blocks the calling of free_scroll
2010-02-16 15:45:32 +01:00
Nikolas Garofil
247c62c5d8
Fix another memleak in scroll
2010-02-16 13:27:49 +01:00
Nikolas Garofil
a6debedc93
Fix 3 memleaks that happen when scroll receives wrong args
2010-02-15 16:02:29 +01:00
Nikolas Garofil
53af0f379f
Fix multiple definitions when building in FreeBSD
2010-02-14 22:58:02 +01:00
Nikolas Garofil
3763c263c3
Make sure bsdapm functions can be reached
2010-02-14 21:22:31 +01:00
Nikolas Garofil
4c06be139c
Make sure that bsdapm.cc compiles in FreeBSD
2010-02-14 15:36:22 +01:00
Nikolas Garofil
7de3b9736a
Make sure that freebsd.cc compiles in FreeBSD
2010-02-14 15:26:44 +01:00
Nikolas Garofil
7791e34900
Make sure that fs.cc compiles in FreeBSD
2010-02-14 15:09:12 +01:00
Nikolas Garofil
8db1e1a2a2
Make sure that conky.cc compiles in FreeBSD
2010-02-14 14:00:26 +01:00
Nikolas Garofil
064c6f9e42
Fix wrong mixer values on some systems (thanks hoffa)
2010-02-12 17:03:25 +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
Nikolas Garofil
b206ecc93d
new should be combined with delete instead of free (to stop valgrind from complaining)
2010-02-11 14:44:15 +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
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
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