Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-01-04 23:55:23 +00:00
Code Issues Releases Activity
3,000 Commits 5 Branches 46 Tags 22 MiB
3e85698458
Commit Graph

2266 Commits

Author SHA1 Message Date
Pavel Labath
3c7f2192b2 update callback objects can now signal termination with a write to a pipe as well 2011-02-27 22:43:40 +01:00
Pavel Labath
bcfc90accb C++ wrapper of pipe2(2) 2011-02-27 22:43:40 +01:00
Pavel Labath
536f719c65 exception class for c functions which set errno 2011-02-27 22:43:40 +01:00
Pavel Labath
9d6d26154a added a convenient c++ wrapper for strerror_r 
as a bonus, it can be used to insulate us from the GNU vs. XSI strerror_r interface differences
 2011-02-27 22:43:40 +01:00
Pavel Labath
b96f112106 Make $exec et al. use the new callback system 
I removed the code for automatic killing of stuck children, because (by admission of the person
who wrote it) it wasn't working. I also removed the $pre_exec variable, because one can use lua
to generate the config on the startup, if one wants to.
 2011-02-27 22:43:32 +01:00
Pavel Labath
7cf37f7de0 Make $rss use the new callback system 2011-02-16 00:33:22 +01:00
Nikolas Garofil
cb544bd1f7 Check that there is no writing outside the string 2011-02-13 00:10:20 +01:00
Nikolas Garofil
5aaac61f4e make cast unnecessary 2011-02-12 19:11:01 +01:00
Nikolas Garofil
678d79e6fe use sscanf() instead of hextobyte() 2011-02-12 18:01:41 +01:00
Nikolas Garofil
723255f142 Use inet_ntop(), thanks to pavelo for telling me about this 2011-02-12 17:18:33 +01:00
Nikolas Garofil
70b6f35a84 fix racecondition in eve, based on a patch from Vasiliy Kulikov, based on a patch from Brandon 2011-02-11 18:30:04 +01:00
Nikolas Garofil
18ce365d16 change reading args of $v6addrs and add docs 2011-02-11 15:43:01 +01:00
Nikolas Garofil
2754fab78d Support for scope in $v6addrs 2011-02-11 13:05:00 +01:00
Nikolas Garofil
997dcc87d9 fix build without ipv6 support 2011-02-11 00:27:12 +01:00
Nikolas Garofil
b548f476cc Support for -n in $v6addrs 2011-02-10 23:27:14 +01:00
Nikolas Garofil
ac4a3682ae Fix security bug in 's getSkillname 2011-02-10 16:20:06 +01:00
Nikolas Garofil
5a5e8f80b1 Support for short-version ipv6-addresses 2011-02-10 16:01:16 +01:00
Nikolas Garofil
2aafb591ee Add fscanf_no_i18n() to fix sf.net #3154556 2011-02-10 01:08:34 +01:00
Nikolas Garofil
6287b22a3d Add $v6addrs to increase IPv6 support 
This is only the beginning of the ipv6 support,
This var isn't documented and only works on Linux.
It should also be patched to show the addresses in compressed format
Some other vars should also be added to see things like netmask, scope, routes, ...
 2011-02-09 18:49:52 +01:00
Pavel Labath
fb81e3a9b3 Make $weather use the new callback system 2011-01-06 16:26:53 +01:00
Pavel Labath
10d7605a51 use get_result_copy() instead of get_result() 
i don't seem to follow my own advice :/
 2011-01-06 15:32:10 +01:00
Pavel Labath
b0deb283ec make $curl use the new callback system instead of timed_thread 
ps: this breaks $rss and $weather, they need to be ported as well
 2011-01-06 15:29:51 +01:00
Pavel Labath
41dc5db094 Initialize special_t when allocating it (this should fix sf.net #3138243) 2011-01-05 13:54:04 +01:00
Pavel Labath
87591f502e add a $memdirty variable 
patch contributed by Piotr Karbowski (sf.net #3138195)
 2011-01-04 14:48:33 +01:00
Pavel Labath
5237fe9d23 Revert "$mixer: report more reasonable values for mono devices" 
the user reports this didn't fix the problem (see sf.net #3131452)

This reverts commit 540f78f0bd.
 2011-01-02 14:24:10 +01:00
Pavel Labath
f0d48190ff $mixer: report more reasonable values for mono devices 2011-01-01 11:37:31 +01:00
Pavel Labath
9d0932d711 Use the new callback system instead of add_update_callback() & co. 2010-12-31 13:39:54 +01:00
Tiago Vale
c5d065d119 Added support for POWER_SUPPLY_POWER_NOW In Linux, apparently POWER_SUPPLY_CURRENT_NOW was deprecated and replaced by POWER_SUPPLY_POWER_NOW. In my system, ever since kernel 2.6.36.1 battery lifetime showed "unknown" in conky. Check http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=532000. 
Signed-off-by: Pavel Labath <pavelo@centrum.sk>
 2010-12-30 14:42:16 +01:00
Pavel Labath
c5fe259ae0 a new update callback system 
it should replace both timed_thread and run_update_callback() systems
it features:
- automatic removal of callbacks which are not used
- ability to run callback less frequent than the update_interval
- avoidance of running the same callback multiple times
 2010-12-24 15:09:40 +01:00
Pavel Labath
29ef75083a Fix 'comparison between signed and unsigned expressions' warning 2010-12-23 18:25:31 +01:00
Pavel Labath
44a30fac3d kvm_proc needs synchronized access 
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Pavel Labath <pavelo@centrum.sk>

Conflicts:

	src/conky.c
	src/freebsd.cc
	src/freebsd.h
 2010-12-09 19:22:34 +01:00
Nikos Ntarmos
3b5d5f33b3 Build fixes for bmpx 
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Pavel Labath <pavelo@centrum.sk>
 2010-12-09 18:46:51 +01:00
Pavel Labath
f1bc24f199 fclose(3) instead of pclose(3) as the latter seems to leak file descriptors 
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Pavel Labath <pavelo@centrum.sk>

Conflicts:

	src/exec.c - had to merge manually
 2010-12-05 21:16:01 +01:00
Pavel Labath
43d81169f6 Use initializer list for member initialization 2010-11-26 18:03:41 +01:00
Nikolas Garofil
99c359b212 Fix displaying UTF-8 without XFT 2010-11-26 17:59:07 +01:00
Nikolas Garofil
f6a4588b3c Include default values set by cmake in print_version(), Don't set HTTPPORT when BUILD_HTTP is unset 2010-11-24 18:17:53 +01:00
Nikolas Garofil
d48e83e0d4 Bugfix: Shades weren't placed correct after a $goto 2010-11-24 16:47:29 +01:00
Nikolas Garofil
b43e130180 small rewrite print_version() 2010-11-24 00:46:29 +01:00
Pavel Labath
981ed0b609 fix own_window_colour setting name 2010-11-23 23:18:50 +01:00
Nikolas Garofil
7b128a9f16 Merge branch 'lua-config' 2010-11-23 18:56:58 +01:00
Nikolas Garofil
c93f9817cb Merge branch 'master' into lua-config 2010-11-23 18:50:48 +01:00
Nikolas Garofil
687407479f Make sure template_ in calc_cpu_total() can also be TMPL_LONGPROC 2010-11-23 18:50:40 +01:00
Pavel Labath
5aa59f55fa Make xmms2 work again (not tested yet) 2010-11-23 18:42:48 +01:00
Nikolas Garofil
1b791ed1c8 Merge branch 'master' into lua-config 2010-11-23 17:42:00 +01:00
Nikolas Garofil
23a193fe89 Complete previous commit 2010-11-23 17:40:53 +01:00
Nikolas Garofil
c1933dc186 Make sure char-arrays filled with read() are null-terminated 2010-11-23 17:33:26 +01:00
Pavel Labath
cc98b26119 Fix small error in old config handling 2010-11-23 16:45:42 +01:00
Pavel Labath
4ab7f6d0d1 Replace the if(&l) unused hack with unused attribute 2010-11-23 16:43:14 +01:00
Nikolas Garofil
5781e4f1e7 Fix build with BUILD_X11 but without OWN_WINDOW 2010-11-23 13:58:53 +01:00
Nikolas Garofil
529392aef0 Fix building without BUILD_OLD_CONFIG 2010-11-22 23:45:38 +01:00
Nikolas Garofil
c119410c78 A bit i18n 2010-11-21 23:39:35 +01:00
Pavel Labath
5a7ec7fb0b Simplify exception handling and get rid of conky::critical_error 
As i said in my rant somewhere, it's up to the person catching the exception to decide if the
error is critical or not. The person throwing the exception should specify the type of error and
that's where his job ends.
 2010-11-21 22:44:04 +01:00
Pavel Labath
5c49c52a0b make convert.lua "bimodal" 
it does The Right Thing(tm) both when called from conky and as standalone
 2010-11-21 22:26:35 +01:00
Nikolas Garofil
b5216499c2 Don't quit when configfiles are deleted 2010-11-21 16:56:50 +01:00
Nikolas Garofil
5a85fc9053 Don't quit when configfiles are deleted 2010-11-21 16:46:58 +01:00
Nikolas Garofil
b0e1c3d8a5 Remove useless try-catch 2010-11-21 15:46:42 +01:00
Nikolas Garofil
bce7064cdb Bugfix: segfault at config reload 2010-11-21 14:32:59 +01:00
Nikolas Garofil
a87c3ee205 Shrink code 2010-11-21 00:23:27 +01:00
Nikolas Garofil
199f8876fb Fix leaks that happen when there is no config available (these are only tiny leaks because conky will shutdown anyway when there is no config available) 2010-11-21 00:05:20 +01:00
Nikolas Garofil
cad18ce2e0 Fix leaks that happen when there is no config available (these are only tiny leaks because conky will shutdown anyway when there is no config available) 2010-11-20 23:35:02 +01:00
Nikolas Garofil
c63f42a693 fix manual merge 2010-11-20 17:25:06 +01:00
Nikolas Garofil
fcf318c6dd Fix bug with SF ID 3101185 (manual merge) 2010-11-20 17:18:34 +01:00
Nikolas Garofil
0ee557a4ee Fix bug with SF ID 3101185 2010-11-20 16:59:32 +01:00
Nikolas Garofil
559d4ebb53 clean up code a bit 2010-11-19 15:52:21 +01:00
Nikolas Garofil
5d28bed7db Support for old config syntax (Optional) 2010-11-19 14:27:18 +01:00
Pavel Labath
3db3e6045f Fix segfault when out_to_x is set to false 2010-11-18 16:09:36 +01:00
Nikolas Garofil
e19f1c76a9 Some errormessages 2010-11-18 00:36:36 +01:00
Pavel Labath
b7a80fa449 Fix segfault when own_window is set to false 2010-11-17 14:43:49 +01:00
Pavel Labath
8d37f8b498 Woops.. forgot to actually declare the nvidia_display setting 2010-11-17 14:36:48 +01:00
Pavel Labath
ad79c87376 Merge remote branch 'origin/master' into lua-config 
Conflicts:
	src/conky.cc
 2010-11-16 22:55:33 +01:00
Nikolas Garofil
8123e447e2 Replace a CRIT_ERR in combine by trying,throwing and catching 
PS: I want to replace all similar CRIT_ERR's like this, opinions ?
 2010-11-16 13:41:44 +01:00
Nikolas Garofil
fd9dd921a4 Extra constructor for own msg 2010-11-15 17:59:53 +01:00
Nikolas Garofil
5a41152dbb Make stuff to throw childs of runtime_error 2010-11-15 17:52:42 +01:00
Nikolas Garofil
c671226a83 print_version() usable without quiting and replace all exit()-s in conky.cc 2010-11-15 17:07:38 +01:00
Nikolas Garofil
90eda7edbf own_window and own_window_transparent should default to yes without option 2010-11-15 14:00:31 +01:00
Pavel Labath
97ac409903 Use real types instead of enums to distinguish exceptions 2010-11-15 00:24:49 +01:00
Nikolas Garofil
c2c06d0956 Fix memleak 2010-11-14 22:13:56 +01:00
Nikolas Garofil
5dd486d345 conky_error class replacing runtime_error 2010-11-14 18:19:46 +01:00
Nikolas Garofil
fbec1252a1 Merge branch 'master' into lua-config 2010-11-14 15:25:17 +01:00
Pavel Labath
17d4658242 Fix "Conky usually segfaults on config file changes" (sf.net #3100221) 
Someone needs to learn the difference between passing by value and passing by reference.

Bug reported by Kevin Lyles.
 2010-11-14 14:34:39 +01:00
Nikolas Garofil
b5ff3eb411 Make lua required by cmake 2010-11-14 01:41:07 +01:00
Nikolas Garofil
4ac40e6054 Fix compiling without builtin config 2010-11-14 01:25:11 +01:00
Nikolas Garofil
e73da6b72e Fix compiling without X11 support 2010-11-13 23:59:31 +01:00
Pavel Labath
c9df66f487 Merge remote branch 'origin/master' into lua-config 
Conflicts:
	src/conky.cc
	src/logging.h
 2010-11-13 20:17:46 +01:00
Pavel Labath
f33c65aed2 This was overkill 2010-11-13 20:11:29 +01:00
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
Nikolas Garofil
9d7a914515 Make I18N optional 2010-11-13 19:45:04 +01:00
Pavel Labath
375e21af07 Fix a small leak + some cleanup 2010-11-13 19:40:43 +01:00
Pavel Labath
a1f4984a4e Make conky not crash on exit when using weather objects 2010-11-13 16:36:43 +01:00
Pavel Labath
758c2ed674 Use std::min instead of the MIN macro 2010-11-12 20:08:34 +01:00
Pavel Labath
d899f603d3 Fix some obvious errors in ccurl_thread.cc 
However, the whole thing still doesn't quite work for me.... It crashes on exit.
 2010-11-12 20:00:24 +01:00
Pavel Labath
9a08141389 Fix the "ISO C does not permit named variadic macros" in maintainer mode 
and a few other that have cropped up in the process
 2010-11-12 19:48:06 +01:00
Nikolas Garofil
561e1ea75d Fix missing SCNu16 (Thanks pavelo) 2010-11-12 18:21:58 +01:00
Nikolas Garofil
e918ea4655 Let cmake check whether to build for old or new audacious 2010-11-12 16:49:34 +01:00
Nikolas Garofil
47965eedbc Fix memleak in is_disk() 2010-11-11 00:31:06 +01:00
Nikolas Garofil
1b90218c33 Let $acpitemp use /sys instead of /proc 
From the 2.6.36 changelog (http://www.kernel.org/pub/linux/kernel/v2.6/ChangeLog-2.6.36):
Mark the ACPI thermal procfs I/F deprecated, because /sys/class/thermal/ is already available and has been working for years w/o any problem.
The ACPI thermal procfs I/F will be removed in 2.6.37
 2010-11-10 18:22:22 +01:00
Nikolas Garofil
b902b70e96 i18n-ize conky.cc 2010-10-31 20:01:20 +01:00
Pavel Labath
c9334eb071 Make conky (more-or-less) functional again 2010-10-31 18:17:22 +01:00
Pavel Labath
104ae7454c Make setting getters/setters atomic. 2010-10-31 00:22:35 +02:00
Nikolas Garofil
b98ebc90ee Internationalization support 
This patch adds i18n-support with gettext, all translatable strings in the
code should be placed inside _() to make sure users see them in their own
language (I only did this for print_version() for now)
 2010-10-31 00:02:02 +02:00
Pavel Labath
214ed0ac87 Add lock/unlock functions to lua::state 2010-10-30 23:54:13 +02:00
Nikolas Garofil
be9b62f0aa Show error when creating a empty udp package fails, this also fixes a g++ warning 2010-10-30 22:53:13 +02:00
Nikolas Garofil
33db46cef1 Fix building without Imlib2 2010-10-30 17:44:33 +02:00
Nikolas Garofil
89a8456495 Fix x11 check in cmake 2010-10-27 07:37:11 +02:00
Nikolas Garofil
11e5db2132 Fix memleak when there is no config available 
The 'buf' string in current_config() got allocated but not deleted when
CRIT_ERR stops the program.
 2010-10-24 17:57:58 +02:00
Kevin Lyles
56ddea77a8 Fixed foreground colors being semi-transparent 
Signed-off-by: Brenden Matthews <brenden@diddyinc.com>
 2010-10-15 11:23:14 -07:00
Kevin Lyles
a251357f1d Fixed gradients to actually use both end colors 
Signed-off-by: Brenden Matthews <brenden@diddyinc.com>
 2010-10-15 11:23:08 -07:00
Brenden Matthews
ca9acc13c0 C++ify some curl stuff. 2010-10-14 17:28:57 -07:00
Dan McGee
93c6baebb6 Enable use of HTTP cache headers in curl plugin 
This will allow us to get 304 responses back from remote URLs that we are
grabbing using the curl, weather, and rss plugins. The first time we fetch a
resource, we will always get the full content, but from there on out we will
store any provided 'Etag' or 'Last-Modified' header, and submit these on the
next request. If we get a 304 response back, we won't have to do any work at
all.

This benefits both us (bandwidth and parsing savings) and remote URLs (we
actually make an attempt to not retrieve the same resource over and over
again).
 2010-10-14 17:04:32 -07:00
Brenden Matthews
b06af986a8 Bulid fix for nvidia support. 
See http://bugs.gentoo.org/show_bug.cgi?id=339971 for details.
 2010-10-06 11:53:06 -07:00
Brenden Matthews
15006a1a41 Fix warning. 2010-10-05 13:22:27 -07:00
Brenden Matthews
d64b05b648 Build fix. 2010-10-05 13:21:36 -07:00
Brenden Matthews
6437804959 Allow method to pass execgraph arguments containing spaces. 2010-10-05 12:27:03 -07:00
Ben Kibbey
5a898d373e Abort curl transfers if they drop below 1000B/s for more than 60s. 
Signed-off-by: Brenden Matthews <brenden@diddyinc.com>
 2010-10-05 12:09:55 -07:00
Brenden Matthews
5b0dee741c Improve curl code. 2010-10-05 11:56:08 -07:00
Markus
c9cf08d9e9 Fix short_units for below kilo values. 
Signed-off-by: Brenden Matthews <brenden@diddyinc.com>
 2010-10-05 11:31:31 -07: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
9f7e696a85 Remove the $include variable 
the way it is implemented now just wont work with the new config file. And i don't think that
many people used it anyway. Maybe add a replacement later?
 2010-09-15 23:34:47 +02:00
Pavel Labath
d9d8506e0b Add a luaL_gsub wrapper to lua::state 2010-09-13 13:16:16 +02:00
Pavel Labath
22de36271d Build fix in smapi.cc 2010-09-13 11:49:44 +02:00
Pavel Labath
bad23c7b77 Remove the --for-scripts hack. Maybe add it later? 2010-09-12 16:43:43 +02:00
Pavel Labath
0fd23a6f7e Set CLOEXEC flag on the inotify file descriptor 2010-09-12 16:36:21 +02:00
Pavel Labath
eeb1a6a0d7 Properly load config file and print the default one 
ps: the new implementation no longer requires fopencookie() and co.
 2010-09-12 16:23:06 +02:00
Pavel Labath
e935a3d107 Call curl_global_cleanup() even in case of errors 2010-09-12 15:42:20 +02:00
Pavel Labath
bee7b9b99c Bugfix in own_window setting handler 2010-09-12 15:32:05 +02:00
Pavel Labath
8cb63b0c8b Update the default config file to match new syntax 2010-09-12 15:31:18 +02:00
Pavel Labath
c5e45008df Add a luaL_loadfile wrapper to lua::state 2010-09-12 14:53:06 +02:00
Pavel Labath
55282b64d8 Config file handling changes 
- changed default config filenames, to avoid conflict with conky-1.x
- specifying "-" as config file reads from stdin
- if a user config file exists but is not readable, report an error instead of falling back to
  the system-wide config.
 2010-09-12 14:01:34 +02:00
Pavel Labath
4426a8fa5b The --stdin-config param is kinda pointless, just use -c /dev/stdin 2010-09-12 13:50:47 +02:00
Pavel Labath
0a655c1ff6 Merge remote branch 'origin/master' into lua-config 2010-09-11 14:52:25 +02:00
Pavel Labath
eb06bb874c curl_global_init() is not needed here (anymore) 2010-09-11 14:51:08 +02:00
Pavel Labath
ef24f62412 Merge remote branch 'origin/master' into lua-config 
Conflicts:
	src/conky.cc
 2010-09-11 14:50:37 +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
Brenden Matthews
2f9195bd56 When we have a failure in mail thread, sleep for a bit. 2010-09-09 10:55:34 -07:00
Brenden Matthews
d0a20850c8 Improve failure handling in mail threads. 
When we have a failure in the mail thread, lookup the hostname again in
case the failure is due odd to DNS changes, or some other madness.
 2010-09-09 10:55:24 -07: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
5e6a5fdb3c htons() is not needed when using getaddrinfo (sf.net #3055612) 
patch sumbitted by Ben Kibbey
 2010-08-30 12:06:50 +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
ebd8a6d9fa Merge remote branch 'origin/master' into lua-config 2010-08-28 12:28:37 +02:00
Pavel Labath
0d9052b83b Add modelines to imlib.h 2010-08-28 12:26:12 +02:00
Pavel Labath
0ac1c21ece Avoid compiler warning 2010-08-27 16:24:26 +02:00