1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-20 03:51:18 +00:00
Commit Graph

868 Commits

Author SHA1 Message Date
Brenden Matthews
f10ffe07c4 Fix invalid call to close(). 2009-08-04 23:06:13 -06:00
Brenden Matthews
fbf746e53c Fix broken RSS code. 2009-08-04 22:56:19 -06:00
Nikolas Garofil
c99e092246 Gcc complains too much when build without X11 and NCurses 2009-08-04 22:13:06 +02:00
Nikolas Garofil
d69b3b56f0 Fix: reloading turned ncurses off 2009-08-04 13:46:59 +02:00
Brenden Matthews
aa142b0941 Revert "Compilation fix for weather stuff."
This reverts commit 63229dac63.
2009-08-03 12:52:10 -06:00
Brenden Matthews
63229dac63 Compilation fix for weather stuff. 2009-08-03 12:48:52 -06:00
Brenden Matthews
05330f24a3 Merge branch 'master' of git.omp.am:/home/omp/git/conky
Conflicts:
	src/conky.c
2009-08-03 12:41:07 -06:00
Brenden Matthews
51ddee12dd Fix imlib2 context. 2009-08-03 12:39:44 -06:00
Cesare Tirabassi
2118fc5889 Merge branch 'master' into weather-forecast 2009-08-03 19:59:36 +02:00
Cesare Tirabassi
36ae626ab8 Add parser initialisation and cleanup 2009-08-03 19:58:21 +02:00
Nikolas Garofil
37e2bb471b Support for in ncurses 2009-08-03 19:36:47 +02:00
Cesare Tirabassi
4fe70ad0e6 weather: change hardcoded constant 5 to FORECAST_DAYS macro 2009-08-03 11:49:26 +02:00
Cesare Tirabassi
14b7acdab6 Add weather_forecast object 2009-08-02 23:54:44 +02:00
Brenden Matthews
dbf3448031 Update conky_window Lua table when it changes. 2009-08-01 15:11:18 -06:00
Brenden Matthews
47b2869028 Code formatting. 2009-08-01 15:01:00 -06:00
Brenden Matthews
358a2b989e Add lua_startup_hook. 2009-08-01 14:36:38 -06:00
Brenden Matthews
41aed41e35 Add lua_shutdown_hook. 2009-08-01 14:30:14 -06:00
Nikolas Garofil
44b82311b9 Added support for out_to_ncurses
All ERR()'s are renamed to NORM_ERR() and box to mbox so that they don't
clash with things in ncurses.h .
Ncurses is enabled by default when building conky but can be disabled with
--disable-ncurses .
At the moment configure doesn't check if ncurses is actually available.
I'm adding support for ncurses so that we can make as much things as possible
that are only available in X11 also available in console in the future.
2009-08-01 20:45:43 +02:00
Nikolas Garofil
763ae568a7 Fix reloading config after 7ff2a71aa0 2009-08-01 12:14:10 +02:00
Cesare Tirabassi
01e66c7f8c Bug fix: make -X,--display actually work, improve error message if display not found 2009-08-01 09:34:21 +02:00
Nikolas Garofil
7ff2a71aa0 Added $include var to load configfiles inside of other configfiles 2009-07-31 15:28:55 +02:00
Brenden Matthews
be145bd55d Removed alias config option due to brokenness.
The alias option was broken by fb8ccd7a05,
and it seems like trying to make it work again will only result in
breakage for env var substitution anyway.
2009-07-31 00:33:06 -06:00
Nikolas Garofil
9ad3b9d8bc Fix: make sure 51c928a8ef works when programs terminate by themselves 2009-07-29 21:27:00 +02:00
Nikolas Garofil
51c928a8ef Fix: kill zombies without breaking b963c2827f 2009-07-29 11:43:16 +02:00
Cesare Tirabassi
81c691d15a add emacs indentation variables to source files in line with current vim settings 2009-07-28 23:44:22 +02:00
Brenden Matthews
ec517ecb26 Remove deprecated stuff from docs and conky.c (for 1.7.3). 2009-07-28 12:43:45 -06:00
Brenden Matthews
da4b542ae6 Added some Lua API stuff.
Added conky_set_update_interval() API call, which allows you to change
Conky's update interval from a Lua script.  Added the 'conky_info' table
to global Lua context, which still needs populating with stuff (right
now it only contains the current update interval and the system uptime).
2009-07-28 12:38:43 -06:00
Nikolas Garofil
e124064892 Fix: Always include stuff that used to use popen because it's now using pid_popen 2009-07-28 15:59:17 +02:00
Cesare Tirabassi
da06200e43 Fix user_times bug (launchpad #405188). 2009-07-27 15:09:18 -06:00
Brenden Matthews
d97cd93a1c Add vim modelines. 2009-07-27 14:47:31 -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
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
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
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
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
d3013bc410 Better argument handling for rss/curl/weather. 2009-07-20 09:59:31 -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
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
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
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
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
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
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
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
f6472cbbb5 Fix memleak when build with X11 but turned off in config 2009-07-12 14:52:58 +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
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
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
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
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
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
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
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
Nikolas Garofil
f2176e6f54 Added support for blink 2009-06-13 23:52:41 +02: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
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
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
Nikolas Garofil
f3fd389ea0 read_tcp werkt maar moet nog stresstesten ondergaan 2009-06-04 19:39:18 +02:00