1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-27 04:32:55 +00:00
Commit Graph

563 Commits

Author SHA1 Message Date
Nelis Oostens
ebbf28c79b Update command options documentation (#247)
- Removed deprecated option (-s)
 - Added info (build flag)
 - Sorted alphabetically

This fixes issue #203
2016-05-06 07:25:06 -04:00
marcpayne
8dda4c3995 Parse quoted execgraph cmd before parsing options (#232)
When parsing the argument string for graph objects, check if there is a
double-quoted command in the beginning of the string and extract it
before parsing any options. This prevents items in a command from being
improperly recognized as graph options. It should also eliminate the
need to place commands with spaces into a separate script.

Also, fall back on default_graph_{height,width} instead of using
hard-coded values so that the default values set in a user's config will
work.
2016-05-03 08:04:57 -04:00
Brenden Matthews
49babf1181 Merge pull request #184 from marcpayne/lua-bindings
Require Lua 5.1 when building the Lua bindings
2016-03-21 09:12:35 -07:00
Marc Payne
adae1f6293 Refactor the exec callback system
The main purpose of this commit is to ensure that exec callbacks are
registered at startup (or config reload), so that they have a chance to
run on the first update interval. Much of the code in exec.cc got
consolidated, making it easier to follow. Several checks for NULL
pointers should eliminate some obscure segfaults I noticed, as well.

During the refactoring, I implemented height and width arguments for
execbar and execgauge. The functionality was already there, but wasn't
being used. All this is accompanied by updates to the man page and
plenty of code comments.
2016-01-09 10:19:48 -07:00
Marc Payne
0dbd27d2de Require Lua 5.1 when building the Lua bindings
The cairo/imlib2/rsvg bindings require tolua++ [1], which is currently only
compatible with Lua 5.1 or earlier. We need to force Conky to compile against
Lua 5.1 if the user chooses to build the bindings.

This commit adds a separate pkg_search_module command specifically for Lua 5.1,
along with a note in the documentation. The original pkg_search_module command
was updated to include (and prefer) Lua 5.3+. Also, I threw in two other minor
random fixes to the docs while I was at it.

[1] https://github.com/LuaDist/toluapp
2015-12-11 16:05:02 -07:00
Franc[e]sco
162d9d13b7 added support for multiple xinerama heads (fixes issue #172) 2015-12-01 13:53:43 +01:00
Brenden Matthews
279af501a5 Merge pull request #157 from travisred/master
fix typo in docs
2015-11-07 09:30:21 -08:00
Brenden Matthews
efa7a6f74d Merge pull request #154 from vvheritagevv/master
Changed apm_ descriptions. The FreeBSD specific ones work with OpenBS…
2015-11-07 09:30:09 -08:00
Travis Reddell
96e4313a47 fix typo in docs 2015-10-19 17:23:00 -07:00
Jeremy Gransden
2c035f3cb0 Changed apm_ descriptions. the FreeBSD specific ones work with OpenBSD as well 2015-10-15 10:04:45 -04:00
Marc Payne
caefe535c7 Update documentation for if_running 2015-08-28 18:42:12 -06:00
Brenden Matthews
9f6d727831 Merge pull request #115 from marcpayne/top-name-verbose
Add top_name_verbose option
2015-07-30 15:59:16 -07:00
Nelis Oostens
b5e4056b9d Updated templateN to new syntax
- Explicitly mentioned the use of [[ and ]]
2015-07-27 08:08:50 +00:00
Nelis Oostens
d07c9368cb Clarified templateN documentation
- Added arg start counter
2015-07-27 08:06:39 +00:00
Marc Payne
06722e4a2a Add top_name_verbose option
Since commit 749083a, the output of ${top name <num>} contains the full
command line of each process, including arguments. While this feature can
be very useful, it changes the default behavior of Conky.

The present commit adds a new top_name_verbose option that allows the user
to toggle between basenames with no arguments (the old behavior) and full
command lines with arguments. To remain consistent with past versions of
Conky, the default value of top_name_verbose is false.

Fixes #113 (https://github.com/brndnmtthws/conky/issues/113).
2015-07-20 17:27:45 -06:00
Troy C
34903b493f Update docs for diskio label 2015-02-19 14:23:37 -06:00
Łukasz Stelmach
00481ee9a9 Read configuration from ~/.config/conky/conky.conf
Try to load configuration from ~/.config/conky/conky.conf before
falling back to ~/.conkyrc and /etc/conky/conky.conf.
2014-11-17 22:06:27 +01:00
Paul Egan
9809f7cd91 Support for graph output on console/shell 2014-05-05 21:07:55 +01:00
Vilmos Nebehaj
f39de709e3 Update docs for battery_bar and battery_percent. 2014-03-09 18:54:41 +01:00
eskerda
68263d4556 add support for $ibm_thinklight
Some IBM/Lenovo models come with a light on the top edge of the
display to illuminate the keyboard. This either reports 'on', 'off'
or 'unknown'.
2013-12-06 16:44:37 +01:00
Pavel Labath
5177c8d282 MPD: add mpd_albumartist (sf.net #3532376)
Adds mpd_albumartist support as an object since mpd_artist lists all participating artists of the
current song and not the main album artist.

patch by Sébastien Lavoie-Courchesne
2012-10-07 12:07:38 +02:00
Pavel Labath
ef2855080e Make sure we get report if one of the commands in the documentation pipeline fails 2012-10-03 22:51:28 +02:00
Magliano Andrea
78b1daf848 Update docs + minor changes
* document DragonFly specific $version variable
* add sample conky config file
* some dragonfly.cc code cleanup
2012-06-28 19:05:28 +02:00
Brenden Matthews
ddef05d4eb Update version, copyright. 2012-05-03 16:34:44 -07:00
Pavel Labath
be4854c6bb add mpd_date function that shows date for current track (sf.net #3440445)
patch submitted by Andrey Tikhonov
2012-01-29 21:14:19 +01:00
Pavel Labath
3c82e6bd3d Fix spelling error in the manpage
noticed by Vincent C.
2011-12-08 12:45:55 +01:00
Christian Brabandt
354e577b15 Cmus support added to conky 2011-10-13 09:41:53 +02:00
Pavel Labath
6c04ba542b Add uid to "top" output (sf.net #3178916)
original patch submitted by Thomas Wiegner, I added support for printing of raw uids.
2011-10-10 22:11:34 +02:00
skizzhg
71e220eaa6 Explained that mixer requires OSS and added the device list. 2011-08-25 18:46:15 +02:00
Pavel Labath
17cf8517c3 Merge remote branch 'origin/master' into lua-config 2011-03-26 21:09:00 +01:00
Pavel Labath
75e147fa25 Remove timed_thread code as it is no longer used. 2011-03-26 21:04:07 +01:00
Pavel Labath
b96f112106 Make $exec et al. use the new callback system
I removed the code for automatic killing of stuck children, because (by admission of the person
who wrote it) it wasn't working. I also removed the $pre_exec variable, because one can use lua
to generate the config on the startup, if one wants to.
2011-02-27 22:43:32 +01:00
Nikolas Garofil
18ce365d16 change reading args of $v6addrs and add docs 2011-02-11 15:43:01 +01:00
Pavel Labath
87591f502e add a $memdirty variable
patch contributed by Piotr Karbowski (sf.net #3138195)
2011-01-04 14:48:33 +01:00
Nikolas Garofil
7310bff162 remove TEXT in config_settings.xml and variables.xml 2010-11-25 14:41:24 +01:00
Pavel Labath
87415d6e36 xftfont is renamed to font
whether the font setting specifies an X or an Xft font depends on the use_xft setting.
2010-11-17 14:49:03 +01:00
Pavel Labath
0852aa4fcd Merge remote branch 'origin/master' into lua-config
Conflicts:
	src/ccurl_thread.cc
	src/conky.cc
	src/llua.cc
	src/logging.h
	src/nvidia.cc
2010-11-13 20:05:59 +01:00
Brenden Matthews
34fc51fdc0 Fix indentation. 2010-10-05 13:25:42 -07:00
Brenden Matthews
6437804959 Allow method to pass execgraph arguments containing spaces. 2010-10-05 12:27:03 -07:00
Brenden Matthews
6119a0737e Correct docs. 2010-10-05 12:03:18 -07:00
Pavel Labath
9f7e696a85 Remove the $include variable
the way it is implemented now just wont work with the new config file. And i don't think that
many people used it anyway. Maybe add a replacement later?
2010-09-15 23:34:47 +02:00
Pavel Labath
ed70663b99 Make minimum_{width,height} lua settings 2010-08-26 17:40:53 +02:00
Pavel Labath
467abd2edf Make default_gauge_{width,height} lua settings 2010-08-26 17:26:34 +02:00
Pavel Labath
184afe1555 Make default_graph_{width,height} lua settings 2010-08-26 17:18:55 +02:00
Pavel Labath
34a34693d7 Make default_bar_{width,height} lua settings 2010-08-26 16:33:13 +02:00
Pavel Labath
8ff9b58c3b Fix 'nvidia with ncurses segfaults' (sf.net #3006233)
Additionally, add a nvidia_display variable. This enables the $nvidia variable to be used without
out_to_x yes (X11 support still has to be built in, you just don't have to use it).
2010-08-13 15:23:11 +02:00
Nikolas Garofil
99fc975780 Add support for $wireless_freq 2010-06-07 10:50:02 +02:00
Nikolas Garofil
7b9d69950c Docs for $wireless_channel 2010-06-07 10:06:07 +02:00
Nikolas Garofil
edc45d41f2 Add support for http_refresh 2010-06-04 15:47:01 +02:00
Nikolas Garofil
54d4e6518d Add support for out_to_http 2010-06-04 14:41:12 +02:00
Nikolas Garofil
3f7ecb3a26 Add support for $irc 2010-04-30 19:32:42 +02:00
Nikolas Garofil
a13c56a7a5 Add support for $ical 2010-04-27 16:42:21 +02:00
Nikolas Garofil
9a50e0ed19 update docs 2010-04-24 15:01:10 +02:00
Nikolas Garofil
00c869a2bf Add almost all stock data yahoo provides 2010-04-24 14:57:04 +02:00
Nikolas Garofil
45d63c7fba Default tcp_ping port changed to 80 2010-04-24 12:33:40 +02:00
Nikolas Garofil
a2ae025f56 Add support for $tcp_ping 2010-04-24 01:40:24 +02:00
Nikolas Garofil
ed0dd49dd8 Add some more stock data that yahoo is providing 2010-04-22 16:52:15 +02:00
Nikolas Garofil
bc5a414594 $curl can now use 0 (immediately) as interval 2010-04-19 17:19:56 +02:00
Nikolas Garofil
d6537aa678 Add support for $stock 2010-04-19 14:45:05 +02:00
Nikolas Garofil
a6e63bcaa0 Add support for MySQL
Warning: Altough the current version works (for me),
the syntax of the configoptions and vars will probably change
over time. Contact me if you have ideas.

The following is a example of how you can use it now:

mysql_host someserver.com
mysql_db my_database
mysql_user loginname
mysql_password "s3cr3t"
TEXT
${mysql select var1 from some_table}${mysql select var2 from some_table}
2010-04-18 17:52:41 +02:00
Nikolas Garofil
0ab2efc2b2 Add support for $no_update 2010-04-17 15:19:44 +02:00
Nikolas Garofil
19ad7d2cc3 Add support for $read_udp 2010-04-16 18:53:48 +02:00
Nikolas Garofil
95a2de7346 Update docs and extras 2010-04-15 17:30:14 +02:00
Nikolas Garofil
f5c147b160 Add support for $nodename_short
This is different implementation (compared to 9e3156a4a6)
because 1.8.1 was still regular c instead of c++
2010-04-14 18:41:25 +02:00
Nikolas Garofil
08ea4391d4 Deprecated max_specials, made it unlimited by changing the data structure for specials 2010-04-14 16:59:50 +02:00
Nikolas Garofil
cda990633c Add support for --stdin-config 2010-04-13 17:02:39 +02:00
Nikolas Garofil
1de13eb728 update docs 2010-04-12 12:48:02 +02:00
Cesare Tirabassi
cc71dea079 Fix doc re. mixer names
(cherry picked from commit 1fe99bc578)
2010-03-13 19:30:58 +01:00
Pavel Labath
2ad1809f87 s/substract/subtract/ 2010-02-28 14:05:28 +01:00
Pavel Labath
6382d8cd34 Make own_window_title default value in docs reflect reality 2010-02-26 18:14:25 +01:00
Nikolas Garofil
99b5352cff Add --for-scripts support 2010-02-20 02:25:38 +01:00
Caleb Spare
c7fa36a5f2 $memwithbuffers object and bar (sf.net #2954143)
I've added $memwithbuffers to complement $mem, $memeasyfree, etc. This
variable indicates the used system memory, regardless of buffers/caches. If
the "no_buffers" option is set to "no", it will be the same as $mem. The
reason I find this change useful is that I like to display both the total
used system memory and the memory being used by applications.

I've also included a memwithbuffersbar, which is the same as membar except
that it uses $memwithbuffers as the size instead of $mem.

Signed-off-by: Pavel Labath <pavelo@centrum.sk>
2010-02-18 18:32:25 +01:00
Pavel Labath
d6ea46f8cb Update docs to be consistent with changes in previous commit 2010-02-17 19:55:39 +01:00
Nikolas Garofil
3ceb8cb570 Add support for scrolling in the other direction 2010-02-17 17:49:03 +01:00
Nikolas Garofil
01e3bb62a2 Implements texecpi variable 2010-02-07 10:29:43 +01:00
Nikolas Garofil
8973cf315a Adjust format of curl, rss and include entries in variables.xml so that the script that enters them in the wiki can read them. 2010-02-06 17:21:08 +01:00
Pavel Labath
1de2a9e6c5 Add optional argument to $acpiacadapter
The exact location of the state information seems hardware dependent, so this adds the option to
specify it manually. (linux only)
2010-01-24 15:34:03 +01:00
Brenden Matthews
b8a678728c Remove automake build system, fix defconfig.h. 2010-01-04 18:07:49 -08:00
Brenden Matthews
39f01e216b Added disable_auto_reload option, callback fixes.
There were some issues with reloading and the threaded callback
framework, which I think are mostly resolved now, but may need more
testing.
2010-01-02 14:44:12 -08:00
Brenden Matthews
0f5f2a1afe Improve handling of ARGB visuals a bit.
Conflicts:

	src/conky.cc
2010-01-02 11:43:29 -08:00
Brenden Matthews
2951f5571c Add missing copyright notices. 2010-01-01 15:49:41 -08:00
Brenden Matthews
cf9e498b24 Update copyright notices. 2010-01-01 15:46:17 -08:00
danielb
6c5fa44660 Add ARGB visual support.
This patch adds the possibility to use a argb visual for the conky
window.  Adding a boolean configuration entry 'own_window_argb_visual'.
the 'set_transparent_background' method sets the alpha bytes of the argb
color for transparency, instead of pseudo transparency.  This patch
would close following feature request:
https://sourceforge.net/tracker/?func=detail&aid=1563931&group_id=143975&at
id=757311 and would be a workaround for some reported transparency bugs
(https://sourceforge.net/tracker/?func=detail&aid=1968923&group_id=143975&a
tid=757308 for example)

Signed-off-by: Brenden Matthews <brenden@diddyinc.com>
2010-01-01 15:03:40 -08:00
Brenden Matthews
3efe71520f Deprecate autotools, update docs to reflect cmake build system. 2010-01-01 14:08:57 -08:00
Cesare Tirabassi
c8a99a865a Fix some typos in documentation 2009-12-27 23:07:16 +01:00
Brenden Matthews
4d0924f6b0 More work on CMake build system (possibly finished?). 2009-12-19 11:39:16 -08:00
Brenden Matthews
51ff65ede0 Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-12-17 18:52:05 -08:00
Phil Sutter
510d617c74 fix doc typo and add highlighting for times_in_seconds 2009-12-13 00:28:01 +01:00
Brenden Matthews
48e834d1eb More work on CMake build system. 2009-12-10 20:37:56 -08:00
Cesare Tirabassi
a14cca6592 remove <programlisting> from variables.xml, it only messes the man page and serve no other purpose 2009-12-09 23:29:44 +01:00
Brenden Matthews
f36f747aca Add (broken) cmake build stuff. 2009-11-26 11:25:32 -08:00
Brenden Matthews
8bd41caa51 Add creation functions for certain cairo structures. 2009-11-25 12:53:42 -08:00
Nikolas Garofil
4652e834b1 Add support for max_text_width configuration setting 2009-11-25 16:04:49 +01:00
Nikolas Garofil
d9f93d3c1e Fix: README contained control chars 2009-11-23 01:04:25 +01:00
Pavel Labath
722c7566b6 A better fix for the PAGER=vim problem, thanks Phil 2009-11-22 23:30:47 +01:00
Pavel Labath
93c71fe608 unset PAGER before generating README
apparently, some people like to set PAGER=vim and vim doesn't like when we redirect man output to
a file
2009-11-22 23:21:49 +01:00
Nikolas Garofil
0ef81a2f05 Fix xml syntax docs 2009-11-22 19:51:11 +01:00
Nikolas Garofil
fe1d7da3d5 Add support for $pid_read and $pid_write 2009-11-19 12:32:14 +01:00
Nikolas Garofil
f8bae62234 $format_time treats ( and ) as special chars 2009-11-19 00:21:49 +01:00
Nikolas Garofil
59594e70d2 Added support for \Sx to $format_time 2009-11-19 00:04:49 +01:00