Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-15 17:47:09 +00:00
Code Issues Releases Activity
3,789 Commits 5 Branches 46 Tags 22 MiB
670973a678
Commit Graph

593 Commits

Author SHA1 Message Date
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
Nikolas Garofil
8f42831a62 Add support for time_in_seconds configuration setting 2009-11-18 20:07:47 +01:00
Nikolas Garofil
0215298c27 Added support for $format_time 2009-11-18 15:35:35 +01:00
Pavel Labath
e97b67aa20 IPv6 support for $tcp_portmon 
In theory, this may fail to compile on ancient systems that don't have IPv6 types (struct
sockaddr_in6 et al.) available. If it turns out that such systems are still in use, the best way
to solve it would be to provide dummy declarations via configure tests.
 2009-11-16 18:17:16 +01:00
Nikolas Garofil
66d8b2cbe0 fix minor mistake in docs 2009-11-16 17:37:25 +01:00
Nikolas Garofil
84d6095c40 Use seconds instead of centiseconds as unit for $pid_time_kernelmode, $pid_time_usermode and $pid_time 2009-11-16 16:59:41 +01:00
Nikolas Garofil
7b05f78de8 Added support for $pid_time_usermode, $pid_time_kernelmode and $pid_time 2009-11-16 15:30:57 +01:00
Nikolas Garofil
015d275098 Add support for $pid_nice and $pid_priority 2009-11-16 15:01:43 +01:00
Nikolas Garofil
f93aa2a68d Added support for $pid_threads and $pid_thread_list 2009-11-16 09:54:17 +01:00
Nikolas Garofil
2ed76a345f Added support for $pid_vmpeak, $pid_vmsize, $pid_vmlck, $pid_vmhwm, $pid_vmrss, $pid_vmdata, $pid_vmstk, $pid_vmexe, $pid_vmlib, $pid_vmpte 2009-11-15 19:44:37 +01:00
Pavel Labath
72412c463b Rename $running_processes to $running_threads, implement real $running_processes 2009-11-15 17:55:03 +01:00
Nikolas Garofil
2c2e87061b Added support for $gid_name 2009-11-15 17:46:41 +01:00
Nikolas Garofil
3fa868f35b Added support for $uid_name 2009-11-15 17:21:55 +01:00
Nikolas Garofil
d38049fb96 Added support for $pid_uid, $pid_euid, $pid_suid, $pid_fsuid, $pid_gid, $pid_egid, $pid_sgid and $pid_fsgid 2009-11-15 14:49:55 +01:00
Nikolas Garofil
b8e6b1a58d Add support for $pid_parent 2009-11-15 13:26:40 +01:00
Nikolas Garofil
038e182c38 argument of $cmdline_to_pid doesnt have to be the full commandline 2009-11-15 00:51:38 +01:00
Nikolas Garofil
fa459f0539 Make it possible to use other vars as arguments for the $pid-vars, add support for $pid_state_short, add support for $cmdline_to_pid 2009-11-14 22:07:54 +01:00
Cesare Tirabassi
0ee5e9935a Refactoring of commit 363cf1ab73 
The problem with the original commit was that some session-managers set
stdin to /dev/null for the processes they launch, therefore the variable
wasn't very effective.
This commit change the variable conky_user_time to user_time.
This variable has a mandatory argument, a console identifier
(eg. tty7, pts/0, etc.).
Once called, this will list how long the user for the given console has been
logged in for.
This commit also allows multiple user_time to be specified for different
consoles, as well as correctly handle a conky restart.
 2009-11-14 15:57:45 +01:00
Nikolas Garofil
44de7fe6be Support for $pid_state 2009-11-14 13:58:07 +01:00
Pavel Labath
7cd6ae02b0 own_window_colour documentation fix 
the manpage says the hex color string should include the '#', but that's not true (not now,
anyway). Also, the syntax highlighting is wrong, but i don't know how to fix that.
 2009-11-14 12:27:05 +01:00
Nikolas Garofil
28d63e97ec Add middle_middle to the docs 2009-11-14 02:37:00 +01:00
Nikolas Garofil
ab0b80e495 Added support for $pid_chroot 2009-11-13 16:54:40 +01:00
Cesare Tirabassi
363cf1ab73 Add $conky_user_time (sf.net #2830919) 
The bug reporter asks if it is possible to add a variable giving the "current
user time" only, since the variable user_times reports the times for ALL
logged users.
AFAIK, the only info one can gather inside conky, is the login time for the
tty connected to conky's standard input.
This commit adds support for it (it should work on any posix compliant *nix).
Note that in coherence with the definition, the variable is called
conky_user_time (for a single user stand-alone machine used as a desktop
this would be the "current" user time).
 2009-11-13 16:30:04 +01:00
Nikolas Garofil
52629bef61 Added support for $pid_openfiles 2009-11-13 00:36:46 +01:00
Nikolas Garofil
6c4f069f00 Added support for $pid_exe and $pid_stdin, $pid_stdout and $pid_stderr 2009-11-12 20:34:43 +01:00
Nikolas Garofil
6b20156a1b Added support for $pid_environ_list 2009-11-12 15:42:18 +01:00
Nikolas Garofil
d595a65077 Add support for $pid_environ 2009-11-11 22:56:12 +01:00
Nikolas Garofil
cb96b3bcca Add cwd to $pid and split into $pid_cmdline and $pid_cwd 2009-11-11 16:27:19 +01:00
Nikolas Garofil
46dd6ca513 Add support for ${pid cmdline} 2009-11-11 10:55:25 +01:00
Nikolas Garofil
a1e199c85a Fix building with metar but without xoap 2009-11-08 18:00:13 +01:00
Nikolas Garofil
aad43bea8d Added support for $threads and fixed $processes on Linux 2009-11-07 18:14:04 +01:00
Nikolas Garofil
1ed564fd0b Revert "Added support for and fixed on Linux" 
This reverts commit 43c7c0373b.
 2009-11-07 18:13:21 +01:00
Nikolas Garofil
43c7c0373b Added support for and fixed on Linux 2009-11-07 18:06:07 +01:00
Phil Sutter
0bed05997b review load* code 2009-11-03 23:23:23 +01:00
Phil Sutter
c3430dc587 nvidia: fix syntax in variables.xml 2009-11-03 23:23:22 +01:00
Phil Sutter
a106b52698 curl: put init and print code to where it belongs 
This also fixes a bug in arg parsing, effectively forcing an interval to
be specified.
 2009-10-12 21:33:02 +02:00
Phil Sutter
ea92e63a44 tztime: fix argument parsing bug, clarify docs 2009-10-04 04:03:21 +02:00
Brenden Matthews
584d05d2ad Add the -p/--pause command line option. 2009-10-03 14:26:39 -07:00
Brenden Matthews
7fc4d40eb2 Allow spaces in mail folder names for pop/imap. 
For example, you can specify "-f '[Gmail]/All Mail'" in your mail args
to view all mails in your Google mail IMAP folder.
 2009-09-27 10:40:06 -07:00
Brenden Matthews
a7df1681bb Switching email addrs. 2009-09-26 20:40:42 -07:00
Brenden Matthews
f0ae7e5911 Fix title in config_settings.html. 2009-09-16 08:54:12 -07:00
Pavel Labath
47c88b2149 Weather forecast documentation fix: high -> hi 
Another option would be to change the code to expect "high" as a parameter
 2009-09-09 21:18:43 +02:00
Phil Sutter
5a3b7c074b Rewrite hddtemp support for better scaling 
Instead of connecting once for each object, have a central update
routine (limiting support to only a single hddtemp daemon to connect
to).
 2009-09-06 21:53:53 +02:00
Phil Sutter
9619109bfc use CLEANFILES instead of defining a custom clean target 2009-09-05 03:34:33 +02:00
Cesare Tirabassi
141c229afc Add day and date data_type to 2009-08-10 22:46:21 +02:00
Cesare Tirabassi
e16511be02 Set refresh period for the 5 days forecast to 3 and a half hours, in accordance to Exhibit B of EULA 2009-08-05 17:26:25 +02:00
Brenden Matthews
e41f3e4f7b Fix parsing of XOAP xml. 
Also made the XOAP cloud condition match that of the NOAA stuff
(lowercase).
 2009-08-04 21:15:08 -06:00
Cesare Tirabassi
2118fc5889 Merge branch 'master' into weather-forecast 2009-08-03 19:59:36 +02:00
Nikolas Garofil
4990f25791 Support for $color in ncurses 2009-08-03 19:39:37 +02:00
Nikolas Garofil
37e2bb471b Support for in ncurses 2009-08-03 19:36:47 +02:00
Cesare Tirabassi
ea8e737f4f weather_forecast: corrected variables.xml formatting 2009-08-03 11:58:01 +02:00
Cesare Tirabassi
14b7acdab6 Add weather_forecast object 2009-08-02 23:54:44 +02:00
Nikolas Garofil
945da94b95 Fix minor spelling mistake 2009-08-01 22:46:10 +02:00
Brenden Matthews
358a2b989e Add lua_startup_hook. 2009-08-01 14:36:38 -06:00
Brenden Matthews
a3e4b3dd41 Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-08-01 14:30:27 -06:00
Brenden Matthews
41aed41e35 Add lua_shutdown_hook. 2009-08-01 14:30:14 -06:00
Nikolas Garofil
46df53a361 Fix minor spelling mistake 2009-08-01 22:15:09 +02:00
Brenden Matthews
bb89efee5b Doc cleanup. 2009-08-01 13:15:53 -06:00
Nikolas Garofil
44b82311b9 Added support for out_to_ncurses 
All ERR()'s are renamed to NORM_ERR() and box to mbox so that they don't
clash with things in ncurses.h .
Ncurses is enabled by default when building conky but can be disabled with
--disable-ncurses .
At the moment configure doesn't check if ncurses is actually available.
I'm adding support for ncurses so that we can make as much things as possible
that are only available in X11 also available in console in the future.
 2009-08-01 20:45:43 +02:00
Nikolas Garofil
7ff2a71aa0 Added $include var to load configfiles inside of other configfiles 2009-07-31 15:28:55 +02:00
Brenden Matthews
be145bd55d Removed alias config option due to brokenness. 
The alias option was broken by fb8ccd7a05,
and it seems like trying to make it work again will only result in
breakage for env var substitution anyway.
 2009-07-31 00:33:06 -06:00
Cesare Tirabassi
38e544ee25 weather: add icon data_type for xoap 2009-07-29 22:22:24 +02:00
Cesare Tirabassi
81c691d15a add emacs indentation variables to source files in line with current vim settings 2009-07-28 23:44:22 +02:00
Brenden Matthews
ec517ecb26 Remove deprecated stuff from docs and conky.c (for 1.7.3). 2009-07-28 12:43:45 -06:00
Brenden Matthews
da4b542ae6 Added some Lua API stuff. 
Added conky_set_update_interval() API call, which allows you to change
Conky's update interval from a Lua script.  Added the 'conky_info' table
to global Lua context, which still needs populating with stuff (right
now it only contains the current update interval and the system uptime).
 2009-07-28 12:38:43 -06:00
Brenden Matthews
04ee7dc2fc Add/fix vim modelines for automake stuff. 2009-07-27 14:49:19 -06:00
Brenden Matthews
73d36a59c0 Be more intelligent about handling tolua++ user types. 2009-07-27 14:07:36 -06:00
Nikolas Garofil
febc5306e2 Don't place conky_ in front of lua functionnames if it's already there 2009-07-25 12:03:09 +02:00
Nikolas Garofil
875c7c3129 Support for update_interval_on_battery 2009-07-24 12:06:44 +02:00
Brenden Matthews
25b0218acb Include lua.html in tarball. 2009-07-22 11:31:49 -06:00
Nikolas Garofil
41a7cffbe7 Fix bug with SF id 2808272 (tail and head) 
To fix this bug the tail and head code was rewritten, everything should still
work except tailing a FIFO instead of a normal head.
 2009-07-21 23:41:47 +02:00