Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-28 13:00:45 +00:00
Code Issues Releases Activity
2,060 Commits 5 Branches 46 Tags 22 MiB
4927eb85a2
Commit Graph

1462 Commits

Author SHA1 Message Date
Phil Sutter
4b0c1d3226 mboxscan: convert to generic object payload 2009-11-03 23:23:22 +01:00
Phil Sutter
dd36fc4caa mixer: convert to generic object payload 2009-11-03 23:23:22 +01:00
Phil Sutter
c45decda5e curl: convert to generic object payload 2009-11-03 23:23:22 +01:00
Phil Sutter
4716969cc6 weather objects: convert to generic object payload 2009-11-03 23:23:22 +01:00
Phil Sutter
046ae1dd61 rss: convert to generic object payload 2009-11-03 23:23:22 +01:00
Phil Sutter
9202a9da87 eve: convert to generic object payload 2009-11-03 23:23:22 +01:00
Phil Sutter
94ac89e091 sysfs objects: convert to generic object payload 2009-11-03 23:23:22 +01:00
Phil Sutter
d2be5980ca tcp_portmon: convert to generic object payload 2009-11-03 23:23:22 +01:00
Phil Sutter
8d1640f30b fs_*: convert to generic object payload 2009-11-03 23:23:22 +01:00
Phil Sutter
f31e5cefe7 fs_bar, fs_bar_free: convert to generic object payload 2009-11-03 23:23:22 +01:00
Phil Sutter
f6942c8c98 tailhead: convert to generic object payload 2009-11-03 23:23:22 +01:00
Phil Sutter
1d73d82b87 convert tztime to generic object payload 2009-11-03 23:23:22 +01:00
Phil Sutter
8165a91f0a nvidia: convert to generic text object payload 2009-11-03 23:23:22 +01:00
Phil Sutter
eff3f75014 text_object: introduce a generic payload pointer 2009-11-03 23:23:22 +01:00
Phil Sutter
d1b2c7eac3 local_mails: put code to where it belongs 
Note that the code does not only use a pre-processor generator for
defining the print functions, but also for their prototypes. Sadly, this
generated a conflict in mboxscan.c which this patch resolves, too.
 2009-11-03 01:50:28 +01:00
Phil Sutter
fa9135f9df mail: put imap and pop3 code to where it belongs 2009-11-03 01:50:28 +01:00
Phil Sutter
8b76d8fb60 net_stats: outsource network-related objects 2009-11-03 01:50:28 +01:00
Phil Sutter
9efa29be28 combine: outsource code 2009-11-03 01:50:28 +01:00
Phil Sutter
37658b540b scroll: outsource code 2009-11-03 01:50:28 +01:00
Phil Sutter
24d9e8bf24 read_tcp: outsource code 2009-11-03 01:50:28 +01:00
Phil Sutter
7a168c377b exec: put all exec-related stuff into it's own file 
While here, also merge the execi and texeci fields of struct
text_object, so more common code can be shared in between.
 2009-11-03 01:50:28 +01:00
Phil Sutter
2631f42820 ibm: put specific code to where it belongs 2009-11-03 01:50:28 +01:00
Phil Sutter
7fc1c801aa gw_info: move code to where it belongs 2009-11-03 01:50:28 +01:00
Cesare Tirabassi
27a2a253a8 Fix indenting of last commit 2009-11-01 18:42:29 +01:00
Cesare Tirabassi
4ea99e27f1 Fix hwmon location for kernel >= 2.6.31 (closes sf: #2865628) 
In the linux kernel 2.6.31 and above, device data can either be in
/sys/class/hwmon/hwmonDEV or /sys/class/hwmon/hwmonDEV/device.
Just stat'ing for the latter doesn't work since it can exist but not contain
the required data (see https://bugs.launchpad.net/bugs/435571 for details).
The patch could be improved to keep in memory the right location of the data
on the user's system instead of trying each time, but, is it worth doing it?
 2009-11-01 18:37:48 +01:00
Phil Sutter
f7f3b37807 rss.h: drop useless header include 2009-10-12 23:04:41 +02:00
Phil Sutter
d1ed9c8399 fix compiling in a messy way 
A cleaner but more ugly solution would be to include text_object.h in
every header containing struct text_object definitions. But this
apparently triggers a big mess, since text_object.h itself includes
custom headers. Forward defining struct text_object is obviously the
mostly simple solution until there is a bigger header include review
cleaning it all up.
 2009-10-12 23:00:06 +02:00
Phil Sutter
a106b52698 curl: put init and print code to where it belongs 
This also fixes a bug in arg parsing, effectively forcing an interval to
be specified.
 2009-10-12 21:33:02 +02:00
Phil Sutter
ad8dd36cb7 weather objects: move init and print code to weather.c 2009-10-12 21:33:02 +02:00
Phil Sutter
6a2f58a25c rss: move init and print code into rss.c 2009-10-12 21:33:02 +02:00
Phil Sutter
ddca4aac68 spend some time with eve.{c,h} 
* minimise core code hooks
* drop useless exporting of private functions (and make them static)
* reorder functions in eve.c so no prototypes are needed
* drop massive header include and add double include barrier in eve.h
 2009-10-12 21:33:02 +02:00
Phil Sutter
700a32b2e7 sysfs objects: merge init and print routines 2009-10-12 21:33:02 +02:00
Phil Sutter
da7876468f tcp_portmon: drop useless function pointer cast, use OBJ_ARG 2009-10-12 21:33:02 +02:00
Phil Sutter
4d70cf07b8 fs_bar, fs_bar_free: merge init and print routines 2009-10-12 21:33:02 +02:00
Phil Sutter
b9a28c37a8 tail, head: use OBJ_ARG to simplify code 2009-10-12 21:33:02 +02:00
Phil Sutter
a529ac52de hddtemp: drop dead code (custom per-object data) 2009-10-12 21:33:02 +02:00
Cesare Tirabassi
066af067f0 Fix global info.desktop variables were incorrectly freed, sf #2876647 2009-10-12 13:38:48 +02:00
Phil Sutter
ea92e63a44 tztime: fix argument parsing bug, clarify docs 2009-10-04 04:03:21 +02: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
adf9d23927 outsource time, utime and tztime into a separate file 2009-10-04 03:24:04 +02:00
Phil Sutter
e3e77ce75e move the SIZE_DEFAULTS() macro to where it belongs to 2009-10-04 03:24:04 +02:00
Brenden Matthews
584d05d2ad Add the -p/--pause command line option. 2009-10-03 14:26:39 -07:00
Brenden Matthews
88a8799bf5 Improve IMAP/POP3 code, fix compiler error. 2009-09-30 18:06:18 -07:00
Brenden Matthews
7fc4d40eb2 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.
 2009-09-27 10:40:06 -07:00
Brenden Matthews
4a0676d4d0 Fix IMAP IDLE with Google's IMAP service. 2009-09-26 18:38:55 -07:00
Pavel Labath
28978461a7 Put OBJ(image) in $ifdefs 
so that conky produces more meaningful error message when compiled without imlib
 2009-09-25 14:43:46 +02:00
Pavel Labath
bfda285567 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.
 2009-09-22 18:19:08 +02:00
Phil Sutter
cfccea4079 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.
 2009-09-20 19:04:45 +02:00
Phil Sutter
d163293f66 index processes in a hash table for faster lookup 2009-09-20 16:10:05 +02:00
Pavel Labath
596449c902 It feels much better to let the thread exit voluntarily instead of violently killing it 2009-09-20 14:38:57 +02:00
Phil Sutter
d45aa362b0 fixup for ncurses output 2009-09-20 13:52:46 +02:00
Phil Sutter
4823b1f428 drop duplicate code 2009-09-20 13:18:10 +02:00
Phil Sutter
3569ece513 minor indentation fixup 2009-09-20 13:16:43 +02:00
Phil Sutter
e391fa40a9 this was looking wrong 2009-09-20 13:16:43 +02:00
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
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
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
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
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
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
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
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
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
Nikolas Garofil
db1c0061b0 Fix: rename timeout in mpdcode to prevent clashes with timeout in ncurses 2009-08-06 16:35:06 +02:00
Nikolas Garofil
157537fc30 Fix buildproblems introduced by 3f4127080e . inet.h is used by read_tcp and timeout is renamed to prevent clashes with timeout in ncurses 2009-08-06 15:28:07 +02:00
Brenden Matthews
9827726ae5 Uhh..ansohus 2009-08-06 00:54:40 -06:00
Brenden Matthews
3f4127080e Started on breaking up conky.c. 
These changes will likely result in breakage, particularly with
different features enabled/disabled.
 2009-08-05 16:46:51 -06:00
Brenden Matthews
c29301d02a Move xdbe swap stuff into x11.c. 2009-08-05 15:41:56 -06:00
Brenden Matthews
4e88abde40 Finish c60209f6d0. 2009-08-05 15:33:41 -06:00
Brenden Matthews
c60209f6d0 Swap Xdbe buffers when resizing window. 2009-08-05 15:21:59 -06:00
Brenden Matthews
2904720a58 Don't clear entire X window, just drawing area. 2009-08-05 14:40:53 -06:00
Brenden Matthews
7b93ad8071 Don't pass mouse clicks when window is desktop type. 2009-08-05 14:35:33 -06:00
Brenden Matthews
2115d925e4 Code formatting. 2009-08-05 14:35:20 -06:00
Cesare Tirabassi
4d35595e5e fix compilation error due to initial declaration in for loop being not compliant with C99 2009-08-05 17:55:09 +02:00
Cesare Tirabassi
0cd29676c0 Add xoap error handler to weather-forecast too 2009-08-05 17:50:24 +02:00
Cesare Tirabassi
e16511be02 Set refresh period for the 5 days forecast to 3 and a half hours, in accordance to Exhibit B of EULA 2009-08-05 17:26:25 +02:00
Brenden Matthews
f10ffe07c4 Fix invalid call to close(). 2009-08-04 23:06:13 -06:00
Brenden Matthews
fbf746e53c Fix broken RSS code. 2009-08-04 22:56:19 -06:00
Brenden Matthews
e41f3e4f7b Fix parsing of XOAP xml. 
Also made the XOAP cloud condition match that of the NOAA stuff
(lowercase).
 2009-08-04 21:15:08 -06:00
Nikolas Garofil
c99e092246 Gcc complains too much when build without X11 and NCurses 2009-08-04 22:13:06 +02:00
Cesare Tirabassi
fc54981da8 Fix major memory leak in prss.c 2009-08-04 14:28:24 +02:00
Nikolas Garofil
d69b3b56f0 Fix: reloading turned ncurses off 2009-08-04 13:46:59 +02:00
Brenden Matthews
aec2ac5448 Let's try __attribute__ this time for unused vars. 2009-08-03 13:48:18 -06:00
Brenden Matthews
3b13ae971e Do the UNUSED() thing another way. 2009-08-03 13:34:47 -06:00
Brenden Matthews
581f59528b Spell 'of' correctly. 2009-08-03 12:57:22 -06:00
Brenden Matthews
efa5a211b7 Better fix for unused var problem. 2009-08-03 12:56:41 -06:00
Brenden Matthews
ecfcfacce3 Fix compiler warning. 2009-08-03 12:54:21 -06:00
Brenden Matthews
aa142b0941 Revert "Compilation fix for weather stuff." 
This reverts commit 63229dac63.
 2009-08-03 12:52:10 -06:00
Brenden Matthews
63229dac63 Compilation fix for weather stuff. 2009-08-03 12:48:52 -06:00
Brenden Matthews
05330f24a3 Merge branch 'master' of git.omp.am:/home/omp/git/conky 
Conflicts:
	src/conky.c
 2009-08-03 12:41:07 -06:00
Brenden Matthews
51ddee12dd Fix imlib2 context. 2009-08-03 12:39:44 -06:00
Cesare Tirabassi
2118fc5889 Merge branch 'master' into weather-forecast 2009-08-03 19:59:36 +02:00
Cesare Tirabassi
36ae626ab8 Add parser initialisation and cleanup 2009-08-03 19:58:21 +02:00
Nikolas Garofil
37e2bb471b Support for in ncurses 2009-08-03 19:36:47 +02:00
Cesare Tirabassi
4fe70ad0e6 weather: change hardcoded constant 5 to FORECAST_DAYS macro 2009-08-03 11:49:26 +02:00
Cesare Tirabassi
d707d536bb Fix bad memory allocation 2009-08-03 00:24:39 +02:00
Cesare Tirabassi
14b7acdab6 Add weather_forecast object 2009-08-02 23:54:44 +02:00
Brenden Matthews
dbf3448031 Update conky_window Lua table when it changes. 2009-08-01 15:11:18 -06:00
Brenden Matthews
47b2869028 Code formatting. 2009-08-01 15:01:00 -06:00
Brenden Matthews
358a2b989e Add lua_startup_hook. 2009-08-01 14:36:38 -06:00
Brenden Matthews
41aed41e35 Add lua_shutdown_hook. 2009-08-01 14:30:14 -06: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
Nikolas Garofil
763ae568a7 Fix reloading config after 7ff2a71aa0 2009-08-01 12:14:10 +02:00
Cesare Tirabassi
01e66c7f8c Bug fix: make -X,--display actually work, improve error message if display not found 2009-08-01 09:34:21 +02:00
Nikolas Garofil
7ff2a71aa0 Added $include var to load configfiles inside of other configfiles 2009-07-31 15:28:55 +02:00
Cesare Tirabassi
8af1f24624 minor fix to allow out-of-tree builds 2009-07-31 13:50:33 +02:00
Brenden Matthews
be145bd55d Removed alias config option due to brokenness. 
The alias option was broken by fb8ccd7a05,
and it seems like trying to make it work again will only result in
breakage for env var substitution anyway.
 2009-07-31 00:33:06 -06:00
Cesare Tirabassi
38e544ee25 weather: add icon data_type for xoap 2009-07-29 22:22:24 +02:00
Nikolas Garofil
8f3150d8f6 Merge branch 'master' of ssh://git.omp.am/home/omp/git/conky 2009-07-29 21:27:19 +02:00
Nikolas Garofil
9ad3b9d8bc Fix: make sure 51c928a8ef works when programs terminate by themselves 2009-07-29 21:27:00 +02:00
Cesare Tirabassi
7bfff20e5d Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-07-29 18:04:57 +02:00
Cesare Tirabassi
580fa3a52d correct typo in error message 2009-07-29 18:04:34 +02:00
Nikolas Garofil
51c928a8ef Fix: kill zombies without breaking b963c2827f 2009-07-29 11:43:16 +02: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
ec517ecb26 Remove deprecated stuff from docs and conky.c (for 1.7.3). 2009-07-28 12:43:45 -06:00
Brenden Matthews
da4b542ae6 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).
 2009-07-28 12:38:43 -06:00
Nikolas Garofil
e124064892 Fix: Always include stuff that used to use popen because it's now using pid_popen 2009-07-28 15:59:17 +02:00
Brenden Matthews
6c6711aa6d Fix problem with invalid window props? 
We should check to make sure the atom actually exists before trying to
retrieve the property.
 2009-07-27 21:01:55 -06:00
Brenden Matthews
73eaf0cfc3 Clean up x11.c a bit. 2009-07-27 15:34:06 -06:00
Cesare Tirabassi
da06200e43 Fix user_times bug (launchpad #405188). 2009-07-27 15:09:18 -06:00
Brenden Matthews
dd6133b055 Fix linking error with Lua extras disabled. 2009-07-27 15:03:21 -06:00
Brenden Matthews
d97cd93a1c Add vim modelines. 2009-07-27 14:47:31 -06:00
Brenden Matthews
73d36a59c0 Be more intelligent about handling tolua++ user types. 2009-07-27 14:07:36 -06:00
Nikolas Garofil
ca0f8f8712 Fix: If there is no battery then we don't care about the status 2009-07-27 13:34:20 +02:00
Nikolas Garofil
3e41b36fdf use EXIT_SUCCESS and EXIT_FAILURE instead of 0 and 1 when calling exit 2009-07-27 01:29:57 +02:00
Cesare Tirabassi
ffe5d5f104 Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-07-26 13:04:11 +02:00
Cesare Tirabassi
94cd289aec clean the stack when llua_update_window_table is called with a window table not yet populated 2009-07-26 13:03:41 +02:00
Nikolas Garofil
b963c2827f 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).
 2009-07-26 02:26:22 +02:00
Nikolas Garofil
4d37d021e1 Handle if popen should fail 2009-07-25 14:36:55 +02:00
Nikolas Garofil
febc5306e2 Don't place conky_ in front of lua functionnames if it's already there 2009-07-25 12:03:09 +02:00
Nikolas Garofil
7ce38ecf09 Fix: Make sure lua works without X11 2009-07-25 02:42:31 +02:00
Nikolas Garofil
ca04b9a3c7 just making bdf5e87c92 easier to read 2009-07-24 16:17:03 +02:00
Cesare Tirabassi
bdf5e87c92 workaround to fix feed_title being processed when not yet parsed 2009-07-24 14:48:54 +02:00
Cesare Tirabassi
0be6e37e07 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 2009-07-24 13:07:20 +02:00
Nikolas Garofil
381b47a0a9 Don't do useless checks 2009-07-24 12:39:48 +02:00
Nikolas Garofil
875c7c3129 Support for update_interval_on_battery 2009-07-24 12:06:44 +02:00
Nikolas Garofil
ce8d124ce6 Merge branch 'master' of ssh://git.omp.am/home/omp/git/conky 2009-07-24 11:45:33 +02:00
Nikolas Garofil
44ca4647b8 bugfix 2009-07-24 11:44:17 +02:00
Cesare Tirabassi
0081fcab60 Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-07-24 11:32:02 +02:00
Cesare Tirabassi
f5c8964510 Revert "the why recasting when you can simply declare it commit ..." 
This reverts commit b2a30ea478.
 2009-07-24 11:30:27 +02:00
Nikolas Garofil
3322b2a9a9 Merge branch 'master' of ssh://git.omp.am/home/omp/git/conky 2009-07-24 11:12:35 +02:00
Nikolas Garofil
feedc8e7fa Fix unclosed file in get_battery_stuff 2009-07-24 11:09:00 +02:00
Cesare Tirabassi
b2a30ea478 the why recasting when you can simply declare it commit ... 2009-07-23 23:58:27 +02:00
Cesare Tirabassi
d349fe56b2 Changed xoap parsing method to xpath, in preparation to include forecast data 2009-07-23 23:46:23 +02:00
Nikolas Garofil
922db9af82 Fix CRIT_ERR everywhere 2009-07-23 20:30:53 +02:00
Nikolas Garofil
7e7a193b74 Fix memleak in $weather 2009-07-23 18:50:39 +02:00
Nikolas Garofil
03a0e8ae19 Fix bug SF ID 2814810 (wrong output with execp and execpi) 2009-07-23 13:33:49 +02:00
Nikolas Garofil
ccd51857c1 Let $tail and $head work with FIFOs again (was disabled by commit 41a7cffbe7 ), and fix memory bug when to_real_path is used in init_tailhead 2009-07-22 22:08:31 +02:00
Nikolas Garofil
41a7cffbe7 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.
 2009-07-21 23:41:47 +02:00
Nikolas Garofil
caf0731565 Fix multiline stuff when build with X11 but output_to_x turned off. 
This commit reverts 725a3ba43a and fixes 5967d28511
 2009-07-21 12:39:09 +02:00
Brenden Matthews
e973de66cf Fix multiline stuff without X11. 2009-07-20 20:11:33 -06:00
Brenden Matthews
725a3ba43a Revert "Fix multiline strings displayed on 1 line when output to x is not used" 
This reverts commit 5967d28511.
 2009-07-20 17:46:22 -06:00
Nikolas Garofil
5967d28511 Fix multiline strings displayed on 1 line when output to x is not used 2009-07-21 00:47:02 +02:00
Brenden Matthews
9cda78c023 Clarify weather opts, refactor some weather code. 2009-07-20 13:17:44 -06:00
Brenden Matthews
f169e0e071 Actually apply c1cf1232e0. 2009-07-20 12:40:32 -06:00
Brenden Matthews
38015c6600 Document curl stuff better. 2009-07-20 12:04:53 -06:00
Nikos Ntarmos
739e47f9ec Teach freebsd.c to use the new CRIT_ERR format 
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-07-20 11:51:02 -06:00
Brenden Matthews
d3013bc410 Better argument handling for rss/curl/weather. 2009-07-20 09:59:31 -06:00
Nikolas Garofil
911eb4dc59 Include timed_thread.h when needed 2009-07-20 17:42:17 +02:00
Brenden Matthews
961274bc56 Oops, add missing files. 2009-07-20 09:21:33 -06:00
Brenden Matthews
f46eb1b6cb Fix minor memleak. 2009-07-20 00:40:23 -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
09d41cb0b6 Fix building without X11 support broke after commits f1c47e5fc4 and 670e9a0eb1 2009-07-20 01:02:27 +02:00
Cesare Tirabassi
ba414d8ab8 fix out-of-tree builds 2009-07-20 00:43:41 +02:00
Brenden Matthews
80a71ea8bd Handle curl errors better (in weather and rss). 2009-07-19 15:28:19 -06:00
Brenden Matthews
e76f0c8587 Exit properly when forking. 2009-07-19 14:55:41 -06:00
Nikolas Garofil
4c41ec843a fix hardcoding 2009-07-19 21:56:07 +02:00