monky
14 years agoFix segfault and memleaks in curl
Nikolas Garofil [Sun, 8 Nov 2009 20:49:28 +0000 (21:49 +0100)]
Fix segfault and memleaks in curl

14 years agoMerge branch 'master' of ssh://git.omp.am/home/omp/git/conky
Nikolas Garofil [Sun, 8 Nov 2009 19:30:50 +0000 (20:30 +0100)]
Merge branch 'master' of ssh://git.omp.am/home/omp/git/conky

14 years agoMake sure there is no optimization with --enable-debug and --enable-testing
Nikolas Garofil [Sun, 8 Nov 2009 19:29:43 +0000 (20:29 +0100)]
Make sure there is no optimization with --enable-debug and --enable-testing

14 years agoifblock objects: fix bug for sub-object parsing ifblocks
Phil Sutter [Sun, 8 Nov 2009 19:16:25 +0000 (20:16 +0100)]
ifblock objects: fix bug for sub-object parsing ifblocks

When dropping the ifblock field of struct text_object, I short-sightedly
reused the sub field for holding the pointer to the matching else/endif.
This however doesn't work for objects parsing their own object list, as
they need the sub field for themselfs.

Since we have it, simply reuse the special_data field instead and hope
there won't ever be an object which is both special and ifblock. ;)

14 years agofix conversion bug when freeing exec objects
Phil Sutter [Sun, 8 Nov 2009 02:28:43 +0000 (03:28 +0100)]
fix conversion bug when freeing exec objects

14 years agoFix building with metar but without xoap
Nikolas Garofil [Sun, 8 Nov 2009 17:00:13 +0000 (18:00 +0100)]
Fix building with metar but without xoap

14 years agoUse a define for the maximum number of network devices
Nikolas Garofil [Sat, 7 Nov 2009 22:46:46 +0000 (23:46 +0100)]
Use a define for the maximum number of network devices

14 years agoAdded support for $threads and fixed $processes on Linux
Nikolas Garofil [Sat, 7 Nov 2009 17:14:04 +0000 (18:14 +0100)]
Added support for $threads and fixed $processes on Linux

14 years agoRevert "Added support for and fixed on Linux"
Nikolas Garofil [Sat, 7 Nov 2009 17:13:21 +0000 (18:13 +0100)]
Revert "Added support for  and fixed  on Linux"

This reverts commit 43c7c0373b5aa88075e6c6c63e2c743edac26523.

14 years agoAdded support for and fixed on Linux
Nikolas Garofil [Sat, 7 Nov 2009 17:06:07 +0000 (18:06 +0100)]
Added support for  and fixed  on Linux

14 years agoFix building with --disable-xft and add ncurses to the -v option
Nikolas Garofil [Sat, 7 Nov 2009 14:32:03 +0000 (15:32 +0100)]
Fix building with --disable-xft and add ncurses to the -v option

14 years agoFix building with --disable-iostats
Nikolas Garofil [Sat, 7 Nov 2009 12:21:47 +0000 (13:21 +0100)]
Fix building with --disable-iostats

14 years agoFix building with --disable-x11 --disable-lua --disable-ncurses
Nikolas Garofil [Sat, 7 Nov 2009 11:21:48 +0000 (12:21 +0100)]
Fix building with --disable-x11 --disable-lua --disable-ncurses

14 years agoMinor autoconf fix for iconv
Nikolas Garofil [Sat, 7 Nov 2009 00:15:20 +0000 (01:15 +0100)]
Minor autoconf fix for iconv

14 years agoscan_graph: allow giving a "hint" about a good scale value
Phil Sutter [Thu, 5 Nov 2009 23:05:08 +0000 (00:05 +0100)]
scan_graph: allow giving a "hint" about a good scale value

This is more or less a temporary fix to restore the former behaviour. In
the long term objects will define a max value, which will be of use for
all kinds of meters.

14 years agoweather: fix this embarrassing bug
Phil Sutter [Thu, 5 Nov 2009 21:27:34 +0000 (22:27 +0100)]
weather: fix this embarrassing bug

14 years agogit ignore temporary files in lua/
Phil Sutter [Thu, 5 Nov 2009 21:06:03 +0000 (22:06 +0100)]
git ignore temporary files in lua/

14 years agotop: drop problematic field totalmem
Phil Sutter [Tue, 3 Nov 2009 22:11:14 +0000 (23:11 +0100)]
top: drop problematic field totalmem

The field totalmem was formerly used to hold the percentage of used mem
by a process. So at update time, the field info.memmax was being
addressed, which is potentially being updated at the same time, As all
updating routines potentially run in parallel. Though there is an
(quite) easy fix for this: calculate the percentage upon object
printing. This works because conky synchronises all update routines
right before printing the result. (To omit locking on it's own.)

14 years agoenum special_types: define nonspecial for completeness
Phil Sutter [Tue, 27 Oct 2009 19:56:00 +0000 (20:56 +0100)]
enum special_types: define nonspecial for completeness

14 years agoif_gw: no need to free unused obj->data.s
Phil Sutter [Fri, 30 Oct 2009 00:31:43 +0000 (01:31 +0100)]
if_gw: no need to free unused obj->data.s

14 years agotext_object: completely remove the need for data.ifblock
Phil Sutter [Thu, 29 Oct 2009 02:52:59 +0000 (03:52 +0100)]
text_object: completely remove the need for data.ifblock

14 years agodrop useless ifblock.str
Phil Sutter [Thu, 29 Oct 2009 02:41:23 +0000 (03:41 +0100)]
drop useless ifblock.str

14 years agono need to save the args passed to if_empty and if_match
Phil Sutter [Tue, 27 Oct 2009 00:24:52 +0000 (01:24 +0100)]
no need to save the args passed to if_empty and if_match

14 years agodrop a few unused fields from struct text_object
Phil Sutter [Tue, 27 Oct 2009 00:15:30 +0000 (01:15 +0100)]
drop a few unused fields from struct text_object

14 years agodrop struct text_object field pair, since it got unused due to latest commits
Phil Sutter [Sun, 25 Oct 2009 21:58:04 +0000 (22:58 +0100)]
drop struct text_object field pair, since it got unused due to latest commits

14 years agodrop struct text_object field f
Phil Sutter [Sun, 25 Oct 2009 21:47:53 +0000 (22:47 +0100)]
drop struct text_object field f

14 years agodrop now unused SIZE_DEFAULTS macro
Phil Sutter [Sun, 25 Oct 2009 21:37:08 +0000 (22:37 +0100)]
drop now unused SIZE_DEFAULTS macro

14 years agospecials: convert stippled_hr object to new style
Phil Sutter [Thu, 29 Oct 2009 02:22:58 +0000 (03:22 +0100)]
specials: convert stippled_hr object to new style

14 years agospecials: convert tab object to new style
Phil Sutter [Thu, 29 Oct 2009 02:18:24 +0000 (03:18 +0100)]
specials: convert tab object to new style

14 years agospecials: convert gauge objects to new style
Phil Sutter [Thu, 29 Oct 2009 02:13:47 +0000 (03:13 +0100)]
specials: convert gauge objects to new style

14 years agospecials: convert graph objects to new style
Phil Sutter [Thu, 29 Oct 2009 02:08:08 +0000 (03:08 +0100)]
specials: convert graph objects to new style

14 years agomisc smaller fixes
Phil Sutter [Wed, 28 Oct 2009 02:54:53 +0000 (03:54 +0100)]
misc smaller fixes

14 years agospecials: introduce dedicated per-object data and merge graph objects
Phil Sutter [Sun, 25 Oct 2009 20:47:47 +0000 (21:47 +0100)]
specials: introduce dedicated per-object data and merge graph objects

14 years agoreview load* code
Phil Sutter [Sun, 25 Oct 2009 13:13:26 +0000 (14:13 +0100)]
review load* code

14 years agomove loadavg and loadgraph code to common.c
Phil Sutter [Sun, 25 Oct 2009 12:49:10 +0000 (13:49 +0100)]
move loadavg and loadgraph code to common.c

14 years agolocal_mails: convert to generic object payload
Phil Sutter [Sat, 24 Oct 2009 23:59:07 +0000 (01:59 +0200)]
local_mails: convert to generic object payload

This also includes a little header include cleanup.

14 years agomail: convert to generic object payload
Phil Sutter [Sat, 24 Oct 2009 23:49:58 +0000 (01:49 +0200)]
mail: convert to generic object payload

14 years agomail: use a private common struct mail_s instead of info.mail
Phil Sutter [Sat, 24 Oct 2009 23:43:08 +0000 (01:43 +0200)]
mail: use a private common struct mail_s instead of info.mail

14 years agotext_object: use field i instead of cpu_index
Phil Sutter [Sat, 17 Oct 2009 14:55:12 +0000 (16:55 +0200)]
text_object: use field i instead of cpu_index

14 years agoif_up: convert to generic object payload
Phil Sutter [Fri, 9 Oct 2009 02:30:02 +0000 (04:30 +0200)]
if_up: convert to generic object payload

14 years agodrop now unused sensor field
Phil Sutter [Fri, 9 Oct 2009 01:58:16 +0000 (03:58 +0200)]
drop now unused sensor field

14 years agoobsd_sensors: cleanup code (untested)
Phil Sutter [Fri, 9 Oct 2009 01:55:46 +0000 (03:55 +0200)]
obsd_sensors: cleanup code (untested)

14 years agoibm: convert to generic object payload
Phil Sutter [Fri, 9 Oct 2009 01:44:45 +0000 (03:44 +0200)]
ibm: convert to generic object payload

14 years agonet_stats: convert to generic object payload
Phil Sutter [Fri, 9 Oct 2009 01:16:17 +0000 (03:16 +0200)]
net_stats: convert to generic object payload

14 years agodiskio: convert to generic object payload
Phil Sutter [Wed, 7 Oct 2009 20:44:17 +0000 (22:44 +0200)]
diskio: convert to generic object payload

14 years agocombine: convert to generic object payload
Phil Sutter [Tue, 6 Oct 2009 23:20:45 +0000 (01:20 +0200)]
combine: convert to generic object payload

14 years agoscroll: convert to generic object payload
Phil Sutter [Tue, 6 Oct 2009 23:04:32 +0000 (01:04 +0200)]
scroll: convert to generic object payload

14 years agoread_tcp: convert to generic object payload
Phil Sutter [Tue, 6 Oct 2009 22:27:04 +0000 (00:27 +0200)]
read_tcp: convert to generic object payload

14 years agoexec: convert to generic object payload
Phil Sutter [Tue, 6 Oct 2009 22:09:14 +0000 (00:09 +0200)]
exec: convert to generic object payload

14 years agotop: convert to generic object payload
Phil Sutter [Tue, 6 Oct 2009 20:33:28 +0000 (22:33 +0200)]
top: convert to generic object payload

14 years agomboxscan: convert to generic object payload
Phil Sutter [Tue, 6 Oct 2009 19:59:45 +0000 (21:59 +0200)]
mboxscan: convert to generic object payload

14 years agomixer: convert to generic object payload
Phil Sutter [Tue, 6 Oct 2009 19:48:26 +0000 (21:48 +0200)]
mixer: convert to generic object payload

14 years agocurl: convert to generic object payload
Phil Sutter [Sun, 4 Oct 2009 19:17:43 +0000 (21:17 +0200)]
curl: convert to generic object payload

14 years agoweather objects: convert to generic object payload
Phil Sutter [Sun, 4 Oct 2009 18:52:05 +0000 (20:52 +0200)]
weather objects: convert to generic object payload

14 years agorss: convert to generic object payload
Phil Sutter [Sun, 4 Oct 2009 17:14:30 +0000 (19:14 +0200)]
rss: convert to generic object payload

14 years agoeve: convert to generic object payload
Phil Sutter [Sun, 4 Oct 2009 16:53:17 +0000 (18:53 +0200)]
eve: convert to generic object payload

14 years agosysfs objects: convert to generic object payload
Phil Sutter [Sun, 4 Oct 2009 16:22:08 +0000 (18:22 +0200)]
sysfs objects: convert to generic object payload

14 years agotcp_portmon: convert to generic object payload
Phil Sutter [Sun, 4 Oct 2009 15:22:25 +0000 (17:22 +0200)]
tcp_portmon: convert to generic object payload

14 years agofs_*: convert to generic object payload
Phil Sutter [Sun, 4 Oct 2009 14:53:21 +0000 (16:53 +0200)]
fs_*: convert to generic object payload

14 years agofs_bar, fs_bar_free: convert to generic object payload
Phil Sutter [Sun, 4 Oct 2009 14:12:47 +0000 (16:12 +0200)]
fs_bar, fs_bar_free: convert to generic object payload

14 years agotailhead: convert to generic object payload
Phil Sutter [Sun, 4 Oct 2009 12:41:51 +0000 (14:41 +0200)]
tailhead: convert to generic object payload

14 years agoconvert tztime to generic object payload
Phil Sutter [Sat, 3 Oct 2009 15:09:13 +0000 (17:09 +0200)]
convert tztime to generic object payload

14 years agonvidia: convert to generic text object payload
Phil Sutter [Sat, 3 Oct 2009 14:14:23 +0000 (16:14 +0200)]
nvidia: convert to generic text object payload

14 years agotext_object: introduce a generic payload pointer
Phil Sutter [Sat, 3 Oct 2009 14:08:33 +0000 (16:08 +0200)]
text_object: introduce a generic payload pointer

14 years agonvidia: fix syntax in variables.xml
Phil Sutter [Sat, 3 Oct 2009 14:03:08 +0000 (16:03 +0200)]
nvidia: fix syntax in variables.xml

14 years agolocal_mails: put code to where it belongs
Phil Sutter [Sat, 24 Oct 2009 23:13:50 +0000 (01:13 +0200)]
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.

14 years agomail: put imap and pop3 code to where it belongs
Phil Sutter [Sat, 24 Oct 2009 23:17:30 +0000 (01:17 +0200)]
mail: put imap and pop3 code to where it belongs

14 years agonet_stats: outsource network-related objects
Phil Sutter [Sat, 17 Oct 2009 14:43:12 +0000 (16:43 +0200)]
net_stats: outsource network-related objects

14 years agocombine: outsource code
Phil Sutter [Sat, 17 Oct 2009 14:14:25 +0000 (16:14 +0200)]
combine: outsource code

14 years agoscroll: outsource code
Phil Sutter [Tue, 6 Oct 2009 23:04:32 +0000 (01:04 +0200)]
scroll: outsource code

14 years agoread_tcp: outsource code
Phil Sutter [Sat, 17 Oct 2009 13:47:06 +0000 (15:47 +0200)]
read_tcp: outsource code

14 years agoexec: put all exec-related stuff into it's own file
Phil Sutter [Thu, 15 Oct 2009 19:51:21 +0000 (21:51 +0200)]
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.

14 years agoibm: put specific code to where it belongs
Phil Sutter [Tue, 13 Oct 2009 21:01:31 +0000 (23:01 +0200)]
ibm: put specific code to where it belongs

14 years agogw_info: move code to where it belongs
Phil Sutter [Tue, 13 Oct 2009 20:44:56 +0000 (22:44 +0200)]
gw_info: move code to where it belongs

14 years agoFix indenting of last commit
Cesare Tirabassi [Sun, 1 Nov 2009 17:42:29 +0000 (18:42 +0100)]
Fix indenting of last commit

14 years agoFix hwmon location for kernel >= 2.6.31 (closes sf: #2865628)
Cesare Tirabassi [Sun, 1 Nov 2009 17:37:48 +0000 (18:37 +0100)]
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?

14 years agorss.h: drop useless header include
Phil Sutter [Mon, 12 Oct 2009 21:04:41 +0000 (23:04 +0200)]
rss.h: drop useless header include

14 years agofix compiling in a messy way
Phil Sutter [Mon, 12 Oct 2009 21:00:06 +0000 (23:00 +0200)]
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.

14 years agocurl: put init and print code to where it belongs
Phil Sutter [Sun, 4 Oct 2009 19:06:52 +0000 (21:06 +0200)]
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.

14 years agoweather objects: move init and print code to weather.c
Phil Sutter [Sun, 4 Oct 2009 17:42:01 +0000 (19:42 +0200)]
weather objects: move init and print code to weather.c

14 years agorss: move init and print code into rss.c
Phil Sutter [Sun, 4 Oct 2009 17:04:08 +0000 (19:04 +0200)]
rss: move init and print code into rss.c

14 years agospend some time with eve.{c,h}
Phil Sutter [Sun, 4 Oct 2009 16:39:28 +0000 (18:39 +0200)]
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

14 years agosysfs objects: merge init and print routines
Phil Sutter [Sun, 4 Oct 2009 16:05:47 +0000 (18:05 +0200)]
sysfs objects: merge init and print routines

14 years agotcp_portmon: drop useless function pointer cast, use OBJ_ARG
Phil Sutter [Sun, 4 Oct 2009 15:08:08 +0000 (17:08 +0200)]
tcp_portmon: drop useless function pointer cast, use OBJ_ARG

14 years agofs_bar, fs_bar_free: merge init and print routines
Phil Sutter [Sun, 4 Oct 2009 13:50:47 +0000 (15:50 +0200)]
fs_bar, fs_bar_free: merge init and print routines

14 years agotail, head: use OBJ_ARG to simplify code
Phil Sutter [Sun, 4 Oct 2009 12:44:20 +0000 (14:44 +0200)]
tail, head: use OBJ_ARG to simplify code

14 years agohddtemp: drop dead code (custom per-object data)
Phil Sutter [Sun, 4 Oct 2009 12:37:56 +0000 (14:37 +0200)]
hddtemp: drop dead code (custom per-object data)

14 years agoFix global info.desktop variables were incorrectly freed, sf #2876647
Cesare Tirabassi [Mon, 12 Oct 2009 11:38:48 +0000 (13:38 +0200)]
Fix global info.desktop variables were incorrectly freed, sf #2876647

14 years agotztime: fix argument parsing bug, clarify docs
Phil Sutter [Sun, 4 Oct 2009 01:59:47 +0000 (03:59 +0200)]
tztime: fix argument parsing bug, clarify docs

14 years agoiconv: outsource code into it's own file
Phil Sutter [Sat, 3 Oct 2009 18:01:33 +0000 (20:01 +0200)]
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.

14 years agooutsource time, utime and tztime into a separate file
Phil Sutter [Sat, 3 Oct 2009 15:46:59 +0000 (17:46 +0200)]
outsource time, utime and tztime into a separate file

14 years agomove the SIZE_DEFAULTS() macro to where it belongs to
Phil Sutter [Wed, 30 Sep 2009 23:25:24 +0000 (01:25 +0200)]
move the SIZE_DEFAULTS() macro to where it belongs to

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