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
Brenden Matthews
8bd41caa51
Add creation functions for certain cairo structures.
2009-11-25 12:53:42 -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
d9f93d3c1e
Fix: README contained control chars
2009-11-23 01:04:25 +01:00
Pavel Labath
722c7566b6
A better fix for the PAGER=vim problem, thanks Phil
2009-11-22 23:30:47 +01:00
Pavel Labath
93c71fe608
unset PAGER before generating README
...
apparently, some people like to set PAGER=vim and vim doesn't like when we redirect man output to
a file
2009-11-22 23:21:49 +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
0ef81a2f05
Fix xml syntax docs
2009-11-22 19:51:11 +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
Phil Sutter
45a183d840
xlib: do exit() on IOError instead of abort()
...
The IOError happens every time I close conky's normal own window, so I
guess the situation is not as abnormal as abort() indicates. Calling
exit() instead should really suffice and give the process a chance to
clean up (by calling destructor routines for instance).
2009-11-19 23:04:09 +01:00
Phil Sutter
6f9bfe970a
fix potential buffer overflow when printing top values
2009-11-19 23:04:09 +01:00
Phil Sutter
9efa384bbc
lua: outsource code
2009-11-19 23:04:09 +01:00
Phil Sutter
b6d1ff6c42
i8k: outsource code
2009-11-19 23:04:09 +01:00
Nikolas Garofil
fe1d7da3d5
Add support for $pid_read and $pid_write
2009-11-19 12:32:14 +01:00
Nikolas Garofil
f8bae62234
$format_time treats ( and ) as special chars
2009-11-19 00:21:49 +01:00
Nikolas Garofil
59594e70d2
Added support for \Sx to $format_time
2009-11-19 00:04:49 +01:00
Nikolas Garofil
4a1be880d3
Make $user_time, $mpd_elapsed and $mpd_length compatible with times_in_seconds
2009-11-18 21:25:05 +01:00
Nikolas Garofil
d9ad73af65
Make sure $format_time only works when times_in_seconds is enabled
2009-11-18 20:27:53 +01:00
Nikolas Garofil
8f42831a62
Add support for time_in_seconds configuration setting
2009-11-18 20:07:47 +01:00
Nikolas Garofil
4cfb042df9
Fix bug in $pid_cmdline
2009-11-18 18:02:10 +01:00
Nikolas Garofil
6046198053
Fix bug in $pid_nice, $pid_priority, $pid_time, $pid_time_kernelmode and $pid_time_usermode
2009-11-18 17:13:20 +01:00
Nikolas Garofil
0215298c27
Added support for $format_time
2009-11-18 15:35:35 +01:00
Nikolas Garofil
ed21808597
Fix default config when built without x11
2009-11-16 21:42:55 +01:00
Nikolas Garofil
90f5701f3e
Bugfix: crash when apcupsd isnt running
2009-11-16 20:19:57 +01:00
Phil Sutter
a1ddcc0786
fix potential buffer overflow in parse_conky_vars()
2009-11-16 19:52:48 +01:00
