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

325 Commits

Author SHA1 Message Date
Brenden Matthews
5b9d47c039 Couple fixes for the top_time stuff. 2009-02-08 10:13:54 -07: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
1a35a68bca fix segfault for diskiograph
The crux is to split args between those for scan_graph() on one hand and
prepare_diskio_stat() on the other hand. To make the code working with
minimal changes, move the yet optional devicename to the end.

General note on graphs:
- for all graphs there exist the optional arguments for scan_graph()
  which come first and are optional (intended duplicate)
- all other args are object specific, and may be optional as well
2008-12-18 15:18:53 +01:00
Brenden Matthews
35a2d09c5f Merge branch 'master' of git://nwl.cc/~n0-1/conky 2008-12-17 17:03:33 -07:00
Phil Sutter
f85c1ea5a6 Make gateway objects also detect routes with missing RTF_GATEWAY flag
This was a bug, not a feature. From the FreeBSD manpage rtentry(9):

| Vt struct sockaddr *rt_gateway;
|
| The "target" of the route, which can either represent a destination in
| its own right (some protocols will put a link-layer address here), or
| some intermediate stop on the way to that destination (if the
| RTF_GATEWAY flag is set).

So for a default route with "dest" and "mask" both zero, either
RTF_GATEWAY is present, or "gate" is zero.
2008-12-17 02:37:07 +01:00
Itai Zukerman
bb817b2cf7 Patch to allow escaping newlines in the config. 2008-12-15 21:17:56 -07:00
Brenden Matthews
2b128b7a7c Merge branch 'master' of git://nwl.cc/~n0-1/conky 2008-12-15 18:00:05 -07:00
Phil Sutter
62a6c0cbac have a maximum width for all variable length mpd vars
Thanks to FreakGuard (IRC) preparing this one.
2008-12-15 19:40:54 +01:00
Brenden Matthews
650be03fd4 Improve behaviour of $pb_battery. 2008-12-13 20:55:45 -07:00
Phil Sutter
5445c8890a fix disk_protect for linux-2.6.27
The path for the sysfs attribute has changed. Also negative values show
disabled disk protect, so catch this when interpreting the file's
content.
2008-12-14 02:51:50 +01: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
Phil Sutter
aa363ec3b3 update changelog 2008-12-08 16:19:35 +01:00
Brenden Matthews
e2c49531f3 Limit $battery_percent to 100 (bug 2145006) 2008-12-07 15:58:40 -07:00
Brenden Matthews
39ba74a590 Don't put unit with hddtemp values for consistency (bug 2133107) 2008-12-07 15:54:40 -07:00
Brenden Matthews
1fcbecf4af Fix broken $execbar (bug 2133709) 2008-12-07 15:49:04 -07:00
Brenden Matthews
9345e2bb8f Allow more than 9 CPUs for CPU stats (bug 2155500) 2008-12-07 15:34:46 -07:00
Brenden Matthews
6fab949926 Removing $freq_dyn and $freq_dyn_g
I have decided to remove $freq_dyn and $freq_dyn_g due to license issues
(see sf.net tracker bug #2166612)
2008-12-07 15:15:57 -07:00
Erik Waling
51fe4fa419 Fetch volume through Audacious API (thanks Erik) 2008-12-07 00:38:06 -07:00
Cesare Tirabassi
b64203b547 Fix for buffer overflow with $execi (thanks Cesare) 2008-12-07 00:31:53 -07:00
Lassi Selander
20b2d2f464 Adds a variable if_xmms2_connected to hide objects when xmms2d is not
running (thanks Lassi)
2008-12-07 00:22:05 -07:00
Pavol Rusnak
e4e9cf4311 Fix for wrong usage of strncat (thanks Pavol) 2008-12-07 00:18:34 -07:00
Brenden Matthews
f7281c192a Updating changelog (and testing ciabot). 2008-12-06 23:39:16 -07:00
Phil
d1b139f8e2 since DEV_NAME() is used when calling, this check is needless
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1274 7f574dfc-610e-0410-a909-a81674777703
2008-12-06 19:10:27 +00:00
Phil
c4b98f0762 Add debugging output at runtime
The new command line option '-D' ('--debug') increases debugging level by one.
For debugging output a user could be interested in, use the macros DEBUG() and
DEBUG2(). Functionality is equal to the ERR() macro. DEBUG2() prints stuff only
if debugging level is greater one, which means that '--debug' has been
specified more than once. This patch also includes usage of the macros for the
new template object (as debugging syntax errors in templates is one thing a
user potentially needs to do).


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1273 7f574dfc-610e-0410-a909-a81674777703
2008-11-30 20:53:20 +00:00
Phil
ce5eb880e7 add support for template objects
Basically you can define a template like this:

| template0 \1:\n   ${fs_free \2} / ${fs_used \2}

and use it later like this:

| ${template0 root /}
| ${template0 boot /boot}

which is exactly the same as the following:

| root:
|    ${fs_free /} / ${fs_used /}
| boot:
|    ${fs_free /boot} / ${fs_used /boot}

hope you like it, I do already. :)


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1270 7f574dfc-610e-0410-a909-a81674777703
2008-11-29 01:34:54 +00: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
Brenden Matthews
1ab4b8ec51 * Applied OpenBSD patches
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1266 7f574dfc-610e-0410-a909-a81674777703
2008-10-08 11:41:16 +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
Brenden Matthews
0c2c9dd038 * Added small patch to support negative values (such as negative disk capacity) (thanks hinokind)
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1251 7f574dfc-610e-0410-a909-a81674777703
2008-09-12 05:03:38 +00:00
Brenden Matthews
6769495e10 * Improve Conky's overall interval timing
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1250 7f574dfc-610e-0410-a909-a81674777703
2008-09-12 03:01:33 +00:00
Brenden Matthews
8bb6b479a8 * Improve timed_thread timing
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1249 7f574dfc-610e-0410-a909-a81674777703
2008-09-11 22:27:19 +00:00
Brenden Matthews
f968843514 remove extra quote that snuck in to the changelog
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1248 7f574dfc-610e-0410-a909-a81674777703
2008-09-11 15:56:48 +00:00
Brenden Matthews
0c59779528 maybe fix missing include bug (http://bugs.gentoo.org/show_bug.cgi?id=235233)
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1247 7f574dfc-610e-0410-a909-a81674777703
2008-09-11 15:44:48 +00:00
Brenden Matthews
4ca31d2ce4 * Improved hddtemp support
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1245 7f574dfc-610e-0410-a909-a81674777703
2008-09-11 03:21:39 +00:00
Brenden Matthews
068f6b5b09 * Fixed bug with freq_dyn on x86_64 (thanks Miroslav)
* Fixed buffer overflow in update_net_stats() (thanks Miroslav)
* Small fix for nvidia mem freq (thanks Cezary)

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1244 7f574dfc-610e-0410-a909-a81674777703
2008-09-08 04:48:13 +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
740eca5cf2 * Fix compile error when MPD support not enabled
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1236 7f574dfc-610e-0410-a909-a81674777703
2008-08-14 17:10:41 +00:00
Brenden Matthews
961b70b6e6 * Add option to specify number of retries for IMAP/POP3 stuff (via -r)
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1233 7f574dfc-610e-0410-a909-a81674777703
2008-08-05 18:00:30 +00:00
Phil
4fc4ece8c1 forgot the ChangeLog update
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1232 7f574dfc-610e-0410-a909-a81674777703
2008-08-03 13:28:15 +00:00
Brenden Matthews
bea18942cd update changelog
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1230 7f574dfc-610e-0410-a909-a81674777703
2008-07-30 02:05:12 +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
Brenden Matthews
69ff93d0ea * Fixed bug with $if_empty and $mpd_* vars (sf.net #2008752)
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1225 7f574dfc-610e-0410-a909-a81674777703
2008-07-17 02:38:04 +00:00
Nikolas Garofil
97de8557b2 Made log/normal argument for graphs optional
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1216 7f574dfc-610e-0410-a909-a81674777703
2008-07-06 10:56:59 +00:00
Nikolas Garofil
5008a5d532 Update ChangeLog
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1213 7f574dfc-610e-0410-a909-a81674777703
2008-07-05 23:32:10 +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
Brenden Matthews
66079c5585 Added sysfs AC adapter support patch (thanks Byron); Small compilation error fix
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1196 7f574dfc-610e-0410-a909-a81674777703
2008-06-28 19:17:49 +00:00
Phil
28478344ab two new smapi variables and a bit of documentation improvement
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1194 7f574dfc-610e-0410-a909-a81674777703
2008-06-25 10:08:27 +00:00
Nikolas Garofil
312d3d6de8 Merge with conky1-extra, Changelog contains the changes
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1193 7f574dfc-610e-0410-a909-a81674777703
2008-06-21 20:37:58 +00:00
Nikolas Garofil
25ef59dc09 Added the changes from this week to Changelog
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1188 7f574dfc-610e-0410-a909-a81674777703
2008-06-21 15:04:49 +00:00
Nikolas Garofil
2e2765393e magic nums to defines and don't check ut_name and ut_line length because it can't be larger then UT_NAMESIZE and UT_LINESIZE
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1162 7f574dfc-610e-0410-a909-a81674777703
2008-06-17 20:44:06 +00:00