1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-20 03:51:18 +00:00
Commit Graph

46 Commits

Author SHA1 Message Date
Pavel Labath
09c0bccf55 Move vi modelines closer to the beginning, so they're more likely to be actually used. 2009-09-12 12:50:51 +02:00
Nikolas Garofil
44b82311b9 Added support for out_to_ncurses
All ERR()'s are renamed to NORM_ERR() and box to mbox so that they don't
clash with things in ncurses.h .
Ncurses is enabled by default when building conky but can be disabled with
--disable-ncurses .
At the moment configure doesn't check if ncurses is actually available.
I'm adding support for ncurses so that we can make as much things as possible
that are only available in X11 also available in console in the future.
2009-08-01 20:45:43 +02:00
Cesare Tirabassi
81c691d15a add emacs indentation variables to source files in line with current vim settings 2009-07-28 23:44:22 +02:00
Brenden Matthews
d97cd93a1c Add vim modelines. 2009-07-27 14:47:31 -06:00
Brenden Matthews
90932b87e1 Update MPD elapsed/progress when stopped. 2009-07-19 11:59:20 -06:00
Ole Christian Tvedt
5f31a052bb Fixed $if_mpd_playing. Would not return false after true.
Previously, is_playing was never returned to 0 even if a song stopped
playing.

Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-06-14 20:07:59 -06:00
Ole Christian Tvedt
9048af353a Read MPD connection data from environment.
Most MPD clients read the MPD_HOST and MPD_PORT
environment variables. Now, conky will too.

MPD_HOST can be either "hostname" or "password@hostname".

If a user specifies a host in the configuration, the
password set in MPD_HOST will be ignored. This is to
prevent the password from being sent to the wrong host.

In other words, if the host is specified in the conky
configuration, the password must be too (if there is
one).

Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-06-14 20:07:59 -06:00
Brenden Matthews
f05829ad9a Update copyright stuff, fix conky.conf weirdness. 2009-03-29 22:55:51 -06:00
Phil Sutter
363bed34ac fix temporary printing of "(null)" for mpd vars
To minimise the chance of printing variables in an undefined state, call
free() as late as possible (i.e., right before strdup()'ing the new
value).
2009-03-23 23:46:10 +01:00
Sattvik
482dd1b82f Null mpd variables should have an empty string patch sf.net id #2564747. 2009-02-17 22:42:08 -07:00
Phil Sutter
757983ab56 internal rewrite of mpd support
Handle mpd internal information inside mpd.c. Use a refcounter to check
if the mpd-information can be freed (maybe useless). Remove the now
useless "full" flag of free_text_objects.
2008-12-18 13:40:21 +01:00
Phil Sutter
9a85812e06 here comes the big header include rewrite
Some statics are now defined by configure.ac.in, conky.h got a lot
smaller, which I see as a positive sign.

This patch should not change any functionality, just change what's
defined where. Some features I did/could not test are probably broken,
also compiling for any other OS surely won't complete now. Though I
think fixing these problems is as easy as including some missing
headers.

I've done compile checks with the following configure options:
./configure --enable-eve --enable-rss --enable-smapi
	--enable-wlan --enable-debug --enable-testing

So what needs to be tested is:
- audacious
- BMPx
- xmms2
- nvidia
2008-12-15 23:12:33 +01:00
Brenden Matthews
dc3ed8df13 Removing old svn keywords. 2008-12-09 16:35:49 -07:00
Brenden Matthews
a40cfd9702 Add an option to timed_thread_test() to not wait for the interval period (so that IMAP IDLE works better) 2008-12-09 01:37:59 -07:00
Brenden Matthews
4be537a020 * Added $if_mpd_playing patch (thanks tarpman)
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1267 7f574dfc-610e-0410-a909-a81674777703
2008-10-08 11:44:27 +00:00
Kevin Lyles
40f2fcfd7b Fixed compilation issues with --enable-testing
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1164 7f574dfc-610e-0410-a909-a81674777703
2008-06-19 06:17:53 +00:00
Kevin Lyles
610b0b628d Split conky.h into several smaller header files
In order to do this correctly:
	Removed duplicate includes
	Fixed mpd functions to accept mpd_s instead of information
	Freed mpd.h of any need to include conky.h (mpd.c still includes it for the constants)



git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1154 7f574dfc-610e-0410-a909-a81674777703
2008-06-14 18:41:12 +00:00
Brenden Matthews
be2cd44e6d doc cleanup
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1090 7f574dfc-610e-0410-a909-a81674777703
2008-03-31 04:56:39 +00:00
Brenden Matthews
3efefaf182 * Fixed bug in libmpdclient that caused file descriptors to be left open.
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1080 7f574dfc-610e-0410-a909-a81674777703
2008-03-30 01:23:04 +00:00
Phil
2da63063d8 make use of __attribute__
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1076 7f574dfc-610e-0410-a909-a81674777703
2008-03-29 11:35:02 +00:00
Phil
2913a71216 the big relocation patch
* this moves all declarations to the beginning of their block
  to prevent mixed declarations and code


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1068 7f574dfc-610e-0410-a909-a81674777703
2008-03-29 06:24:04 +00:00
Phil
963bb6211c fix thread definitions
* we code against interfaces (void *f(void *))
* casting function pointers to object pointers
  is a no-no says gcc


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1065 7f574dfc-610e-0410-a909-a81674777703
2008-03-29 05:14:35 +00:00
Brenden Matthews
934c3a94e8 fixing up text_buffer_size stuff
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1021 7f574dfc-610e-0410-a909-a81674777703
2008-03-20 21:28:19 +00:00
Brenden Matthews
2698046591 2008-03-19
* Fixed a number of small memory leaks.
	* Performed some minor profiling on Conky; introduced
	small_text_buffer_size and large_text_buffer_size config options instead
	of just text_buffer_size.
	* Fixed some minor bugs introduced by new patches.


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1014 7f574dfc-610e-0410-a909-a81674777703
2008-03-19 22:28:23 +00:00
Kevin Lyles
3d26a4880e Reformatted all code
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1007 7f574dfc-610e-0410-a909-a81674777703
2008-02-20 20:30:45 +00:00
Brenden Matthews
da182541fb oops; don't clear mpd stuff after setting status
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@968 7f574dfc-610e-0410-a909-a81674777703
2007-10-02 23:51:49 +00:00
Brenden Matthews
7e2b84c93e small mpd fix (fixes minor breakage in recent mpd improvements)
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@965 7f574dfc-610e-0410-a909-a81674777703
2007-09-28 19:50:58 +00:00
Brenden Matthews
c09d5346a0 fix var clearing stuff in mpd thread
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@946 7f574dfc-610e-0410-a909-a81674777703
2007-09-01 20:36:56 +00:00
Brenden Matthews
0863020b6e unlock mutexes correctly
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@945 7f574dfc-610e-0410-a909-a81674777703
2007-09-01 18:18:26 +00:00
Brenden Matthews
0ae51e37ee fix clearing issue with mpd
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@944 7f574dfc-610e-0410-a909-a81674777703
2007-08-31 23:45:41 +00:00
Brenden Matthews
ef272217d9 * _Really_ fix mpd SIGPIPE issues
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@942 7f574dfc-610e-0410-a909-a81674777703
2007-08-31 18:32:51 +00:00
Brenden Matthews
c16e2a66fe fixup mpd stuff
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@936 7f574dfc-610e-0410-a909-a81674777703
2007-08-31 03:37:32 +00:00
Brenden Matthews
12baf6c0b4 some small fixes for mpd stuff
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@935 7f574dfc-610e-0410-a909-a81674777703
2007-08-31 02:05:02 +00:00
Brenden Matthews
2fcd64d59e * Use timed_thread for mpd
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@934 7f574dfc-610e-0410-a909-a81674777703
2007-08-30 17:21:30 +00:00
Brenden Matthews
9b71a6cd7b * Fixed issue with SIGPIPE and mpd
* Updated COPYING (with more clarifications)

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@927 7f574dfc-610e-0410-a909-a81674777703
2007-08-27 20:26:58 +00:00
Brenden Matthews
27b4c8550c clarifying licensing
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@904 7f574dfc-610e-0410-a909-a81674777703
2007-08-10 19:53:44 +00:00
Brenden Matthews
f95d63bf56 * Fixed potential issue on FreeBSD when nprocs < 10 (thanks zotrix)
* Added support for multiple batteries when using acpi (thanks Phil)
    * a bunch of code cleanups (thanks Psychon)
    * added max length paramater to mpd_title (thinks fow)
    * a number of small bug fixes


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@889 7f574dfc-610e-0410-a909-a81674777703
2007-08-05 04:47:21 +00:00
Jasper
2a35f75225 add a header to these files, just like in the other files.
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@598 7f574dfc-610e-0410-a909-a81674777703
2006-03-16 18:29:23 +00:00
Philip Kovacs
3e8d1ee0e3 mpd: replace Unknown's with blank
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@534 7f574dfc-610e-0410-a909-a81674777703
2006-02-14 18:26:52 +00:00
Brenden Matthews
af523cb966 mpd fix
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@531 7f574dfc-610e-0410-a909-a81674777703
2006-02-14 01:58:20 +00:00
Brenden Matthews
b123e01d42 mpd fixes
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@527 7f574dfc-610e-0410-a909-a81674777703
2006-02-13 04:14:17 +00:00
Brenden Matthews
c8e33e9cc3 mpd improvements
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@521 7f574dfc-610e-0410-a909-a81674777703
2006-01-31 03:32:26 +00:00
Johannes Winkelmann
03cc602812 fix memory leak in mpd introduced in rev 1.3, sf patch 1319461 (1024 bytes per update when mpd in "stopped" or "unknown" state, 1024 when changing from play to "stop")
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@349 7f574dfc-610e-0410-a909-a81674777703
2005-10-16 15:32:33 +00:00
Brenden Matthews
0c90c2a30a patch 1319461
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@343 7f574dfc-610e-0410-a909-a81674777703
2005-10-11 01:37:46 +00:00
Brenden Matthews
471fcabc90 fixed graph width issue
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@262 7f574dfc-610e-0410-a909-a81674777703
2005-09-04 03:43:18 +00:00
Brenden Matthews
e5893c4329 moved stuff
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@130 7f574dfc-610e-0410-a909-a81674777703
2005-08-21 22:10:54 +00:00