monky
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).

14 years agoAdded some Lua API stuff.
Brenden Matthews [Tue, 28 Jul 2009 18:38:43 +0000 (12:38 -0600)]
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).

14 years agoFix: Always include stuff that used to use popen because it's now using pid_popen
Nikolas Garofil [Tue, 28 Jul 2009 13:59:17 +0000 (15:59 +0200)]
Fix: Always include stuff that used to use popen because it's now using pid_popen

14 years agoFix problem with invalid window props?
Brenden Matthews [Tue, 28 Jul 2009 03:01:55 +0000 (21:01 -0600)]
Fix problem with invalid window props?

We should check to make sure the atom actually exists before trying to
retrieve the property.

14 years agoClean up x11.c a bit.
Brenden Matthews [Mon, 27 Jul 2009 21:34:06 +0000 (15:34 -0600)]
Clean up x11.c a bit.

14 years agoMake configure opts for Lua extras more concise.
Brenden Matthews [Mon, 27 Jul 2009 21:28:40 +0000 (15:28 -0600)]
Make configure opts for Lua extras more concise.

14 years agoFix user_times bug (launchpad #405188).
Cesare Tirabassi [Mon, 27 Jul 2009 21:09:18 +0000 (15:09 -0600)]
Fix user_times bug (launchpad #405188).

14 years agoFix linking error with Lua extras disabled.
Brenden Matthews [Mon, 27 Jul 2009 21:03:21 +0000 (15:03 -0600)]
Fix linking error with Lua extras disabled.

14 years agoAdd/fix vim modelines for automake stuff.
Brenden Matthews [Mon, 27 Jul 2009 20:49:19 +0000 (14:49 -0600)]
Add/fix vim modelines for automake stuff.

14 years agoAdd vim modelines.
Brenden Matthews [Mon, 27 Jul 2009 20:47:19 +0000 (14:47 -0600)]
Add vim modelines.

14 years agoBe more intelligent about handling tolua++ user types.
Brenden Matthews [Mon, 27 Jul 2009 20:07:36 +0000 (14:07 -0600)]
Be more intelligent about handling tolua++ user types.

14 years agoFix: If there is no battery then we don't care about the status
Nikolas Garofil [Mon, 27 Jul 2009 11:34:20 +0000 (13:34 +0200)]
Fix: If there is no battery then we don't care about the status

14 years agouse EXIT_SUCCESS and EXIT_FAILURE instead of 0 and 1 when calling exit
Nikolas Garofil [Sun, 26 Jul 2009 23:29:57 +0000 (01:29 +0200)]
use EXIT_SUCCESS and EXIT_FAILURE instead of 0 and 1 when calling exit

14 years agoremove imlib_clip_line from lua/imlib2.pkg; the actual code for this (was in rgbadraw...
Cesare Tirabassi [Sun, 26 Jul 2009 17:31:53 +0000 (19:31 +0200)]
remove imlib_clip_line from lua/imlib2.pkg; the actual code for this (was in rgbadraw.c) has been removed upstream but not the prototype

14 years agoMerge branch 'master' of git.omp.am:/home/omp/git/conky
Cesare Tirabassi [Sun, 26 Jul 2009 11:04:11 +0000 (13:04 +0200)]
Merge branch 'master' of git.omp.am:/home/omp/git/conky

14 years agoclean the stack when llua_update_window_table is called with a window table not yet...
Cesare Tirabassi [Sun, 26 Jul 2009 11:03:41 +0000 (13:03 +0200)]
clean the stack when llua_update_window_table is called with a window table not yet populated

14 years agoFix: conky waited indefinitely on programs started with \$exec-alike vars if those...
Nikolas Garofil [Sun, 26 Jul 2009 00:26:22 +0000 (02:26 +0200)]
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).

14 years agoHandle if popen should fail
Nikolas Garofil [Sat, 25 Jul 2009 12:36:55 +0000 (14:36 +0200)]
Handle if popen should fail

14 years agoDon't place conky_ in front of lua functionnames if it's already there
Nikolas Garofil [Sat, 25 Jul 2009 10:03:09 +0000 (12:03 +0200)]
Don't place conky_ in front of lua functionnames if it's already there

14 years agoFix: Make sure lua works without X11
Nikolas Garofil [Sat, 25 Jul 2009 00:42:31 +0000 (02:42 +0200)]
Fix: Make sure lua works without X11

14 years agojust making bdf5e87c927348a6cf446e2840b2b14ad46a7dbc easier to read
Nikolas Garofil [Fri, 24 Jul 2009 14:17:03 +0000 (16:17 +0200)]
just making bdf5e87c927348a6cf446e2840b2b14ad46a7dbc easier to read

14 years agoworkaround to fix feed_title being processed when not yet parsed
Cesare Tirabassi [Fri, 24 Jul 2009 12:48:54 +0000 (14:48 +0200)]
workaround to fix feed_title being processed when not yet parsed

14 years agoFixed parsing of rss parameters (last 2 are optional) and typo in rss.c; there is...
Cesare Tirabassi [Fri, 24 Jul 2009 11:07:20 +0000 (13:07 +0200)]
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

14 years agoDon't do useless checks
Nikolas Garofil [Fri, 24 Jul 2009 10:39:48 +0000 (12:39 +0200)]
Don't do useless checks

14 years agoSupport for update_interval_on_battery
Nikolas Garofil [Fri, 24 Jul 2009 10:06:44 +0000 (12:06 +0200)]
Support for update_interval_on_battery

14 years agoMerge branch 'master' of ssh://git.omp.am/home/omp/git/conky
Nikolas Garofil [Fri, 24 Jul 2009 09:45:33 +0000 (11:45 +0200)]
Merge branch 'master' of ssh://git.omp.am/home/omp/git/conky

14 years agobugfix
Nikolas Garofil [Fri, 24 Jul 2009 09:43:53 +0000 (11:43 +0200)]
bugfix

14 years agoMerge branch 'master' of git.omp.am:/home/omp/git/conky
Cesare Tirabassi [Fri, 24 Jul 2009 09:32:02 +0000 (11:32 +0200)]
Merge branch 'master' of git.omp.am:/home/omp/git/conky

14 years agoRevert "the why recasting when you can simply declare it commit ..."
Cesare Tirabassi [Fri, 24 Jul 2009 09:30:27 +0000 (11:30 +0200)]
Revert "the why recasting when you can simply declare it commit ..."

This reverts commit b2a30ea47878ca335a603dff14c87a01a168770e.

14 years agoMerge branch 'master' of ssh://git.omp.am/home/omp/git/conky
Nikolas Garofil [Fri, 24 Jul 2009 09:12:35 +0000 (11:12 +0200)]
Merge branch 'master' of ssh://git.omp.am/home/omp/git/conky

14 years agoFix unclosed file in get_battery_stuff
Nikolas Garofil [Fri, 24 Jul 2009 09:09:00 +0000 (11:09 +0200)]
Fix unclosed file in get_battery_stuff

14 years agothe why recasting when you can simply declare it commit ...
Cesare Tirabassi [Thu, 23 Jul 2009 21:58:27 +0000 (23:58 +0200)]
the why recasting when you can simply declare it commit ...

14 years agoChanged xoap parsing method to xpath, in preparation to include forecast data
Cesare Tirabassi [Thu, 23 Jul 2009 21:46:23 +0000 (23:46 +0200)]
Changed xoap parsing method to xpath, in preparation to include forecast data

14 years agoFix CRIT_ERR everywhere
Nikolas Garofil [Thu, 23 Jul 2009 18:30:53 +0000 (20:30 +0200)]
Fix CRIT_ERR everywhere

14 years agoFix memleak in $weather
Nikolas Garofil [Thu, 23 Jul 2009 16:50:08 +0000 (18:50 +0200)]
Fix memleak in $weather

14 years agoFix bug SF ID 2814810 (wrong output with execp and execpi)
Nikolas Garofil [Thu, 23 Jul 2009 11:33:49 +0000 (13:33 +0200)]
Fix bug SF ID 2814810 (wrong output with execp and execpi)

14 years agoLet $tail and $head work with FIFOs again (was disabled by commit 41a7cffbe7c4a4a4f04...
Nikolas Garofil [Wed, 22 Jul 2009 20:08:31 +0000 (22:08 +0200)]
Let $tail and $head work with FIFOs again (was disabled by commit 41a7cffbe7c4a4a4f04aa0a414901f01f0d7d198 ), and fix memory bug when to_real_path is used in init_tailhead

14 years agodeleted obsolete buildubu.sh
Cesare Tirabassi [Wed, 22 Jul 2009 17:37:39 +0000 (19:37 +0200)]
deleted obsolete buildubu.sh

14 years agoInclude lua.html in tarball.
Brenden Matthews [Wed, 22 Jul 2009 17:31:49 +0000 (11:31 -0600)]
Include lua.html in tarball.

14 years agoFix bug with SF id 2808272 (tail and head)
Nikolas Garofil [Tue, 21 Jul 2009 21:41:47 +0000 (23:41 +0200)]
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.

14 years agoFix multiline stuff when build with X11 but output_to_x turned off.
Nikolas Garofil [Tue, 21 Jul 2009 10:39:09 +0000 (12:39 +0200)]
Fix multiline stuff when build with X11 but output_to_x turned off.

This commit reverts 725a3ba43a903edff3b68ae0c104c463b974fb5b and fixes 5967d285114a0d38d5af5e055a2874e9d7561225

14 years agoFix multiline stuff without X11.
Brenden Matthews [Tue, 21 Jul 2009 02:11:33 +0000 (20:11 -0600)]
Fix multiline stuff without X11.

14 years agoRevert "Fix multiline strings displayed on 1 line when output to x is not used"
Brenden Matthews [Mon, 20 Jul 2009 23:46:22 +0000 (17:46 -0600)]
Revert "Fix multiline strings displayed on 1 line when output to x is not used"

This reverts commit 5967d285114a0d38d5af5e055a2874e9d7561225.

14 years agoUpdate the doc date when check_docs.py is ran.
Brenden Matthews [Mon, 20 Jul 2009 23:32:56 +0000 (17:32 -0600)]
Update the doc date when check_docs.py is ran.

14 years agoFix up some lua configure stuff.
Brenden Matthews [Mon, 20 Jul 2009 23:16:48 +0000 (17:16 -0600)]
Fix up some lua configure stuff.

14 years agoFix multiline strings displayed on 1 line when output to x is not used
Nikolas Garofil [Mon, 20 Jul 2009 22:47:02 +0000 (00:47 +0200)]
Fix multiline strings displayed on 1 line when output to x is not used

14 years agoMerge branch 'master' of git.omp.am:/home/omp/git/conky
Cesare Tirabassi [Mon, 20 Jul 2009 22:05:13 +0000 (00:05 +0200)]
Merge branch 'master' of git.omp.am:/home/omp/git/conky

14 years agoadd tolua++5.1 as an additional helper function and set library flag accordingly
Cesare Tirabassi [Mon, 20 Jul 2009 22:04:53 +0000 (00:04 +0200)]
add tolua++5.1 as an additional helper function and set library flag accordingly

14 years agoClarify weather opts, refactor some weather code.
Brenden Matthews [Mon, 20 Jul 2009 19:17:44 +0000 (13:17 -0600)]
Clarify weather opts, refactor some weather code.

14 years agoEnable weather if XOAP is enabled.
Brenden Matthews [Mon, 20 Jul 2009 18:53:25 +0000 (12:53 -0600)]
Enable weather if XOAP is enabled.