Phil Sutter
65effae144
scroll: convert to callbacks.print
2009-11-29 22:21:48 +01:00
Phil Sutter
67559fdaca
moc: convert to callbacks.print and callbacks.free
2009-11-29 22:21:48 +01:00
Phil Sutter
dd8ec48fcb
bmpx: convert to callbacks.print
...
While here, also drop those calls to memset, as the whole info object is
being zeroed at the beginning of main(). (Probably this is useful upon
config reload, too.)
2009-11-29 22:21:48 +01:00
Phil Sutter
6371551153
audacious: convert to callbacks.print
2009-11-29 22:21:48 +01:00
Phil Sutter
974d28a667
apcupsd: convert to callbacks.print
2009-11-29 22:21:48 +01:00
Phil Sutter
ac80e6f55f
hddtemp: convert to callbacks.print
2009-11-29 22:21:48 +01:00
Phil Sutter
49cacbbc91
offset, align, tailhead: convert to callbacks.print
2009-11-29 22:21:48 +01:00
Phil Sutter
e0a3a82932
fs objects: convert to callbacks.print
2009-11-29 22:21:48 +01:00
Phil Sutter
18d2319d73
tcp-portmon: convert to callbacks.print
2009-11-29 22:21:48 +01:00
Phil Sutter
d0a2c51f4b
font: convert scan_font to match common signature
2009-11-29 22:21:48 +01:00
Phil Sutter
9247d838c3
hddtemp: convert to callbacks.free
2009-11-29 22:21:48 +01:00
Phil Sutter
eb612dfcb0
hr, stippled_hr: convert to callbacks.print
2009-11-29 22:21:48 +01:00
Phil Sutter
4927eb85a2
goto, tab: convert to callbacks.print
2009-11-29 22:21:48 +01:00
Phil Sutter
9c8805ee7b
shadecolor: convert to callbacks.print
2009-11-29 22:21:48 +01:00
Phil Sutter
f9036f58a2
outlinecolor: convert to callbacks.print
2009-11-29 22:21:48 +01:00
Phil Sutter
1a6803454c
color: convert to callbacks.print
2009-11-29 22:21:48 +01:00
Phil Sutter
08122354a9
convert some special printing functions to common signature
...
Also add a little hack to $scroll to omit the need to call new_fg() from
inside print_scroll(). Instead of inserting a new special after printing
the scrolled text, insert a new object after the scroll object when
parsing text objects to handle the color reset.
2009-11-29 22:21:48 +01:00
Phil Sutter
2e83ff05c5
text object list: allow appending a list of objects
2009-11-29 22:21:11 +01:00
Phil Sutter
02d104cc6a
free_text_objects: drop empty switch cases
2009-11-29 21:40:48 +01:00
Phil Sutter
9cf2b88242
bunch of trivial conversions to gen_free_opaque()
2009-11-29 21:40:48 +01:00
Phil Sutter
697e64272e
text_object: provide generic object free routine
...
This is a valid replacement to a custom routine for objects using data.s
or data.opaque to point to dynamically allocated data.
2009-11-29 21:40:48 +01:00
Phil Sutter
fa3118993e
huge bunch of trivial conversions to obj->callbacks
2009-11-29 21:40:38 +01:00
Phil Sutter
7b05bdd665
text_object: introduce text_object_callbacks
...
The callback functions are:
print - to be called from generate_text_internal()
iftest - same as print for ifblock objects (triggers jumping)
barval - same as above for bar objects (returns current bar value)
gaugeval - same as above for gauge objects
graphval - same as above for graph objects
percentage - for percentage objects, returns actual percentage
free - called in free_text_objects()
Until conversion is complete, if the function pointer is NULL the old
lookup by type is being done.
Note that it's possible to assign both 'print' and 'iftest' callbacks.
In this case, the code simply ignores the 'iftest' callback, though this
could easily be changed (always calling DO_JUMP at last, of course) in
order to allow ifblock objects to print something in addition to jumping
somewhere (or not).
2009-11-29 21:33:30 +01:00
Phil Sutter
d989f5b34a
cleanup exec.c
2009-11-29 21:28:58 +01:00
Brenden Matthews
f36f747aca
Add (broken) cmake build stuff.
2009-11-26 11:25:32 -08:00
Nikolas Garofil
4652e834b1
Add support for max_text_width configuration setting
2009-11-25 16:04:49 +01:00
Nikolas Garofil
4c4770eb77
Fix: $scroll,$if_running and $apcupsd_lastxfer can now have long arguments if text_buffer_size is increased
2009-11-24 13:23:58 +01:00
Nikolas Garofil
b2987b9354
Fix: Templates only work when they end with a space or a }
2009-11-23 12:58:20 +01:00
Nikolas Garofil
fb3c59baec
Fix building with --disable-x11
2009-11-22 23:05:08 +01:00
Phil Sutter
970420106c
fix new_graph parameters
...
One should never print into buffers without knowing their size. Although
new_graph consumes only a single char, this may already be too much.
2009-11-22 21:12:54 +01:00
Phil Sutter
346b4cfbc1
move get_x11_color() to colours.c
2009-11-22 21:07:42 +01:00
Nikolas Garofil
6ee76e5c55
Fix compiling with --disable-x11
2009-11-22 14:05:11 +01:00
Phil Sutter
66df73f74a
implement ASCII gauge and enable all gauge objects for use with no X
2009-11-22 02:09:46 +01:00
Phil Sutter
c2eb77c3f0
realise seamless integration of new_bar_in_shell
...
The decision about whether to print ASCII or X11 bar is done from within
specials.c, so all those #ifdef + if () blocks can be dropped. This also
implicitly enables the ASCII bar for some bar printing objects which where
forgotten before.
2009-11-22 02:09:46 +01:00
Nikolas Garofil
c131c1d129
Bugfix: letting XmbSetWMProperties set the windowtitle causes a memleak with some versions of Xlib
2009-11-21 23:58:02 +01:00
Nikolas Garofil
20a7f5eb72
Merge branch 'master' of ssh://git.omp.am/home/omp/git/conky
2009-11-21 15:50:35 +01:00
Nikolas Garofil
567a86f99a
Fix segfault in X11-related code
...
Conky sometimes tries to clears part of a window before it's created,
this breaks closing the displaying. For example with this config:
TEXT
$lua
2009-11-21 15:45:00 +01:00
Phil Sutter
d7f9e64824
allow AF_INET6 in libmpdclient since mpd supports it
...
Thanks to Kaleb Elwert (belak, IRC) who reported the problem and tested
the fix.
2009-11-20 23:00:47 +01:00
Nikolas Garofil
b85b0d5aab
Bugfix: Sx in $format_time prints out wrong values when number of seconds ends with a zero and has no numbers behind the point
2009-11-20 15:23:54 +01:00
Phil Sutter
7291184783
simplify conky_version and co. a bit
2009-11-20 00:03:15 +01:00
Phil Sutter
c8bed3a28d
voltage: outsource printing code
2009-11-20 00:02:42 +01:00
Phil Sutter
b25be92273
xmms2: do 'gg=G' in vim :)
2009-11-20 00:01:47 +01:00
Phil Sutter
c439c8e7b6
mpd: outsource printing code
...
In order to make life a bit easier, the struct mpd_s field "volume" has
been renamed to just "vol" to match the object's name (mpd_vol).
Although format_media_player_time() is probably meant to be used by all
supported media players, it's currently being used by mpd only. So for
now this function can reside statically in mpd.c
2009-11-20 00:01:33 +01:00
Phil Sutter
87873bceeb
lines, words: outsource code
2009-11-19 23:59:50 +01:00
Phil Sutter
ea22f21252
smapi: outsource printing code
2009-11-19 23:57:38 +01:00
Phil Sutter
bb35c25284
ibm: convert to common signature
2009-11-19 23:57:16 +01:00
Phil Sutter
91b0c66617
mixer: convert to common signature
2009-11-19 23:56:01 +01:00
Phil Sutter
80e41032cd
{down,up}speedgraph: convert to match common signature
2009-11-19 23:52:39 +01:00
Phil Sutter
80114f3b1e
diskio: convert print functions to match common signature
2009-11-19 23:51:13 +01:00
Phil Sutter
b9f1dc7283
cleanup times_in_seconds enhancement
...
This also adds code to unset the variable before reloading the config.
2009-11-19 23:39:08 +01:00
