1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-27 20:44:56 +00:00
Commit Graph

175 Commits

Author SHA1 Message Date
Brenden Matthews
4cd04f00f9 Bump build version. 2016-10-04 09:49:19 +02:00
Vincent Cheng
48ea5914e9 Fix build failures on Debian kfreebsd (#291) 2016-07-13 07:24:29 -07:00
Brenden Matthews
4055b347f9 Version bump to 1.10.4. 2016-06-25 09:40:05 -07:00
Brenden Matthews
6e06110065 Version bump to 1.10.3. 2016-06-25 09:36:51 -07:00
Stephane Fontaine
587631a15b Add native support for pulseaudio. (#283)
* Add native support for pulseaudio.

This adds ability to get Pulseaudio current volume without calling an
external program. Also it provides a few other parameters like card's
current profile similarly to pavucontrol. Currently it only queries the
default sink (and associated card).

* Switch to pulse async API.

This us by far the most efficient as conky subscribe to a few pulseaudio
notifications. Whenever pulseaudio server changes (volume or default
sink or default card), conky's callback updates the results.
2016-06-24 07:17:20 -07:00
Laurent Georget
dbf26f0a42 Fix the symbol stdscr not found compilation error (#254)
The compilation fails when the symbols of terminfo are not present in
the libncurses.so. This can happen when the terminfo library libtinfo.so
is compiled separately. Using pkg_config is the correct approach to
handle all cases.
2016-05-14 10:38:55 -07:00
Toke Høiland-Jørgensen
0db823e56c Add systemd journal support. (#214)
This adds support for reading log entries from the Systemd journal. A
new command, called simply 'journal', is added which takes a number of
lines as a parameter and optionally which journal (user or system) to
read from.

Obviously, libsystemd is required to build journal support. Tested on
Arch Linux (Systemd v229).

Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
2016-05-06 07:25:30 -04:00
Brenden Matthews
49babf1181 Merge pull request #184 from marcpayne/lua-bindings
Require Lua 5.1 when building the Lua bindings
2016-03-21 09:12:35 -07:00
marguerite
7dff2e5577 do not override LIB_SUFFIX 2016-01-07 17:26:18 +08:00
marguerite
89f9a6bdf1 respect LIB_INSTALL_DIR 2016-01-07 14:42:14 +08:00
Marc Payne
0dbd27d2de Require Lua 5.1 when building the Lua bindings
The cairo/imlib2/rsvg bindings require tolua++ [1], which is currently only
compatible with Lua 5.1 or earlier. We need to force Conky to compile against
Lua 5.1 if the user chooses to build the bindings.

This commit adds a separate pkg_search_module command specifically for Lua 5.1,
along with a note in the documentation. The original pkg_search_module command
was updated to include (and prefer) Lua 5.3+. Also, I threw in two other minor
random fixes to the docs while I was at it.

[1] https://github.com/LuaDist/toluapp
2015-12-11 16:05:02 -07:00
Brenden Matthews
443ddf54a0 Merge pull request #178 from antonio-malcolm/master
Fix for compiling against toluapp
2015-12-04 10:30:24 -08:00
Brenden Matthews
c1dceef75a Merge pull request #173 from Francesco149/xinerama-support
Fix for Xinerama alignment bugs
2015-12-04 10:29:42 -08:00
Antonio Malcolm
2599288a97 Fix for compiling against toluapp 2015-12-03 20:50:33 -08:00
Casey Webster
ce08b9fe7b Final fix for check_include_file
Per disucssion with arclance in #166, the call to check_include_file has
been migrated back to check_include_files and the required define set in
CMAKE_REQUIRED_DEFINITIONS.  This properly removes the dependancy on
the check_include_file module.  Third time is a charm!
2015-12-01 16:53:38 -05:00
Franc[e]sco
162d9d13b7 added support for multiple xinerama heads (fixes issue #172) 2015-12-01 13:53:43 +01:00
Brenden Matthews
6e48a22dde Prep for next release. 2015-11-18 07:51:15 -08:00
Casey Webster
2f362e44a5 Reverts a change from check_include_file to files
One of the check_include_file checks in ConkyPlatformChecks should
not have been changed to check_include_files because the latter
takes 2 arguments and this call gives 3 (and doens't work right
without the third).
2015-11-17 15:08:58 +00:00
Casey Webster
3a574ba88b Fixes typo in ConkyPlatformChecks
Fixes #162 by changing CheckInlcudeFile to
CheckIncludeFiles so that CMake can correctly include
the module.  Change calls to check_include_file to
check_include_files.
2015-11-16 18:04:02 +00:00
Paul Egan
b502ab5f5b Be explicit about documentation encoding. Fixes #91. 2015-08-23 22:12:24 +01:00
Natanael Copa
18877f3992 Change ipv6 check to warning instead of fatal error
The compile server might not have ipv6 but that does not prevent us from
building conky and run it on a machine which has ipv6.
2015-07-23 16:15:30 +02:00
Natanael Copa
8711bdee8b Use posix awk instead of GNU awk
We don't use any fancy GNU awk extensions so chekc for a portable awk
instead of require GNU awk.
2015-07-23 16:05:31 +02:00
Vincent Cheng
b8082ca1fa Avoid clobbering CFLAGS/CXXFLAGS set by user 2015-07-07 01:38:12 -07:00
Brenden Matthews
58abe0e91d Prep for next release. 2015-06-21 17:53:16 -07:00
Brenden Matthews
8a4eb2655d Prep for 1.10.0 release. 2015-06-21 17:49:06 -07:00
Brenden Matthews
7733a6d6f3 Let's be real about the versioning. 2015-05-23 09:30:53 -07:00
Troy C
237fe4864b Adding nested check, due to comments in ft2build.h 2015-02-27 16:22:33 -06:00
Troy C
ac224149de Add freetype path for Ubuntu 12.04 2015-02-27 15:17:15 -06:00
Troy C
80470556b9 Fix freetype include path 2015-02-20 19:53:03 -06:00
Łukasz Stelmach
00481ee9a9 Read configuration from ~/.config/conky/conky.conf
Try to load configuration from ~/.config/conky/conky.conf before
falling back to ~/.conkyrc and /etc/conky/conky.conf.
2014-11-17 22:06:27 +01:00
Denis Gorodnichev
442f78119c add support for x11 shape extension
x11 shape extension (version >= 1.1) provide ability to set up input region
set up empty input region for undecorated window to create transparent window for mouse events
2014-09-09 11:12:44 +04:00
Pavel Labath
02dfacd694 Add support for lua 5.2
luamm is now able to be compiled with both lua 5.1 and 5.2 (assuming 5.2 has backward
compatibility features compiled in). It is my intention to always support at least two versions
of lua.
2013-07-13 23:55:28 +02:00
Pavel Labath
2b8d603a9f Remove the cmake test for gcc-4.4
It tests for gcc, and conky is perfectly capable of being compiled with e.g. clang.
2013-07-13 19:40:23 +02:00
Jochen Keil
550d644e6c Add rsvg bindings to cmake build framework 2013-05-22 22:39:41 +02:00
Pavel Labath
459dd4109c Hopefully a lua build check which finally works on all distros 2013-02-23 09:51:49 +01:00
Daniel Pielmeier
96935e8221 Fix build checks for Lua >=5.1 and <5.2. 2013-01-29 10:57:40 -08:00
James Morris
710646c101 fix to force usage of lua 5.1 when both 5.1 and 5.2 installed 2013-01-12 20:26:39 +00:00
Pavel Labath
55a1c41827 Really fix "conky fails to build with audacious" (sf.net #3539500)
apparently, my previous fix was not sufficient, although I do remember testing it :/

fix by Daniel Pielmeier.
2012-08-25 23:14:46 +02:00
Pavel Labath
89720b4e81 Add preprocessor defitions that request posix features 2012-07-20 20:59:07 +02:00
Pavel Labath
2fcd9c74a8 Detect clock_gettime properly
my implementation of AC_SEARCH_LIBS macro was incorrect. This should hopefully fix it.
2012-07-20 18:09:35 +02:00
Pavel Labath
ba1919a02e Fix "conky fails to build with audacious" (sf.net #3539500)
audacious needs dbus to compile, but we failed to provide a path to the directory containing the
header files.

bug reported by Daniel Pielmeier
2012-07-07 20:41:45 +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
Magliano Andrea
93af415ad7 Force global library path for pkgsrc.
DragonFlyBSD uses pkgsrc package infrastructure, hence the the need
for extra flags.

Cmake pkg_search_module macro sets according <XPREFIX>_LDFLAGS var,
thus the correct way should be to append it to conky_includes and
conky_libs for each extra package needed.
As all pkgsrc packages always install in /usr/pkg, the simplest thing
is to set specific cflags and ldflags at the very beginning.

Conky is btw wip (work in progress) in pkgsrc system, mostly with
NetBSD patches. This is intended as radical workaround (DragonFlyBSD
specific for now) instead of submitting specific patches to pksrc
maintainers.
2012-07-05 20:39:38 +02:00
Pavel Labath
01995b1326 Woops, typo in the previous commit 2012-07-05 16:46:04 +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
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
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
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
Christian Brabandt
354e577b15 Cmus support added to conky 2011-10-13 09:41:53 +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
031e79e77e Fix linking error: clock_gettime not found
I decided to reimplement AC_SEARCH_LIB from autotools in the process, as I consider it a very
nifty feature.
2011-09-30 23:01:24 +02: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
187dc352c4 apcupsd supposedly works on FreeBSD as well 2010-12-09 18:55:22 +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
Pavel Labath
7df57a9961 Change the default config file back to .conkyrc
we have the auto-conversion script now, there is no need for a new name (yet)
2010-11-23 19:18:47 +01:00
Nikolas Garofil
5f76f847dd Bugfix: choosing BUILD_ARGB without OWN_WINDOW breaks building 2010-11-22 21:14:45 +01:00
Nikolas Garofil
5d28bed7db Support for old config syntax (Optional) 2010-11-19 14:27:18 +01:00
Nikolas Garofil
0d98fe8478 Merge branch 'master' into lua-config 2010-11-14 14:19:42 +01:00
Nikolas Garofil
a18f5e2808 Make sure MAINTAINER_MODE sets DEBUG 2010-11-14 02:27:01 +01:00
Nikolas Garofil
b5ff3eb411 Make lua required by cmake 2010-11-14 01:41:07 +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
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
Nikolas Garofil
e918ea4655 Let cmake check whether to build for old or new audacious 2010-11-12 16:49:34 +01:00
Nikolas Garofil
4d157a298b Fix compiling with audacious support (Patch from billie, thanks !) 2010-11-12 12:32:49 +01: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
Nikolas Garofil
89a8456495 Fix x11 check in cmake 2010-10-27 07:37:11 +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
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
cccbf3b4c0 Add a CMAKE variable for the patch program 2010-06-13 19:09:07 +02:00
Pavel Labath
c80deb2d69 Fix "wrong type of arguments for cairo_set_dash", sf.net #3014648
I am not particularly proud of this solution. If you have a better one, feel free to implement
it.
2010-06-13 18:57:07 +02:00
Pavel Labath
2232641b8e Change the >=gcc-4.4 test from warning into an error
This reverts commit 37355406a8.
2010-06-10 19:19:49 +02:00
Nikolas Garofil
54d4e6518d Add support for out_to_http 2010-06-04 14:41:12 +02:00
Nikolas Garofil
a9b12b3074 Make building with RSS possible 2010-05-06 01:46:07 +02:00
Nikolas Garofil
3f7ecb3a26 Add support for $irc 2010-04-30 19:32:42 +02:00
Nikolas Garofil
aada8c4d26 ical support default off and block compiling if it's requested but not available 2010-04-27 21:14:32 +02:00
Nikolas Garofil
a13c56a7a5 Add support for $ical 2010-04-27 16:42:21 +02:00
Nikolas Garofil
7065ba251e Make it possible for cmake to find mysql.h 2010-04-18 20:30:10 +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
08ea4391d4 Deprecated max_specials, made it unlimited by changing the data structure for specials 2010-04-14 16:59:50 +02:00
Nikolas Garofil
d91214e290 Fix using the wireless-vars 2010-02-20 17:59:51 +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
4793655974 Link with devstat when building in FreeBSD 2010-02-14 21:35:13 +01:00
Nikolas Garofil
da4e9349f8 Link with kvm when building in FreeBSD 2010-02-14 20:20:45 +01:00
Nikolas Garofil
96bf9d0d72 Also set curl when rss is requested 2010-02-09 19:14:14 +01:00
Nikolas Garofil
0c19282eee Let cmake check for and include xext when building with xdbe 2010-01-25 00:08:06 +01:00
Pavel Labath
6e89ed7e2d Get $iconv vars working again 2010-01-20 18:17:30 +01:00
Pavel Labath
926af1041e Make building with LUA and MAINTAINER_MODE work
apparently, it was just a name conflict.
2010-01-19 16:33:05 +01:00
Nikolas Garofil
122f82ff16 disable dependencies in UI when disabling X11 2010-01-17 20:40:40 +01:00
Nikolas Garofil
e840dcdd5b When building without x11, also disable xdamage, own_window, xdbe, xft, imlib2, argb and remove x11-related options from the builtin config 2010-01-17 16:15:59 +01:00
Nikolas Garofil
287c38a0b9 Added support for builtin config in cmake 2010-01-17 03:00:51 +01: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
b4a73e166e add missing BUILD_IBM define to config.h.in 2010-01-10 22:01:04 +01: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
79be66b15a Fix building of iostats. 2010-01-06 21:11:58 +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
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