Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-09-30 05:59:07 +00:00
Code Issues Releases Activity
1,476 Commits 5 Branches 46 Tags 22 MiB
b7f2424077
Commit Graph

103 Commits

Author SHA1 Message Date
Brenden Matthews
b7f2424077 Enable Lua by default. 2009-06-02 13:44:45 -06:00
Nikos Ntarmos
8da700b8c1 Delay checking for want_apcupsd. 
The if-clause checking for the host operating system being Linux may
change the value of want_apcupsd. Delay checking for its value until
after that.

Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-05-23 21:08:32 -06:00
Nikos Ntarmos
ec2597f944 Revert "Disable config-output on FreeBSD." 
This reverts commit a54fa6a8f4.

Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-05-23 21:08:31 -06:00
Brenden Matthews
0907f1035a Bump to 1.7.2. 2009-05-21 23:03:06 -06:00
Brenden Matthews
dd5fbeb41b Improve reload_config() window destruction/creation. 2009-05-19 21:34:43 -06:00
Brenden Matthews
ba0eb5d85d Inotify support. 
Added inotify support to reload the config when modified automatically
on systems that support it
 2009-05-19 17:14:34 -06:00
Brenden Matthews
ddcc8ceb70 Merge branch 'master' into imlib2 
Conflicts:
	extras/nano/conky.nanorc
	extras/vim/syntax/conkyrc.vim
 2009-05-17 22:11:40 -06:00
Brenden Matthews
d26b946b7b Merge branch 'master' into imlib2 2009-05-16 18:37:11 -06:00
Brenden Matthews
08fbc21c19 Merge branch 'master' into lua 2009-05-15 13:51:43 -06:00
Toni Spets
0ea5fa1468 disable OpenMP by default, i386 optimization problems 2009-05-15 22:39:47 +03:00
Toni Spets
a64e9f8950 Lua scripting support, initial commit 2009-05-15 21:08:51 +03:00
Brenden Matthews
18b174e967 Merge branch 'master' into imlib2 
Conflicts:
	src/Makefile.am
 2009-05-12 17:52:49 -06:00
Jaromir Smrcek
cf2c61b588 Added support for APC UPS daemon monitoring. 2009-05-10 12:58:06 -06:00
Brenden Matthews
80aaadb48f Merge branch 'master' into imlib2 2009-05-09 21:14:39 -06:00
Brenden Matthews
f49ab7ffcb Only enable OpenMP stuff for gcc >=4.3. 2009-05-09 12:00:09 -06:00
Brenden Matthews
8fbb3a9cfe Merge branch 'master' into imlib2 2009-05-05 17:36:38 -06:00
Brenden Matthews
fde096c435 Added some completely pointless OpenMP optimizations(?) 2009-05-05 17:36:12 -06:00
Brenden Matthews
a98a927116 Merge branch 'master' into imlib2 
Conflicts:
	configure.ac.in
	src/conky.c
 2009-05-01 23:29:21 -06:00
Brenden Matthews
55a388a907 Disable config-output on FreeBSD. 2009-04-28 15:22:00 -06:00
Jérôme Plût
ff9154216b Make ALSA mixers available on Linux, and added $if_mixer_mute. 2009-04-28 10:56:49 -06:00
Nikos Ntarmos
d9923abaa9 Fix FOPENCOOKIE detection glitch 
Using AM_CONDITIONAL's inside an if block is considered "confusing" by
the automake manual[1] and in fact leads to configure code that won't
work unless fopencookie actually exists in a system.

[1] http://sources.redhat.com/automake/automake.html#Conditionals

Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
 2009-03-29 01:25:39 +01:00
Brenden Matthews
4c77eed1c3 Couple minor fixes. 
Make X11_initialise() work as it should, clarified IBM/Lenovo aka smapi
support in configure script.
 2009-03-19 13:42:21 -06:00
Brenden Matthews
5378d13cfb some imlib2 work 2009-03-18 22:02:25 -06:00
Brenden Matthews
c2b1728af9 Update configure.ac.in for 1.7.x. 2009-03-15 20:03:12 -06:00
Phil Sutter
77c59b260d merge ibm-acpi and smapi together 
Well, not really. I don't dare putting it all together into a single
source file, as that would just not make sense. Instead, this patch
eliminates the --enable-smapi configure option and all related checks,
replacing them with the equivalents from --enable-ibm.
 2009-02-22 02:58:42 +01:00
Phil Sutter
d500f1005a outsource ibm-acpi stuff into it's own source file 
Despite this is actually not much code and could stay inside linux.c as
well, this makes sense as I want to combine smapi and ibm-acpi
functionality. Virtually every user of a notebook made by IBM/Lenovo
will want both, so this should be a feature not a bug.

Besides making the ibm-acpi objects being built optionally, this should
not change anything to the code flow.
 2009-02-22 02:58:29 +01:00
Alexander Monakov
24ddc9665e Fix nvidia memory frequency reading patch sf.net id #2493134. 2009-02-17 22:10:15 -07:00
Brenden Matthews
5b9d47c039 Couple fixes for the top_time stuff. 2009-02-08 10:13:54 -07: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
Phil Sutter
1ddb6a88b9 use the builtin config also as a default one 
This depends on fopencookie, which is linux-specific. For BSD, there is
a similar function called funopen, which can be used as a drop-in
replacement.
 2008-12-14 15:45:30 +01:00
Phil Sutter
7dca22a41b print config output support in the final stats 2008-12-14 04:22:36 +01:00
Brenden Matthews
fd1354bea3 Build fix for config output. 2008-12-14 04:22:36 +01:00
Phil Sutter
7a6ce89226 implement sample config printing support 
This patch makes Conky print a sample config when being called with the
'-C' flag.

A short test showed an increase of ~10kbytes of the conky binary's size.
 2008-12-12 15:38:01 +01:00
Brenden Matthews
dc3ed8df13 Removing old svn keywords. 2008-12-09 16:35:49 -07:00
Brenden Matthews
7de6c1d061 * Introduced (buggy) support for IMAP IDLE 
* Added support for MOC (the console audio player) (thanks henux)
* Added scroll step patch (thanks asto)


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1252 7f574dfc-610e-0410-a909-a81674777703
 2008-09-24 06:59:45 +00:00
Roman Bogorodskiy
92928dd49a Extra space in m4_define seem to make sense. 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1239 7f574dfc-610e-0410-a909-a81674777703
 2008-08-16 15:56:20 +00:00
Brenden Matthews
74832228b5 bump version 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1238 7f574dfc-610e-0410-a909-a81674777703
 2008-08-14 17:33:49 +00:00
Brenden Matthews
4644bc3e23 * Conky 1.6.1 released 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1237 7f574dfc-610e-0410-a909-a81674777703
 2008-08-14 17:16:31 +00:00
Brenden Matthews
6cbffa71ef remove hardcoded retry stuff; put -Werror back in (who the fk removed that?) 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1234 7f574dfc-610e-0410-a909-a81674777703
 2008-08-05 18:43:24 +00:00
Brenden Matthews
c5dbd0afa9 add missing xmms2.h to dist 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1229 7f574dfc-610e-0410-a909-a81674777703
 2008-07-30 02:03:42 +00:00
Brenden Matthews
be3a78189b * Conky 1.6.0 released 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1228 7f574dfc-610e-0410-a909-a81674777703
 2008-07-22 01:15:57 +00:00
Nikolas Garofil
23321c408d made defines of some literal values and defines to configure.ac.in 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1223 7f574dfc-610e-0410-a909-a81674777703
 2008-07-12 10:25:05 +00:00
Nikolas Garofil
8745d71edf Proper indenting for eve-code, made a define of the default netdev, and moved some defines to configure.ac.in 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1222 7f574dfc-610e-0410-a909-a81674777703
 2008-07-12 01:22:40 +00:00
Nikolas Garofil
2574d2cf30 multiple definition fix no longer necessary after libgnu removal 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1220 7f574dfc-610e-0410-a909-a81674777703
 2008-07-09 21:49:13 +00:00
Philip Kovacs
b58d412441 removed gnulib completely. use a simple getnameinfo function check for --enable-portmon. 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1218 7f574dfc-610e-0410-a909-a81674777703
 2008-07-07 20:09:37 +00:00
Nikolas Garofil
1188beddca configure.ac.in back to 1209 state to prevent linkingprobs 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1212 7f574dfc-610e-0410-a909-a81674777703
 2008-07-04 08:48:26 +00:00
Philip Kovacs
a2775d30d1 --libtool version of gnulib installed 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1211 7f574dfc-610e-0410-a909-a81674777703
 2008-07-03 23:28:51 +00:00
Nikolas Garofil
28e47b6db5 Linking failed on some systems 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1209 7f574dfc-610e-0410-a909-a81674777703
 2008-07-03 22:31:14 +00:00
Nikolas Garofil
fec88c0429 Compilation with --enable-testing works by removing stdio.h 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1207 7f574dfc-610e-0410-a909-a81674777703
 2008-07-01 17:33:21 +00:00
Nikolas Garofil
72f416212f configure option for mathfunctions 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1204 7f574dfc-610e-0410-a909-a81674777703
 2008-07-01 11:13:40 +00:00