Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-16 10:05:22 +00:00
Code Issues Releases Activity
1,112 Commits 5 Branches 46 Tags 22 MiB
ecb3004c0f
Commit Graph

683 Commits

Author SHA1 Message Date
Phil
ecb3004c0f improve template support 
* handle escaped characters in parameters to the template object, too
* add samples to the documentation
* do some code cleanup by outsourcing the string substitution into it's
  own function


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1271 7f574dfc-610e-0410-a909-a81674777703
 2008-11-29 13:02:42 +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
Phil
820e0d24c4 fix my own fix 
The second parameter is optional, so have conky act accordingly. This time I
tested using either two or three params and it worked flawlessly.


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1269 7f574dfc-610e-0410-a909-a81674777703
 2008-11-04 23:25:28 +00:00
Phil
f44003e07c fix a potential segfault 
* happened when passing wrong arguments to ${scroll}, particularly with only
  one instead of the mandatory two unsigned ints
* as it's not clear whether %n will change the value returned by sscanf or not,
  use a solution that works in both situations (%n incrementing the return
  value or not)


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1268 7f574dfc-610e-0410-a909-a81674777703
 2008-11-04 21:42:48 +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
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
bb74efed2e remove quality debugging code 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1263 7f574dfc-610e-0410-a909-a81674777703
 2008-09-29 01:38:57 +00:00
Brenden Matthews
7ea81e1913 add $mixer docs 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1262 7f574dfc-610e-0410-a909-a81674777703
 2008-09-29 01:37:33 +00:00
Brenden Matthews
c5fcc5c6f1 handle BYE from server when idling (IMAP stuff) 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1261 7f574dfc-610e-0410-a909-a81674777703
 2008-09-26 21:29:02 +00:00
Brenden Matthews
1849db04e1 respect IMAP IDLE timeout period 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1260 7f574dfc-610e-0410-a909-a81674777703
 2008-09-26 21:09:48 +00:00
Brenden Matthews
ae92753584 close socket before exiting thread 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1259 7f574dfc-610e-0410-a909-a81674777703
 2008-09-25 18:29:04 +00:00
Brenden Matthews
3115cd8389 improving IMAP IDLE support, more 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1258 7f574dfc-610e-0410-a909-a81674777703
 2008-09-25 04:01:47 +00:00
Brenden Matthews
e80ec4cc5f improving IMAP IDLE support 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1257 7f574dfc-610e-0410-a909-a81674777703
 2008-09-25 03:11:24 +00:00
Brenden Matthews
c15287e798 fix small bug in imap idle stuff 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1256 7f574dfc-610e-0410-a909-a81674777703
 2008-09-24 21:04:29 +00:00
Brenden Matthews
39270e951f add $Id$ to moc stuff 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1255 7f574dfc-610e-0410-a909-a81674777703
 2008-09-24 20:56:09 +00:00
Brenden Matthews
dfc4d44203 oops; forgot to add moc.[ch] 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1253 7f574dfc-610e-0410-a909-a81674777703
 2008-09-24 20:53:58 +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
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
7996b9d05c oops, remove debug stuff 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1246 7f574dfc-610e-0410-a909-a81674777703
 2008-09-11 03:22:37 +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
Phil
56ba0250ab fix error reporting for battery_* variables 
* reproduce with a config displaying stuff for BAT0 and BAT1
  while only BAT0 is installed: the call to get_battery_stuff()
  for the existent BAT0 will reset the static variable rep and
  the errors for BAT1 will be reported over and over again
* this fix is not perfect: if both batteries are missing, only
  the first errors will be reported; but better than flooding the
  terminal


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1243 7f574dfc-610e-0410-a909-a81674777703
 2008-09-01 23:46:48 +00:00
Phil
3adb16ea40 another indentation (and some whitespace) fixup 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1242 7f574dfc-610e-0410-a909-a81674777703
 2008-09-01 23:08:09 +00:00
Phil
36e34a3c8d enable max length argument for mpd_smart 
* this also fixes mpd_title for changing lengths, e.g.
  ${mpd_title 2} ${mpd_title 3} ${mpd_title 4}


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1241 7f574dfc-610e-0410-a909-a81674777703
 2008-09-01 22:30:54 +00:00
Phil
e873442ec5 fix indenting in construct_text_object() 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1240 7f574dfc-610e-0410-a909-a81674777703
 2008-09-01 22:05:24 +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
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
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
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
d23271777d little simplification and improvement of $nvidia 
* check only the unique part of the argument
* print temperatures like all others (%.1f)
* do argument parsing in nvidia.c (so all specific stuff is at one place)
* little header cleanup


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1231 7f574dfc-610e-0410-a909-a81674777703
 2008-08-03 13:27:00 +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
1577667a70 s/kiB/KiB/g 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1227 7f574dfc-610e-0410-a909-a81674777703
 2008-07-20 02:05:11 +00:00
Brenden Matthews
b9bdafb0df improve last fix a bit 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1226 7f574dfc-610e-0410-a909-a81674777703
 2008-07-17 03:14:37 +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
Brenden Matthews
ae4bd7cdf9 fix missing include 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1224 7f574dfc-610e-0410-a909-a81674777703
 2008-07-15 01:05:37 +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
47462b5d1e solve warnings 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1221 7f574dfc-610e-0410-a909-a81674777703
 2008-07-09 23:05:48 +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
9094035f8e Fix bug in optional normal/log argument for graphs 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1217 7f574dfc-610e-0410-a909-a81674777703
 2008-07-06 13:04:29 +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
Roman Bogorodskiy
67d66b03eb - Use u_int instead of unsigned long for storing 
vm related values returned by sysctl
- Minor style fix in preproccessor comments


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1215 7f574dfc-610e-0410-a909-a81674777703
 2008-07-06 09:25:28 +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
5619ce52ad adjust #includes 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1208 7f574dfc-610e-0410-a909-a81674777703
 2008-07-01 19:43:24 +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
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