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,117 Commits 5 Branches 46 Tags 22 MiB
7d7e9b6fd8
Commit Graph

279 Commits

Author SHA1 Message Date
Pavel Labath
47d9a63dff Make update_interval{,_on_battery} lua settings 2010-09-11 14:25:19 +02:00
Pavel Labath
cd5e3f8fa0 Make font and xftalpha lua settings 2010-09-08 17:30:04 +02:00
Pavel Labath
9fc5b84a32 Make pop3 and imap lua settings 2010-09-07 17:39:36 +02:00
Pavel Labath
2978965368 Make total_run_times a lua setting 2010-08-31 11:49:37 +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
6364bbd380 Make lua_{draw_hook_{pre,post},{shutdown,startup}_hook} lua settings 2010-08-29 15:56:15 +02:00
Pavel Labath
26cb39f67c Make lua_load a lua setting 2010-08-29 15:45:38 +02:00
Pavel Labath
b1891474e7 Make max_port_monitor_connections a lua setting 2010-08-29 15:19:46 +02:00
Pavel Labath
eedb5241f8 Make imlib_cache_{size,flush_interval} lua settings 2010-08-29 14:31:22 +02:00
Pavel Labath
77d4a55dcc Fix segfault in ccurl_thread.cc 
curl_global_init() is not thread-safe, it must be called at the start of main()
 2010-08-29 13:42:07 +02:00
Pavel Labath
68d0a223fb Make sensor_device a lua setting 
I haven't tested if this compiles, but I couldn't have broken much, because before this it
definitely didn't compile.
 2010-08-27 13:52:21 +02:00
Pavel Labath
ce49490144 Make mail_spool a lua setting 2010-08-26 23:07:21 +02:00
Pavel Labath
976e0eddf5 Merge remote branch 'origin/master' into lua-config 
Conflicts:
	src/conky.cc
 2010-08-26 22:38:55 +02:00
Pavel Labath
df6db63972 c++-ify variable_substitute() 2010-08-26 20:04:46 +02:00
Pavel Labath
ed70663b99 Make minimum_{width,height} lua settings 2010-08-26 17:40:53 +02:00
Pavel Labath
467abd2edf Make default_gauge_{width,height} lua settings 2010-08-26 17:26:34 +02:00
Pavel Labath
184afe1555 Make default_graph_{width,height} lua settings 2010-08-26 17:18:55 +02:00
Pavel Labath
34a34693d7 Make default_bar_{width,height} lua settings 2010-08-26 16:33:13 +02:00
Pavel Labath
b6ed33b82a Make temperature_unit a lua setting 2010-08-25 21:26:14 +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
e59679a0c1 Make pad_percents a lua setting 2010-08-25 19:19:10 +02:00
Pavel Labath
b863f216b8 Make hddtemp_{host,port} lua settings 2010-08-25 19:16:56 +02:00
Pavel Labath
31cbd710a6 Make top_name_width a lua setting 2010-08-25 19:09:15 +02:00
Pavel Labath
3d29d27e8b make maximum_width a lua setting 2010-08-25 19:01:02 +02:00
Pavel Labath
5f60b5427e Improve range_config_setting<> 
now it catches negative values assigned to unsigned settings
 2010-08-25 18:51:29 +02:00
Pavel Labath
2c96799e59 Make {overwrite,append}_file lua settings 2010-08-22 13:04:19 +02:00
Pavel Labath
3dd4593bc9 Make max_text_width a lua setting 2010-08-22 12:49:31 +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
663e99ee53 Make mpd_{host,password,port} lua settings 2010-08-22 12:17:09 +02:00
Pavel Labath
4cb6606ea2 Make nvidia_display a lua setting 2010-08-21 14:13:07 +02:00
Pavel Labath
179a1a15b9 Merge branch 'master' into lua-config 
Conflicts:
	src/conky.cc
	src/mysql.cc
	src/mysql.h
 2010-08-21 14:11:33 +02:00
Pavel Labath
8ff9b58c3b Fix 'nvidia with ncurses segfaults' (sf.net #3006233) 
Additionally, add a nvidia_display variable. This enables the $nvidia variable to be used without
out_to_x yes (X11 support still has to be built in, you just don't have to use it).
 2010-08-13 15:23:11 +02:00
Pavel Labath
074271b430 Fix gcc warning 2010-07-29 16:31:30 +02:00
Pavel Labath
968f5f4201 auto_ptr is deprecated 2010-06-26 12:33:55 +02:00
Pavel Labath
dad4b80c8f Fix double-free bug in mysql.cc 2010-06-23 19:06:32 +02:00
Pavel Labath
b5a4d899ab Make mysql_* lua settings 2010-06-22 01:34:55 +02:00
Pavel Labath
c33d617179 make templateN a lua setting 2010-06-21 00:37:58 +02:00
Pavel Labath
76a1b17e5c make out_to_http a lua setting 2010-06-20 19:31:17 +02:00
Pavel Labath
8c41d3183e make http_refresh a lua setting 2010-06-20 19:15:56 +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
b5800a3418 Use fixed-width fonts with out_to_http so that everything lands where it should land 2010-06-05 14:27:20 +02:00
Nikolas Garofil
7a2e292429 Change multiple spaces in &nbsp;-s when out_to_http is used 2010-06-05 14:05:08 +02:00
Nikolas Garofil
e7eae4ec8f Change newlines in "<br />"-s when out_to_http is used 2010-06-05 02:08:50 +02:00
Nikolas Garofil
edc45d41f2 Add support for http_refresh 2010-06-04 15:47:01 +02:00
Nikolas Garofil
54d4e6518d Add support for out_to_http 2010-06-04 14:41:12 +02:00
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
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
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
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
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
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
131ceb5ccf Bugfix: shifted bars 2010-04-15 23:59:24 +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
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
Pavel Labath
939985042a Remove a redundant copy of arg[cv] 2010-03-19 20:33:49 +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
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
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
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
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