Phil Sutter
b6a57a8f77
cleanup free_text_objects()
2009-12-01 00:32:33 +01:00
Phil Sutter
3f00e817c5
free desktop information where it should be done
2009-12-01 00:32:33 +01:00
Phil Sutter
5ed38bfe0d
convert top objects to callbacks.free
2009-12-01 00:32:33 +01:00
Phil Sutter
ba47b49d88
move free_all_processes() to where it really should be
2009-12-01 00:32:33 +01:00
Phil Sutter
8ef2f13e9d
convert xmms2 objects to callbacks.free
2009-12-01 00:32:33 +01:00
Phil Sutter
6fb5302778
convert mpd objects to callbacks.free
2009-12-01 00:32:33 +01:00
Phil Sutter
4c4a7c4096
convert nameserver to callbacks.free
2009-12-01 00:32:33 +01:00
Phil Sutter
781bc7b024
convert gateway objects to callbacks.free
2009-12-01 00:32:33 +01:00
Phil Sutter
93c2079af0
generically free obj->sub if non-zero in free_text_objects()
2009-12-01 00:32:33 +01:00
Phil Sutter
87472a3daa
convert cmdline_to_pid to callbacks.free
2009-12-01 00:32:33 +01:00
Phil Sutter
ede0838e17
drop struct information parameter from generate_text_internal()
2009-12-01 00:32:33 +01:00
Phil Sutter
0f8b7d1186
cleanup generate_text_internal()
2009-12-01 00:32:33 +01:00
Phil Sutter
92ae6fab8a
replace substitute_newlines() object typecheck with object field
...
This is the more generic way, although I doubt this is really error
preventing. To me, it's not totally clear as to when
substitute_newlines() is forbidden and when not. Maybe someone (the
author?) can shed light on the internal algorithm of this feature.
2009-12-01 00:32:33 +01:00
Phil Sutter
c9f1c318aa
convert OBJ_text to callbacks
...
This is tricky: there is no such thing as $text. In fact, everything
below TEXT in the conkyrc which is NOT a text object will become one of
type OBJ_text.
To make life easy, introduce a function obj_be_plain_text() converting a
given object to the given plain text.
2009-12-01 00:32:33 +01:00
Phil Sutter
e569803324
convert if_updatenr to callbacks.iftest
2009-12-01 00:32:33 +01:00
Phil Sutter
841a3814c8
convert $updates to callbacks.print
2009-12-01 00:32:32 +01:00
Phil Sutter
ffec9dd50c
font: convert to callbacks.print
2009-12-01 00:32:32 +01:00
Phil Sutter
95b92d6cff
new_font: convert to common signature
2009-12-01 00:32:32 +01:00
Phil Sutter
e5b25fd30a
unconditionally call load_fonts()
...
Since load_fonts() iterates over font_count fonts which is initially -1,
it turns into a NOP when no fonts where added.
2009-12-01 00:32:32 +01:00
Phil Sutter
68a09f7a02
gid_name, uid_name: outsource sub object parsing and convert to callbacks.print
2009-12-01 00:32:32 +01:00
Phil Sutter
4ba0f9ff4f
pid objects: convert to callbacks.print
2009-12-01 00:32:32 +01:00
Phil Sutter
5b686294f3
pid objects: outsource sub object evaluation
2009-12-01 00:32:32 +01:00
Phil Sutter
057855442c
cleanup proc.c obj->data mess
...
Use a local variable named 'pathbuf' of sufficient size to hold the
generated path name.
2009-12-01 00:32:32 +01:00
Phil Sutter
d9dbd528c4
simplify iconv_convert() a bit (exit early on error)
2009-12-01 00:32:32 +01:00
Phil Sutter
938af98ff3
convert iconv objects to callbacks
2009-12-01 00:32:32 +01:00
Phil Sutter
b8e600b9a4
convert bsd apm objects to callbacks.print
2009-12-01 00:32:32 +01:00
Phil Sutter
d48c2f143c
convert $include to callbacks.print
2009-12-01 00:32:32 +01:00
Phil Sutter
3ed82a34dd
convert blink to callbacks.print
2009-12-01 00:32:32 +01:00
Phil Sutter
dc0af635d6
convert to_bytes to callbacks.print
2009-12-01 00:32:32 +01:00
Phil Sutter
8da8b26ddf
use gen_print_nothing for $apcupsd
2009-12-01 00:32:32 +01:00
Phil Sutter
37cbdcf89b
convert $endif to callbacks.print
2009-12-01 00:32:32 +01:00
Phil Sutter
718ed9d280
convert $else to callbacks.iftest
2009-12-01 00:32:32 +01:00
Phil Sutter
f1454767b2
convert image to callbacks.print
2009-12-01 00:32:32 +01:00
Phil Sutter
3fa5c55933
convert some non-openbsd objects to callbacks.{print,iftest}
2009-12-01 00:32:32 +01:00
Phil Sutter
c652427aed
convert freq and freq_g to callbacks.print
2009-12-01 00:32:32 +01:00
Phil Sutter
31c3734cc8
convert acpitemp to callbacks.{print,free}
2009-12-01 00:32:32 +01:00
Phil Sutter
a67ab7a3c8
convert some ifblock objects to callbacks.iftest
2009-12-01 00:32:32 +01:00
Phil Sutter
721cdbdd30
convert eval to callbacks.print
2009-12-01 00:32:32 +01:00
Phil Sutter
f5596a6505
trivial conversion of cmdline_to_pid to callbacks.print
2009-12-01 00:32:32 +01:00
Phil Sutter
871c4b2d02
convert buffers and cached to callbacks.print
2009-12-01 00:32:32 +01:00
Phil Sutter
1f8bafbcfc
convert processes and threads objects to callbacks.print
2009-12-01 00:32:32 +01:00
Phil Sutter
82d6d349ba
convert user objects to callbacks.{print,free}
2009-12-01 00:32:32 +01:00
Phil Sutter
b4aa2328d7
convert uptime objects to callbacks.print
2009-12-01 00:32:32 +01:00
Phil Sutter
cce12efda7
convert sysname to callbacks.print
2009-12-01 00:32:31 +01:00
Phil Sutter
e9dde6293b
convert nodename to callbacks.print
2009-12-01 00:32:31 +01:00
Phil Sutter
d9e2f687b6
convert format_time to callbacks.print
2009-12-01 00:32:31 +01:00
Phil Sutter
f84b14904c
convert kernel and machine to callbacks.print
2009-12-01 00:32:31 +01:00
Phil Sutter
177da5ffbb
convert mem and swap objects to callbacks.print
2009-12-01 00:32:31 +01:00
Phil Sutter
ef60b7eb8a
drop update_x11info()
...
instead:
- call XDefaultScreen() and XScreenCount() directly from the print
callback
- have no update callback at all for the desktop objects (seems to work
well without)
2009-12-01 00:32:31 +01:00
Phil Sutter
6004ab961a
convert desktop and monitor objects to callbacks.print
2009-12-01 00:32:31 +01:00