monky
14 years agoAdd the -p/--pause command line option.
Brenden Matthews [Sat, 3 Oct 2009 21:26:39 +0000 (14:26 -0700)]
Add the -p/--pause command line option.

14 years agoImprove IMAP/POP3 code, fix compiler error.
Brenden Matthews [Thu, 1 Oct 2009 01:06:18 +0000 (18:06 -0700)]
Improve IMAP/POP3 code, fix compiler error.

14 years agoAllow spaces in mail folder names for pop/imap.
Brenden Matthews [Sun, 27 Sep 2009 17:40:06 +0000 (10:40 -0700)]
Allow spaces in mail folder names for pop/imap.

For example, you can specify "-f '[Gmail]/All Mail'" in your mail args
to view all mails in your Google mail IMAP folder.

14 years agoSwitching email addrs.
Brenden Matthews [Sun, 27 Sep 2009 03:40:42 +0000 (20:40 -0700)]
Switching email addrs.

14 years agoFix IMAP IDLE with Google's IMAP service.
Brenden Matthews [Sun, 27 Sep 2009 01:38:07 +0000 (18:38 -0700)]
Fix IMAP IDLE with Google's IMAP service.

14 years agoPut OBJ(image) in $ifdefs
Pavel Labath [Fri, 25 Sep 2009 12:43:46 +0000 (14:43 +0200)]
Put OBJ(image) in $ifdefs

so that conky produces more meaningful error message when compiled without imlib

14 years agoMake -d switch work again
Pavel Labath [Tue, 22 Sep 2009 16:19:08 +0000 (18:19 +0200)]
Make -d switch work again

-d was broken because fork-to-background was done after the update thread creation, so the
threads ended up in the wrong process. This delays the thread creation until after the fork.

14 years agoallow setting profiling gcc flags without hassle
Phil Sutter [Sun, 20 Sep 2009 17:18:17 +0000 (19:18 +0200)]
allow setting profiling gcc flags without hassle

And also ignore the files generated hereby. ;)

14 years agodo not block when reading inotify_fd
Phil Sutter [Sun, 20 Sep 2009 15:48:55 +0000 (17:48 +0200)]
do not block when reading inotify_fd

Originally, I was experiencing sporadic lockups when reading inotify_fd;
which is strange, since it is protected by select(). This should fix it
despite of the original problem.

14 years agoindex processes in a hash table for faster lookup
Phil Sutter [Sun, 20 Sep 2009 14:09:18 +0000 (16:09 +0200)]
index processes in a hash table for faster lookup

14 years agoIt feels much better to let the thread exit voluntarily instead of violently killing it
Pavel Labath [Sun, 20 Sep 2009 12:38:57 +0000 (14:38 +0200)]
It feels much better to let the thread exit voluntarily instead of violently killing it

14 years agofixup for ncurses output
Phil Sutter [Sun, 20 Sep 2009 01:48:00 +0000 (03:48 +0200)]
fixup for ncurses output

14 years agodrop duplicate code
Phil Sutter [Sun, 20 Sep 2009 02:07:45 +0000 (04:07 +0200)]
drop duplicate code

14 years agominor indentation fixup
Phil Sutter [Sun, 20 Sep 2009 01:32:07 +0000 (03:32 +0200)]
minor indentation fixup

14 years agothis was looking wrong
Phil Sutter [Sun, 20 Sep 2009 01:23:46 +0000 (03:23 +0200)]
this was looking wrong

14 years agominor simplification of get_string_width_special()
Phil Sutter [Sun, 20 Sep 2009 01:17:55 +0000 (03:17 +0200)]
minor simplification of get_string_width_special()

14 years agoupdate machinery: keep threads persistent
Phil Sutter [Sun, 20 Sep 2009 01:11:38 +0000 (03:11 +0200)]
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.

14 years agosimplify get_string_width() a bit
Phil Sutter [Sun, 20 Sep 2009 01:02:56 +0000 (03:02 +0200)]
simplify get_string_width() a bit

14 years agoFix title in config_settings.html.
Brenden Matthews [Wed, 16 Sep 2009 15:54:12 +0000 (08:54 -0700)]
Fix title in config_settings.html.

14 years agoOBJ -> OBJ_ARG; apparently forgotten in 9f22ba
Pavel Labath [Tue, 15 Sep 2009 21:54:31 +0000 (23:54 +0200)]
OBJ -> OBJ_ARG; apparently forgotten in 9f22ba

14 years agotop.c: fix for unsigned underflow
Phil Sutter [Tue, 15 Sep 2009 20:59:37 +0000 (22:59 +0200)]
top.c: fix for unsigned underflow

Yes, I also thought these are monotonic counters. But it seems like they
are not, at least sometimes the value decreases by 1 leading to a very
very high cpu usage percentage being printed.

14 years agobetter zero out allocated memory
Phil Sutter [Mon, 14 Sep 2009 00:07:45 +0000 (02:07 +0200)]
better zero out allocated memory

14 years agoupdate machinery: run each update callback in it's own thread
Phil Sutter [Thu, 10 Sep 2009 23:18:38 +0000 (01:18 +0200)]
update machinery: run each update callback in it's own thread

14 years agoread_tcp: get rid of heavy indenting
Phil Sutter [Thu, 10 Sep 2009 21:10:07 +0000 (23:10 +0200)]
read_tcp: get rid of heavy indenting

14 years agocore: add OBJ_ARG() and OBJ_IF_ARG() to force arguments
Phil Sutter [Wed, 9 Sep 2009 23:35:57 +0000 (01:35 +0200)]
core: add OBJ_ARG() and OBJ_IF_ARG() to force arguments

These macros can be used just like their OBJ() and OBJ_IF()
counterparts, just that they bail out hard when arg is unset. While
here, also cleanup the macro definition by using __* macros and fully
cleanup the macro namespace when the job is done.

Although this makes conky kind of less robust when it comes to
configuration errors, aborting is the right thing to do to avoid
ambiguity between unknown text objects.

14 years agoimlib2: don't flood warnings on non-existing images
Phil Sutter [Wed, 9 Sep 2009 23:59:08 +0000 (01:59 +0200)]
imlib2: don't flood warnings on non-existing images

14 years agodo not unconditionally overwrite a variable after conditionally setting it
Phil Sutter [Wed, 9 Sep 2009 23:49:10 +0000 (01:49 +0200)]
do not unconditionally overwrite a variable after conditionally setting it

14 years agominor indenting fixup
Phil Sutter [Wed, 9 Sep 2009 23:42:04 +0000 (01:42 +0200)]
minor indenting fixup

14 years agoapcupsd: drop init_apcupsd() since it was called at the wrong place
Phil Sutter [Wed, 9 Sep 2009 23:37:23 +0000 (01:37 +0200)]
apcupsd: drop init_apcupsd() since it was called at the wrong place

Normally, this is not enough reason to remove code, but in this case it
means that either the tester always had $nvidia (if enabled) or $combine
also in her setup, or it was working without (which I guess, since there
is duplicate code in update_apcupsd()).

14 years agoupdate machinery: add some documentation
Phil Sutter [Wed, 9 Sep 2009 22:12:56 +0000 (00:12 +0200)]
update machinery: add some documentation

14 years agoMove vi modelines closer to the beginning, so they're more likely to be actually...
Pavel Labath [Sat, 12 Sep 2009 10:50:51 +0000 (12:50 +0200)]
Move vi modelines closer to the beginning, so they're more likely to be actually used.

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