Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-26 12:27:52 +00:00
Code Issues Releases Activity
1,732 Commits 5 Branches 46 Tags 22 MiB
165eeb0fd6
Commit Graph

421 Commits

Author SHA1 Message Date
Jaromir Smrcek
cf2c61b588 Added support for APC UPS daemon monitoring. 2009-05-10 12:58:06 -06:00
Brenden Matthews
24f97c45c6 Allow the use of '#' for comments within text area (can be escaped with '\#'. 
Also refactored some code relating to the config file loading (since
there was some duplication of code).
 2009-05-09 20:10:55 -06:00
Brenden Matthews
fdadbbf98e Added top_name_width config option. 2009-05-07 17:49:32 -06:00
Brenden Matthews
3b6f4c767a Update changelog for last commit. 2009-05-07 12:48:54 -06:00
Brenden Matthews
fde096c435 Added some completely pointless OpenMP optimizations(?) 2009-05-05 17:36:12 -06:00
Brenden Matthews
f6fe653401 Revert "Combine can now use other chars to seperate vars (used to be only space)" 
This reverts commit 3dd1738fb9.
 2009-05-04 13:13:51 -06:00
Nikolas Garofil
3dd1738fb9 Combine can now use other chars to seperate vars (used to be only space) 
Also undid the last change because sony.h was not included, feel free to submit
it again if you include this file and other sourcefiles needed (there is also
no definition of get_sony_fanspeed). If sony systems already have this file and
a definition of this function, please update the configure file so that support
for this is disabled by default and can be enabled by sony owners.
 2009-05-04 12:58:52 +02:00
Yeon-Hyeong Yang
f8a6a4035c Added Sony VAIO fanspeed info (thanks Yeon-Hyeong). 
Also removed the README and man page from the repo, as they don't really
need to be there and just cause conflicts.
 2009-05-03 21:23:59 -06:00
Brenden Matthews
27fff0d9cb Fixed $texeci regression. 2009-05-01 23:05:06 -06:00
Brenden Matthews
45b3a6f66d Fix changelog. 
Needed to make sure the stuff that went in after 1.7.0 is not below the
'1.7.0 released' entry.
 2009-05-01 17:12:09 -06:00
Yeon-Hyeong Yang
68ea7a7859 Added diskio_avg_samples patch (thanks Yeon-Hyeong) 2009-05-01 17:03:59 -06:00
Brenden Matthews
814469b0c9 Conky 1.7.0 "Hungry Hobo" released! 2009-05-01 16:56:12 -06:00
Nikolas Garofil
e05e9ece8e Added the combine variable 2009-04-30 21:05:59 +02: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
Lassi Selander
49aee8707a Various XMMS2 updates (thanks Lassi). 2009-04-28 10:02:24 -06:00
Nikolas Garofil
6bc19d0396 Workaround for the problem that $goto only moves the first rss-item by making 
it possible to specify the number of spaces you want in front of each rss-item
 2009-04-19 00:42:01 +02:00
Nikolas Garofil
86b91db305 Bugfix: compilation without X11 broke after latest patches 2009-04-13 14:42:31 +02:00
Brenden Matthews
38ee788da4 Added default_bar/graph/gauge_size config options (thanks wire64 for the idea) 2009-04-09 16:00:40 -06:00
Or Cohen
b6e691e8ac Minor fix for fs_used_perc, fs_free and fs_free_perc 2009-04-09 15:34:12 -06:00
Brenden Matthews
9f6c13e16a Fix charset of changelog. 2009-03-29 23:18:17 -06:00
Brenden Matthews
edc8857b4f Update changelog. 2009-03-29 21:32:24 -06:00
Phil Sutter
2c3d57d841 add eval object, evaluating it's args 
This object makes use of the possibility to escape dollar signs in TEXT.
Take the following example in the conkyrc:
| $${downspeed ${gw_iface}}
will be evaluated to (assuming the gw_iface is eth0):
| ${downspeed eth0}
and finally interpreted to print the gateway interface's downspeed rate.
 2009-03-24 01:25:13 +01:00
Brenden Matthews
b18628ad98 Update changelog. 2009-03-16 15:32:01 -06:00
Brenden Matthews
c5946e227d Updating changelog. 2009-03-15 19:37:11 -06:00
Nikos Ntarmos
e275b05242 Disk i/o support on FreeBSD patch. 
Patch sf.net id #2657227 (thanks Nikos).
 2009-03-15 19:11:49 -06:00
Brenden Matthews
1aa8f6ada4 Updating changelog. 2009-03-15 19:01:06 -06:00
Nikolas Garofil
d1baa243a8 Added alias configfile setting 
This patch is written by a anonymous author, see patch on sf.net
id #2663691 . I changed it a bit so that it can't overwrite
existing environment variables and updated the docs and syntaxfiles
 2009-03-07 15:12:09 +01:00
Phil Sutter
72e217fae2 fix padding of $processes 
Padding to 4 digits allows for max 9999 processes, which should really
be more than enough for systems running conky. ;)
 2009-03-01 21:12:16 +01:00
Phil Sutter
e6a9c02d11 fix padding in temp_print 2009-03-01 21:03:49 +01:00
Phil Sutter
44c5a10e04 rewrite human_readable() to minimise padding 
Also fix spaced_print(): when given a width of e.g. 3, output at least 3
characters, not 2 as it was before.
 2009-03-01 20:24:22 +01:00
Nikolas Garofil
09ac943a3a if_updatenr added 2009-03-01 15:10:01 +01: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
Brenden Matthews
f92978c5e5 No space between number and units please. 2009-02-17 22:50:43 -07:00
Sattvik
482dd1b82f Null mpd variables should have an empty string patch sf.net id #2564747. 2009-02-17 22:42:08 -07:00
Tamim Khan
d1180b4729 XMMS2 fix and refactoring patch sf.net id #2579357 (thanks Tamim). 2009-02-17 22:29:42 -07:00
Nicolas Sierro
cf77d3f1f9 Extended support for local Maildir patch sf.net id #2561323 (thanks Nicolas). 2009-02-17 22:26:15 -07:00
Martin Tůma
f7aeae2c01 Fix shown battery status patch. 
Fix shown battery status when the battery is not charging any more but is not full charged patch sf.net id #2556056 (thanks Martin).
 2009-02-17 22:19:25 -07:00
Carpathia
5640da7c84 Patch to clarify things in conky.conf sf.net id #2548805 (thanks Carpathia). 2009-02-17 22:14:59 -07:00
Alexander Monakov
24ddc9665e Fix nvidia memory frequency reading patch sf.net id #2493134. 2009-02-17 22:10:15 -07:00
Alexander Monakov
966a05a984 Fix diskio_read/write patch sf.net id #2493084 (thanks Alexander). 2009-02-17 22:04:38 -07:00
Kim Holviala
27bb931e41 Patch by Kim Holviala sf.net id #2484548. 
* change the height of execbar and execibar to be the same as other
		bars have by default (6 pixels)
		* treat mixer values as percentages as they're usually 0-100 (switch
		to spaced_print() with pad_percents)
		* change temp_print() from snprintf() to spaced_print()
		* remove decimals from temp_print() as none of the current sources can
		supply values smaller than 1 degree (C or F, doesn't matter)
		* add a space between number and the unit in human_readable()
		* fix number printing in human_readable()
		* network $upspeed and $downspeed now use human_readable()
 2009-02-17 22:00:23 -07:00
Swoög
b516e19440 Patch to add $battery_short variable. 2009-02-17 21:49:45 -07:00
Nikolas Garofil
1085d2b27e out_to_x can now be turned off 2009-02-15 18:58:03 +01:00
Nikolas Garofil
227e5a3d38 docs and syntax for overwrite_file and append_file 2009-02-12 23:04:39 +01:00
Nikolas Garofil
4c25a9680e Added output_to_stderr 2009-02-10 09:43:20 +01:00
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
Nikolas Garofil
83bf37fe85 Bugfix: execgraph scale 0-0 instead of 0-100 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1149 7f574dfc-610e-0410-a909-a81674777703
 2008-06-08 20:39:07 +00:00
Nikolas Garofil
29ba1bdd2e memgraph documentation 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1144 7f574dfc-610e-0410-a909-a81674777703
 2008-06-08 11:41:00 +00:00
Nikolas Garofil
26bea66044 Bugfix: didn't work 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1143 7f574dfc-610e-0410-a909-a81674777703
 2008-06-08 11:16:51 +00:00
Nikolas Garofil
a306817910 Bugfix: same text multiple times caused by if-family 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1141 7f574dfc-610e-0410-a909-a81674777703
 2008-06-07 19:11:29 +00:00