Pavel Labath
0852aa4fcd
Merge remote branch 'origin/master' into lua-config
...
Conflicts:
src/ccurl_thread.cc
src/conky.cc
src/llua.cc
src/logging.h
src/nvidia.cc
2010-11-13 20:05:59 +01:00
Pavel Labath
375e21af07
Fix a small leak + some cleanup
2010-11-13 19:40:43 +01:00
Nikolas Garofil
561e1ea75d
Fix missing SCNu16 (Thanks pavelo)
2010-11-12 18:21:58 +01:00
Pavel Labath
1c785f2ab9
Remove obsolete config-file stuff, move slowly toward making conky functional again
2010-09-15 23:37:13 +02:00
Pavel Labath
a111356ea4
Make music_player_interval a lua setting
2010-09-11 14:45:19 +02:00
Pavel Labath
47d9a63dff
Make update_interval{,_on_battery} lua settings
2010-09-11 14:25:19 +02:00
Pavel Labath
ef2b39a97f
Make text_buffer_size a lua setting
2010-08-29 23:50:32 +02:00
Pavel Labath
a9893684ac
Make max_user_text a lua setting
2010-08-29 20:01:05 +02:00
Pavel Labath
0085402d08
Make if_up_strictness a lua setting
2010-08-25 19:40:24 +02:00
Pavel Labath
127ed29fb9
Make stippled_borders a lua setting
2010-08-25 19:26:15 +02:00
Pavel Labath
2c96799e59
Make {overwrite,append}_file lua settings
2010-08-22 13:04:19 +02:00
Pavel Labath
228f65bc52
Make diskio_avg_samples a lua setting
2010-08-22 12:31:11 +02:00
Pavel Labath
9d30e34a01
Make net_avg_samples a lua setting
2010-08-22 12:28:04 +02:00
Pavel Labath
80f3359634
make cpu_avg_samples a lua setting
2010-08-22 12:24:26 +02:00
Pavel Labath
968f5f4201
auto_ptr is deprecated
2010-06-26 12:33:55 +02:00
Pavel Labath
76a1b17e5c
make out_to_http a lua setting
2010-06-20 19:31:17 +02:00
Pavel Labath
78ba5c2800
Merge remote branch 'origin/master' into lua-config
...
Conflicts:
src/conky.cc
src/conky.h
src/top.cc
2010-06-20 19:09:13 +02:00
Nikolas Garofil
54d4e6518d
Add support for out_to_http
2010-06-04 14:41:12 +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
Pavel Labath
dfc9efa3cc
make out_to_console/stderr lua settings
2010-04-30 19:06:17 +02:00
Pavel Labath
9e8bbdd4ef
Create a conky window when own_window is set
2010-04-23 21:25:09 +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
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
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
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
aa95dfdd5e
make top_cpu_separate a lua setting
2010-03-07 13:33:48 +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
12e98c7da5
Port out_to_x setting to lua-config
2010-02-25 22:28:34 +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
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
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
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
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
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
cf9e498b24
Update copyright notices.
2010-01-01 15:46:17 -08: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
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
Brenden Matthews
b6331b4eb6
Switch some more bits to C++, more CMake changes.
2009-12-09 20:05:32 -08:00
Phil Sutter
d3aafc4a75
reenable top for all target OS's
...
Occurs to work fine on FreeBSD, the other BSD's probably need more work,
anyway.
2009-12-01 00:45:17 +01:00
Phil Sutter
ede0838e17
drop struct information parameter from generate_text_internal()
2009-12-01 00:32:33 +01:00
Phil Sutter
841a3814c8
convert $updates to callbacks.print
2009-12-01 00:32:32 +01:00
