Cesare Tirabassi [Sat, 18 Jul 2009 04:42:25 +0000 (06:42 +0200)]
Merge branch 'master' of git.omp.am:/home/omp/git/conky
Cesare Tirabassi [Sat, 18 Jul 2009 04:39:54 +0000 (06:39 +0200)]
weather: glib is not needed
Nikolas Garofil [Fri, 17 Jul 2009 23:15:09 +0000 (01:15 +0200)]
Fix bug in $scroll (if there were only 2 args the 2nd couldn't be numerical)
Nikolas Garofil [Fri, 17 Jul 2009 16:37:46 +0000 (18:37 +0200)]
Nikolas Garofil [Fri, 17 Jul 2009 16:01:41 +0000 (18:01 +0200)]
Fix memleaks when reloading configuration and place same parts of main() and reload_config() in a seperate function
Nikolas Garofil [Thu, 16 Jul 2009 18:28:23 +0000 (20:28 +0200)]
Fix a lot of unimportant memleaks caused by a CRIT_ERR
Nikolas Garofil [Wed, 15 Jul 2009 22:31:22 +0000 (00:31 +0200)]
Show warnings when not running in X and vars like desktop or monitor are used
Nikolas Garofil [Wed, 15 Jul 2009 21:55:22 +0000 (23:55 +0200)]
Fix freeing unregistered mem when build when running without X
Nikolas Garofil [Wed, 15 Jul 2009 14:33:18 +0000 (16:33 +0200)]
Fix all memleaks that are clearly visible,
the default config should now run without memleaks, valgrind will
still report memleaks caused by the own_window-lines and the xft-lines
(in some cases) but those are caused by code that's not part of conky
Nikolas Garofil [Tue, 14 Jul 2009 17:17:14 +0000 (19:17 +0200)]
Cesare Tirabassi [Tue, 14 Jul 2009 16:47:00 +0000 (18:47 +0200)]
Merge branch 'master' of git.omp.am:/home/omp/git/conky
Cesare Tirabassi [Tue, 14 Jul 2009 16:46:15 +0000 (18:46 +0200)]
Fix Property Change Events are passes also to OWN_WINDOW
Nikolas Garofil [Tue, 14 Jul 2009 16:10:43 +0000 (18:10 +0200)]
Fix strange effects on desktop caused by
4a14668772a37b18a9aceb8951ece260084bc96e
Nikolas Garofil [Tue, 14 Jul 2009 16:05:49 +0000 (18:05 +0200)]
Fix memleaks introduced by g7bbde2b
Nikolas Garofil [Tue, 14 Jul 2009 15:43:27 +0000 (17:43 +0200)]
Fix building with strict compilers
Cesare Tirabassi [Tue, 14 Jul 2009 14:57:51 +0000 (16:57 +0200)]
refactored desktop info code so that its only called on X property events; TO DO doesn't work with own_window
Nikolas Garofil [Tue, 14 Jul 2009 14:07:33 +0000 (16:07 +0200)]
Fix a part of the memleaks in the X-related code,
if you remove all lines above TEXT in defconfig.h,
then it should run without memleaks.
Nikolas Garofil [Tue, 14 Jul 2009 10:47:24 +0000 (12:47 +0200)]
Fix memleaks when running with total_run_times
Brenden Matthews [Mon, 13 Jul 2009 22:11:21 +0000 (16:11 -0600)]
Use OBJ_THREAD() for weather, get rid of pointless return.
Brenden Matthews [Mon, 13 Jul 2009 21:21:42 +0000 (15:21 -0600)]
Merge branch 'master' of git.omp.am:/home/omp/git/conky
Brenden Matthews [Mon, 13 Jul 2009 21:21:25 +0000 (15:21 -0600)]
Fix minor $weather memleak.
Cesare Tirabassi [Mon, 13 Jul 2009 21:19:32 +0000 (23:19 +0200)]
Fix compilation with --disable-own-window (sf.net #2820716)
Cesare Tirabassi [Mon, 13 Jul 2009 20:57:07 +0000 (22:57 +0200)]
weather: clarified URI and corrected some minor format problems with variables.xml
Nikolas Garofil [Mon, 13 Jul 2009 15:32:33 +0000 (17:32 +0200)]
Remove old,unused desktop-finding code
Nikolas Garofil [Mon, 13 Jul 2009 13:04:57 +0000 (15:04 +0200)]
Fix minor memleak (fonts)
Cesare Tirabassi [Mon, 13 Jul 2009 09:31:20 +0000 (11:31 +0200)]
weather: removed constraints of 3 locations per uri from docs; corrected possible buffer overflow
Brenden Matthews [Mon, 13 Jul 2009 05:31:57 +0000 (23:31 -0600)]
Refactor some of the new weather code, fix docs.
I moved the weather stuff into its own thread, and also fixed up some
abuse of <simplelist> formatting throughout the docs. Hopefully we can
keep things a little more uniform from now on.
Brenden Matthews [Mon, 13 Jul 2009 03:38:35 +0000 (21:38 -0600)]
Fix Lua window table segfault.
Cesare Tirabassi [Sun, 12 Jul 2009 19:18:28 +0000 (21:18 +0200)]
Merge branch 'master' of git.omp.am:/home/omp/git/conky
Brenden Matthews [Sun, 12 Jul 2009 18:32:31 +0000 (12:32 -0600)]
Fix man page name.
Nikolas Garofil [Sun, 12 Jul 2009 18:01:31 +0000 (20:01 +0200)]
Fix minor memleak
Nikolas Garofil [Sun, 12 Jul 2009 17:42:10 +0000 (19:42 +0200)]
fix: segfault when TEXT is missing and build with x11
Cesare Tirabassi [Sun, 12 Jul 2009 16:46:07 +0000 (18:46 +0200)]
Merge branch 'master' of git.omp.am:/home/omp/git/conky
Nikolas Garofil [Sun, 12 Jul 2009 16:29:50 +0000 (18:29 +0200)]
Fix: free_fonts tries sometimes tries to free much
When build with support for x11 and ran with a empty config this resulted in a segfault.
Nikolas Garofil [Sun, 12 Jul 2009 12:52:58 +0000 (14:52 +0200)]
Fix memleak when build with X11 but turned off in config
Nikolas Garofil [Sun, 12 Jul 2009 10:28:22 +0000 (12:28 +0200)]
Ugly workaround for segfaults when build with x11 and lua
Cesare Tirabassi [Sun, 12 Jul 2009 09:58:34 +0000 (11:58 +0200)]
free info.x11.desktop.name in free_text_objects()
Cesare Tirabassi [Sun, 12 Jul 2009 09:45:33 +0000 (11:45 +0200)]
Merge branch 'master' of git.omp.am:/home/omp/git/conky
Nikolas Garofil [Sat, 11 Jul 2009 22:51:17 +0000 (00:51 +0200)]
Fix building without math but with X11
Nikolas Garofil [Sat, 11 Jul 2009 22:05:53 +0000 (00:05 +0200)]
Fix: reading mem after its freed (current_config)
Cesare Tirabassi [Sat, 11 Jul 2009 19:37:54 +0000 (21:37 +0200)]
Merge branch 'master' of git.omp.am:/home/omp/git/conky
Nikolas Garofil [Sat, 11 Jul 2009 13:02:17 +0000 (15:02 +0200)]
Fix building without lua
Cesare Tirabassi [Sat, 11 Jul 2009 08:50:02 +0000 (10:50 +0200)]
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.
Nikolas Garofil [Fri, 10 Jul 2009 22:43:09 +0000 (00:43 +0200)]
Fix building without weather
Nikolas Garofil [Fri, 10 Jul 2009 17:33:26 +0000 (19:33 +0200)]
spelling: stable instead of stabe
Brenden Matthews [Fri, 10 Jul 2009 16:12:04 +0000 (10:12 -0600)]
Fix warning about AM_PROG_CC_C_O.
Brenden Matthews [Fri, 10 Jul 2009 16:07:39 +0000 (10:07 -0600)]
Fix build errors with --disable-x11.
Brenden Matthews [Wed, 8 Jul 2009 08:09:06 +0000 (02:09 -0600)]
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.
Nikolas Garofil [Thu, 9 Jul 2009 18:12:52 +0000 (20:12 +0200)]
Added support for swapfree
Nikolas Garofil [Wed, 8 Jul 2009 13:51:08 +0000 (15:51 +0200)]
Fix memleaks in CRIT_ERR
Brenden Matthews [Tue, 7 Jul 2009 23:34:02 +0000 (17:34 -0600)]
Merge branch 'master' of git.omp.am:/home/omp/git/conky
Brenden Matthews [Tue, 7 Jul 2009 23:33:38 +0000 (17:33 -0600)]
Handle thread death better (sf.net #2818145).
Nikolas Garofil [Tue, 7 Jul 2009 22:35:20 +0000 (00:35 +0200)]
Fix memleak triggered by (and others)
Cesare Tirabassi [Tue, 7 Jul 2009 16:08:54 +0000 (18:08 +0200)]
weather: lets make this compliant to prehistoric standards and at the same time working ...
Nikolas Garofil [Tue, 7 Jul 2009 15:27:57 +0000 (17:27 +0200)]
fix minor memleak when closing conky
Nikolas Garofil [Tue, 7 Jul 2009 13:38:13 +0000 (15:38 +0200)]
Fixed mixed code and declarations (not allowed in some C standards, like C90)
Nikolas Garofil [Tue, 7 Jul 2009 13:02:29 +0000 (15:02 +0200)]
added some extra info about the needed libs for compiling to docs.xml and added the url of the wiki to docs.xml
Cesare Tirabassi [Tue, 7 Jul 2009 10:08:24 +0000 (12:08 +0200)]
weather: add more weather modifiers
Cesare Tirabassi [Tue, 7 Jul 2009 09:16:25 +0000 (11:16 +0200)]
weather: corrected typo
Cesare Tirabassi [Tue, 7 Jul 2009 09:13:07 +0000 (11:13 +0200)]
weather: changed ifs in parsing routine to switch/case and corrected TCU handling
Cesare Tirabassi [Mon, 6 Jul 2009 22:20:12 +0000 (00:20 +0200)]
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.
Brenden Matthews [Sun, 5 Jul 2009 04:03:12 +0000 (22:03 -0600)]
Improve docs and parsing of graph args further.
Brenden Matthews [Sun, 5 Jul 2009 03:43:45 +0000 (21:43 -0600)]
Improved parsing of graph arguments.
Removed "log"|"normal" arguments in favour of -l switch.
Brenden Matthews [Sun, 5 Jul 2009 03:13:00 +0000 (21:13 -0600)]
Fix some minor leaky code.
Brenden Matthews [Sun, 5 Jul 2009 02:57:41 +0000 (20:57 -0600)]
Remove newline with comment only lines in TEXT.
Nils Schweinsberg [Thu, 2 Jul 2009 06:36:37 +0000 (00:36 -0600)]
Fix escaping of comments in TEXT (sf.net #2813390, thanks Nils).
Nikolas Garofil [Mon, 29 Jun 2009 14:04:00 +0000 (16:04 +0200)]
Fix segfault in to_real_path
Phil Sutter [Sun, 21 Jun 2009 23:50:15 +0000 (01:50 +0200)]
fix a few memleaks
Phil Sutter [Sun, 21 Jun 2009 21:44:48 +0000 (23:44 +0200)]
fix for testing and debug on FreeBSD
(Probably not complete yet)
Phil Sutter [Sun, 21 Jun 2009 21:46:03 +0000 (23:46 +0200)]
fix conf_cookie for FreeBSD
While here, also clean up the #ifdef mess created
around the whole config output support.
Phil Sutter [Fri, 19 Jun 2009 23:40:40 +0000 (01:40 +0200)]
Use the internal process list for if_running on Linux
Phil Sutter [Fri, 19 Jun 2009 23:14:57 +0000 (01:14 +0200)]
exiting early on error definitely sanitises indenting here
Brenden Matthews [Mon, 15 Jun 2009 03:05:11 +0000 (21:05 -0600)]
Some Imlib2 refactoring.
Ole Christian Tvedt [Mon, 15 Jun 2009 00:02:58 +0000 (02:02 +0200)]
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>
Ole Christian Tvedt [Sun, 14 Jun 2009 23:15:04 +0000 (01:15 +0200)]
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>
Brenden Matthews [Sun, 14 Jun 2009 22:12:12 +0000 (16:12 -0600)]
Fixup some imlib2 flush interval stuff.
Ole Christian Tvedt [Sun, 14 Jun 2009 20:48:34 +0000 (22:48 +0200)]
Fixed docs for upspeed and downspeed (not necessarily in KiB any longer).
Signed-off-by: Brenden Matthews <brenden@rty.ca>
Brenden Matthews [Sun, 14 Jun 2009 20:50:30 +0000 (14:50 -0600)]
Approach the per-image cache control another way.
Brenden Matthews [Sun, 14 Jun 2009 18:24:18 +0000 (12:24 -0600)]
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.
Lassi Selander [Sun, 14 Jun 2009 18:03:50 +0000 (12:03 -0600)]
Fix XMMS2 related crash (sf.net #2806111 and #2805310, thanks Lassi).
Brenden Matthews [Sat, 13 Jun 2009 23:47:32 +0000 (17:47 -0600)]
Ole Christian Tvedt [Sat, 13 Jun 2009 21:36:28 +0000 (23:36 +0200)]
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>
Pavel Labath [Sat, 13 Jun 2009 22:02:50 +0000 (00:02 +0200)]
Better parsing of process names containing funky chars
Nikolas Garofil [Sat, 13 Jun 2009 21:52:41 +0000 (23:52 +0200)]
Added support for blink
Brenden Matthews [Sat, 13 Jun 2009 21:05:06 +0000 (15:05 -0600)]
Show count of variables/config settings.
Brenden Matthews [Sat, 13 Jun 2009 19:40:27 +0000 (13:40 -0600)]
Fix regression in Lua inotify stuff.
Ole Christian Tvedt [Sat, 13 Jun 2009 18:59:28 +0000 (20:59 +0200)]
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>
Brenden Matthews [Sat, 13 Jun 2009 19:19:40 +0000 (13:19 -0600)]
Brenden Matthews [Sat, 13 Jun 2009 19:17:18 +0000 (13:17 -0600)]
Fix inotify segfault (sf.net #2804886).
Fix segfault due to bad checking of return values for inotify code
(sf.net #2804886)
Nikolas Garofil [Fri, 12 Jun 2009 23:59:04 +0000 (01:59 +0200)]
full text last commit: Added to_bytes
Nikolas Garofil [Fri, 12 Jun 2009 23:48:54 +0000 (01:48 +0200)]
Added
Pavel Labath [Fri, 12 Jun 2009 17:54:30 +0000 (19:54 +0200)]
Changelog...
Pavel Labath [Fri, 12 Jun 2009 17:08:44 +0000 (19:08 +0200)]
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.
Pavel Labath [Thu, 4 Jun 2009 11:44:14 +0000 (13:44 +0200)]
Just moving an obviously misplaced comment
Brenden Matthews [Fri, 12 Jun 2009 04:35:19 +0000 (22:35 -0600)]
Pixel perfect borders?
Brenden Matthews [Fri, 12 Jun 2009 01:07:21 +0000 (19:07 -0600)]
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.
Brenden Matthews [Thu, 11 Jun 2009 07:28:11 +0000 (01:28 -0600)]
Apply fs stat changes to fs_free_perc also (thanks Cesare).
Brenden Matthews [Wed, 10 Jun 2009 20:13:17 +0000 (14:13 -0600)]
Brenden Matthews [Wed, 10 Jun 2009 20:09:34 +0000 (14:09 -0600)]
Revert "Clarify fs free stats."
This reverts commit
da65a4bcf8e3746cf746b1e943441900169fdffe.
Brenden Matthews [Wed, 10 Jun 2009 20:08:39 +0000 (14:08 -0600)]
Fix regression with loading of non-Xft fonts (sf.net #2804324).