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).
Brenden Matthews [Wed, 10 Jun 2009 17:31:24 +0000 (11:31 -0600)]
Clarify fs free stats.
Pavel Labath [Wed, 10 Jun 2009 15:57:41 +0000 (17:57 +0200)]
Include conky_no_x11.conf in the tarballs
otherwise, building with --enable-config-output --disable-x11 fails.
Brenden Matthews [Wed, 10 Jun 2009 01:06:01 +0000 (19:06 -0600)]
Changeloggin'
Brenden Matthews [Wed, 10 Jun 2009 00:39:26 +0000 (18:39 -0600)]
Fixed a regression with font rendering.
Fixed a regression which causes fonts to not be rendered properly with
certain types of windows.
Brenden Matthews [Tue, 9 Jun 2009 20:57:36 +0000 (14:57 -0600)]
Update changelog.
Pavel Labath [Tue, 9 Jun 2009 15:21:40 +0000 (17:21 +0200)]
Fix comments in TEXT section
When a '#' is found in TEXT, section remove_comments() is called. However, that function doesn't
limit itself to removing that particular comment. Instead, it greedily removes all "comments" from
the string, including those in ${color $abcdef} constructs. This, obviously, makes a mess of
things.
Solution: I added a new function, remove_comment(), that only removes the current comment.
Note: Atm, the function doesn't delete the newline, since that was the current behavior, and is
the natural one for the config section. However, for the TEXT it seems better to delete the \n
too, to avoid blank lines.
Note2: this also fixes the bug in strfold(), which incorectly copied the string, truncating it by
one byte.
Signed-off-by: Brenden Matthews <brenden@rty.ca>
Vincent Breitmoser [Tue, 9 Jun 2009 20:52:18 +0000 (14:52 -0600)]
Added format_human_readable option (sf.net #2803345, thanks Vincent).
Nikolas Garofil [Mon, 8 Jun 2009 19:15:18 +0000 (21:15 +0200)]
extra displayoptions for battery_short and make sure full isn't handled as unknown
Nikos Ntarmos [Mon, 8 Jun 2009 15:09:28 +0000 (18:09 +0300)]
Include sys/param.h for FreeBSD
We need this on FreeBSD as some of the constants used in ucred.h and
mount.h are defined there.
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
Nikos Ntarmos [Mon, 8 Jun 2009 16:35:41 +0000 (19:35 +0300)]
Check for deleted and not expunged emails
This should fix bug #2802529. I've also revamped the X-Mozilla-Status
header handling which was kind of fishy till now.
Disclaimer: I have no mbox folders around to test it.
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
Nikos Ntarmos [Mon, 8 Jun 2009 16:35:40 +0000 (19:35 +0300)]
Lua's pkg-config name is lua-5.1 on FreeBSD
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
Brenden Matthews [Mon, 8 Jun 2009 03:49:10 +0000 (21:49 -0600)]
Rearrange changelog a bit.
Brenden Matthews [Mon, 8 Jun 2009 03:45:39 +0000 (21:45 -0600)]
Strip control chars from README.
Brenden Matthews [Mon, 8 Jun 2009 03:23:35 +0000 (21:23 -0600)]
Fix check_docs.py to work with cleaned up XML.
Nikolas Garofil [Sun, 7 Jun 2009 16:41:10 +0000 (18:41 +0200)]
Fix compiling without X11
Nikolas Garofil [Sun, 7 Jun 2009 13:01:48 +0000 (15:01 +0200)]
need_to_load_fonts shouldn't be used without X11
Nikolas Garofil [Sun, 7 Jun 2009 09:58:05 +0000 (11:58 +0200)]
Changelog update
Nikolas Garofil [Sun, 7 Jun 2009 09:41:29 +0000 (11:41 +0200)]
Merge branch 'master' of ssh://git.omp.am/home/omp/git/conky
Nikolas Garofil [Sun, 7 Jun 2009 08:56:22 +0000 (10:56 +0200)]
Changelog updated
Brenden Matthews [Sun, 7 Jun 2009 04:56:29 +0000 (22:56 -0600)]
Make device argument optional for most net stats.
We can use DEFAULTNETDEV for more than just up/downspeedgraph.
Brenden Matthews [Sun, 7 Jun 2009 04:53:40 +0000 (22:53 -0600)]
reload_config() fix, fix default net graph args.
Closing the X display on reload caused some weirdness. We can just
leave it open between reloads. For whatever reason we had a macro
inside quotes for the default net device.
Brenden Matthews [Sun, 7 Jun 2009 03:09:26 +0000 (21:09 -0600)]
Fix error in docs regarding graph arguments.
Brenden Matthews [Sun, 7 Jun 2009 00:12:25 +0000 (18:12 -0600)]
Add note about -a opts, bump doc date.
Brenden Matthews [Sun, 7 Jun 2009 00:10:20 +0000 (18:10 -0600)]
Update command opts docs.
Brenden Matthews [Sun, 7 Jun 2009 00:03:22 +0000 (18:03 -0600)]
Doc correction.
Brenden Matthews [Sat, 6 Jun 2009 23:42:02 +0000 (17:42 -0600)]
Brenden Matthews [Sat, 6 Jun 2009 23:25:34 +0000 (17:25 -0600)]
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.
Brenden Matthews [Sat, 6 Jun 2009 22:56:35 +0000 (16:56 -0600)]
Add tidying/sorting to check_docs.py.
Brenden Matthews [Sat, 6 Jun 2009 18:20:13 +0000 (12:20 -0600)]
Merge branch 'master' of git.omp.am:/home/omp/git/conky
Pavel Labath [Sat, 6 Jun 2009 18:18:46 +0000 (12:18 -0600)]
Fix bug in template code.
Signed-off-by: Brenden Matthews <brenden@rty.ca>
Nikolas Garofil [Sat, 6 Jun 2009 18:04:20 +0000 (20:04 +0200)]
Let wireless_link_bar work in shell
Phil Sutter [Sat, 6 Jun 2009 16:18:31 +0000 (18:18 +0200)]
Add a better fix for the $addr update problem
In general, initialising last_update_time to next_update_time upon
startup doesn't make sense, as some update functions check for the
distance between the two being higher than a given epsilon to prevent
updating too often. This means that they won't trigger when
update_stuff() is being run for the first time.
Phil Sutter [Sat, 6 Jun 2009 16:14:06 +0000 (18:14 +0200)]
Revert "Bugfix: $addr and $addrs couldn't find ip's before the first update."
This reverts commit
8ffb8b238dfd3614afc582c0d5537e684219d039.
Surely, there is a better solution for that.
Nikolas Garofil [Sat, 6 Jun 2009 15:41:51 +0000 (17:41 +0200)]
Bugfix: $addr and $addrs couldn't find ip's before the first update.
When you started "$updates|${addr eth0}" displayed "0|No Address",
after the first update you got something normal like "1|192.168.0.1"
This patch should fix this.
Brenden Matthews [Sat, 6 Jun 2009 09:56:22 +0000 (03:56 -0600)]
Brenden Matthews [Sat, 6 Jun 2009 09:04:36 +0000 (03:04 -0600)]
Unbreak $combine.
Brenden Matthews [Sat, 6 Jun 2009 08:47:29 +0000 (02:47 -0600)]
More s/IMLIB2/Imlib2/g