Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-19 19:45:15 +00:00
Code Issues Releases Activity
2,760 Commits 5 Branches 46 Tags 22 MiB
ad79c87376
Commit Graph

2097 Commits

Author SHA1 Message Date
Nikolas Garofil
4bc136be88 Bugfix: $alignr had some problems after commit 40452c9712 
Example:
TEXT
alfa bravo
charlie ${alignr}delta
echo ${alignr}foxtrot

Note to self:
It could be that this fix brings back part of the bug that
40452c9712 fixed. Check this !
 2010-05-24 21:04:42 +02:00
Alexander Graf
fbd7ad0152 Accept top_name_width on FreeBSD 
It was inside #ifdef __linux__, though it is not Linux specific.

Signed-off-by: Alexander Graf <agraf@znc.in>
Signed-off-by: Pavel Labath <pavelo@centrum.sk>
 2010-05-23 21:54:42 +02:00
Alexander Graf
696d841e97 Compile under FreeBSD 
This allows compilation under FreeBSD without errors.

read_tcpip.cc:  Avoid using of SOCK_NONBLOCK argument for socket().
SOCK_NONBLOCK is Linux-specific and its use was substituted with a
fcntl() call after socket().

freebsd.cc:  Change return type of update_*() to int, as required by
common.h.

Signed-off-by: Alexander Graf <agraf@znc.in>
Signed-off-by: Pavel Labath <pavelo@centrum.sk>
 2010-05-23 21:54:42 +02:00
Cesare Tirabassi
7a61fe8504 Fix battery_bar not parsing arguments correctly (sf: #2998034, lp: #569195) 2010-05-23 11:25:19 +02:00
Nikolas Garofil
4256da3b7f forgot to change header in previous commit 2010-05-09 22:42:06 +02:00
Nikolas Garofil
9838bb2cde Make sure audacious-code compiles 2010-05-09 22:07:12 +02:00
Nikolas Garofil
9cb4583429 Bugfix: mem-problems in ical-code 2010-05-07 02:10:49 +02:00
Nikolas Garofil
78e9a69b4e Bugfix: memleaks in rss-code 2010-05-06 17:29:09 +02:00
Nikolas Garofil
f7980ca5a1 Bugfix: BUILD_WEATHER is replaced by BUILD_WEATHER_METAR and BUILD_WEATHER_XOAP 2010-05-06 16:09:17 +02:00
Nikolas Garofil
f6ab74f3a6 Bugfix: RSS interval was in secs instead of mins 2010-05-06 11:54:47 +02:00
Nikolas Garofil
51f7969571 Bugfix: pthread - $curl related bug 2010-05-06 01:24:30 +02:00
Nikolas Garofil
40452c9712 Bugfix: $alignr only worked on the first line of $execp, $execpi, $lua and $lua_parse 2010-05-05 22:02:28 +02:00
Nikolas Garofil
a32d9e41a4 Bugfix: memory and thread-deleting problems 
For example the following config had a problem:
TEXT
$i8k_cpu_temp

I could fix it shorter, but then valgrind would still show memleaks
 2010-05-05 18:46:04 +02:00
Pavel Labath
f81c29a42d make out_to_ncurses a lua setting 
this completes the porting of bool settings
 2010-04-30 19:33:21 +02:00
Nikolas Garofil
3f7ecb3a26 Add support for $irc 2010-04-30 19:32:42 +02:00
Pavel Labath
dfc9efa3cc make out_to_console/stderr lua settings 2010-04-30 19:06:17 +02:00
Pavel Labath
c31f27fe92 make override_utf8_locale a lua setting 2010-04-30 17:51:30 +02:00
Nikolas Garofil
4fe945fbc4 Fix bug in ical's eventlist 2010-04-28 12:18:15 +02:00
Pavel Labath
a7513c76e5 better fix the gcc warning 2010-04-27 18:11:38 +02:00
Nikolas Garofil
a13c56a7a5 Add support for $ical 2010-04-27 16:42:21 +02:00
Nikolas Garofil
b4bcc0814f Solve some gcc warnings 2010-04-25 18:33:08 +02:00
Nikolas Garofil
c2c743f542 complete stock error mesg 2010-04-24 18:26:17 +02:00
Nikolas Garofil
343a2f6842 fix bug in stock 2010-04-24 18:09:09 +02:00
Nikolas Garofil
00c869a2bf Add almost all stock data yahoo provides 2010-04-24 14:57:04 +02:00
Nikolas Garofil
45d63c7fba Default tcp_ping port changed to 80 2010-04-24 12:33:40 +02:00
Nikolas Garofil
a2ae025f56 Add support for $tcp_ping 2010-04-24 01:40:24 +02:00
Pavel Labath
ede92b87bd make gap_[xy] a lua setting 2010-04-23 22:00:32 +02:00
Pavel Labath
feb4100e84 make double_buffer a lua setting 2010-04-23 21:54:40 +02:00
Pavel Labath
9e8bbdd4ef Create a conky window when own_window is set 2010-04-23 21:25:09 +02:00
Pavel Labath
67e37668ec make border_width a lua setting 2010-04-23 01:22:22 +02:00
Pavel Labath
96c966b7a6 Make border_{inner,outer}_margin a lua setting 2010-04-22 21:59:12 +02:00
Pavel Labath
00e91d8c31 Merge remote branch 'origin/master' into lua-config 
Conflicts:
	src/conky.cc
	src/x11.cc
 2010-04-22 21:17:14 +02:00
Nikolas Garofil
ed0dd49dd8 Add some more stock data that yahoo is providing 2010-04-22 16:52:15 +02:00
Nikolas Garofil
3b427bf004 Bugfix: segfault in curl-related code 2010-04-22 16:35:00 +02:00
Nikolas Garofil
52ec22c30a Bugfix: segfault in 2010-04-22 13:52:55 +02:00
Nikolas Garofil
28bf02a451 Removed cleanup functions added in the previous 2 commits 
These functions are not everywhere supported.
 2010-04-22 12:33:14 +02:00
Nikolas Garofil
bb34971fbf Remove some more memleaks in the curl code, also caused by openssl 2010-04-22 00:47:06 +02:00
Nikolas Garofil
986e1251ae Removed one of the memleaks in curl caused by openssl 2010-04-22 00:05:56 +02:00
Pavel Labath
927394505c Make use_xft a lua setting 2010-04-21 19:33:39 +02:00
Nikolas Garofil
2f838fe676 change specials back to ll (fixed bug mentioned in previous commit) 2010-04-21 18:03:53 +02:00
Nikolas Garofil
f603fbfd88 change specials back into a normal array until i fix the only-1-line-graph-bug 2010-04-21 14:54:45 +02:00
Nikolas Garofil
93de6a1798 Fix bug in previous commit and a old memleak in curl 2010-04-19 22:25:50 +02:00
Nikolas Garofil
bc5a414594 $curl can now use 0 (immediately) as interval 2010-04-19 17:19:56 +02:00
Nikolas Garofil
89c2d4ecdd curl 2010-04-19 14:54:03 +02:00
Nikolas Garofil
d6537aa678 Add support for $stock 2010-04-19 14:45:05 +02:00
Nikolas Garofil
d9930744de fix memleak 2010-04-18 20:49:14 +02:00
Nikolas Garofil
a6e63bcaa0 Add support for MySQL 
Warning: Altough the current version works (for me),
the syntax of the configoptions and vars will probably change
over time. Contact me if you have ideas.

The following is a example of how you can use it now:

mysql_host someserver.com
mysql_db my_database
mysql_user loginname
mysql_password "s3cr3t"
TEXT
${mysql select var1 from some_table}${mysql select var2 from some_table}
 2010-04-18 17:52:41 +02:00
Nikolas Garofil
15d9a95c95 solve printf warning 2010-04-18 00:23:00 +02:00
Nikolas Garofil
0ab2efc2b2 Add support for $no_update 2010-04-17 15:19:44 +02:00
Nikolas Garofil
0047a132ab Merge read_tcp and read_udp as much as possible 2010-04-17 02:31:37 +02:00
Nikolas Garofil
19ad7d2cc3 Add support for $read_udp 2010-04-16 18:53:48 +02:00
Nikolas Garofil
0ab87b40a5 Improve unknown var error 2010-04-16 00:20:08 +02:00
Nikolas Garofil
131ceb5ccf Bugfix: shifted bars 2010-04-15 23:59:24 +02:00
Nikolas Garofil
2e34a9e1c5 Bugfix: segfault 2010-04-15 21:31:10 +02:00
Nikolas Garofil
ae6810fbd5 Bugfix: read_tcp treated a succesfull connection as failed and vice versa 2010-04-15 19:54:01 +02:00
Nikolas Garofil
5ecb0f7030 Add support for arch linux to $distribution 2010-04-15 16:49:55 +02:00
Nikolas Garofil
5ef6de8822 Add support for $distribution 2010-04-15 16:05:42 +02:00
Nikolas Garofil
a734f86071 Bugfix: memleak at crash caused by missing arg 2010-04-15 13:00:54 +02:00
Nikolas Garofil
5ddf751345 Bugfix: "out_to_x no" was ignored when in a file included with ${include path_to_file} 2010-04-14 21:50:50 +02:00
Nikolas Garofil
f5c147b160 Add support for $nodename_short 
This is different implementation (compared to 9e3156a4a6)
because 1.8.1 was still regular c instead of c++
 2010-04-14 18:41:25 +02:00
Nikolas Garofil
08ea4391d4 Deprecated max_specials, made it unlimited by changing the data structure for specials 2010-04-14 16:59:50 +02:00
Nikolas Garofil
cda990633c Add support for --stdin-config 2010-04-13 17:02:39 +02:00
Nikolas Garofil
dbfbc5f28c Bugfix: adding/removing use_xft in the config had no effect unless you restarted conky, reloading the config was not enough 2010-04-12 23:27:12 +02:00
Pavel Labath
f1c717286b inotifi_init1() is not available on older systems 
-> replace with inotify_init() + fcntl()
atomicity should not be important here, since we don't have any threads running at the point of
the call
 2010-04-12 22:40:16 +02:00
Nikolas Garofil
ce5a64d08a Removed all code depending on MIXER_IS_ALSA 
Reasons:
-As far as i know, all systems can use the non-MIXER_IS_ALSA way to get the values
-This code shows wrong mixer values
-You can't define MIXER_IS_ALSA with the current cmake configuration
-In the current state this code is incorrect c++ and does not compile (altough it's
probably correct c, i didn't check that)

The 3 last reasons can be fixed, but i'm not in favor of doing that because of the 1st reason
 2010-04-12 16:55:03 +02:00
Nikolas Garofil
96ec637af9 Bugfix: mixerbar showed wrong values 2010-04-12 13:37:49 +02:00
Nikolas Garofil
a6b43da875 Bugfix: ac-adapter is sometimes called ADP1 in sysfs instead of AC 2010-04-12 12:33:24 +02:00
Nikolas Garofil
15326c502c Bugfix: battery_bar should also work without argument 2010-04-11 19:13:14 +02:00
Nikolas Garofil
34f3547c0d Bugfix: When the first line behind TEXT was a comment, the start of the second line wasn't parsed 2010-04-10 20:11:20 +02:00
Pavel Labath
939985042a Remove a redundant copy of arg[cv] 2010-03-19 20:33:49 +01:00
Pavel Labath
d3723e727c Fix a leak in mpd.cc (refcount fail) 2010-03-18 21:31:18 +01:00
Pavel Labath
8c30957671 fix "conky's $mpd_* don't update", sf.net #2970555 2010-03-18 21:26:10 +01:00
Pavel Labath
4b38666777 Fix a couple of problems when compiling without OWN_WINDOW 2010-03-14 22:26:29 +01:00
Pavel Labath
5e13dce11c Simplify border width expressions by common subexpression elimination 2010-03-12 19:27:07 +01:00
Pavel Labath
405a175366 add vi modeline 2010-03-12 19:05:59 +01:00
Pavel Labath
88064ef8db set current_text_color if needed 2010-03-12 19:05:01 +01:00
Pavel Labath
0584d423e6 make default_{shade_,outline_,}color lua settings 2010-03-11 12:08:55 +01:00
Pavel Labath
ac8d4385eb Make colorN a lua setting 2010-03-11 11:31:10 +01:00
Pavel Labath
68272383fa make conversion functions inline 2010-03-10 21:18:03 +01:00
Pavel Labath
b1a871b9b9 reorder things a bit, make background_colour setting check the value for validity 2010-03-10 21:02:13 +01:00
Pavel Labath
c41a507e62 Initialize X when out_to_x is set (using the infractructure from previous commit) 2010-03-10 20:01:26 +01:00
Pavel Labath
ba79c58f37 Change setting setter call order, add cleanup function 
Call setting setters in the order in which they were registered.
Add a cleanup function, called in the reverse registration order.
 2010-03-10 19:33:45 +01:00
Nikolas Garofil
7264b97e7a Add missing header after commit d93dc72e6dbaaa254eaf7ccf0b014d6af1bb45ea;hpb=0336b5d67daf0b03868c4e594a0eca15a4aecd00 2010-03-08 18:13:55 +01:00
Pavel Labath
1d20229d74 make uppercase a lua setting 2010-03-07 13:46:58 +01:00
Pavel Labath
9d8e89a119 make format_human_readable a lua setting 2010-03-07 13:44:33 +01:00
Pavel Labath
06bf26b757 make short_units a lua setting 2010-03-07 13:36:40 +01:00
Pavel Labath
aa95dfdd5e make top_cpu_separate a lua setting 2010-03-07 13:33:48 +01:00
Pavel Labath
357a505dc4 make no_buffers a lua setting 2010-03-07 13:20:16 +01:00
Pavel Labath
d6ff7b7315 make use_spacer a lua setting 2010-03-05 21:05:05 +01:00
Pavel Labath
964b8eaf28 make disable_auto_reload a lua setting 2010-03-05 21:00:25 +01:00
Pavel Labath
667b0d1d8c make extra_newline a lua setting 2010-03-05 20:58:39 +01:00
Pavel Labath
48346c8325 make times_in_seconds a lua setting 2010-03-05 14:20:04 +01:00
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
af02eab4b6 This appears to plug a leak. 2010-03-04 17:40:37 +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
Pavel Labath
5b65fce42d C++ version of lua::state::pushstring 2010-03-02 20:29:37 +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
41ddaf9e23 refactor settings classes 
result: easier declaration of settings, easier construction of custom setting classes, commitcount++
 2010-03-02 19:29:51 +01:00
Pavel Labath
a810804a6b make own_window_colour a lua setting 2010-02-28 15:51:01 +01:00
Pavel Labath
2ad1809f87 s/substract/subtract/ 2010-02-28 14:05:28 +01:00
Pavel Labath
b8bed06cc8 C++ version of get_x11_color() 2010-02-28 12:26:18 +01:00
Pavel Labath
5c3d06346a Use min() and max() instead of infinity() for default limits 
because integral types do not have infinite values
 2010-02-28 12:13:37 +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
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
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
Pavel Labath
a152a32d66 lua_isnil() binding 2010-02-16 16:46:16 +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
Pavel Labath
8bc8d9d7b8 Remove unneeded #includes 2010-02-16 15:14:40 +01:00
Nikolas Garofil
247c62c5d8 Fix another memleak in scroll 2010-02-16 13:27:49 +01:00
Pavel Labath
5b743293da Add some comments to explain how things work 2010-02-16 12:32:53 +01:00
Nikolas Garofil
a6debedc93 Fix 3 memleaks that happen when scroll receives wrong args 2010-02-15 16:02:29 +01:00
Pavel Labath
ad6707fac9 More refactoring and (hopefully) simplification 
The idea was to avoid passing the data_source factory function through two std::binds.
 2010-02-15 13:18:53 +01:00
Pavel Labath
56266e9476 add lua_settop() binding 2010-02-15 13:00:33 +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
Pavel Labath
1d6009594c Simplify data source creation, create it directly inside lua userdata 2010-02-14 20:36:17 +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
Pavel Labath
fa02cdceab An object-oriented api for accessing data sources from lua 2010-02-13 17:00:20 +01:00
Pavel Labath
b3411782e6 Rephrase an error message 2010-02-12 23:04:32 +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
Pavel Labath
00d8215e00 added state::createuserdata template function 2010-02-12 17:41:24 +01:00
Pavel Labath
0ae2ba5210 Retab luamm in line with setting we use (yeah... i know :/) 2010-02-12 17:11:50 +01:00
Pavel Labath
3e98e18324 add lua_pushnumber wrapper 
there are still some functions whose C++ wrappers i didn't create. add them if you need them
 2010-02-12 17:06:24 +01:00