1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-18 11:05:18 +00:00
Commit Graph

379 Commits

Author SHA1 Message Date
Cesare Tirabassi
d3f1e6288c Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-07-12 21:18:28 +02:00
Brenden Matthews
69e27d28b3 Fix man page name. 2009-07-12 12:32:31 -06:00
Cesare Tirabassi
df17a54301 Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-07-12 11:45:33 +02:00
Nikolas Garofil
9e6fb9c2fe Fix building without math but with X11 2009-07-12 00:51:17 +02:00
Cesare Tirabassi
88ae603cf5 Add support for $desktop, $desktop_number and $desktop_name
Should work with any window manager that supports the
freedesktop.org Window Manager Specification
(see http://www.freedesktop.org/wiki/Specifications/wm-spec).

I have tested succesfully with openbox but some more testing with other
wm would be needed!

Support is built-in; if it is not acceptable to loose cpu cycles for this
at every conky refresh step than it should be conditionally compiled.
2009-07-11 10:50:02 +02:00
Nikolas Garofil
b5ad154f1d spelling: stable instead of stabe 2009-07-10 19:33:26 +02:00
Brenden Matthews
2fa5f97edb A whole bunch of changes, mostly Lua related.
Improved Lua API (lua_read_parse has been removed in favour of the
conky_parse() Lua API call).  The docs have been improved to reflect the
recent Lua API stuff as well.  Introduced new Lua Cairo and Imlib2
bindings, which require the tolua++ tool.  Fixed some other
miscellaneous doc related things.
2009-07-09 22:47:41 -06:00
Nikolas Garofil
9065d1f422 Added support for swapfree 2009-07-09 20:12:52 +02:00
Nikolas Garofil
59f678ecb6 added some extra info about the needed libs for compiling to docs.xml and added the url of the wiki to docs.xml 2009-07-07 15:02:29 +02:00
Cesare Tirabassi
1171ab38a5 Added support for $weather (experimental).
Download, parse and display METAR data from the NWS.

icao must be a valid icao for the required location
(see for instance https://pilotweb.nas.faa.gov/qryhtml/icao/).

data_type must be one of the following:

last_update   : display the date (yyyy/mm/dd) and time (UTC)
	        of the last update.
temperature_C : display air temperature in degree Celsius.
temperature_F : display air temperature in degree Fahrenheit.
cloud_cover   : display the highest cloud cover status.
pressure      : display air pressure in millibar.
wind_speed    : display wind speed in km/hour.
wind_dir      : display wind direction.
wind_dir_DEG  : display compass wind direction.
humidity      : display relative humidity in %.
weather       : display any relevant weather event (rain, snow, etc.).

delay_in_minutes (optional, default 30) cannot be lower than 30 min.
Up to 3 stations can be simultaneously queried.

Use --enable-weather to compile this in.
2009-07-07 00:20:12 +02:00
Brenden Matthews
ae6c02b0c8 Improve docs and parsing of graph args further. 2009-07-04 22:03:12 -06:00
Brenden Matthews
52c68c094c Improved parsing of graph arguments.
Removed "log"|"normal" arguments in	favour of -l switch.
2009-07-04 21:43:45 -06:00
Ole Christian Tvedt
07cfe08dd3 Fixed docs for upspeed and downspeed (not necessarily in KiB any longer).
Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-06-14 16:00:32 -06:00
Lassi Selander
b4f88ff319 Fix XMMS2 related crash (sf.net #2806111 and #2805310, thanks Lassi). 2009-06-14 12:03:50 -06:00
Ole Christian Tvedt
23e89dca08 Added own_window_type panel
The panel type reserves space along the edge of the
screen, just like regular DE panels, taskbars and the
like. I have tested it for several hours now with lots
of different settings, and it seems to be working fine.

Works especially well with alignment top_??? or
bottom_??? and single-line output. Something like
this:

  own_window yes
  own_window_type panel

  alignment bottom_left
  maximum_width 1680
  minimum_size 1680
  gap_x 0
  gap_y 0

  stippled_borders 1
  draw_borders yes

  update_interval 3.0

  TEXT
  $nodename $tab $freq_g ${color grey}GHz$color $tab $memperc% ${color grey}RAM$color $tab $cpu% ${color grey}CPU $tab etc...etc...$alignr${time %F %R}

The line after TEXT is supposed to be on one line,
just in case some channel has messed it up.

Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-06-13 17:46:09 -06:00
Nikolas Garofil
f2176e6f54 Added support for blink 2009-06-13 23:52:41 +02:00
Brenden Matthews
182ca0c57c Show count of variables/config settings. 2009-06-13 15:05:06 -06:00
Nikolas Garofil
0108d14e68 Added 2009-06-13 01:48:54 +02:00
Pavel Labath
c0d1c313e9 Support for per-task I/O statistics - $top_io
Basically, I just added three new process properties (io_read, io_write, io_perc - representing
the amount of I/O done by the process during the update interval) and $top_io, that sorts
processes based on io_perc.

Atm, it's completely #ifdef'd, since it requires kernel support. But that creates some wierd
looking syntax at some places, so it may be better to remove some ifdefs.  It even may be
possible to completely remove the ifdefs (ie. convert them to #ifdef linux) since the code will
compile just fine even if the kernel doesn't support I/O accounting. I'll leave that for someone
else to decide.
2009-06-12 19:39:45 +02:00
Brenden Matthews
e45db41a9d Added border_inner_margin and border_outer_margin.
The border_margin config option is now deprecated.  This also resolves
an issue with weird border_margin values causing X to crash.
2009-06-11 19:07:21 -06:00
Brenden Matthews
eb722bf30d Revert "Clarify fs free stats."
This reverts commit da65a4bcf8.
2009-06-10 14:09:34 -06:00
Brenden Matthews
da65a4bcf8 Clarify fs free stats. 2009-06-10 11:31:24 -06:00
Vincent Breitmoser
f3aa025872 Added format_human_readable option (sf.net #2803345, thanks Vincent). 2009-06-09 14:52:18 -06:00
Nikolas Garofil
c392152d3a extra displayoptions for battery_short and make sure full isn't handled as unknown 2009-06-08 21:15:18 +02:00
Brenden Matthews
e995be8cf8 Strip control chars from README. 2009-06-07 21:45:39 -06:00
Brenden Matthews
6ebfffe542 Fix check_docs.py to work with cleaned up XML. 2009-06-07 21:23:35 -06:00
Brenden Matthews
a9c8ae4145 Make device argument optional for most net stats.
We can use DEFAULTNETDEV for more than just up/downspeedgraph.
2009-06-06 22:56:29 -06:00
Brenden Matthews
17d5310981 Fix error in docs regarding graph arguments. 2009-06-06 21:09:26 -06:00
Brenden Matthews
34db4eb49b Add note about -a opts, bump doc date. 2009-06-06 18:12:25 -06:00
Brenden Matthews
815dcf872d Update command opts docs. 2009-06-06 18:10:20 -06:00
Brenden Matthews
f295e2dc9f Doc correction. 2009-06-06 18:03:22 -06:00
Brenden Matthews
33754ecebe Let lua_graph behave more like other graphs.
Changed llua_getinteger() to llua_getnumber() returning a double, so
that you can use floating point values in graphs etc.  Lua graph will
scale like other graphs (except execgraph) by default now, and you can
manually set a scale with the scale argument.
2009-06-06 17:25:34 -06:00
Brenden Matthews
576d55e473 Add tidying/sorting to check_docs.py. 2009-06-06 16:56:35 -06:00
Phil Sutter
20e4e19f83 add entropy_perc
There is no rounding done, so e.g. 3.6% get 3%. But double casting and
calling round_to_int() is just too ugly.
2009-06-04 22:51:25 +02:00
Nikolas Garofil
f3fd389ea0 read_tcp werkt maar moet nog stresstesten ondergaan 2009-06-04 19:39:18 +02:00
Brenden Matthews
904354f93b Added some better cache control options for Imlib2. 2009-06-03 13:24:53 -06:00
Brenden Matthews
4ec728fa42 Added fancy new 'temperature gradients' feature.
See docs for more details on 'temperature gradients', which can be
turned on with the -t switch on graphs.  Also improved parsing of
options with $execgraph and $execigraph, but may cause some breakage.
2009-05-24 15:53:32 -06:00
Brenden Matthews
06044bf7e5 Try and fix weirdness with hwmon/i2c/platform options. 2009-05-24 13:07:27 -06:00
Brenden Matthews
6477962dc9 Added support for rending images by way of IMLIB2. 2009-05-17 23:11:22 -06:00
Brenden Matthews
ddcc8ceb70 Merge branch 'master' into imlib2
Conflicts:
	extras/nano/conky.nanorc
	extras/vim/syntax/conkyrc.vim
2009-05-17 22:11:40 -06:00
Brenden Matthews
353f0b6ad7 More work on imlib2 stuff.
Seems to be some rendering corruption which I'm not sure the reason for,
but other than that I think it works okay.
2009-05-16 23:47:02 -06:00
Brenden Matthews
e18e051b66 Fix docs. 2009-05-16 17:19:15 -06:00
Brenden Matthews
b661dbf5a7 More lua stuff. 2009-05-16 17:04:26 -06:00
Brenden Matthews
0e21a804ee Couple minor lua changes. 2009-05-16 14:55:05 -06:00
Toni Spets
a64e9f8950 Lua scripting support, initial commit 2009-05-15 21:08:51 +03:00
Phil Sutter
a07a082d76 add documentation about --print-config 2009-05-12 01:58:41 +02:00
Phil Sutter
16d551b208 add system-wide config to FILES section 2009-05-12 01:31:47 +02:00
Phil Sutter
322d77942a hwmon: add args for value precalculation 2009-05-12 00:49:40 +02:00
Brenden Matthews
8cb0027f45 Various fixes.
Added missing apcupsd.[hc], added apcupsd_loadgauge, fixed compilation
errors, updated docs & syntax stuff.
2009-05-10 13:11:09 -06:00
Jaromir Smrcek
cf2c61b588 Added support for APC UPS daemon monitoring. 2009-05-10 12:58:06 -06:00
Brenden Matthews
197c4d5bc3 Update docs, remove deprecated code. 2009-05-09 23:30:42 -06:00
Brenden Matthews
a5efc6fa46 Make docs aboot gap/position stuff easier to find. 2009-05-09 22:14:10 -06:00
Brenden Matthews
fdadbbf98e Added top_name_width config option. 2009-05-07 17:49:32 -06:00
Brenden Matthews
72a90b38be Specify that imap/pop3 interval is in seconds. 2009-05-07 13:18:24 -06:00
Brenden Matthews
884ce9192e Fix for imap docs. 2009-05-07 13:16:26 -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
Yeon-Hyeong Yang
68ea7a7859 Added diskio_avg_samples patch (thanks Yeon-Hyeong) 2009-05-01 17:03:59 -06:00
Brenden Matthews
cd2fc39cad Bump docs. 2009-05-01 16:53:57 -06:00
Brenden Matthews
e8e6d1c819 Few misc doc related things.
Added the (incomplete) check_docs.py, to 'synchronize' the docs with the
code, as well as vim/nano syntax stuff.

Removed some unused OBJ_* stuff from text_objects.h, and updated docs
with some missing things.  Also removed a couple deprecated objects
which were still documented.
2009-05-01 16:53:50 -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
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
Brenden Matthews
77f818168b Update docs. 2009-04-09 20:18:19 -06:00
Brenden Matthews
506f6ecc3b Special default & gauge fixes. 2009-04-09 20:10:08 -06:00
Brenden Matthews
acfef7760f Clarify $tab arguments. 2009-04-09 17:08:01 -06: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
Brenden Matthews
ea34b2c5e5 Fix xmms2 related compilation error? 2009-04-09 15:33:50 -06:00
Phil Sutter
7001e95186 be consistent when parsing args of cpu objects
The inconsistent naming of the cpu parameter in the docs led me to this,
so I also simplified parsing by introducing the macro SCAN_CPU(). Note
that this introduces a syntactical change to the config: the cpuN
argument now has to be passed at first position to $cpugraph.
2009-04-04 01:25:33 +02:00
Brenden Matthews
595b22fcce Don't strip control chars from man page.
If you're using `less' to view the readme, it should display properly.
If we run the man page through `col', it results in weird characters
hanging around.
2009-03-29 22:56:29 -06:00
Brenden Matthews
f05829ad9a Update copyright stuff, fix conky.conf weirdness. 2009-03-29 22:55:51 -06:00
Phil Sutter
e7559ad5be update README and manpage 2009-03-24 01:25:56 +01: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
c8e2437f1e Regenerate docs. 2009-03-17 23:27:54 -06:00
newclearman
3d56128925 Adds the docs for the gauges
Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-03-17 23:27:47 -06:00
Brenden Matthews
21e9964c5a Update docs for $if_running. 2009-03-15 22:14:07 -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
ecabc1a29b update README and manpage 2009-03-01 21:12:46 +01:00
Nikolas Garofil
09ac943a3a if_updatenr added 2009-03-01 15:10:01 +01:00
Nicolas Sierro
cf77d3f1f9 Extended support for local Maildir patch sf.net id #2561323 (thanks Nicolas). 2009-02-17 22:26:15 -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
Swoög
b516e19440 Patch to add $battery_short variable. 2009-02-17 21:49:45 -07:00
Brenden Matthews
b4cd98868f Misc compilation fixes. 2009-02-17 21:45:06 -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
Alexander Graf
b4f06b7547 Update README and conky.1
With my last patch I did only update the XML documentation file without
updating the auto-generated manpage and README file.

This patch also updates README and conky.1.
2009-02-07 17:44:19 +01:00
Alexander Graf
9c679bf33f Add ${top_time} sorting processes by CPU time 2009-02-07 15:01:50 +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
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
669c12e490 Update docs. 2008-12-15 21:18:24 -07:00
Itai Zukerman
bb817b2cf7 Patch to allow escaping newlines in the config. 2008-12-15 21:17:56 -07:00
Brenden Matthews
721d329151 Add conky.1 back into repo. 2008-12-13 19:39:29 -07:00
Phil Sutter
c84b485178 update the default config along with the syntax files 2008-12-12 15:32:16 +01:00
Brenden Matthews
dc3ed8df13 Removing old svn keywords. 2008-12-09 16:35:49 -07:00
Brenden Matthews
9684e6b36f Removing svn ebuild, changing svn references to git. 2008-12-08 23:12:58 -07:00
Phil Sutter
ffbac491d2 drop docs of dropped objects
All the Fahrenheit specific objects have been removed due to
f5259295cf, remove their documentation
also.
2008-12-08 16:11:39 +01: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