monky
14 years agoChangelog...
Pavel Labath [Fri, 11 Sep 2009 21:24:33 +0000 (23:24 +0200)]
Changelog...

14 years agoInclude LUA_LIBS in the tolua configure test
Pavel Labath [Fri, 11 Sep 2009 21:07:50 +0000 (23:07 +0200)]
Include LUA_LIBS in the tolua configure test

14 years agoupdate machinery: fix accidential naming conflict
Phil Sutter [Wed, 9 Sep 2009 20:56:10 +0000 (22:56 +0200)]
update machinery: fix accidential naming conflict

14 years agoupdate machinery: fix for update_stat() on linux
Phil Sutter [Tue, 8 Sep 2009 20:15:09 +0000 (22:15 +0200)]
update machinery: fix for update_stat() on linux

14 years agoWeather forecast documentation fix: high -> hi
Pavel Labath [Wed, 9 Sep 2009 19:18:43 +0000 (21:18 +0200)]
Weather forecast documentation fix: high -> hi

Another option would be to change the code to expect "high" as a parameter

14 years agoFix window width calculation when $lua returns newlines
Pavel Labath [Wed, 9 Sep 2009 19:15:18 +0000 (21:15 +0200)]
Fix window width calculation when $lua returns newlines

I just hope it doesn't break anything.

14 years agoComment out OpenMP leftovers
Pavel Labath [Tue, 8 Sep 2009 18:49:40 +0000 (20:49 +0200)]
Comment out OpenMP leftovers

14 years agoupdate machinery: fix top objects
Phil Sutter [Sun, 6 Sep 2009 23:49:44 +0000 (01:49 +0200)]
update machinery: fix top objects

This is a bit messy, but since the top update stuff could use a rewrite
anyway, this should do.

14 years agoignore the auto-generated script compile
Phil Sutter [Sun, 6 Sep 2009 23:38:13 +0000 (01:38 +0200)]
ignore the auto-generated script compile

14 years agoupdate machinery: let CALLBACK() die again
Phil Sutter [Sun, 6 Sep 2009 23:22:16 +0000 (01:22 +0200)]
update machinery: let CALLBACK() die again

There are no INFO_* variables any more, so the argument passed to OBJ()
is always a function pointer or zero. By checking the argument passed in
add_update_callback(), the branch in the OBJ() macro can be dropped,
too.

14 years agoupdate machinery: clean up
Phil Sutter [Sun, 6 Sep 2009 23:12:11 +0000 (01:12 +0200)]
update machinery: clean up

* Remove leftover INFO_* values from object definitions which didn't
  trigger anything.
* Drop the whole INFO_* enum as it's values are not used anymore.

14 years agoupdate machinery: complete transition
Phil Sutter [Sun, 6 Sep 2009 23:05:33 +0000 (01:05 +0200)]
update machinery: complete transition

* Drop all need_mask alterations (no idea why there were here at all,
  but surely not sane since they are missing in the non-linux
  functions).
* Drop the update delay for update_meminfo(), as parsing /proc should
  not lead to abnormal overhead.
* Check for x_initialised from inside update_x11info(), so we can call
  it unconditionally.

14 years agorework the update machinery to use callbacks
Phil Sutter [Sun, 6 Sep 2009 22:14:54 +0000 (00:14 +0200)]
rework the update machinery to use callbacks

Besides improving performance when updating stuff, we ideally have no
text object specific code in update_stuff() anymore (aside some
leftovers).

The macros in construct_text_object() have gotten a bit crazier than
they were before:
* using CALLBACK(&func) instead of an INFO_* parameter to OBJ() will
  make it add the given callback to the list of callbacks to be iterated
  over at each update interval.
* BEWARE: the above assumes function pointer values to be > 0!
* This implicitly fixes a bug in the code: passing 0 as INFO_* value
  led to selecting INFO_MAIL (1 << 0 == 1).
* Now it would select INFO_CPU (== 0), which got unused and therefore is
  not a problem at all (the 0 value should be unused in enums anyway).

This needs some more work, then we should be able to drop the whole
INFO_* enum. Then CALLBACK() can die again and with it goes the ugly
casting stuff done to distinguish callbacks from INFO_* values.

14 years agomove the static last_*_update variables into the function
Phil Sutter [Sun, 6 Sep 2009 19:57:19 +0000 (21:57 +0200)]
move the static last_*_update variables into the function

14 years agoRewrite hddtemp support for better scaling
Phil Sutter [Sun, 6 Sep 2009 19:53:53 +0000 (21:53 +0200)]
Rewrite hddtemp support for better scaling

Instead of connecting once for each object, have a central update
routine (limiting support to only a single hddtemp daemon to connect
to).

14 years agouse CLEANFILES instead of defining a custom clean target
Phil Sutter [Sat, 5 Sep 2009 01:34:33 +0000 (03:34 +0200)]
use CLEANFILES instead of defining a custom clean target

14 years agocleanup src/Makefile.am
Phil Sutter [Sat, 5 Sep 2009 01:30:12 +0000 (03:30 +0200)]
cleanup src/Makefile.am

Since the files mentioned in conky_SOURCES are already included in the
distfile, no need to specify them again in EXTRA_DIST.

14 years agofix lua automake rules for distfile creation
Phil Sutter [Sat, 5 Sep 2009 00:33:42 +0000 (02:33 +0200)]
fix lua automake rules for distfile creation

14 years agomove the ncurses.h include from conky.h to core.c
Phil Sutter [Thu, 3 Sep 2009 22:08:40 +0000 (00:08 +0200)]
move the ncurses.h include from conky.h to core.c

Fixes some namespace error with libmpdclient.c.

14 years agooutsource the whole template object machinery
Phil Sutter [Thu, 3 Sep 2009 21:53:20 +0000 (23:53 +0200)]
outsource the whole template object machinery

14 years agoignore lua/.deps/
Phil Sutter [Thu, 3 Sep 2009 20:32:32 +0000 (22:32 +0200)]
ignore lua/.deps/

14 years agoFix if_running not working on linux when a top flavour is not running
Cesare Tirabassi [Thu, 3 Sep 2009 21:13:14 +0000 (23:13 +0200)]
Fix if_running not working on linux when a top flavour is not running

14 years agoDon't abort diskio objects initialisation if the given device doesn't exist, we could...
Cesare Tirabassi [Fri, 14 Aug 2009 16:32:39 +0000 (18:32 +0200)]
Don't abort diskio objects initialisation if the given device doesn't exist, we could have these objects iffed; closes LP: #405188

14 years agoPrecised last two weather_forecast xpaths
Cesare Tirabassi [Tue, 11 Aug 2009 14:10:35 +0000 (16:10 +0200)]
Precised last two weather_forecast xpaths

14 years agoAdd day and date data_type to
Cesare Tirabassi [Mon, 10 Aug 2009 20:46:21 +0000 (22:46 +0200)]
Add day and date data_type to

14 years agoAdd global ncurses headerfile and make sure timeout in mailcode doesn't clash with...
Nikolas Garofil [Sat, 8 Aug 2009 01:20:47 +0000 (03:20 +0200)]
Add global ncurses headerfile and make sure timeout in mailcode doesn't clash with timeout from ncurses

14 years agoUndo adding local ncurses.h header-file added by b4b0228d091928af1fb1d25f637bd768d0c6...
Nikolas Garofil [Sat, 8 Aug 2009 00:54:07 +0000 (02:54 +0200)]
Undo adding local ncurses.h header-file added by b4b0228d091928af1fb1d25f637bd768d0c65a21 .

The headerfile used globally should be used instead of one in the local dir.
If conky can't find it, it should be fixed in configure.ac.in or Makefile.am,
and not in the code.

14 years agoFix: Add header needed for read_tcp
Nikolas Garofil [Sat, 8 Aug 2009 00:49:28 +0000 (02:49 +0200)]
Fix: Add header needed for read_tcp

14 years agoinclude ncurses.h in core.c
Phil Sutter [Fri, 7 Aug 2009 22:21:37 +0000 (00:21 +0200)]
include ncurses.h in core.c

14 years agoRevert "Uhh..ansohus"
Brenden Matthews [Fri, 7 Aug 2009 07:24:24 +0000 (01:24 -0600)]
Revert "Uhh..ansohus"

This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530.

Or this.

14 years agoRevert "Merge branch 'master' of git.omp.am:/home/omp/git/conky"
Brenden Matthews [Fri, 7 Aug 2009 07:23:27 +0000 (01:23 -0600)]
Revert "Merge branch 'master' of git.omp.am:/home/omp/git/conky"

This reverts commit d710ea8b9d134c1b61510c400f99006f5b07c10c, reversing
changes made to 9827726ae5a13a49a9bcb3528db9a251e0e99530.

Also didn't meant to push this.

14 years agoRevert "auesnthaeou"
Brenden Matthews [Fri, 7 Aug 2009 07:21:56 +0000 (01:21 -0600)]
Revert "auesnthaeou"

This reverts commit 70adc04fc28cd92c976301aa36b0dcb8d719389b.

Oops, didn't mean to push this.  I'll start a new branch now (so I don't
do this again...).

14 years agoauesnthaeou
Brenden Matthews [Fri, 7 Aug 2009 03:56:40 +0000 (21:56 -0600)]
auesnthaeou

14 years agoMerge branch 'master' of git.omp.am:/home/omp/git/conky
Brenden Matthews [Thu, 6 Aug 2009 20:21:50 +0000 (14:21 -0600)]
Merge branch 'master' of git.omp.am:/home/omp/git/conky

Conflicts:
src/conky.h

14 years agoFix: rename timeout in mpdcode to prevent clashes with timeout in ncurses
Nikolas Garofil [Thu, 6 Aug 2009 14:35:06 +0000 (16:35 +0200)]
Fix: rename timeout in mpdcode to prevent clashes with timeout in ncurses

14 years agoFix buildproblems introduced by 3f4127080e0577c71c42ad487f8a9435c761329c . inet.h...
Nikolas Garofil [Thu, 6 Aug 2009 13:28:07 +0000 (15:28 +0200)]
Fix buildproblems introduced by 3f4127080e0577c71c42ad487f8a9435c761329c . inet.h is used by read_tcp and timeout is renamed to prevent clashes with timeout in ncurses

14 years agoUhh..ansohus
Brenden Matthews [Thu, 6 Aug 2009 06:54:40 +0000 (00:54 -0600)]
Uhh..ansohus

14 years agoStarted on breaking up conky.c.
Brenden Matthews [Wed, 5 Aug 2009 22:46:51 +0000 (16:46 -0600)]
Started on breaking up conky.c.

These changes will likely result in breakage, particularly with
different features enabled/disabled.

14 years agoMove xdbe swap stuff into x11.c.
Brenden Matthews [Wed, 5 Aug 2009 21:41:29 +0000 (15:41 -0600)]
Move xdbe swap stuff into x11.c.

14 years agoFinish c60209f6d0ac82ceb9d34e2011b11e08d79cbb86.
Brenden Matthews [Wed, 5 Aug 2009 21:33:41 +0000 (15:33 -0600)]
Finish c60209f6d0ac82ceb9d34e2011b11e08d79cbb86.

14 years agoSwap Xdbe buffers when resizing window.
Brenden Matthews [Wed, 5 Aug 2009 21:21:59 +0000 (15:21 -0600)]
Swap Xdbe buffers when resizing window.

14 years agoDon't clear entire X window, just drawing area.
Brenden Matthews [Wed, 5 Aug 2009 20:40:53 +0000 (14:40 -0600)]
Don't clear entire X window, just drawing area.

14 years agoDon't pass mouse clicks when window is desktop type.
Brenden Matthews [Wed, 5 Aug 2009 20:35:33 +0000 (14:35 -0600)]
Don't pass mouse clicks when window is desktop type.

14 years agoCode formatting.
Brenden Matthews [Wed, 5 Aug 2009 20:35:20 +0000 (14:35 -0600)]
Code formatting.

14 years agofix compilation error due to initial declaration in for loop being not compliant...
Cesare Tirabassi [Wed, 5 Aug 2009 15:55:09 +0000 (17:55 +0200)]
fix compilation error due to initial declaration in for loop being not compliant with C99

14 years agoAdd xoap error handler to weather-forecast too
Cesare Tirabassi [Wed, 5 Aug 2009 15:50:24 +0000 (17:50 +0200)]
Add xoap error handler to weather-forecast too

14 years agoSet refresh period for the 5 days forecast to 3 and a half hours, in accordance to...
Cesare Tirabassi [Wed, 5 Aug 2009 15:26:25 +0000 (17:26 +0200)]
Set refresh period for the 5 days forecast to 3 and a half hours, in accordance to Exhibit B of EULA

14 years agoFix invalid call to close().
Brenden Matthews [Wed, 5 Aug 2009 05:06:13 +0000 (23:06 -0600)]
Fix invalid call to close().

14 years agoFix broken RSS code.
Brenden Matthews [Wed, 5 Aug 2009 04:56:19 +0000 (22:56 -0600)]
Fix broken RSS code.

14 years agoFix parsing of XOAP xml.
Brenden Matthews [Wed, 5 Aug 2009 03:15:08 +0000 (21:15 -0600)]
Fix parsing of XOAP xml.

Also made the XOAP cloud condition match that of the NOAA stuff
(lowercase).

14 years agoGcc complains too much when build without X11 and NCurses
Nikolas Garofil [Tue, 4 Aug 2009 20:13:06 +0000 (22:13 +0200)]
Gcc complains too much when build without X11 and NCurses

14 years agoFix major memory leak in prss.c
Cesare Tirabassi [Tue, 4 Aug 2009 12:26:33 +0000 (14:26 +0200)]
Fix major memory leak in prss.c

14 years agoFix: reloading turned ncurses off
Nikolas Garofil [Tue, 4 Aug 2009 11:46:59 +0000 (13:46 +0200)]
Fix: reloading turned ncurses off

14 years agoLet's try __attribute__ this time for unused vars.
Brenden Matthews [Mon, 3 Aug 2009 19:48:18 +0000 (13:48 -0600)]
Let's try __attribute__ this time for unused vars.

14 years agoDo the UNUSED() thing another way.
Brenden Matthews [Mon, 3 Aug 2009 19:34:47 +0000 (13:34 -0600)]
Do the UNUSED() thing another way.

14 years agoSpell 'of' correctly.
Brenden Matthews [Mon, 3 Aug 2009 18:57:22 +0000 (12:57 -0600)]
Spell 'of' correctly.

14 years agoBetter fix for unused var problem.
Brenden Matthews [Mon, 3 Aug 2009 18:56:41 +0000 (12:56 -0600)]
Better fix for unused var problem.

14 years agoFix compiler warning.
Brenden Matthews [Mon, 3 Aug 2009 18:54:21 +0000 (12:54 -0600)]
Fix compiler warning.

14 years agoRevert "Compilation fix for weather stuff."
Brenden Matthews [Mon, 3 Aug 2009 18:52:10 +0000 (12:52 -0600)]
Revert "Compilation fix for weather stuff."

This reverts commit 63229dac638d3f67d83c829106632a758d0eded7.

14 years agoCompilation fix for weather stuff.
Brenden Matthews [Mon, 3 Aug 2009 18:48:52 +0000 (12:48 -0600)]
Compilation fix for weather stuff.

14 years agoMerge branch 'master' of git.omp.am:/home/omp/git/conky
Brenden Matthews [Mon, 3 Aug 2009 18:41:07 +0000 (12:41 -0600)]
Merge branch 'master' of git.omp.am:/home/omp/git/conky

Conflicts:
src/conky.c

14 years agoFix imlib2 context.
Brenden Matthews [Mon, 3 Aug 2009 18:39:44 +0000 (12:39 -0600)]
Fix imlib2 context.

14 years agoMerge branch 'master' into weather-forecast
Cesare Tirabassi [Mon, 3 Aug 2009 17:59:36 +0000 (19:59 +0200)]
Merge branch 'master' into weather-forecast

14 years agoAdd parser initialisation and cleanup
Cesare Tirabassi [Mon, 3 Aug 2009 17:58:21 +0000 (19:58 +0200)]
Add parser initialisation and cleanup

14 years agoSupport for $color in ncurses
Nikolas Garofil [Mon, 3 Aug 2009 17:39:37 +0000 (19:39 +0200)]
Support for $color in ncurses

14 years agoSupport for in ncurses
Nikolas Garofil [Mon, 3 Aug 2009 17:36:47 +0000 (19:36 +0200)]
Support for  in ncurses

14 years agoUpdated ChangeLog with weather_forecast
Cesare Tirabassi [Mon, 3 Aug 2009 11:38:53 +0000 (13:38 +0200)]
Updated ChangeLog with weather_forecast

14 years agoweather_forecast: corrected variables.xml formatting
Cesare Tirabassi [Mon, 3 Aug 2009 09:58:01 +0000 (11:58 +0200)]
weather_forecast: corrected variables.xml formatting

14 years agoweather: change hardcoded constant 5 to FORECAST_DAYS macro
Cesare Tirabassi [Mon, 3 Aug 2009 09:49:26 +0000 (11:49 +0200)]
weather: change hardcoded constant 5 to FORECAST_DAYS macro

14 years agoFix bad memory allocation
Cesare Tirabassi [Sun, 2 Aug 2009 22:24:39 +0000 (00:24 +0200)]
Fix bad memory allocation

14 years agoAdd weather_forecast object
Cesare Tirabassi [Sun, 2 Aug 2009 21:54:44 +0000 (23:54 +0200)]
Add weather_forecast object

14 years agoUpdate conky_window Lua table when it changes.
Brenden Matthews [Sat, 1 Aug 2009 21:11:18 +0000 (15:11 -0600)]
Update conky_window Lua table when it changes.

14 years agoMerge branch 'master' of git.omp.am:/home/omp/git/conky
Brenden Matthews [Sat, 1 Aug 2009 21:01:09 +0000 (15:01 -0600)]
Merge branch 'master' of git.omp.am:/home/omp/git/conky

14 years agoCode formatting.
Brenden Matthews [Sat, 1 Aug 2009 21:01:00 +0000 (15:01 -0600)]
Code formatting.

14 years agoFix minor spelling mistake
Nikolas Garofil [Sat, 1 Aug 2009 20:46:10 +0000 (22:46 +0200)]
Fix minor spelling mistake

14 years agoAdd lua_startup_hook.
Brenden Matthews [Sat, 1 Aug 2009 20:36:38 +0000 (14:36 -0600)]
Add lua_startup_hook.

14 years agoMerge branch 'master' of git.omp.am:/home/omp/git/conky
Brenden Matthews [Sat, 1 Aug 2009 20:30:27 +0000 (14:30 -0600)]
Merge branch 'master' of git.omp.am:/home/omp/git/conky

14 years agoAdd lua_shutdown_hook.
Brenden Matthews [Sat, 1 Aug 2009 20:30:14 +0000 (14:30 -0600)]
Add lua_shutdown_hook.

14 years agoFix minor spelling mistake
Nikolas Garofil [Sat, 1 Aug 2009 20:15:09 +0000 (22:15 +0200)]
Fix minor spelling mistake

14 years agoDoc cleanup.
Brenden Matthews [Sat, 1 Aug 2009 19:15:53 +0000 (13:15 -0600)]
Doc cleanup.

14 years agoAdded support for out_to_ncurses
Nikolas Garofil [Sat, 1 Aug 2009 18:45:43 +0000 (20:45 +0200)]
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.

14 years agoFix reloading config after 7ff2a71aa09054811833ce0aafb00f3898bdbe72
Nikolas Garofil [Sat, 1 Aug 2009 10:14:10 +0000 (12:14 +0200)]
Fix reloading config after 7ff2a71aa09054811833ce0aafb00f3898bdbe72

14 years agoBug fix: make -X,--display actually work, improve error message if display not found
Cesare Tirabassi [Sat, 1 Aug 2009 07:34:21 +0000 (09:34 +0200)]
Bug fix: make -X,--display actually work, improve error message if display not found

14 years agoAdded $include var to load configfiles inside of other configfiles
Nikolas Garofil [Fri, 31 Jul 2009 13:28:55 +0000 (15:28 +0200)]
Added $include var to load configfiles inside of other configfiles

14 years agominor fix to allow out-of-tree builds
Cesare Tirabassi [Fri, 31 Jul 2009 11:50:33 +0000 (13:50 +0200)]
minor fix to allow out-of-tree builds

14 years agoRemoved alias config option due to brokenness.
Brenden Matthews [Fri, 31 Jul 2009 06:33:06 +0000 (00:33 -0600)]
Removed alias config option due to brokenness.

The alias option was broken by fb8ccd7a05847c19a863be785d1786846671a1c9,
and it seems like trying to make it work again will only result in
breakage for env var substitution anyway.

14 years agoActually fix Lua extra compiler includes.
Brenden Matthews [Fri, 31 Jul 2009 05:40:09 +0000 (23:40 -0600)]
Actually fix Lua extra compiler includes.

I did it wrong with 1a86405cd9c7a98bd18914bf4269731ea54616d1.

14 years agoUndo some automake brain damage.
Brenden Matthews [Fri, 31 Jul 2009 05:19:48 +0000 (23:19 -0600)]
Undo some automake brain damage.

14 years agoFix Lua extra compiler includes.
Brenden Matthews [Fri, 31 Jul 2009 04:21:09 +0000 (22:21 -0600)]
Fix Lua extra compiler includes.

14 years agoCouple minor automake fixes.
Brenden Matthews [Thu, 30 Jul 2009 19:55:25 +0000 (13:55 -0600)]
Couple minor automake fixes.

14 years agoAdd missing changelog entry.
Cesare Tirabassi [Thu, 30 Jul 2009 19:22:27 +0000 (21:22 +0200)]
Add missing changelog entry.

14 years agoAdd missing changelog entry.
Brenden Matthews [Thu, 30 Jul 2009 06:08:48 +0000 (00:08 -0600)]
Add missing changelog entry.

14 years agoweather: add icon data_type for xoap
Cesare Tirabassi [Wed, 29 Jul 2009 20:22:24 +0000 (22:22 +0200)]
weather: add icon data_type for xoap

14 years agoMerge branch 'master' of ssh://git.omp.am/home/omp/git/conky
Nikolas Garofil [Wed, 29 Jul 2009 19:27:19 +0000 (21:27 +0200)]
Merge branch 'master' of ssh://git.omp.am/home/omp/git/conky

14 years agoFix: make sure 51c928a8ef589c722c8342769a491556c25d67c4 works when programs terminate...
Nikolas Garofil [Wed, 29 Jul 2009 19:27:00 +0000 (21:27 +0200)]
Fix: make sure 51c928a8ef589c722c8342769a491556c25d67c4 works when programs terminate by themselves

14 years agoMerge branch 'master' of git.omp.am:/home/omp/git/conky
Cesare Tirabassi [Wed, 29 Jul 2009 16:04:57 +0000 (18:04 +0200)]
Merge branch 'master' of git.omp.am:/home/omp/git/conky

14 years agocorrect typo in error message
Cesare Tirabassi [Wed, 29 Jul 2009 16:04:34 +0000 (18:04 +0200)]
correct typo in error message

14 years agoFix: kill zombies without breaking b963c2827fe5491e7073de4e829ac6686f148d8f
Nikolas Garofil [Wed, 29 Jul 2009 09:43:16 +0000 (11:43 +0200)]
Fix: kill zombies without breaking b963c2827fe5491e7073de4e829ac6686f148d8f

14 years agoadd emacs indentation variables to source files in line with current vim settings
Cesare Tirabassi [Tue, 28 Jul 2009 21:44:22 +0000 (23:44 +0200)]
add emacs indentation variables to source files in line with current vim settings

14 years agoRemove deprecated stuff from docs and conky.c (for 1.7.3).
Brenden Matthews [Tue, 28 Jul 2009 18:43:45 +0000 (12:43 -0600)]
Remove deprecated stuff from docs and conky.c (for 1.7.3).