Phil Sutter [Thu, 12 Nov 2009 23:39:00 +0000 (00:39 +0100)]
drop adt746x objects
This was really creepy stuff. Last updated in April, 2006 to work with
kernels > 2.6.12. I consider this "fobar" (fscking obsolete beyond all
recognition) and doubt anyone still uses this. If you do, blame me. :)
Nikolas Garofil [Thu, 12 Nov 2009 23:38:13 +0000 (00:38 +0100)]
Merge branch 'master' of ssh://git.omp.am/home/omp/git/conky
Nikolas Garofil [Thu, 12 Nov 2009 23:36:46 +0000 (00:36 +0100)]
Added support for $pid_openfiles
Phil Sutter [Thu, 12 Nov 2009 22:50:17 +0000 (23:50 +0100)]
entropy: outsource code
This patch ought to be small and simple ...
The reason why it's not is me wanting the entropy data out of struct
information. This means update_entropy() can not be used anymore, as it
uses this globally available object.
The solution I am presenting here is quite messy regarding header
includes. Hopefully this will go away soon as I plan on creating some
sort of "OS library" containing all OS specific routines and defining
macros for easier capability checking in the non-specific code. This on
the other hand means we'll need "wrappers" around OS specific objects,
but that's not as bad as it seems - having non-specific text objects
only will definitely clean up the code, and capabilities can be checked
where they should be.
Phil Sutter [Thu, 12 Nov 2009 20:32:59 +0000 (21:32 +0100)]
top: fix segfault for $if_running
The "name" field may be zero, which makes strcmp() freak out.
Nikolas Garofil [Thu, 12 Nov 2009 20:48:15 +0000 (21:48 +0100)]
fix potential bugs in snprintf
Nikolas Garofil [Thu, 12 Nov 2009 20:33:57 +0000 (21:33 +0100)]
Fix building without C99
Nikolas Garofil [Thu, 12 Nov 2009 19:34:43 +0000 (20:34 +0100)]
Added support for $pid_exe and $pid_stdin, $pid_stdout and $pid_stderr
Nikolas Garofil [Thu, 12 Nov 2009 14:42:18 +0000 (15:42 +0100)]
Added support for $pid_environ_list
Nikolas Garofil [Wed, 11 Nov 2009 21:56:12 +0000 (22:56 +0100)]
Add support for $pid_environ
Nikolas Garofil [Wed, 11 Nov 2009 15:27:19 +0000 (16:27 +0100)]
Add cwd to $pid and split into $pid_cmdline and $pid_cwd
Nikolas Garofil [Wed, 11 Nov 2009 12:44:50 +0000 (13:44 +0100)]
fix previous commit
Nikolas Garofil [Wed, 11 Nov 2009 12:43:14 +0000 (13:43 +0100)]
fix tiny compile problem
Nikolas Garofil [Wed, 11 Nov 2009 12:23:05 +0000 (13:23 +0100)]
Fix memleak and change literals to defines
Nikolas Garofil [Wed, 11 Nov 2009 10:33:28 +0000 (11:33 +0100)]
Add proc.c and proc.h
Nikolas Garofil [Wed, 11 Nov 2009 09:55:25 +0000 (10:55 +0100)]
Add support for ${pid cmdline}
Nikolas Garofil [Tue, 10 Nov 2009 12:23:00 +0000 (13:23 +0100)]
Fix $if_mpd_playing and $mpd_percent when you stop playing a song, thanks Sakari Matikka
Nikolas Garofil [Mon, 9 Nov 2009 23:15:30 +0000 (00:15 +0100)]
Fix memleak
Nikolas Garofil [Mon, 9 Nov 2009 01:38:20 +0000 (02:38 +0100)]
Fix $scroll only scrolls once
Nikolas Garofil [Sun, 8 Nov 2009 20:49:28 +0000 (21:49 +0100)]
Fix segfault and memleaks in curl
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
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
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. ;)
Phil Sutter [Sun, 8 Nov 2009 02:28:43 +0000 (03:28 +0100)]
fix conversion bug when freeing exec objects
Nikolas Garofil [Sun, 8 Nov 2009 17:00:13 +0000 (18:00 +0100)]
Fix building with metar but without xoap
Nikolas Garofil [Sat, 7 Nov 2009 22:46:46 +0000 (23:46 +0100)]
Use a define for the maximum number of network devices
Nikolas Garofil [Sat, 7 Nov 2009 17:14:04 +0000 (18:14 +0100)]
Added support for $threads and fixed $processes 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.
Nikolas Garofil [Sat, 7 Nov 2009 17:06:07 +0000 (18:06 +0100)]
Added support for and fixed on Linux
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
Nikolas Garofil [Sat, 7 Nov 2009 12:21:47 +0000 (13:21 +0100)]
Fix building with --disable-iostats
Nikolas Garofil [Sat, 7 Nov 2009 11:21:48 +0000 (12:21 +0100)]
Fix building with --disable-x11 --disable-lua --disable-ncurses
Nikolas Garofil [Sat, 7 Nov 2009 00:15:20 +0000 (01:15 +0100)]
Minor autoconf fix for iconv
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.
Phil Sutter [Thu, 5 Nov 2009 21:27:34 +0000 (22:27 +0100)]
weather: fix this embarrassing bug
Phil Sutter [Thu, 5 Nov 2009 21:06:03 +0000 (22:06 +0100)]
git ignore temporary files in lua/
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.)
Phil Sutter [Tue, 27 Oct 2009 19:56:00 +0000 (20:56 +0100)]
enum special_types: define nonspecial for completeness
Phil Sutter [Fri, 30 Oct 2009 00:31:43 +0000 (01:31 +0100)]
if_gw: no need to free unused obj->data.s
Phil Sutter [Thu, 29 Oct 2009 02:52:59 +0000 (03:52 +0100)]
text_object: completely remove the need for data.ifblock
Phil Sutter [Thu, 29 Oct 2009 02:41:23 +0000 (03:41 +0100)]
drop useless ifblock.str
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
Phil Sutter [Tue, 27 Oct 2009 00:15:30 +0000 (01:15 +0100)]
drop a few unused fields from struct text_object
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
Phil Sutter [Sun, 25 Oct 2009 21:47:53 +0000 (22:47 +0100)]
drop struct text_object field f
Phil Sutter [Sun, 25 Oct 2009 21:37:08 +0000 (22:37 +0100)]
drop now unused SIZE_DEFAULTS macro
Phil Sutter [Thu, 29 Oct 2009 02:22:58 +0000 (03:22 +0100)]
specials: convert stippled_hr object to new style
Phil Sutter [Thu, 29 Oct 2009 02:18:24 +0000 (03:18 +0100)]
specials: convert tab object to new style
Phil Sutter [Thu, 29 Oct 2009 02:13:47 +0000 (03:13 +0100)]
specials: convert gauge objects to new style
Phil Sutter [Thu, 29 Oct 2009 02:08:08 +0000 (03:08 +0100)]
specials: convert graph objects to new style
Phil Sutter [Wed, 28 Oct 2009 02:54:53 +0000 (03:54 +0100)]
misc smaller fixes
Phil Sutter [Sun, 25 Oct 2009 20:47:47 +0000 (21:47 +0100)]
specials: introduce dedicated per-object data and merge graph objects
Phil Sutter [Sun, 25 Oct 2009 13:13:26 +0000 (14:13 +0100)]
review load* code
Phil Sutter [Sun, 25 Oct 2009 12:49:10 +0000 (13:49 +0100)]
move loadavg and loadgraph code to common.c
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.
Phil Sutter [Sat, 24 Oct 2009 23:49:58 +0000 (01:49 +0200)]
mail: convert to generic object payload
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
Phil Sutter [Sat, 17 Oct 2009 14:55:12 +0000 (16:55 +0200)]
text_object: use field i instead of cpu_index
Phil Sutter [Fri, 9 Oct 2009 02:30:02 +0000 (04:30 +0200)]
if_up: convert to generic object payload
Phil Sutter [Fri, 9 Oct 2009 01:58:16 +0000 (03:58 +0200)]
drop now unused sensor field
Phil Sutter [Fri, 9 Oct 2009 01:55:46 +0000 (03:55 +0200)]
obsd_sensors: cleanup code (untested)
Phil Sutter [Fri, 9 Oct 2009 01:44:45 +0000 (03:44 +0200)]
ibm: 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
Phil Sutter [Wed, 7 Oct 2009 20:44:17 +0000 (22:44 +0200)]
diskio: convert to generic object payload
Phil Sutter [Tue, 6 Oct 2009 23:20:45 +0000 (01:20 +0200)]
combine: convert to generic object payload
Phil Sutter [Tue, 6 Oct 2009 23:04:32 +0000 (01:04 +0200)]
scroll: 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
Phil Sutter [Tue, 6 Oct 2009 22:09:14 +0000 (00:09 +0200)]
exec: convert to generic object payload
Phil Sutter [Tue, 6 Oct 2009 20:33:28 +0000 (22:33 +0200)]
top: convert to generic object payload
Phil Sutter [Tue, 6 Oct 2009 19:59:45 +0000 (21:59 +0200)]
mboxscan: convert to generic object payload
Phil Sutter [Tue, 6 Oct 2009 19:48:26 +0000 (21:48 +0200)]
mixer: convert to generic object payload
Phil Sutter [Sun, 4 Oct 2009 19:17:43 +0000 (21:17 +0200)]
curl: 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
Phil Sutter [Sun, 4 Oct 2009 17:14:30 +0000 (19:14 +0200)]
rss: convert to generic object payload
Phil Sutter [Sun, 4 Oct 2009 16:53:17 +0000 (18:53 +0200)]
eve: 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
Phil Sutter [Sun, 4 Oct 2009 15:22:25 +0000 (17:22 +0200)]
tcp_portmon: convert to generic object payload
Phil Sutter [Sun, 4 Oct 2009 14:53:21 +0000 (16:53 +0200)]
fs_*: 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
Phil Sutter [Sun, 4 Oct 2009 12:41:51 +0000 (14:41 +0200)]
tailhead: convert to generic object payload
Phil Sutter [Sat, 3 Oct 2009 15:09:13 +0000 (17:09 +0200)]
convert tztime to generic object payload
Phil Sutter [Sat, 3 Oct 2009 14:14:23 +0000 (16:14 +0200)]
nvidia: convert to generic text object payload
Phil Sutter [Sat, 3 Oct 2009 14:08:33 +0000 (16:08 +0200)]
text_object: introduce a generic payload pointer
Phil Sutter [Sat, 3 Oct 2009 14:03:08 +0000 (16:03 +0200)]
nvidia: fix syntax in variables.xml
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.
Phil Sutter [Sat, 24 Oct 2009 23:17:30 +0000 (01:17 +0200)]
mail: put imap and pop3 code to where it belongs
Phil Sutter [Sat, 17 Oct 2009 14:43:12 +0000 (16:43 +0200)]
net_stats: outsource network-related objects
Phil Sutter [Sat, 17 Oct 2009 14:14:25 +0000 (16:14 +0200)]
combine: outsource code
Phil Sutter [Tue, 6 Oct 2009 23:04:32 +0000 (01:04 +0200)]
scroll: outsource code
Phil Sutter [Sat, 17 Oct 2009 13:47:06 +0000 (15:47 +0200)]
read_tcp: outsource code
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.
Phil Sutter [Tue, 13 Oct 2009 21:01:31 +0000 (23:01 +0200)]
ibm: put specific 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
Cesare Tirabassi [Sun, 1 Nov 2009 17:42:29 +0000 (18:42 +0100)]
Fix indenting of last commit
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?
Phil Sutter [Mon, 12 Oct 2009 21:04:41 +0000 (23:04 +0200)]
rss.h: drop useless header include
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.
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.
Phil Sutter [Sun, 4 Oct 2009 17:42:01 +0000 (19:42 +0200)]
weather objects: move init and print code to weather.c
Phil Sutter [Sun, 4 Oct 2009 17:04:08 +0000 (19:04 +0200)]
rss: move init and print code into rss.c