1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-15 17:47:09 +00:00
Commit Graph

151 Commits

Author SHA1 Message Date
Phil Sutter
6f587402d8 cosmetic fixup session
- kill trailing whitespace (grep -n ' $' src/*.{c,cc,h})
- eliminate space before tab (grep -n ' 	' src/*.{c,cc,h})
  (insert tab by pressing CTRL-v first)
- little indenting fixup in configure.ac.in (we indent using tabs, not
  spaces)

note: this should not change the actual code at all - if it does, feel
free to blame me personally ;)
2009-12-28 21:32:07 +01:00
Phil Sutter
3bc141cb7b use -std=c++0x for C++ sources
This is for --enable-testing, as we use C99 features (anonymous variadic
macros, in logging.h).
2009-12-17 22:14:22 +01:00
Pavel Labath
2790d35e06 Set CXXFLAGS in-line with current CFLAGS settings (autoconf)
Also, replaced #define _GNU_SOURCE (in config.h) with -D_GNU_SOURCE command-line parameter
because, for some reason g++ defines it implicitly and then complains about multiple definitions.
Also, removed -Winline from C(XX)FLAGS because it causes a lot of warnings for c++ code that
can't be easily removed and are not very significant.
2009-12-09 23:59:08 +01:00
Pavel Labath
e9d4e32f8f Replace GHashTable with tr1::unordered_map in tcp_portmon
This means portmon no longer depends on glib.
2009-12-09 23:59:07 +01:00
Pavel Labath
913d956b7c Fix linking on OpenBSD
OpenBSD doesn't need librt for clock_gettime, but configure was adding it to LIBS unconditionally.
Bug reported by dovim.
2009-12-08 20:57:12 +01:00
Phil Sutter
78c4d44ba7 print which features are unsupported at the end of configure 2009-11-15 01:43:30 +01:00
Nikolas Garofil
52ec7d2d51 Make sure there is no optimization with --enable-debug and --enable-testing 2009-11-08 20:29:43 +01:00
Nikolas Garofil
ce99d1a782 Use a define for the maximum number of network devices 2009-11-07 23:46:46 +01:00
Nikolas Garofil
4e69d0e9a8 Minor autoconf fix for iconv 2009-11-07 01:15:20 +01:00
Phil Sutter
1e893ec6e3 iconv: outsource code into it's own file
While testing, I found two already existing bugs:
* the variable 'a' passed to iconv_convert() needs to be passed by
  reference in order to allow for the desired side effect.
* Somehow the trailing junk after an iconv_conversion to a shorter
  string messes things up (and gets printed!). I couldn't exactly find
  out why this happens, but setting (*p) = 0; solves this problem.
2009-10-04 03:41:45 +02:00
Phil Sutter
5c67c0dc97 allow setting profiling gcc flags without hassle
And also ignore the files generated hereby. ;)
2009-09-20 19:18:17 +02:00
Phil Sutter
4840de39cd update machinery: keep threads persistent
Create each thread upon registration of the callback function, then use
semaphores to signal when it's time to update and when updating is
finished.
Many thanks to pavelo who originally came up with the idea for this.
2009-09-20 13:14:08 +02:00
Pavel Labath
5aacddd668 Include LUA_LIBS in the tolua configure test 2009-09-11 23:07:50 +02:00
Pavel Labath
ad51d7ae0b Comment out OpenMP leftovers 2009-09-08 20:49:40 +02: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
Brenden Matthews
46effdcbc4 Fix Lua extra compiler includes. 2009-07-30 22:21:09 -06: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
7de7c60923 Make configure opts for Lua extras more concise. 2009-07-27 15:28:40 -06:00
Brenden Matthews
73d36a59c0 Be more intelligent about handling tolua++ user types. 2009-07-27 14:07:36 -06:00
Brenden Matthews
69a40ca866 Fix up some lua configure stuff. 2009-07-20 17:16:48 -06:00
Cesare Tirabassi
7449c1afa9 Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-07-21 00:05:13 +02:00
Cesare Tirabassi
d817ab7965 add tolua++5.1 as an additional helper function and set library flag accordingly 2009-07-21 00:04:53 +02:00
Brenden Matthews
9cda78c023 Clarify weather opts, refactor some weather code. 2009-07-20 13:17:44 -06:00
Brenden Matthews
f67ebec5e3 Enable weather if XOAP is enabled. 2009-07-20 12:53:25 -06:00
Brenden Matthews
ec4e9a0435 Fix iostats configure stuff. 2009-07-20 12:19:07 -06:00
Brenden Matthews
8a3bdb2541 Bump rev. 2009-07-20 00:02:52 -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
afdda37729 Fixed a tiny bug in configure.ac.in
From the automake docs:
"Note that you must arrange for every AM_CONDITIONAL to be invoked every time configure is run -- if AM_CONDITIONAL is run conditionally (e.g., in a shell if statement), then the result will confuse automake."
2009-07-19 23:31:11 +02:00
Cesare Tirabassi
0b846a112d updated configure print summary with new XOAP flag 2009-07-19 17:46:11 +02: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
46fc4a0564 Added www.weather.com as an additional source of weather data 2009-07-18 15:59:43 +02:00
Cesare Tirabassi
0bc0f46101 weather: glib is not needed 2009-07-18 06:48:58 +02:00
Cesare Tirabassi
4e73ab2dd2 Revert "weather: glib is not needed"
This reverts commit d9cb095441.
2009-07-18 06:47:17 +02:00
Cesare Tirabassi
d9cb095441 weather: glib is not needed 2009-07-18 06:39:54 +02:00
Nikolas Garofil
931019aad9 Fix building without lua 2009-07-11 15:02:17 +02:00
Nikolas Garofil
a64f5b3f34 Fix building without weather 2009-07-11 00:43:09 +02:00
Brenden Matthews
d431491bfb Fix warning about AM_PROG_CC_C_O. 2009-07-10 10:12:04 -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
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
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
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
Pavel Labath
71f6880b01 Just moving an obviously misplaced comment 2009-06-12 19:21:34 +02:00
Nikos Ntarmos
8476bb08b5 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>
2009-06-08 13:05:19 -06:00
Brenden Matthews
4b35fe5db4 s/IMLIB2/Imlib2/g 2009-06-06 02:32:51 -06:00
Brenden Matthews
b7f2424077 Enable Lua by default. 2009-06-02 13:44:45 -06:00
Nikos Ntarmos
8da700b8c1 Delay checking for want_apcupsd.
The if-clause checking for the host operating system being Linux may
change the value of want_apcupsd. Delay checking for its value until
after that.

Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-05-23 21:08:32 -06:00