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

1790 Commits

Author SHA1 Message Date
Cesare Tirabassi
4211ac30db Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-07-11 21:37:54 +02:00
Nikolas Garofil
931019aad9 Fix building without lua 2009-07-11 15:02: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
a64f5b3f34 Fix building without weather 2009-07-11 00:43:09 +02:00
Nikolas Garofil
b5ad154f1d spelling: stable instead of stabe 2009-07-10 19:33:26 +02:00
Brenden Matthews
d431491bfb Fix warning about AM_PROG_CC_C_O. 2009-07-10 10:12:04 -06:00
Brenden Matthews
c494feafe1 Fix build errors with --disable-x11. 2009-07-10 10:07:39 -06: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
3659131192 Fix memleaks in CRIT_ERR 2009-07-08 15:51:08 +02:00
Brenden Matthews
def86cbb35 Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-07-07 17:34:02 -06:00
Brenden Matthews
ce19f6ee6a Handle thread death better (sf.net #2818145). 2009-07-07 17:33:38 -06:00
Nikolas Garofil
553528cb3d Fix memleak triggered by (and others) 2009-07-08 00:35:20 +02:00
Cesare Tirabassi
18ecbef1ae weather: lets make this compliant to prehistoric standards and at the same time working ... 2009-07-07 18:08:54 +02:00
Nikolas Garofil
ce9d9e3298 fix minor memleak when closing conky 2009-07-07 17:27:57 +02:00
Nikolas Garofil
1070c60768 Fixed mixed code and declarations (not allowed in some C standards, like C90) 2009-07-07 15:38:13 +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
09e55bcc7e weather: add more weather modifiers 2009-07-07 12:08:24 +02:00
Cesare Tirabassi
15be8ad175 weather: corrected typo 2009-07-07 11:16:25 +02:00
Cesare Tirabassi
476296be5c weather: changed ifs in parsing routine to switch/case and corrected TCU handling 2009-07-07 11:13:07 +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
Brenden Matthews
14d90ad7d1 Fix some minor leaky code. 2009-07-04 21:13:00 -06:00
Brenden Matthews
e2caa58923 Remove newline with comment only lines in TEXT. 2009-07-04 20:57:41 -06:00
Nils Schweinsberg
aaca08fc97 Fix escaping of comments in TEXT (sf.net #2813390, thanks Nils). 2009-07-02 00:36:37 -06:00
Nikolas Garofil
c84d9f8b26 Fix segfault in to_real_path 2009-06-29 16:04:00 +02:00
Phil Sutter
775d591a68 fix a few memleaks 2009-06-22 02:00:11 +02:00
Phil Sutter
867a842b3f fix for testing and debug on FreeBSD
(Probably not complete yet)
2009-06-22 02:00:11 +02:00
Phil Sutter
912ed67d03 fix conf_cookie for FreeBSD
While here, also clean up the #ifdef mess created
around the whole config output support.
2009-06-22 01:59:26 +02:00
Phil Sutter
c6a5a060cf Use the internal process list for if_running on Linux 2009-06-20 01:46:59 +02:00
Phil Sutter
98e6f41bfa exiting early on error definitely sanitises indenting here 2009-06-20 01:45:05 +02:00
Brenden Matthews
11d5286a40 Some Imlib2 refactoring. 2009-06-14 21:05:11 -06:00
Ole Christian Tvedt
5f31a052bb Fixed $if_mpd_playing. Would not return false after true.
Previously, is_playing was never returned to 0 even if a song stopped
playing.

Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-06-14 20:07:59 -06:00
Ole Christian Tvedt
9048af353a Read MPD connection data from environment.
Most MPD clients read the MPD_HOST and MPD_PORT
environment variables. Now, conky will too.

MPD_HOST can be either "hostname" or "password@hostname".

If a user specifies a host in the configuration, the
password set in MPD_HOST will be ignored. This is to
prevent the password from being sent to the wrong host.

In other words, if the host is specified in the conky
configuration, the password must be too (if there is
one).

Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-06-14 20:07:59 -06:00
Brenden Matthews
8b9f0b6851 Fixup some imlib2 flush interval stuff. 2009-06-14 16:12:12 -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
Brenden Matthews
b78650d29a Approach the per-image cache control another way. 2009-06-14 14:50:30 -06:00
Brenden Matthews
be75e07c9d Increase backwards compat for border_margin.
Even though border_margin is deprecated, we'll set border_inner_margin
anyway so lazy people won't complain too much.
2009-06-14 12:24:18 -06:00
Lassi Selander
b4f88ff319 Fix XMMS2 related crash (sf.net #2806111 and #2805310, thanks Lassi). 2009-06-14 12:03:50 -06:00
Brenden Matthews
c001f73f72 Update changelog for 23e89dca08. 2009-06-13 17:47:32 -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
Pavel Labath
9e976d9dc4 Better parsing of process names containing funky chars 2009-06-14 00:02:50 +02: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
Brenden Matthews
9ce2c8ba07 Fix regression in Lua inotify stuff. 2009-06-13 13:40:27 -06:00
Ole Christian Tvedt
74340eaa9c A mainly cosmetic update.
One useless "if (own_window)" check was removed. It is already inside another
identical check, and so will always evaluate to true.

One strncmp against the word "dock" was limited to four characters instead of
seven, for consistency with the other checks in the configuration parsing code.

Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-06-13 13:21:38 -06:00
Brenden Matthews
26d7547c1e Ugh...finish ca340d2643. 2009-06-13 13:19:40 -06:00
Brenden Matthews
ca340d2643 Fix inotify segfault (sf.net #2804886).
Fix segfault due to bad checking of return values for inotify code
(sf.net #2804886)
2009-06-13 13:17:18 -06:00
Nikolas Garofil
1933df5f31 full text last commit: Added to_bytes 2009-06-13 01:59:04 +02:00