2791 Commits

Author	SHA1	Message	Date
Kevin Lyles	09467931d4	Fix graph auto-scaling when the width is 0	2012-10-03 22:45:13 +02:00
Pavel Labath	6f62e113f1	Do not truncate non-human-readable numbers to 32bit (sf.net #3564560) ... patch by hdastwb	2012-09-04 12:58:54 +02:00
Nikolas Garofil	a0052f6b19	Fix building without X11 ... Fix by Scott Moreau	2012-08-26 13:53:25 +02:00
Nikolas Garofil	79636ef8dd	Merge branch 'master' of git://git.omp.am/conky	2012-07-25 21:34:32 +02:00
Nikolas Garofil	19b9441704	fix if_existing bugs ... - it was returning reverse results when searching strings in file - if didn't detect that files didn't exist when searching for strings	2012-07-20 13:44:53 +02:00
Pavel Labath	8bae807f68	Add a missing include	2012-07-19 18:42:34 +02:00
Nikolas Garofil	3cca68ed3e	Fix -i, -u, -x and -y option	2012-07-17 00:05:54 +02:00
Pavel Labath	b34a1a21e7	Use lround instead of std::lround ... for unknown reasons DragonFly's gcc does not have lround in the std namespace cf. sf.net #3289079	2012-07-13 20:17:54 +02:00
Magliano Andrea	abdb5582bd	Proper handle missing statfs64 ... statfs64 ist atm linux specific; wrap statfs around it. Also cleanup param.h and mount.h including: the assumption in fs.cc that their presence is a sign of *BSDs is wrong, as they exist in linux too with different meaning. Besides presence of mount.h isn't detected in Conky.cmake, so conditional including mount.h in fs.cc is useless. Is just works because mount.h and param.h are included in freebsd.h and dragonfly.h later on. They are unneded in linux. Just remove conditional including of mount.h and param.h in fs.cc, conditional wrap statfs64 in proper *BSD header files.	2012-07-06 15:13:59 +02:00
Pavel Labath	31c2f82842	Fall back to statfs if statfs64 not present ... mostly needed for the dragonfly port (sf.net #3289079)	2012-07-05 16:41:58 +02:00
Pavel Labath	fa575171c4	Remove -D_GNU_SOURCE and do not use GNU extensions ... we hope to compile on non-GNU systems as well	2012-07-01 15:05:27 +02:00
Magliano Andrea	78b1daf848	Update docs + minor changes ... * document DragonFly specific $version variable * add sample conky config file * some dragonfly.cc code cleanup	2012-06-28 19:05:28 +02:00
Magliano Andrea	d5af1be997	Forgot the very new stuff (dragonfly.cc dragonfly.h) ... this actually pertains to 24aaeb2b15e317211af7c94ffddf7b1da1493372	2012-06-28 19:05:07 +02:00
Magliano Andrea	9268165d71	Usable state reached (use top.cc + minor changes) ... * process* management left to top.cc * compile with -Wall -Werror (lots of wasted time for stupid errors) * unify find_process() and new_process(), as used always together Signed-off-by: Pavel Labath <pavelo@centrum.sk>	2012-06-28 19:04:31 +02:00
Magliano Andrea	98196d0e6b	Preliminary import from 2.8.1 git release ... * don't use kvm_* calls, just sysctl (so no suid perm necessary) * sysctls calls in general aren't thread safe, collapse callbacks using same sysctls (specifically total/running procs and proc list ones). Some sysctls need two calls (first to get size of obj returned, second to get object self); if different threads use this schema on same sysctl, weird values are returned (first/second calls sequence should be serialized). In general it makes not much sense too having more threads that use the same sysctl; just get info once and populate all data. * add DragonFly specific extended uname string ($version in conky.conf) with git version and signature Todo: - top process list logic is old style, use top.cc funcs. - find a solution for cpu freq Signed-off-by: Pavel Labath <pavelo@centrum.sk>	2012-06-28 18:56:01 +02:00
Pavel Labath	4c1ec83174	Fix "Using log-scaled graph with show_graph_scale causes segfault" (sf.net #3538674) ... bug reported by Nikslay	2012-06-28 18:26:49 +02:00
Pavel Labath	6b0d6a9f32	Fix a segfault in graph drawing code (sf.net #3537523) ... PS: boy, is that code messy or what bug reported by b3niup	2012-06-26 22:43:12 +02:00
Pavel Labath	b5dc59e9b2	Fix building with BUILD_HTTP ... bug reported by arclance	2012-06-04 23:29:27 +02:00
Pavel Labath	dea2c56582	Fix building on Debian GNU/kFreeBSD (sf.net #3525356)	2012-06-04 16:27:36 +02:00
Pavel Labath	1e5eba211d	Fix `lua hooks are not being called' (sf.net #3501425)	2012-06-03 16:52:16 +02:00
Pavel Labath	11e32706d4	Fix `using "draw_shades yes" lua script runs twice per update' (sf.net #3524540) ... bugreported by arclance	2012-06-03 16:24:37 +02:00
Brenden Matthews	ddef05d4eb	Update version, copyright.	2012-05-03 16:34:44 -07:00
Kevin Lyles	810535a386	Fix overflow in comparisons. ... Fix other comparison issues (integer truncation, overflow in cpu time) Signed-off-by: Brenden Matthews <brenden@diddyinc.com>	2012-05-03 14:08:04 -07:00
Jim Duchek	413ad89ecf	Fixed version string ... Signed-off-by: Brenden Matthews <brenden@diddyinc.com>	2012-05-03 14:06:50 -07:00
Jim Duchek	13a324a462	Remove comment ... Signed-off-by: Brenden Matthews <brenden@diddyinc.com>	2012-05-03 14:06:50 -07:00
Jim Duchek	bf7248ecd6	Fixed GCC 4.7.0 issues, double buffering ... Signed-off-by: Brenden Matthews <brenden@diddyinc.com>	2012-05-03 14:06:50 -07:00
Brenden Matthews	cf7610cf42	Build fix for defconfig.h.	2012-03-07 13:43:26 -08:00
Brenden Matthews	19fc6e1a75	Build fix for Lua >=5.2. ... See Gentoo bug at https://bugs.gentoo.org/show_bug.cgi?id=407089.	2012-03-07 13:37:41 -08:00
Pavel Labath	be4854c6bb	add mpd_date function that shows date for current track (sf.net #3440445) ... patch submitted by Andrey Tikhonov	2012-01-29 21:14:19 +01:00
Nikolas Garofil	6cce8e8e11	fix wrong alignments when font changes (sf.net #3461442)	2012-01-12 20:55:11 +01:00
Nikolas Garofil	59f79105bd	Show "No Address" instead of "::" when there is no address	2012-01-09 11:20:53 +01:00
Nikolas Garofil	2039d6232e	bugfix: $v6addr shows addresses double	2012-01-09 00:23:09 +01:00
Nikolas Garofil	7702c525a7	remove removed network devices (sf.net #3468653)	2012-01-08 15:45:08 +01:00
Pavel Labath	9df83969e7	Fix "rhost undeclared" (sf.net #3466456) ... patch by Jaromír Cápík	2012-01-03 10:39:12 +01:00
Pavel Labath	09dd497314	Second part of the statfs64 patch ... this also fixes the $fs_type variable.	2011-11-02 19:18:02 +01:00
Pavel Labath	3ed782c75c	A slightly better fix for the double-free problem ... one of those frees is completely unnecessary	2011-11-01 19:10:37 +01:00
Pavel Labath	749328456b	Avoid double free on tempgrad graphs ... bug reported by billie.	2011-11-01 19:06:41 +01:00
Pavel Labath	dccf796b42	Use statfs64 for $fs_* to support very large volumes ... bug reported by puppetm.	2011-11-01 16:17:15 +01:00
Brenden Matthews	b3e706aefd	RFC 3501 only requires + for IMAP continuation.	2011-10-31 15:17:47 +01:00
Brenden Matthews	e9a5b23711	Fix another regression from c1277d650b.	2011-10-31 15:16:54 +01:00
Brenden Matthews	e08ccb7512	Fix for regression introduced by 951cb1ac7e.	2011-10-31 13:41:30 +01:00
Pavel Labath	4463a100ba	Increase MAX_NET_INTERFACES to 64 ... also change a magic constant in net_stat.h to reflect the fact that it depends on MAX_NET_INTERFACES. For more info, see sf.net #2872682 and gentoo bug #384505 ps: this should really be solved in a more need way, without the need for static arrays	2011-10-25 19:00:39 +02:00
Pavel Labath	951cb1ac7e	Fix graph updating for large (>512pix) graphs (sf.net #3253656) ... apparently, this was actually a feature as someone made it deliberately act that way. However, I agree with the bug reporter that it is strange so I remove it.	2011-10-23 22:34:51 +02:00
Pavel Labath	6482283c03	Revert default value of alignment to BOTTOM_LEFT ... previous default value NONE behaved strangely in combination with other default settings.	2011-10-23 22:26:15 +02:00
Pavel Labath	04a9a7f137	Fix xmms2 stream updating (sf.net #3150884) ... Currently the variables related to xmms2 in conky do not update if the currently playing track has any of its information updated (ie: the title changes). This results in incorrect behaviour for streams where the same track is continually played but the title and artist change as new songs are played. The attached patch corrects this issue by changing conky to respond to a callback that fires when xmms2 media library entries are updated. After the callback fires, the patch checks to see if the media library entry that changed corresponds to the currently playing song and if it does updates the conky xmms2 related variables accordingly. A different version of the patch was previously submitted and accepted into conky. Unfortunately, this patch contained a bug that caused conky xmms2 variables to be updated when any media library information was updated. However, the previous patch was reverted as a result of a commit the made conky compatible with a new version of the xmms2 client api. Patch submitted by Tamim Khan. Signed-off-by: Pavel Labath <pavelo@centrum.sk>	2011-10-19 16:38:26 +02:00
Pavel Labath	cd9cd2151b	Support IMAP responses which arrive fragmented (sf.net #3182411) ... bug reported by Richard De Boer	2011-10-16 12:24:26 +02:00
Pavel Labath	8e3df58eea	Ignore whitespace in parameters of $pid_* (sf.net #3423766) ... This enables one to pass the output of $top to these variables. It was not possible before, because $top pads the pids with spaces.	2011-10-15 14:27:09 +02:00
Pavel Labath	ee8a9e6b0f	Don't abort when config references a non-existant hwmon file ... this sort of fixes sf.net #3306538. The person there correctly tested for the existance of the file with $if_existing, but the problem is we run the callbacks regardless of the conditional tests.	2011-10-13 10:28:12 +02:00
Christian Brabandt	354e577b15	Cmus support added to conky	2011-10-13 09:41:53 +02:00
Pavel Labath	b1f6ac1688	Remove 'top_field' enum since it is unused	2011-10-10 22:12:05 +02:00
Pavel Labath	6c04ba542b	Add uid to "top" output (sf.net #3178916) ... original patch submitted by Thomas Wiegner, I added support for printing of raw uids.	2011-10-10 22:11:34 +02:00
Pavel Labath	f6b38df642	Remove SECRIT_MULTILINE_CHAR hack ... Noone knows what it was supposed to do and removing it seems to fix sf.net #3411610 (and probably a few others). If it turns out it was doing something useful, we will try to reintroduce it without breaking other things.	2011-10-10 21:04:57 +02:00
Pavel Labath	ddaa48a29e	Use %llu instead of %Lu in the previous commit	2011-10-02 19:29:07 +02:00
Peter Hercek	4345050a6a	mem_vsize and mem_res need to be 64 bit (sf.net #3366272) ... if process allocated 4GiB or more of ram then {top mem_vsize} did not report correct number Signed-off-by: Pavel Labath <pavelo@centrum.sk>	2011-10-02 19:26:10 +02:00
Pavel Labath	3be2b41fbf	fix compilation of freebsd.cc	2011-10-02 14:44:52 +02:00
Pavel Labath	ec2398ff18	c++ify linux.cc:is_disk()	2011-10-02 14:43:44 +02:00
Pavel Labath	0493ba853c	Emulate O_CLOEXEC on systems that don't support it	2011-10-01 22:18:25 +02:00
Pavel Labath	b2331969d5	Fix a crash on exit when using curl ... The problem was that the callback thread is destroyed only in the destructor of the callback_base class (which is called after the destructor of the derived classes). This means that the thread is running even when it's object is partly destroyed, which can cause segfaults, race conditions and other nasty problems. I've fixed it so that the thread is destroyed before the underlying object's destructor is called.	2011-09-28 18:31:05 +02:00
Pavel Labath	6480df48f3	Revert "Fix short_units for below kilo values." ... I revert this, because it breaks padding for numbers < 1000, which causes ugly text shifts when numbers change from <1000 to >1000. If someone disagrees with this, we can talk about it in #conky. I asked before doing this, but noone seemed to care. This "fixes" bug #3389641 on sf.net, reported by sakalisc. This reverts commit c9cf08d9e9. Conflicts: src/conky.cc	2011-09-18 19:16:14 +02:00
Pavel Labath	c9a306defd	Use monotonic time when calculating the update interval (fixes sf.net #2970255) ... when the system clock is moved backwards, the update interval would be calculated incorrectly. If it was moved back far enough, conky would use 100% cpu. Conky now uses monotonic clock to prevent this. If it turns out to be unsupported on some platform, an appropriate fallback can be added. problem reported by norsetto	2011-09-17 13:12:30 +02:00
Pavel Labath	542e0c085e	Support imap passwords with strange characters (sf.net #3402448) ... conky now sends the password using the length + string format, which should not need any quoting of special characters. Hopefully, we won't find a server which does not support this encoding. This also fixes a bug which prevented the password from being entered from the console. bug reported by Brent	2011-09-16 22:16:05 +02:00
Pavel Labath	1321a41015	Fix 'conky-1.8.1 does not build with curl-7.21.7' (sf.net #3383906) ... In the new version of curl, types.h no longer exists. I just removed the offending include as is seems to be unnecessary. bug reported by billie80.	2011-08-01 22:40:23 +02:00
Nikolas Garofil	d59751e19f	Fix a few warnings with gcc 4.4.5	2011-03-27 20:42:18 +02:00
Pavel Labath	b1eab2be0e	gcc-4.5 compatibility fixes	2011-03-27 14:45:38 +02:00
Pavel Labath	17cf8517c3	Merge remote branch 'origin/master' into lua-config	2011-03-26 21:09:00 +01:00
Pavel Labath	75e147fa25	Remove timed_thread code as it is no longer used.	2011-03-26 21:04:07 +01:00
Pavel Labath	f3dfb21859	Make mpd vars use the new update system	2011-03-26 19:35:11 +01:00
Pavel Labath	ba9be3fa18	Make moc vars use the new callback system	2011-03-26 19:35:11 +01:00
Pavel Labath	ad8dfc0853	Make audacious vars use the new update system	2011-03-26 19:35:03 +01:00
Pavel Labath	06304030a2	update system: clear multiple posts in case of slow updates	2011-03-25 12:33:13 +01:00
Pavel Labath	b99c7291bc	Make mail variables use the new callback system	2011-03-25 12:26:49 +01:00
Pavel Labath	367bb58dae	Improvements in the update callback system ... - a function for easier access to the members of the tuple - the is_done() function	2011-03-20 16:53:15 +01:00
Pavel Labath	0eaf5edbb8	Outsource merging of two callbacks into a separate function	2011-03-15 15:13:13 +01:00
Pavel Labath	70da1c8b37	Allow xmms2_smart to display only the title (sf.net #3140371) ... In the current implementation of xmms2_smart, when a song being played does not have an artist name (as is the case with many streams) conky displays an empty space a dash followed by the title (ex: " - Song Title"). The following patch improves this by only displaying the song title in xmms2_smart when the song artist is empty. Moreover, the patch also fixes an issue that existed with the previous xmms2_smart which seemed to be checking the string length of the song title twice before outputing the url of the song. This seems like a typo and what this line likely meant to do was check that both the song artist and song title were empty before displaying the song url. Patch contributed by Tamim Khan. Signed-off-by: Pavel Labath <pavelo@centrum.sk>	2011-03-04 19:29:52 +01:00
Pavel Labath	82d563e18a	gcc-4.5 compatibility fix (kinda) ... (kinda = I don't know why it compiled in 4.4 in the first place)	2011-03-03 23:58:26 +01:00
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
Pavel Labath	71e6a23729	Merge remote branch 'origin/master' into lua-config	2010-08-27 14:56:55 +02:00
Pavel Labath	b5f4c0f7e9	Update modelines on imlib.cc	2010-08-27 14:20:26 +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
Brenden Matthews	dee932d83b	Fix crash in mail stuff due to bad free().	2010-08-26 10:34:34 -07: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	af4633a8ee	fix compilation errors in previous commit	2010-08-24 22:27:09 +02:00
Pavel Labath	684933416c	Fix segfault in i8k (sf.net #3007167) ... Apparently, sometimes the value of i8k.right_fan_status is sometimes null. This just makes sure the null value isn't passed to atoi(3). A better solution would be to figure out why is it null, but I cannot do that as I don't have the hardware.	2010-08-24 21:50:07 +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	3a9823b7f3	Add one more pushstring overload to lua::state	2010-08-21 21:06:34 +02:00
Pavel Labath	da5d739fd9	gcc-4.5 fix (kinda) ... actually it was more of a bug in the code, but it worked in gcc-4.4	2010-08-21 18:01:16 +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	6b45fe1ef0	fix apcupsd compilation	2010-08-19 16:26:34 +02:00
Pavel Labath	a087333285	add missing include	2010-08-19 16:22:09 +02:00
Pavel Labath	1936d6a2ef	fix typo	2010-08-16 16:42:30 +02:00
Pavel Labath	abeadb59d7	Use getaddrinfo instead of gethostbyname ... Patches conky to use getaddrinfo instead of gethostbyname everywhere. gethostbyname is rather flawed and doesn't support IPv6 properly. Patch contributed by Pascal Bleser	2010-08-15 15:56:36 +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	14511b19ea	Make $fs_used_perc and $fs_bar report used space correctly ... they reported fs->size - fs->avail, which is not correct if fs has super-user reserved blocks. note that now $fs_used_perc and $fs_free_perc need not add up to 100%, but that is consistent with what $fs_used and $fs_free do.	2010-08-12 20:58:21 +02:00
Pavel Labath	699d6bed40	Fix buffer overflows in eve.c (sf.net #3034056)	2010-08-12 17:26:07 +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
Pavel Labath	e70df5e477	Ignore spaces in {} when breaking up arguments to $lua	2010-06-18 17:55:49 +02:00
Pavel Labath	945b52b9a6	Use pass-by-reference paramers in ccurl_thread where possible	2010-06-17 15:19:31 +02:00
Pavel Labath	1cf1b5c631	Fix overflow in ccurl_thread interval caused by 0f213c89	2010-06-17 15:12:42 +02:00
Pavel Labath	b82250d551	Small build fix & zero playtime and progress bars when XMMS2 playback is stopped. ... patch contributed by sleipner	2010-06-13 19:10:59 +02:00
Pavel Labath	0f213c89f2	Simplify timed_thread time calculations with some c++0x magic	2010-06-10 19:19:49 +02:00
Pavel Labath	6642004d61	gcc-4.5 compatibility fix	2010-06-10 19:19:49 +02:00
Pavel Labath	e5c9172de3	Use reference parameters where possible	2010-06-10 19:19:49 +02:00
Nikolas Garofil	99fc975780	Add support for $wireless_freq	2010-06-07 10:50:02 +02:00
Nikolas Garofil	6ccde5e7e7	Add support for $wireless_channel (based on a patch by Timothy Ball)	2010-06-07 09:54:25 +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
Alexander Graf	1180733e13	${top}: fix bug of living dead processes ... This fixes a bug occurred with 0b3e3c637e. Dead processes still appeared in ${top} under FreeBSD and OpenBSD. This was because I forgot to update the g_time variable which is used as time stamp in the process list. Signed-off-by: Alexander Graf <agraf@znc.in>	2010-06-03 22:11:57 +02:00
Nikolas Garofil	3fa1ca15e1	Fix previous commit	2010-06-02 19:28:40 +02:00
Nikolas Garofil	d80c372a5c	Fix segfault in mail folder (SF: 3007493)	2010-06-02 18:00:38 +02:00
Alexander Graf	319ff32283	shorten top compare functions ... A substraction is used instead of if, else if, else. This is much shorter. Signed-off-by: Alexander Graf <agraf@znc.in>	2010-05-30 17:52:00 +02:00
Nikolas Garofil	bf7c2bafc2	fix tiny memleak when $top is used wrong	2010-05-30 17:13:40 +02:00
Alexander Graf	0b3e3c637e	${top}: big cleanup ... Linux-specific code in top.cc was moved to linux.cc. Redundant code (e.g. the parts sorting by CPU usage, CPU time or memory usage) was removed. Sorting etc. happens in top.cc, whilst platform-dependent code in linux.cc, freebsd.cc or openbsd.cc just builds up the process table. In the Linux code, some functions had a return value which was never evaluated. They return void now. I tested it on FreeBSD and Linux; The OpenBSD port does not compile anyway. I changed the OpenBSD parts, too, so that it will be less effort to get conky working under OpenBSD. Signed-off-by: Alexander Graf <agraf@znc.in>	2010-05-30 13:55:50 +02:00
Alexander Graf	cc35a00a30	Fix segmentation violation bug in freebsd.cc ... Last patch removed a needed strndup(). Signed-off-by: Alexander Graf <agraf@znc.in> Signed-off-by: Pavel Labath <pavelo@centrum.sk>	2010-05-28 18:58:23 +02:00
Alexander Graf	b0e5e2cd22	${top} improvements for FreeBSD ... - Displaying of CPU time of the processes now works - ${top_time} (sorting by CPU time) works - Using memcpy() instead of many sequential assignments (more clear, less lines, maybe faster, less effort to change something) Signed-off-by: Alexander Graf <agraf@znc.in> Signed-off-by: Pavel Labath <pavelo@centrum.sk>	2010-05-28 18:58:23 +02:00
Nikolas Garofil	53b167a84a	Let $ical show recurring events that had the first start in the past but have one of the next starts in the future. ... Each recurring event is only showed once, maybe i'll change this in the future	2010-05-25 17:33:55 +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
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
Nikolas Garofil	064c6f9e42	Fix wrong mixer values on some systems (thanks hoffa)	2010-02-12 17:03:25 +01:00
Pavel Labath	2d4d2ef4c0	std::function can't be used as a __gc function, provide a simple alternative	2010-02-12 15:05:46 +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
Pavel Labath	6e5c781a78	small bugfix in lua::state::settable	2010-02-11 21:29:02 +01:00
Pavel Labath	fd671ced8f	Move rawset() to the proper category	2010-02-11 21:08:32 +01:00
Pavel Labath	8fe39ab39b	Add a function for retrieving registered data sources	2010-02-11 21:01:59 +01:00
Pavel Labath	109770ac31	Merge remote branch 'origin/master' into lua-config	2010-02-11 16:40:37 +01:00
Pavel Labath	4eda1a8eda	A framework for registering data sources ... This is needed so that we know which sources to export to lua, and a huge switch or something is just too ugly.	2010-02-11 16:30:05 +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
Pavel Labath	4a68be2494	include <config.h> ... not that we need it much, but...	2010-02-11 01:43:48 +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
Pavel Labath	dfb106ac0e	Fix multiple definition error	2010-02-10 21:17:40 +01:00
Pavel Labath	90b30f14f9	Oops, forgot inclusion guards	2010-02-10 19:47:16 +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
Pavel Labath	e4461782ef	C++ binding for lua, with some fancy features ... such as being able to throw exceptions across c++-lua boundary. For more details, see comments in the source code.	2010-02-10 17:34:09 +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
Nikolas Garofil	287c38a0b9	Added support for builtin config in cmake	2010-01-17 03:00:51 +01:00
Dmitry Marakasov	5664cc3d13	Add SMP support for FreeBSD. ... Original patch written by Ivan Klymenko <fidaj@ukr.net>. Signed-off-by: Brenden Matthews <brenden@diddyinc.com>	2010-01-16 10:55:20 -08:00
Pavel Labath	3a23eb5f6c	Fix "off-by-one" bug in hddtemp found by valgrind	2010-01-15 23:41:04 +01:00
Brenden Matthews	002685c0ce	Make timed-thread a lib, rename files.	2010-01-13 10:52:54 -08:00
Pavel Labath	b7028cb9e5	Make weather.cc more c++-ish (and get rid of a leak in the process)	2010-01-13 13:59:24 +01:00
Pavel Labath	c62266a5db	Make sure the $exec buffer is null-terminated	2010-01-13 13:34:14 +01:00
Pavel Labath	86e744d334	Fix slightly over-zealous s///	2010-01-13 10:49:36 +01:00
Brenden Matthews	081d04a059	Pass by value here too.	2010-01-12 10:38:30 -08:00
Brenden Matthews	e0502719a0	Pass function by value to timed_thread::create().	2010-01-12 10:30:37 -08:00
Pavel Labath	0f3a56ccbe	An attempt at making wifi work ... Someone who has iwlib should really test this.	2010-01-11 01:13:42 +01:00
Pavel Labath	47509b38bd	An attempt at making lua bindings work	2010-01-11 00:35:22 +01:00
Phil Sutter	bdda06f4ea	fix segfaults in CRIT_ERR condition ... - pthread_join() on uninitialised threads causes segfault - XFreeFont() dislikes font being zero	2010-01-10 22:09:33 +01:00
Phil Sutter	3ab853af65	fix for a fatal X11 error (possible creation of zero-sized window)	2010-01-10 22:07:52 +01:00
Phil Sutter	0bdff28f69	fix smapi move to C++	2010-01-10 22:06:01 +01:00
Phil Sutter	081f5e1699	make imlib2.c a C++ source, as it uses the C++ symbol 'to_real_path()'	2010-01-10 22:04:15 +01:00
Pavel Labath	e554e6ff67	If we want a function to change the object, we need to pass it by reference	2010-01-07 19:50:00 +01:00
Pavel Labath	4c2d634f07	Unbreak weather and iostats ... The weather still doesn't quite work for me though.	2010-01-07 19:14:53 +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
Pavel Labath	d61c545973	"Port" nvidia code to c++	2010-01-06 20:57:13 +01:00
Brenden Matthews	9b46a61ae6	Don't include non-existent files.	2010-01-06 11:33:42 -08:00
Brenden Matthews	5d20ed4b8c	Fix small logic error in diskio.	2010-01-06 10:18:32 -08:00
Cesare Tirabassi	2568030509	Fix sigsegv if cpu_usage has not yet been populated (seen on 1.8.0_rc1)	2010-01-05 16:59:50 +01:00
Brenden Matthews	7ff762e4af	Resolve issues with timed_thread rewrite WIP.	2010-01-04 19:21:12 -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	01ac47d082	Implement timed_thread rewrite in C++. ... Rewrote timed_thread library in C++ using fancy new C++0x features. The main reason for this is to phase out poor encapsulation and C-style function pointers.	2010-01-04 19:21:12 -08:00
Brenden Matthews	58cbbf57a3	Coulpe minor build fixes.	2010-01-04 18:43:40 -08:00
Brenden Matthews	b8a678728c	Remove automake build system, fix defconfig.h.	2010-01-04 18:07:49 -08:00
Cesare Tirabassi	36b6facaf5	Remove compiler warning about uninitialized variable	2010-01-03 18:52:22 +01:00
Brenden Matthews	9acf0bb4c0	Fix some minor memleaks, fix crash on reload. ... It seems that closing xft fonts on reload is a bad idea, but this seems to result in a memory leak. As far as I can tell, the leak doesn't grow beyond the initial allocation however.	2010-01-02 14:44:20 -08:00
Brenden Matthews	39f01e216b	Added disable_auto_reload option, callback fixes. ... There were some issues with reloading and the threaded callback framework, which I think are mostly resolved now, but may need more testing.	2010-01-02 14:44:12 -08:00
Brenden Matthews	19303af8da	Fix reload problem with ARGB.	2010-01-02 12:12:46 -08:00
Ben Kibbey	c00e7b0a42	Fixes $xmms2_percent and a couple other build fixes. ... Signed-off-by: Brenden Matthews <brenden@diddyinc.com>	2010-01-02 11:50:53 -08:00
Ben Kibbey	ed5e86eb88	Fix the quiet command line option. ... Signed-off-by: Brenden Matthews <brenden@diddyinc.com>	2010-01-02 11:48:50 -08:00
Brenden Matthews	0f5f2a1afe	Improve handling of ARGB visuals a bit. ... Conflicts: src/conky.cc	2010-01-02 11:43:29 -08:00
Brenden Matthews	2951f5571c	Add missing copyright notices.	2010-01-01 15:49:41 -08:00
Brenden Matthews	cf9e498b24	Update copyright notices.	2010-01-01 15:46:17 -08:00
danielb	6c5fa44660	Add ARGB visual support. ... This patch adds the possibility to use a argb visual for the conky window. Adding a boolean configuration entry 'own_window_argb_visual'. the 'set_transparent_background' method sets the alpha bytes of the argb color for transparency, instead of pseudo transparency. This patch would close following feature request: https://sourceforge.net/tracker/?func=detail&aid=1563931&group_id=143975&at id=757311 and would be a workaround for some reported transparency bugs (https://sourceforge.net/tracker/?func=detail&aid=1968923&group_id=143975&a tid=757308 for example) Signed-off-by: Brenden Matthews <brenden@diddyinc.com>	2010-01-01 15:03:40 -08:00
Ben Kibbey	87e422c224	$scroll fix for a text length <= length ... This fixes $scroll to only scroll when the text length is greater than the specified length; hopefully without breaking anything. Signed-off-by: Brenden Matthews <brenden@diddyinc.com>	2010-01-01 14:51:46 -08:00
Ben Kibbey	6e6a1f59e8	Fix hddtemp with disabled drives. ... Some drives are unable to return their temperature when in standby mode. If there is more than one drive installed then other drives may not be able to get parsed. This patch will skip over the unparsable output for the current drive and let others get parsed. Signed-off-by: Brenden Matthews <brenden@diddyinc.com>	2010-01-01 14:50:42 -08:00
Brenden Matthews	4d7d2b27f3	Minor build fix.	2010-01-01 13:45:16 -08:00
Cesare Tirabassi	72bbe51a8c	The HAPPY NEW YEAR commit ... This should close sf #2850092. Basically, before this change, for strings which includes SECRIT_MULTILINE_CHAR the computed maximum substring width was getting summed to the width of the last substring. The old behaviour is kept but for the case of strings including SECRIT_MULTILINE_CHAR, for which now the maximum width of all substrings is taken. I don't think this will break anything else but blame me if it does ...	2009-12-31 23:49:02 +01:00
Phil Sutter	db2282968f	parse the -D flag as early as possible ... In fact, this will make -D being parsed at least before the conkyrc is being read, allowing for debug-output from inside the config-parser. :)	2009-12-29 00:18:12 +01:00
Phil Sutter	6f587402d8	cosmetic fixup session ... - kill trailing whitespace (grep -n ' $' src/*.{c,cc,h}) - eliminate space before tab (grep -n ' ' src/*.{c,cc,h}) (insert tab by pressing CTRL-v first) - little indenting fixup in configure.ac.in (we indent using tabs, not spaces) note: this should not change the actual code at all - if it does, feel free to blame me personally ;)	2009-12-28 21:32:07 +01: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	c4c2377d0e	drop commas at end of enum in top.h	2009-12-28 03:02:06 +01:00
Phil Sutter	dcb35db39d	check return value of write()	2009-12-28 03:02:05 +01:00
Phil Sutter	e99118cf2e	fix for unused results in tailhead.c	2009-12-28 03:02:05 +01:00
Phil Sutter	1ff3f84068	fix for unused results in mboxscan.c	2009-12-28 03:02:05 +01:00
Phil Sutter	43ee33a28d	check return type of dup() in exec.c	2009-12-28 03:02:05 +01:00
Phil Sutter	ac8bb1489d	fix for unused results in eve.c	2009-12-28 03:02:05 +01:00
Phil Sutter	6e53e3278d	implement a safe_asprintf for timeinfo.c	2009-12-28 03:02:05 +01:00
Phil Sutter	aa95dde706	fix for unused results in smapi.c	2009-12-28 03:02:05 +01:00
Phil Sutter	8662e6630e	fix for unused results in linux.c	2009-12-28 03:02:05 +01:00
Phil Sutter	c986aa6346	fix unused result warnings in mail.c	2009-12-28 03:02:05 +01:00