Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-29 05:12:41 +00:00
Code Issues Releases Activity
2,060 Commits 5 Branches 46 Tags 22 MiB
4927eb85a2
Commit Graph

1462 Commits

Author SHA1 Message Date
Brenden Matthews
73eaf0cfc3 Clean up x11.c a bit. 2009-07-27 15:34:06 -06:00
Cesare Tirabassi
da06200e43 Fix user_times bug (launchpad #405188). 2009-07-27 15:09:18 -06:00
Brenden Matthews
dd6133b055 Fix linking error with Lua extras disabled. 2009-07-27 15:03:21 -06:00
Brenden Matthews
d97cd93a1c Add vim modelines. 2009-07-27 14:47:31 -06:00
Brenden Matthews
73d36a59c0 Be more intelligent about handling tolua++ user types. 2009-07-27 14:07:36 -06:00
Nikolas Garofil
ca0f8f8712 Fix: If there is no battery then we don't care about the status 2009-07-27 13:34:20 +02:00
Nikolas Garofil
3e41b36fdf use EXIT_SUCCESS and EXIT_FAILURE instead of 0 and 1 when calling exit 2009-07-27 01:29:57 +02:00
Cesare Tirabassi
ffe5d5f104 Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-07-26 13:04:11 +02:00
Cesare Tirabassi
94cd289aec clean the stack when llua_update_window_table is called with a window table not yet populated 2009-07-26 13:03:41 +02:00
Nikolas Garofil
b963c2827f Fix: conky waited indefinitely on programs started with \$exec-alike vars if those programs don't quit. 
Conky now kills the program when it should start the next update, this makes using things like tail with
the -f option possible in a \$exec.

I am not pushing this to 1.7.2 because this is a pretty big change in the code and it is not really
a bugfix but more a usability-problem-fix (if that term would exist).
 2009-07-26 02:26:22 +02:00
Nikolas Garofil
4d37d021e1 Handle if popen should fail 2009-07-25 14:36:55 +02: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
7ce38ecf09 Fix: Make sure lua works without X11 2009-07-25 02:42:31 +02:00
Nikolas Garofil
ca04b9a3c7 just making bdf5e87c92 easier to read 2009-07-24 16:17:03 +02:00
Cesare Tirabassi
bdf5e87c92 workaround to fix feed_title being processed when not yet parsed 2009-07-24 14:48:54 +02:00
Cesare Tirabassi
0be6e37e07 Fixed parsing of rss parameters (last 2 are optional) and typo in rss.c; there is still a problem with feed_titlesince data->title doesn't get filled before processing 2009-07-24 13:07:20 +02:00
Nikolas Garofil
381b47a0a9 Don't do useless checks 2009-07-24 12:39:48 +02:00
Nikolas Garofil
875c7c3129 Support for update_interval_on_battery 2009-07-24 12:06:44 +02:00
Nikolas Garofil
ce8d124ce6 Merge branch 'master' of ssh://git.omp.am/home/omp/git/conky 2009-07-24 11:45:33 +02:00
Nikolas Garofil
44ca4647b8 bugfix 2009-07-24 11:44:17 +02:00
Cesare Tirabassi
0081fcab60 Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-07-24 11:32:02 +02:00
Cesare Tirabassi
f5c8964510 Revert "the why recasting when you can simply declare it commit ..." 
This reverts commit b2a30ea478.
 2009-07-24 11:30:27 +02:00
Nikolas Garofil
3322b2a9a9 Merge branch 'master' of ssh://git.omp.am/home/omp/git/conky 2009-07-24 11:12:35 +02:00
Nikolas Garofil
feedc8e7fa Fix unclosed file in get_battery_stuff 2009-07-24 11:09:00 +02:00
Cesare Tirabassi
b2a30ea478 the why recasting when you can simply declare it commit ... 2009-07-23 23:58:27 +02:00
Cesare Tirabassi
d349fe56b2 Changed xoap parsing method to xpath, in preparation to include forecast data 2009-07-23 23:46:23 +02:00
Nikolas Garofil
922db9af82 Fix CRIT_ERR everywhere 2009-07-23 20:30:53 +02:00
Nikolas Garofil
7e7a193b74 Fix memleak in $weather 2009-07-23 18:50:39 +02:00
Nikolas Garofil
03a0e8ae19 Fix bug SF ID 2814810 (wrong output with execp and execpi) 2009-07-23 13:33:49 +02:00
Nikolas Garofil
ccd51857c1 Let $tail and $head work with FIFOs again (was disabled by commit 41a7cffbe7 ), and fix memory bug when to_real_path is used in init_tailhead 2009-07-22 22:08:31 +02: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
Nikolas Garofil
caf0731565 Fix multiline stuff when build with X11 but output_to_x turned off. 
This commit reverts 725a3ba43a and fixes 5967d28511
 2009-07-21 12:39:09 +02:00
Brenden Matthews
e973de66cf Fix multiline stuff without X11. 2009-07-20 20:11:33 -06:00
Brenden Matthews
725a3ba43a Revert "Fix multiline strings displayed on 1 line when output to x is not used" 
This reverts commit 5967d28511.
 2009-07-20 17:46:22 -06:00
Nikolas Garofil
5967d28511 Fix multiline strings displayed on 1 line when output to x is not used 2009-07-21 00:47:02 +02:00
Brenden Matthews
9cda78c023 Clarify weather opts, refactor some weather code. 2009-07-20 13:17:44 -06:00
Brenden Matthews
f169e0e071 Actually apply c1cf1232e0. 2009-07-20 12:40:32 -06:00
Brenden Matthews
38015c6600 Document curl stuff better. 2009-07-20 12:04:53 -06:00
Nikos Ntarmos
739e47f9ec Teach freebsd.c to use the new CRIT_ERR format 
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-07-20 11:51:02 -06:00
Brenden Matthews
d3013bc410 Better argument handling for rss/curl/weather. 2009-07-20 09:59:31 -06:00
Nikolas Garofil
911eb4dc59 Include timed_thread.h when needed 2009-07-20 17:42:17 +02:00
Brenden Matthews
961274bc56 Oops, add missing files. 2009-07-20 09:21:33 -06:00
Brenden Matthews
f46eb1b6cb Fix minor memleak. 2009-07-20 00:40:23 -06:00
Brenden Matthews
64394fa7da Merge branch 'master' of git.omp.am:/home/omp/git/conky 
Conflicts:
	configure.ac.in
 2009-07-19 23:45:55 -06:00
Brenden Matthews
c05c157ead Overhauled RSS and weather, added $curl. 
I've taken the curl stuff out of weather and RSS and moved it into it's
own entity.  It should be easier to create curl-based objects if needed
now.
 2009-07-19 23:43:36 -06:00
Nikolas Garofil
09d41cb0b6 Fix building without X11 support broke after commits f1c47e5fc4 and 670e9a0eb1 2009-07-20 01:02:27 +02:00
Cesare Tirabassi
ba414d8ab8 fix out-of-tree builds 2009-07-20 00:43:41 +02:00
Brenden Matthews
80a71ea8bd Handle curl errors better (in weather and rss). 2009-07-19 15:28:19 -06:00
Brenden Matthews
e76f0c8587 Exit properly when forking. 2009-07-19 14:55:41 -06:00
Nikolas Garofil
4c41ec843a fix hardcoding 2009-07-19 21:56:07 +02:00
Nikolas Garofil
f1c47e5fc4 Fix instead of workaround for d0edfa7004 2009-07-19 21:28:14 +02:00
Brenden Matthews
4139ec096f Code formatting. 2009-07-19 12:12:42 -06:00
Brenden Matthews
90932b87e1 Update MPD elapsed/progress when stopped. 2009-07-19 11:59:20 -06:00
Cesare Tirabassi
50fd16d8bd add XOAP to list of compiled-in features, if enabled 2009-07-19 18:14:22 +02:00
Nikolas Garofil
d0edfa7004 Workaround for bug SF id 2819128 ($color inside $scroll disabled) 2009-07-19 00:36:05 +02:00
Brenden Matthews
1f1b846a2d Specials can be within multi-line objects. 2009-07-18 14:25:57 -06:00
Brenden Matthews
52ad674e51 Substitute newlines for everything but text. 2009-07-18 14:00:02 -06:00
Brenden Matthews
9c4ebef376 Oops, fix multiline stuff. 2009-07-18 13:49:52 -06:00
Brenden Matthews
670e9a0eb1 Multiline alignment support, some other misc stuff. 
Added support for X alignment across multi-lined objects (i.e., using
$alignr with $exec).  This may be a bit buggy.  Disabled OpenMP code
until GCC's implementation stabilizes (it's causing too many problems).
A couple Lua API changes.
 2009-07-18 13:46:36 -06:00
Cesare Tirabassi
5eef83d90a add compilation switch --enable-xoap to be able to use www.weather.com as a source of weather data 2009-07-18 21:29:27 +02:00
Cesare Tirabassi
3bb9b4b6b5 Revert "Undid last 3 commits, see rest of the comment for the reason:" 
First of all, we may or may not agree, but I consider reverting my
commits without prior discussion as a minimum unpolite.
I also don't like sites that oblige to register, thats the very reason
why I went with noaa first (and why I use that myself).
Howver, weather.com has a couple of nice features forom an user
viewpoint:

1. Their icons can be used to add a visual quality to the weather
report.
2. They have forecast data, which is not possible to have with noaa
(using TAF its an option, but its going to be very difficult and will
be limited in time and scope).

Nobody is obliged to do anything, people who likes noaa will use noaa,
people that don't mind register or wants the additional benefit will use
weather.com.
Having libxms2 as a dragged depends is, first of all, also with other
options (rss and eve), second we can try to work around it with an
additional compilation flag if really deemed necessary.

This reverts commit d872562942.
 2009-07-18 19:13:37 +02:00
Nikolas Garofil
d872562942 Undid last 3 commits, see rest of the comment for the reason: 
I am not really comfortable with adding support to the conky-code
for sites that only work when you register, that's more something
for in a script.
But the biggest reason I undid the commits is that it is now
impossible to compile conky with support for weather if you don't
have the xml libs installed. Users used to be able to compile with
support for weather (using the other site) without xml2.
If you really want to include this other site in the conky code
then split WEATHER in WEATHERCOM and WEATHERNOAA (altough my personal
opinion is that weather.com should only be supported with scripts)
 2009-07-18 16:22:43 +02:00
Cesare Tirabassi
7b38e810f2 add one missing ifdef to conditionally compile weather code 2009-07-18 16:07:17 +02:00
Cesare Tirabassi
806b840646 Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-07-18 16:00:49 +02:00
Cesare Tirabassi
46fc4a0564 Added www.weather.com as an additional source of weather data 2009-07-18 15:59:43 +02:00
Nikolas Garofil
4284490080 If nothing is read, n1 and n2 are not guaranteed to be 0 2009-07-18 11:37:15 +02:00
Nikolas Garofil
b94569b27b Fix reloading config without X11 2009-07-18 10:49:16 +02:00
Cesare Tirabassi
cba36f279b weather: use expf if --enable_math is given, otherwise use fast 3rd order approximation 2009-07-18 07:57:04 +02:00
Nikolas Garofil
85deafa500 Fix bug in $scroll (if there were only 2 args the 2nd couldn't be numerical) 2009-07-18 01:15:09 +02:00
Nikolas Garofil
e905c7d4f1 Fix building without X11 after commit 20d4c4370a 2009-07-17 18:37:46 +02:00
Nikolas Garofil
20d4c4370a Fix memleaks when reloading configuration and place same parts of main() and reload_config() in a seperate function 2009-07-17 18:01:41 +02:00
Nikolas Garofil
06de5573e8 Fix a lot of unimportant memleaks caused by a CRIT_ERR 2009-07-16 20:28:23 +02:00
Nikolas Garofil
63a8c677b3 Show warnings when not running in X and vars like desktop or monitor are used 2009-07-16 00:31:22 +02:00
Nikolas Garofil
4ec308ef12 Fix freeing unregistered mem when build when running without X 2009-07-15 23:55:22 +02:00
Nikolas Garofil
4c241bbf16 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
 2009-07-15 16:33:18 +02:00
Nikolas Garofil
4addf71241 Make 16768a5ad4 C90-compliant 2009-07-14 19:17:14 +02:00
Cesare Tirabassi
1e5bc370e4 Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-07-14 18:47:00 +02:00
Cesare Tirabassi
16768a5ad4 Fix Property Change Events are passes also to OWN_WINDOW 2009-07-14 18:46:15 +02:00
Nikolas Garofil
cd92949e67 Fix strange effects on desktop caused by 4a14668772 2009-07-14 18:10:43 +02:00
Nikolas Garofil
cfa94a967b Fix memleaks introduced by g7bbde2b 2009-07-14 18:05:49 +02:00
Nikolas Garofil
d75fb18bf8 Fix building with strict compilers 2009-07-14 17:43:27 +02:00
Cesare Tirabassi
7bbde2be73 refactored desktop info code so that its only called on X property events; TO DO doesn't work with own_window 2009-07-14 16:57:51 +02:00
Nikolas Garofil
4a14668772 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.
 2009-07-14 16:07:33 +02:00
Nikolas Garofil
c924bbe194 Fix memleaks when running with total_run_times 2009-07-14 12:47:24 +02:00
Brenden Matthews
0352b96f39 Use OBJ_THREAD() for weather, get rid of pointless return. 2009-07-13 16:11:21 -06:00
Brenden Matthews
73194dee89 Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-07-13 15:21:42 -06:00
Brenden Matthews
74c19cf8e4 Fix minor $weather memleak. 2009-07-13 15:21:25 -06:00
Cesare Tirabassi
602edfea15 Fix compilation with --disable-own-window (sf.net #2820716) 2009-07-13 23:19:32 +02:00
Nikolas Garofil
ed4d2ce0b1 Remove old,unused desktop-finding code 2009-07-13 17:32:33 +02:00
Nikolas Garofil
448476317f Fix minor memleak (fonts) 2009-07-13 15:04:57 +02:00
Cesare Tirabassi
6793959916 weather: removed constraints of 3 locations per uri from docs; corrected possible buffer overflow 2009-07-13 11:31:20 +02:00
Brenden Matthews
e1011c0d13 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.
 2009-07-12 23:31:57 -06:00
Brenden Matthews
ee64345f7c Fix Lua window table segfault. 2009-07-12 21:38:35 -06:00
Cesare Tirabassi
d3f1e6288c Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-07-12 21:18:28 +02:00
Nikolas Garofil
d6525d8790 Fix minor memleak 2009-07-12 20:01:31 +02:00
Nikolas Garofil
dc9e6436cc fix: segfault when TEXT is missing and build with x11 2009-07-12 19:42:10 +02:00
Cesare Tirabassi
14c30feaea Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-07-12 18:46:07 +02:00
Nikolas Garofil
ef13d53938 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.
 2009-07-12 18:29:50 +02:00
Nikolas Garofil
f6472cbbb5 Fix memleak when build with X11 but turned off in config 2009-07-12 14:52:58 +02:00
Nikolas Garofil
dc4087fcff Ugly workaround for segfaults when build with x11 and lua 2009-07-12 12:28:22 +02:00
Cesare Tirabassi
e11015528e free info.x11.desktop.name in free_text_objects() 2009-07-12 11:58:34 +02:00
Cesare Tirabassi
df17a54301 Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-07-12 11:45:33 +02:00
Nikolas Garofil
9e6fb9c2fe Fix building without math but with X11 2009-07-12 00:51:17 +02:00
Nikolas Garofil
f4fd1648e9 Fix: reading mem after its freed (current_config) 2009-07-12 00:05:53 +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
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
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
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
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
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
0108d14e68 Added 2009-06-13 01:48:54 +02:00
Pavel Labath
c0d1c313e9 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.
 2009-06-12 19:39:45 +02:00
Brenden Matthews
d114bcf58a Pixel perfect borders? 2009-06-11 22:35:19 -06:00
Brenden Matthews
e45db41a9d 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.
 2009-06-11 19:07:21 -06:00
Brenden Matthews
357901e6f2 Apply fs stat changes to fs_free_perc also (thanks Cesare). 2009-06-11 01:28:11 -06:00
Brenden Matthews
8e55089537 Revert b6e691e8ac, fix original problem. 2009-06-10 14:13:17 -06:00
Brenden Matthews
eb722bf30d Revert "Clarify fs free stats." 
This reverts commit da65a4bcf8.
 2009-06-10 14:09:34 -06:00
Brenden Matthews
1571bb1aad Fix regression with loading of non-Xft fonts (sf.net #2804324). 2009-06-10 14:08:39 -06:00
Brenden Matthews
da65a4bcf8 Clarify fs free stats. 2009-06-10 11:31:24 -06:00
Brenden Matthews
2469b9bea9 Fixed a regression with font rendering. 
Fixed a regression which causes fonts to not be rendered properly with
certain types of windows.
 2009-06-09 18:39:26 -06:00
Pavel Labath
6586d47813 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>
 2009-06-09 14:56:19 -06:00
Vincent Breitmoser
f3aa025872 Added format_human_readable option (sf.net #2803345, thanks Vincent). 2009-06-09 14:52:18 -06:00
Nikolas Garofil
c392152d3a extra displayoptions for battery_short and make sure full isn't handled as unknown 2009-06-08 21:15:18 +02:00
Nikos Ntarmos
3361596592 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>
 2009-06-08 13:05:20 -06:00
Nikos Ntarmos
d934d11e48 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>
 2009-06-08 13:05:20 -06:00
Nikolas Garofil
25e46ca341 Fix compiling without X11 2009-06-07 18:41:10 +02:00
Nikolas Garofil
b11f2466af need_to_load_fonts shouldn't be used without X11 2009-06-07 15:01:48 +02:00
Brenden Matthews
a9c8ae4145 Make device argument optional for most net stats. 
We can use DEFAULTNETDEV for more than just up/downspeedgraph.
 2009-06-06 22:56:29 -06:00
Brenden Matthews
00e559aef8 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.
 2009-06-06 22:53:40 -06:00
Brenden Matthews
815dcf872d Update command opts docs. 2009-06-06 18:10:20 -06:00
Brenden Matthews
e5abd481cd Fix some stupidity in 33754ecebe. 2009-06-06 17:42:02 -06:00
Brenden Matthews
33754ecebe 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.
 2009-06-06 17:25:34 -06:00
Brenden Matthews
8e81d4e816 Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-06-06 12:20:13 -06:00
Pavel Labath
aa68da1ce6 Fix bug in template code. 
Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-06-06 12:18:46 -06:00
Nikolas Garofil
e4934b9f08 Let wireless_link_bar work in shell 2009-06-06 20:04:20 +02:00
Phil Sutter
3170b5191a 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.
 2009-06-06 18:18:31 +02:00
Phil Sutter
26ecdcf562 Revert "Bugfix: $addr and $addrs couldn't find ip's before the first update." 
This reverts commit 8ffb8b238d.

Surely, there is a better solution for that.
 2009-06-06 18:14:06 +02:00
Nikolas Garofil
8ffb8b238d 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.
 2009-06-06 17:41:51 +02:00
Brenden Matthews
22733a0b4a Fix 6994caa18b. 
Introduced a regression with commit
6994caa18b by getting too happy with
OpenMP.
 2009-06-06 03:56:22 -06:00
Brenden Matthews
384a41cb6e Unbreak $combine. 2009-06-06 03:04:36 -06:00
Brenden Matthews
4b35fe5db4 s/IMLIB2/Imlib2/g 2009-06-06 02:32:51 -06:00
Brenden Matthews
8686ce0347 Apparently some people want more than 64 fonts. 2009-06-06 02:13:42 -06:00
Pavel Labath
c76b7f577d A couple more fixes for the template machinery 
Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-06-05 21:07:32 -06:00
Phil Sutter
20e4e19f83 add entropy_perc 
There is no rounding done, so e.g. 3.6% get 3%. But double casting and
calling round_to_int() is just too ugly.
 2009-06-04 22:51:25 +02:00
Phil Sutter
9d7fc86275 branch conditionally 
In case of undefined MATH there were empty branches which could lead to
decreased performance in totally unoptimised code. ;)
 2009-06-04 22:00:52 +02:00
Phil Sutter
8407d6b3c9 clarify what the preprocessor define does here 2009-06-04 21:46:45 +02:00
Nikolas Garofil
f3fd389ea0 read_tcp werkt maar moet nog stresstesten ondergaan 2009-06-04 19:39:18 +02:00
Nikolas Garofil
25a6fca902 Let entropy_bar, mpd_bar and apcupsd_loadbar work in shell 2009-06-04 18:45:58 +02:00
Brenden Matthews
ff57d1a85e Make Imlib2 global cache flushing actually work. 2009-06-03 13:31:16 -06:00
Brenden Matthews
904354f93b Added some better cache control options for Imlib2. 2009-06-03 13:24:53 -06:00
Nikolas Garofil
3656bced46 some c standards only allow initialisations at the start of a function 2009-06-03 19:17:45 +02:00
Nikolas Garofil
1085ec48cc Make it possible to compile without C99 2009-06-03 18:24:48 +02:00
Nikolas Garofil
5388fc33f6 Let lua_bar work in shell 2009-06-03 17:58:00 +02:00
Toni Spets
09ac517343 Merge OpenBSD patches from ports 2009-06-03 09:16:23 +03:00
Brenden Matthews
6994caa18b Minor refactoring for template code. 2009-06-02 14:51:46 -06:00
Pavel Labath
44ead331cd Make templates work with --disable-x11 
part of the template-handling code was in #ifdef X11, which caused conky to dump core when
compiled without x11.

as a bonus, I changed tests !=' ' to !isspace in two places as it was causing strange effects

Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-06-02 14:48:59 -06:00
Pavel Labath
8540821323 Fix core dumps while handling templates 
Conky would dump core when encountering templates with no parameters (both $templateX and
${templateX}) and when the line contained improperly nested {}.

Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-06-02 14:48:59 -06:00
Nikolas Garofil
abf515d901 Let execibar work in shell 2009-06-02 21:23:00 +02:00
Nikolas Garofil
7807d369ad Let battery_bar work in shell 2009-06-02 19:16:21 +02:00
Nikolas Garofil
1a9d0bdccd Let fs_bar and fs_bar_free work in shell 2009-06-01 16:09:34 +02:00
Nikolas Garofil
faa9086168 Let cpubar work in shell 2009-06-01 15:07:24 +02:00
Nikolas Garofil
0b8b6ccbae Let swapbar work in shell 2009-06-01 13:48:04 +02:00
Nikolas Garofil
bfc791f08b Let membar work in shell 2009-06-01 12:19:25 +02:00
Pavel Labath
0cb91fc3db Fix mouse click coordinates forwarded to the desktop window 
Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-05-31 22:18:12 -06:00
Nikolas Garofil
c3df719716 Created a function to call bars in shell (not only execbar) 
TODO use this function in other places
 2009-06-01 02:23:47 +02:00
Nikolas Garofil
c91e2ed38e Make sure that no X11 stuff is in the binary when not requested 2009-05-31 16:48:16 +02:00
Nikolas Garofil
01bc44aaf6 Don't check if output to X is requested when compiled without X 2009-05-31 16:29:12 +02:00
Brenden Matthews
295203dd4c Fix an issue with reload_config()? 2009-05-30 21:06:49 -06:00
Phil Sutter
533075032a Fix hostname resolution for mpd_host 
When getaddrinfo() returns an IPv6 address, connect() fails since mpd
does not support IPv6. Reproduced by adding the name "localhost" to the
"::1" entry in /etc/hosts.

Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-05-30 19:55:06 -06:00
Alexander Graf
0632693be7 Fix if_existing 
The if_existing with 2 arguments checking whether a file contains a specified
string did not work. This is fixed by this patch.

Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-05-30 16:21:42 -06:00
Brenden Matthews
39071d28e8 Be more graceful when handling IMAP problems. 2009-05-29 23:31:03 -06:00
Brenden Matthews
a31efb7fbe Fix default sizing for bars/graphs/gauges. 
Conflicts:

	src/conky.c
 2009-05-29 14:05:10 -06:00
Nikos Ntarmos
15eb14da5c conf_cookie is there for kFreeBSD as well 
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-05-29 10:57:17 -06:00
Nikos Ntarmos
8553e33763 Include bsd/bsd.h on kFreeBSD 
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-05-29 10:57:17 -06:00
Brenden Matthews
650c39b602 Compilation fixes, fix a segfault on shutdown. 
There was a missing 'break' in a switch/case statement which caused a
segfault on shutdown when using $if_up.
 2009-05-28 21:27:56 -06:00
Nikos Ntarmos
b51d06d178 Gracefully exit from main_loop() 
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-05-28 21:27:56 -06:00
Nikos Ntarmos
c03655bdfa free(3) previously strdup(3)'ed disp 
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-05-28 21:27:56 -06:00
Nikos Ntarmos
613a440fdc XDestroyRegion(3) only for non-NULL regions 
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-05-28 21:27:55 -06:00
Nikos Ntarmos
0c62f02553 XCloseDisplay(3) on re-init_X11() 
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-05-28 21:27:55 -06:00
Nikos Ntarmos
ff72a55691 No need to check for loop variable value 
If the first for-loop succedds in finding the desired interface, it will return to its caller. The only way we drop to the second for-loop is if nothing is found thus far, so no need to check for (i == 16).

Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-05-28 21:27:55 -06:00
Nikos Ntarmos
33451a9420 free(3) previously strndup(3)'ed diskio.dev 
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-05-28 21:27:55 -06:00
Nikos Ntarmos
dc2a8e1de8 free(3) strdup(3)'ed templates array 
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-05-28 21:27:55 -06:00
Nikos Ntarmos
a8300acbc5 free(3) previously strndup(3)'ed netstats.dev 
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-05-28 21:27:55 -06:00
Brenden Matthews
ed5dbc02bb Simplify graph gradient stuff. 2009-05-26 11:44:16 -06:00
Brenden Matthews
d65c33146e OMPtimize the gradient stuff. 2009-05-26 03:14:52 -06:00
Brenden Matthews
b0f37a63e8 Let the graphs be bigger. 2009-05-24 23:31:35 -06:00
Brenden Matthews
35a72f5a95 Fix some minor graph related bugs. 2009-05-24 23:16:36 -06:00
Brenden Matthews
d03df4a367 Allow ~/... and $HOME/... paths for more stuff. 2009-05-24 22:33:47 -06:00
Brenden Matthews
f1cc5cf032 Actually fix hddtemp parsing. 2009-05-24 18:15:05 -06:00
Brenden Matthews
1c4044252c Revert "Fix array bounds problem in hddtemp code." 
This reverts commit d0de7cbd63.
 2009-05-24 18:02:46 -06:00
Brenden Matthews
c92272a943 Fix segfault on reload. 2009-05-24 17:49:50 -06:00
Brenden Matthews
d0de7cbd63 Fix array bounds problem in hddtemp code. 2009-05-24 17:09:38 -06:00
Brenden Matthews
4a08fab0e6 Fix clipping, enable alpha for imlib2. 2009-05-24 16:52:48 -06:00
Brenden Matthews
4ec728fa42 Added fancy new 'temperature gradients' feature. 
See docs for more details on 'temperature gradients', which can be
turned on with the -t switch on graphs.  Also improved parsing of
options with $execgraph and $execigraph, but may cause some breakage.
 2009-05-24 15:53:32 -06:00
Brenden Matthews
ee9364522a Some OpenMP related fixes. 
Fixes for commit 9c331dce49.
 2009-05-24 14:02:33 -06:00
Brenden Matthews
19ca4c071a Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-05-24 13:48:10 -06:00
Brenden Matthews
4bfd545d2f Clip out imlib2 buffer properly. 2009-05-24 13:47:44 -06:00
Joe Myre
7b7d038035 Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-05-24 14:24:07 -05:00
Brenden Matthews
06044bf7e5 Try and fix weirdness with hwmon/i2c/platform options. 2009-05-24 13:07:27 -06:00
Joe Myre
9c331dce49 omped it up 2009-05-24 10:41:35 -05:00
Brenden Matthews
bf2d9de16a Add OpenMP to list of compiled in features (for -v). 2009-05-23 21:18:06 -06:00
Nikos Ntarmos
45e403f553 Allow src/apcupsd.c to compile cleanly on FreeBSD. 
Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-05-23 21:08:32 -06:00
Nikos Ntarmos
12d0d1477f Integrate FreeBSD diskio support. 
This diff moves Linux-specific parts of diskio.c into linux.c and uses
the remaining diskio functions to correctly implement this functionality
for FreeBSD. It also hooks diskio.c to the FreeBSD build.

Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-05-23 21:08:32 -06:00
Nikos Ntarmos
0880c1722d Remove unused variables and rearrange includes. 
Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-05-23 21:08:31 -06:00
Nikos Ntarmos
38d4030e65 conf_cookie valid only for Linux. 
Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-05-23 21:08:31 -06:00
Brenden Matthews
396494d4a0 Fixed parsing of $hwmon? 2009-05-23 21:01:59 -06:00
Brenden Matthews
c9951a3bac Better checking for cases when inotify doesn't work. 2009-05-22 12:48:46 -06:00
Brenden Matthews
0dc7041e6f Fix other parsing bug with hwmon. 2009-05-22 12:30:09 -06:00
Brenden Matthews
1779ef3efd Fix (possibly overkill) hwmon parsing bug. 2009-05-22 12:29:41 -06:00
Brenden Matthews
7f0929d03c Fix imlib2 cache setting. 2009-05-22 11:23:05 -06:00
Brenden Matthews
445fde109c Fix backwards width/height args for image drawing. 2009-05-22 01:39:38 -06:00
Brenden Matthews
3ad217e447 Use original image size when not specified. 2009-05-22 01:18:07 -06:00
Brenden Matthews
b6dea2fce6 Oops, null pointer. 2009-05-20 11:53:43 -06:00
Brenden Matthews
a25e030036 Oh yeah, make sure it compiles without inotify. 
Also removed BSD licensing stuff that pertains to old torsmo code.
 2009-05-19 22:56:33 -06:00
Brenden Matthews
75d1a054be Add message to show the Lua script was reloaded. 2009-05-19 22:51:50 -06:00
Brenden Matthews
011e52650b Added inotify support for reloading Lua scripts automagically. 2009-05-19 22:49:42 -06:00
Brenden Matthews
dd5fbeb41b Improve reload_config() window destruction/creation. 2009-05-19 21:34:43 -06:00
Brenden Matthews
baaba76678 Handle inotify stuff a bit better. 2009-05-19 20:35:02 -06:00
Brenden Matthews
0d3726d352 Oops, remove printf(). 2009-05-19 20:23:44 -06:00
Brenden Matthews
ba0eb5d85d Inotify support. 
Added inotify support to reload the config when modified automatically
on systems that support it
 2009-05-19 17:14:34 -06:00
Brenden Matthews
e05fc3ba38 Don't need a prev ptr in this list. 2009-05-18 15:49:40 -06:00
Filipe Ferreira
5552f4135e Patch to fix rounding error with CPU values. 2009-05-17 23:30:10 -06:00
Brenden Matthews
6477962dc9 Added support for rending images by way of IMLIB2. 2009-05-17 23:11:22 -06:00
Brenden Matthews
ddcc8ceb70 Merge branch 'master' into imlib2 
Conflicts:
	extras/nano/conky.nanorc
	extras/vim/syntax/conkyrc.vim
 2009-05-17 22:11:40 -06:00
Brenden Matthews
6abbbd50f0 Merge branch 'lua' 
Conflicts:
	src/specials.c
 2009-05-17 22:00:44 -06:00
Brenden Matthews
e7bf480d48 Fix null pointer boog in $top stuff. 2009-05-17 21:59:05 -06:00
Brenden Matthews
694b736f64 Merge branch 'master' into lua 2009-05-17 20:58:13 -06:00
Nikolas Garofil
914af765e4 execbar can now be used in the shell even when compiled with x11 support 2009-05-17 13:38:51 +02:00
Brenden Matthews
353f0b6ad7 More work on imlib2 stuff. 
Seems to be some rendering corruption which I'm not sure the reason for,
but other than that I think it works okay.
 2009-05-16 23:47:02 -06:00
Brenden Matthews
1dc7731f6d Merge branch 'master' into imlib2 2009-05-16 22:24:45 -06:00
Brenden Matthews
41e46ffe41 Oops, remove debug printf(). 2009-05-16 22:24:22 -06:00
Brenden Matthews
d26b946b7b Merge branch 'master' into imlib2 2009-05-16 18:37:11 -06:00
Brenden Matthews
72d15db78a Merge branch 'master' into lua 2009-05-16 18:37:04 -06:00
Brenden Matthews
344fa8498d Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-05-16 18:28:19 -06:00
Brenden Matthews
d642a3f659 Fixed comment stuff for real this time? 2009-05-16 18:28:04 -06:00
Nikolas Garofil
94d75cc494 add missing var 2009-05-17 01:33:43 +02:00
Brenden Matthews
f2a69f37ad Merge branch 'master' into lua 2009-05-16 17:08:50 -06:00
Brenden Matthews
debf4ec597 Remove unused var. 2009-05-16 17:08:37 -06:00
Brenden Matthews
dd606eb5ae Merge branch 'master' of git.omp.am:/home/omp/git/conky into lua 
Conflicts:
	src/specials.c
 2009-05-16 17:05:30 -06:00
Brenden Matthews
b661dbf5a7 More lua stuff. 2009-05-16 17:04:26 -06:00
Nikolas Garofil
dae78fb875 Execbar can now also be used on the shell 2009-05-17 00:37:22 +02:00
Brenden Matthews
69718f5b75 Oh my, parse lua output. 2009-05-16 15:06:29 -06:00
Brenden Matthews
72d2aad026 Merge branch 'master' into lua 2009-05-16 14:55:24 -06:00
Brenden Matthews
0e21a804ee Couple minor lua changes. 2009-05-16 14:55:05 -06:00
Toni Spets
453908953f Moved the Lua function calling to it's own function 2009-05-16 20:57:43 +03:00
Toni Spets
da5704fd74 Specifically ask for an integer from Lua for percentage 2009-05-16 20:37:53 +03:00
Nikolas Garofil
3762c5cb10 Use a builtin config without X11-support when compiled without it 
also, make sure X isn't initialised when compiled without x11-support
 2009-05-16 15:57:01 +02:00
Nikolas Garofil
2c35099b82 Bugfix: Segfault when starting with no configfile. 2009-05-16 13:14:45 +02:00
Toni Spets
66ba6e36c9 * Fix leaks 
* Fix HUP behaviour - scripts are now reloaded on HUP
* Remove unneccessary calls to llua_close()
 2009-05-15 23:35:18 +03:00
Toni Spets
b5934e5f69 Remove new lines from ERR messages 2009-05-15 23:01:08 +03:00
Toni Spets
90c9ac2723 Fix old copyright year 
Change all fprintf's to ERR()
 2009-05-15 21:48:11 +03:00
Toni Spets
a64e9f8950 Lua scripting support, initial commit 2009-05-15 21:08:51 +03:00
Brenden Matthews
b4ca1d146f Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-05-13 12:29:09 -06:00
Brenden Matthews
9e79881b5f Fix remove_comments()? 2009-05-13 12:28:53 -06:00
Nikolas Garofil
4db2119a2b Bugfix: segfault with wrong config 
Altough the following configuration is wrong, it should only produce a error
about a missing $endif but instead it also produced a segmentation fault:

TEXT
$if_gw$gw_ip$else
 2009-05-13 20:25:14 +02:00
Brenden Matthews
1b94e22b5c Merge branch 'master' into imlib2 2009-05-12 18:07:20 -06:00
Brenden Matthews
4910d33524 Fix comment removal stuff so that it doesn't break $color. 2009-05-12 18:05:51 -06:00
Brenden Matthews
18b174e967 Merge branch 'master' into imlib2 
Conflicts:
	src/Makefile.am
 2009-05-12 17:52:49 -06:00
Nikolas Garofil
e0b2f75433 Don't check if_gw twice 2009-05-12 20:25:40 +02:00
Phil Sutter
580043075e relying on the return value of scanf when using %n is bad 2009-05-12 00:49:40 +02:00
Phil Sutter
5d69d0378f fix human readable precision calculation 
This bug was quite hard to trigger (happens only with values 9.995-9.999
and 99.95-99.99), but I made it. ;)
 2009-05-12 00:49:40 +02:00
Phil Sutter
322d77942a hwmon: add args for value precalculation 2009-05-12 00:49:40 +02:00
Phil Sutter
ae7996bdd1 fix hwmon for 2.6.29, simplify code a bit 2009-05-12 00:49:40 +02:00
Nikolas Garofil
a01f968677 Bugfix: if_gw only outputs if another gw var is in the if block (sf id 2784627) 2009-05-11 19:47:24 +02:00
Nikolas Garofil
ae1b6c50e6 Remove even more x11-stuff with --disable-x11 2009-05-11 18:37:12 +02:00
Jaromir Smrcek
22601ff864 APC UPS fixes. 2009-05-10 13:37:04 -06:00
Nikolas Garofil
829201517e no x11-stuff for apcupsd when disabled 2009-05-10 21:18:20 +02:00
Brenden Matthews
8cb0027f45 Various fixes. 
Added missing apcupsd.[hc], added apcupsd_loadgauge, fixed compilation
errors, updated docs & syntax stuff.
 2009-05-10 13:11:09 -06:00
Jaromir Smrcek
cf2c61b588 Added support for APC UPS daemon monitoring. 2009-05-10 12:58:06 -06:00
Brenden Matthews
d224810235 Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-05-10 11:52:32 -06:00
Lassi Selander
1399b4483f Fix for previous xmms2 patch. 2009-05-10 11:44:57 -06:00
Nikolas Garofil
c53813a49f no gauges, bars, ... when compiled without X11 2009-05-10 14:14:21 +02:00
Nikolas Garofil
09ad5ce3f1 optimize previous commit (thanks Plague) 2009-05-10 13:44:13 +02:00
Nikolas Garofil
f7568b0753 strcpy shouldn't be used for overlapping strings 2009-05-10 13:14:54 +02:00
Nikolas Garofil
2afe66ed01 Bugfix: removing comments worked only partially 
All lines behind a comment line were also removed, comments should also be able
to start in the middle of line, \# shouldn't be replaced if it's in a comment
 2009-05-10 12:48:22 +02:00
Brenden Matthews
197c4d5bc3 Update docs, remove deprecated code. 2009-05-09 23:30:42 -06:00
Brenden Matthews
80aaadb48f Merge branch 'master' into imlib2 2009-05-09 21:14:39 -06:00
Brenden Matthews
24f97c45c6 Allow the use of '#' for comments within text area (can be escaped with '\#'. 
Also refactored some code relating to the config file loading (since
there was some duplication of code).
 2009-05-09 20:10:55 -06:00
Brenden Matthews
9dc5411681 Fix backwards mail stuff. 2009-05-09 19:20:05 -06:00
Brenden Matthews
db06b5f953 Fix build errors. 2009-05-09 11:20:04 -06:00
Nikolas Garofil
10495ed282 Bugfix: vars related to graphics produced wrong output when not running in X 2009-05-09 14:06:58 +02:00
Brenden Matthews
a45c8c9da4 Add missing source files (genius here). 2009-05-08 14:42:34 -06:00
Brenden Matthews
f7c793a514 Merge branch 'master' into imlib2 2009-05-08 14:38:55 -06:00
Nikolas Garofil
9153318329 Only include disp when needed 2009-05-08 16:04:16 +02:00
Nikolas Garofil
bd99fe5d81 Bugfix: run update_uname also without X11 2009-05-08 14:57:19 +02:00
Brenden Matthews
fdadbbf98e Added top_name_width config option. 2009-05-07 17:49:32 -06:00
Brenden Matthews
a1fc53be97 Merge branch 'master' into imlib2 2009-05-07 12:49:13 -06:00
Nikolas Garofil
c1e47013ef Bugfix: sometimes segfaults with cpubar 2009-05-07 18:44:45 +02:00
Brenden Matthews
31ed5ba178 Some work on imlib2 stuff. 2009-05-05 21:45:05 -06:00
Brenden Matthews
76dedfd563 Merge branch 'master' into imlib2 2009-05-05 17:44:12 -06:00
Brenden Matthews
af55c4afb1 Use a reduction here. 2009-05-05 17:43:45 -06:00
Brenden Matthews
8fbb3a9cfe Merge branch 'master' into imlib2 2009-05-05 17:36:38 -06:00
Brenden Matthews
fde096c435 Added some completely pointless OpenMP optimizations(?) 2009-05-05 17:36:12 -06:00
Brenden Matthews
d6e5a6491f Merge branch 'master' into imlib2 2009-05-04 13:22:51 -06:00
Brenden Matthews
eb2b7a4f30 Removed bits about BSD license. 2009-05-04 13:20:42 -06:00
Brenden Matthews
1b24763df1 Add copyright/license stuff to sony.[ch]. 2009-05-04 13:19:44 -06:00
Brenden Matthews
0d31ff0f4f Missing files, fix last commit. 
Added sony.[ch] stuff, as well as the important change from commit
3dd1738fb9
 2009-05-04 13:15:46 -06:00
Brenden Matthews
f6fe653401 Revert "Combine can now use other chars to seperate vars (used to be only space)" 
This reverts commit 3dd1738fb9.
 2009-05-04 13:13:51 -06:00
Nikolas Garofil
3dd1738fb9 Combine can now use other chars to seperate vars (used to be only space) 
Also undid the last change because sony.h was not included, feel free to submit
it again if you include this file and other sourcefiles needed (there is also
no definition of get_sony_fanspeed). If sony systems already have this file and
a definition of this function, please update the configure file so that support
for this is disabled by default and can be enabled by sony owners.
 2009-05-04 12:58:52 +02:00
Yeon-Hyeong Yang
f8a6a4035c Added Sony VAIO fanspeed info (thanks Yeon-Hyeong). 
Also removed the README and man page from the repo, as they don't really
need to be there and just cause conflicts.
 2009-05-03 21:23:59 -06:00
Brenden Matthews
a98a927116 Merge branch 'master' into imlib2 
Conflicts:
	configure.ac.in
	src/conky.c
 2009-05-01 23:29:21 -06:00
Brenden Matthews
27fff0d9cb Fixed $texeci regression. 2009-05-01 23:05:06 -06:00
Yeon-Hyeong Yang
68ea7a7859 Added diskio_avg_samples patch (thanks Yeon-Hyeong) 2009-05-01 17:03:59 -06:00
Brenden Matthews
e8e6d1c819 Few misc doc related things. 
Added the (incomplete) check_docs.py, to 'synchronize' the docs with the
code, as well as vim/nano syntax stuff.

Removed some unused OBJ_* stuff from text_objects.h, and updated docs
with some missing things.  Also removed a couple deprecated objects
which were still documented.
 2009-05-01 16:53:50 -06:00
Nikolas Garofil
e05e9ece8e Added the combine variable 2009-04-30 21:05:59 +02:00
Jérôme Plût
ff9154216b Make ALSA mixers available on Linux, and added $if_mixer_mute. 2009-04-28 10:56:49 -06:00
Brenden Matthews
2dfc0ee6b4 Fix minor environment variable bug. 2009-04-28 10:54:43 -06:00
Brenden Matthews
d1b6548c55 Minor for for mail args parsing. 2009-04-28 10:19:28 -06:00
Lassi Selander
49aee8707a Various XMMS2 updates (thanks Lassi). 2009-04-28 10:02:24 -06:00
Phil Sutter
fb8ccd7a05 fix for enviroment variable expansion 2009-04-26 22:49:46 +02:00
Nikolas Garofil
6bc19d0396 Workaround for the problem that $goto only moves the first rss-item by making 
it possible to specify the number of spaces you want in front of each rss-item
 2009-04-19 00:42:01 +02:00
Nikolas Garofil
86b91db305 Bugfix: compilation without X11 broke after latest patches 2009-04-13 14:42:31 +02:00
Brenden Matthews
506f6ecc3b Special default & gauge fixes. 2009-04-09 20:10:08 -06:00
Brenden Matthews
38ee788da4 Added default_bar/graph/gauge_size config options (thanks wire64 for the idea) 2009-04-09 16:00:40 -06:00
Or Cohen
b6e691e8ac Minor fix for fs_used_perc, fs_free and fs_free_perc 2009-04-09 15:34:12 -06:00
Brenden Matthews
ea34b2c5e5 Fix xmms2 related compilation error? 2009-04-09 15:33:50 -06:00