Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-20 11:55:20 +00:00
Code Issues Releases Activity
1,224 Commits 5 Branches 46 Tags 22 MiB
d500f1005a
Commit Graph

59 Commits

Author SHA1 Message Date
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
Phil Sutter
b31af01d91 add if_match object comparing strings, floats and ints 
In general, argument types should match, but for combined long and
double usage the long is being converted to double before evaluation.

A few examples:
${if_match ${cpu} < 30}
${if_match "asdf" != "qwer"}
${if_match 0.5 < 0.50001}
${if_match 49.999 < 50}
 2008-12-20 16:14:57 +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
Phil Sutter
ec174bedf2 outsource ifblock and text_object helpers 2008-12-15 23:03:39 +01:00
Phil Sutter
ca66a26813 put text_object stuff into an own header 
For now this is only the object type enum and struct text_object, but it
will do to prepare further outsourcing from both conky.c and conky.h.
 2008-12-15 23:03:39 +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
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
Phil Sutter
19a6e7c925 rewrite tcp-portmon hooks 
Global variables belonging to tcp-portmon are now separated from
conky.c, cleaning up struct information and struct text_object a bit.
 2008-12-11 15:28:21 +01:00
Brenden Matthews
dc3ed8df13 Removing old svn keywords. 2008-12-09 16:35:49 -07:00
Phil Sutter
f5259295cf make unit of all temperatures selectable 
This introduces a new configuration variable called "temperature_unit",
specifying the unit of all temperature sensors. To achieve this, each
object outputting a temperature has to call temp_print() like so:
| temp_print(p, p_max_size, <temp val as double>, <unit of val>);
to specify the input temperature unit, either one of the constants
TEMP_CELSIUS or TEMP_FAHRENHEIT.
 2008-12-08 01:45:12 +01:00
Brenden Matthews
e5fd6f8027 add openbsd.h to EXTRA_DIST 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1264 7f574dfc-610e-0410-a909-a81674777703
 2008-10-01 18:12:02 +00: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
6a5691ab70 We continue our good old tradition of breaking FreeBSD 
code right before the release. This time, somebody refactored
the code to use freebsd.h, but forgot to include
freebsd.h to EXTRA_DIST, so the resulting tarball was
missing it and non-buildable on FreeBSD, thank you, kind man,
for doing it, please keep up breaking FreeBSD port, it's a 
great pleasure for me to fix it all the time, and don't
even think to drop me email or ask me on IRC, I like
surprises very much.


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1235 7f574dfc-610e-0410-a909-a81674777703
 2008-08-07 06:07:50 +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
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
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
Philip Kovacs
c7c822426c latest gnulib sources 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1206 7f574dfc-610e-0410-a909-a81674777703
 2008-07-01 14:46:13 +00:00
Philip Kovacs
5ce58e014e Add libgnu convenience lib, modules stdio and getaddrinfo. 
We now make no assumption about availability of functions
such as snprintf and getnameinfo.  If the target machine 
doesnt have them, libgnu provides them.



git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1203 7f574dfc-610e-0410-a909-a81674777703
 2008-07-01 01:26:02 +00:00
Brenden Matthews
35e1932ad1 fix missing entries in Makefile.am 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1198 7f574dfc-610e-0410-a909-a81674777703
 2008-06-29 00:27:09 +00:00
Brenden Matthews
896863e2d8 Added support for EVE-Online skill monitoring (thanks Asbjørn); fixed up/downspeedgraph segfault 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1197 7f574dfc-610e-0410-a909-a81674777703
 2008-06-28 20:14:04 +00:00
Kevin Lyles
c72a564cea Removed all trailing whitespace 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1156 7f574dfc-610e-0410-a909-a81674777703
 2008-06-15 18:38:33 +00:00
Roman Bogorodskiy
00b26c0834 More or less working on FreeBSD now. 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1155 7f574dfc-610e-0410-a909-a81674777703
 2008-06-15 07:08:52 +00:00
Brenden Matthews
7ff7c1083c * Added NVIDIA Graficcard support patch (thanks meissna) 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1122 7f574dfc-610e-0410-a909-a81674777703
 2008-06-03 20:46:15 +00:00
Roman Bogorodskiy
947dfb558d Small portion of FreeBSD fixes: 
- diskio.c is not needed for freebsd
- sync cpu freq related functions prototypes
- cleanup #indef's

It still doesn't compile on FreeBSD though.


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1117 7f574dfc-610e-0410-a909-a81674777703
 2008-05-03 12:30:05 +00:00
Brenden Matthews
a1452f5db4 * Applied 12 patches: 
1) sysfs battery support (for Linux >=2.6.24) (thanks Kapil)
        2) Improved audacious support patch (thanks Miroslav)
        3) tp_smapi support patch for IBM laptops (thanks Phil)
        4) user info patch (thanks Roland)
        5) added conky build info patch (thanks Roland)
        6) added if_up patch (thanks Phil)
        7) added reload on SIGHUP patch (thanks Jonas)
        8) added pad percentages patch (thanks Jonas)
        9) added fs_type patch (thanks Ryan)
        10) added xmms2 fixes patch (thanks Lassi)
        11) fix sysfs crash patch (thanks Phil)
        12) multiple ip patch ($addrs)
    * Added more alignment support (top_middle, bottom_middle, middle_left,
    and middle_right).


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1010 7f574dfc-610e-0410-a909-a81674777703
 2008-03-18 00:23:16 +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
Kevin Lyles
9a44d8b1c8 Fixed broken compilation on FreeBSD 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1001 7f574dfc-610e-0410-a909-a81674777703
 2008-02-19 18:48:54 +00:00
Brenden Matthews
433b564e14 * Applied 2 patches: 
1) Add diskio for individual devices
        2) Improved output of units, added "short_units" option


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@996 7f574dfc-610e-0410-a909-a81674777703
 2008-02-09 02:21:06 +00:00
Philip Kovacs
c08db2aba5 Externalize default config file: /conky/conky.conf 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@981 7f574dfc-610e-0410-a909-a81674777703
 2007-10-23 21:52:11 +00:00
Brenden Matthews
196235df06 adding prss.h to makefile.am so its actually included in the dist 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@926 7f574dfc-610e-0410-a909-a81674777703
 2007-08-24 02:00:18 +00:00
Toni Spets
3fdb6b7027 New initial RSS code. Parser written by Sisu (Mikko Sysikaski) with more portable libxml2. It is still unstable and in development.\n\nNote: automake and autoconf scripts needs to be updated to support libxml2\! 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@868 7f574dfc-610e-0410-a909-a81674777703
 2007-06-01 10:42:57 +00:00
Roman Bogorodskiy
3b03ca2a76 Experimental RSS code. 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@864 7f574dfc-610e-0410-a909-a81674777703
 2007-05-06 12:17:13 +00:00
Brenden Matthews
0ab1d8b96a * OpenBSD support added to Conky (thanks hifi) 
* Updated mboxscan stuff (thanks calmar)


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@848 7f574dfc-610e-0410-a909-a81674777703
 2007-03-01 01:43:43 +00:00
Brenden Matthews
45acd5c3b9 * Added buffer_text_size option to change the size of the buffer for 
things like $exec, $tail, et cetera
* Added $mboxscan which lets you display the Subject and From fields
from recent email in an mbox file
* Disambiguated (is that a word?) $cpu docs


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@831 7f574dfc-610e-0410-a909-a81674777703
 2007-02-12 01:03:10 +00:00
Philip Kovacs
6776714d9a remove ftp.[ch] from src/Makefile.am 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@827 7f574dfc-610e-0410-a909-a81674777703
 2007-01-08 01:34:00 +00:00
Philip Kovacs
3006f7574a add config.rpath to satisfy AM_ICONV 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@825 7f574dfc-610e-0410-a909-a81674777703
 2007-01-08 01:10:12 +00:00
Philip Kovacs
1c35f432e5 Conky 1.5.0 -- client/server prototype 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@818 7f574dfc-610e-0410-a909-a81674777703
 2006-12-23 06:01:16 +00:00
Philip Kovacs
e4713dc790 use GLib GHashTable for port monitors 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@806 7f574dfc-610e-0410-a909-a81674777703
 2006-12-09 05:40:08 +00:00
Philip Kovacs
eec3c9210b new timed thread abstraction layer 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@770 7f574dfc-610e-0410-a909-a81674777703
 2006-11-14 22:30:31 +00:00
Philip Kovacs
2d4ba18b27 remove bogus cairo junk 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@737 7f574dfc-610e-0410-a909-a81674777703
 2006-11-08 00:36:21 +00:00
Philip Kovacs
4b37a0e158 configure x11/xext/xdamage with pkg-config, etc. 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@731 7f574dfc-610e-0410-a909-a81674777703
 2006-11-07 01:19:32 +00:00
Philip Kovacs
15fd6d6586 removed all mldonkey and seti code -- totally broken 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@727 7f574dfc-610e-0410-a909-a81674777703
 2006-11-05 00:23:18 +00:00
Philip Kovacs
d8786f91b2 remove infopipe kruft 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@722 7f574dfc-610e-0410-a909-a81674777703
 2006-11-04 01:05:47 +00:00
Philip Kovacs
03ebbf2cf4 remove infopipe support 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@718 7f574dfc-610e-0410-a909-a81674777703
 2006-11-04 00:25:22 +00:00
Philip Kovacs
87953b122b removal of xmms/bmp / addition of audacious/infopipe 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@713 7f574dfc-610e-0410-a909-a81674777703
 2006-11-03 20:54:52 +00:00
Roman Bogorodskiy
27731c50dc - Comment out NetBSD/SanOS garbage 
- Print OS information in `conky -v`


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@688 7f574dfc-610e-0410-a909-a81674777703
 2006-08-12 06:10:18 +00:00
Philip Kovacs
ca79c81374 spock's hddtemp & goto patches 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@679 7f574dfc-610e-0410-a909-a81674777703
 2006-08-10 16:56:13 +00:00
Brenden Matthews
e8c9f49594 xmms2 patch 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@612 7f574dfc-610e-0410-a909-a81674777703
 2006-03-25 21:21:07 +00:00
Philip Kovacs
896a5ce701 xmms work continued 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@488 7f574dfc-610e-0410-a909-a81674777703
 2006-01-08 14:51:47 +00:00
Philip Kovacs
6d24365953 xmms/bmp/audacious/infopipe reorgamization 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@487 7f574dfc-610e-0410-a909-a81674777703
 2006-01-08 08:02:37 +00:00