1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-16 01:57:09 +00:00
Commit Graph

2288 Commits

Author SHA1 Message Date
Phil Sutter
15e262a3ca minor simplification of get_string_width_special() 2009-09-20 13:16:20 +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
Phil Sutter
2cb45085e0 simplify get_string_width() a bit 2009-09-20 13:12:56 +02:00
Brenden Matthews
f0ae7e5911 Fix title in config_settings.html. 2009-09-16 08:54:12 -07:00
Pavel Labath
7ad3e34e34 OBJ -> OBJ_ARG; apparently forgotten in 9f22ba 2009-09-15 23:54:31 +02:00
Phil Sutter
fea72bd8f8 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.
2009-09-15 23:16:39 +02:00
Phil Sutter
7fa59c6c90 better zero out allocated memory 2009-09-15 23:16:39 +02:00
Phil Sutter
b7b9329e38 update machinery: run each update callback in it's own thread 2009-09-15 23:16:39 +02:00
Phil Sutter
925ac2b7ba read_tcp: get rid of heavy indenting 2009-09-15 23:16:35 +02:00
Phil Sutter
9f22bab657 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.
2009-09-15 23:12:15 +02:00
Phil Sutter
77cc646080 imlib2: don't flood warnings on non-existing images 2009-09-15 23:12:15 +02:00
Phil Sutter
f33affdc03 do not unconditionally overwrite a variable after conditionally setting it 2009-09-15 23:12:15 +02:00
Phil Sutter
ed3d73c094 minor indenting fixup 2009-09-15 23:12:15 +02:00
Phil Sutter
fa896bec98 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()).
2009-09-15 23:12:15 +02:00
Phil Sutter
9dd360ecdb update machinery: add some documentation 2009-09-15 23:12:15 +02:00
Pavel Labath
09c0bccf55 Move vi modelines closer to the beginning, so they're more likely to be actually used. 2009-09-12 12:50:51 +02:00
Pavel Labath
7dcdedbbe1 Changelog... 2009-09-11 23:24:33 +02:00
Pavel Labath
5aacddd668 Include LUA_LIBS in the tolua configure test 2009-09-11 23:07:50 +02:00
Phil Sutter
a00bd4ad5e update machinery: fix accidential naming conflict 2009-09-09 22:56:10 +02:00
Phil Sutter
466a253a8c update machinery: fix for update_stat() on linux 2009-09-09 22:52:09 +02:00
Pavel Labath
47c88b2149 Weather forecast documentation fix: high -> hi
Another option would be to change the code to expect "high" as a parameter
2009-09-09 21:18:43 +02:00
Pavel Labath
3736b141aa Fix window width calculation when $lua returns newlines
I just hope it doesn't break anything.
2009-09-09 21:15:18 +02:00
Pavel Labath
ad51d7ae0b Comment out OpenMP leftovers 2009-09-08 20:49:40 +02:00
Phil Sutter
f33bcb36ef update machinery: fix top objects
This is a bit messy, but since the top update stuff could use a rewrite
anyway, this should do.
2009-09-07 01:49:44 +02:00
Phil Sutter
15d6beff24 ignore the auto-generated script compile 2009-09-07 01:38:13 +02:00
Phil Sutter
d32879faaa 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.
2009-09-07 01:22:16 +02:00
Phil Sutter
e83fb84c55 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.
2009-09-07 01:12:11 +02:00
Phil Sutter
e044093735 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.
2009-09-07 01:05:33 +02:00
Phil Sutter
d7c7f06aca 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.
2009-09-07 00:36:02 +02:00
Phil Sutter
8cf8c4dac3 move the static last_*_update variables into the function 2009-09-06 21:57:19 +02:00
Phil Sutter
5a3b7c074b 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).
2009-09-06 21:53:53 +02:00
Phil Sutter
9619109bfc use CLEANFILES instead of defining a custom clean target 2009-09-05 03:34:33 +02:00
Phil Sutter
56142a7cd4 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.
2009-09-05 03:30:12 +02:00
Phil Sutter
ce7ec81531 fix lua automake rules for distfile creation 2009-09-05 02:37:11 +02:00
Phil Sutter
12ab00cd2e move the ncurses.h include from conky.h to core.c
Fixes some namespace error with libmpdclient.c.
2009-09-04 00:08:57 +02:00
Phil Sutter
ff199355f6 outsource the whole template object machinery 2009-09-04 00:08:17 +02:00
Phil Sutter
c91957e83a ignore lua/.deps/ 2009-09-03 23:54:32 +02:00
Cesare Tirabassi
75ce3b259b Fix if_running not working on linux when a top flavour is not running 2009-09-03 23:13:14 +02:00
Cesare Tirabassi
08e40c1fe8 Don't abort diskio objects initialisation if the given device doesn't exist, we could have these objects iffed; closes LP: #405188 2009-08-14 18:32:39 +02:00
Cesare Tirabassi
bf1dea5e4e Precised last two weather_forecast xpaths 2009-08-11 16:10:35 +02:00
Cesare Tirabassi
141c229afc Add day and date data_type to 2009-08-10 22:46:21 +02:00
Nikolas Garofil
bfb065502d Add global ncurses headerfile and make sure timeout in mailcode doesn't clash with timeout from ncurses 2009-08-08 03:20:47 +02:00
Nikolas Garofil
74b61f9730 Undo adding local ncurses.h header-file added by b4b0228d09 .
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.
2009-08-08 02:54:07 +02:00
Nikolas Garofil
834804c265 Fix: Add header needed for read_tcp 2009-08-08 02:49:28 +02:00
Phil Sutter
b4b0228d09 include ncurses.h in core.c 2009-08-08 00:28:26 +02:00
Brenden Matthews
043cf686c6 Revert "Uhh..ansohus"
This reverts commit 9827726ae5.

Or this.
2009-08-07 01:24:24 -06:00
Brenden Matthews
d7838b87bf Revert "Merge branch 'master' of git.omp.am:/home/omp/git/conky"
This reverts commit d710ea8b9d, reversing
changes made to 9827726ae5.

Also didn't meant to push this.
2009-08-07 01:23:27 -06:00
Brenden Matthews
098e28598f Revert "auesnthaeou"
This reverts commit 70adc04fc2.

Oops, didn't mean to push this.  I'll start a new branch now (so I don't
do this again...).
2009-08-07 01:21:56 -06:00
Brenden Matthews
70adc04fc2 auesnthaeou 2009-08-06 21:56:40 -06:00
Brenden Matthews
d710ea8b9d Merge branch 'master' of git.omp.am:/home/omp/git/conky
Conflicts:
	src/conky.h
2009-08-06 14:21:50 -06:00