Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-30 21:41:46 +00:00
Code Issues Releases Activity
2,506 Commits 5 Branches 46 Tags 22 MiB
51f7969571
Commit Graph

1855 Commits

Author SHA1 Message Date
Phil Sutter
db2282968f parse the -D flag as early as possible 
In fact, this will make -D being parsed at least before the conkyrc is
being read, allowing for debug-output from inside the config-parser. :)
 2009-12-29 00:18:12 +01:00
Phil Sutter
6f587402d8 cosmetic fixup session 
- kill trailing whitespace (grep -n ' $' src/*.{c,cc,h})
- eliminate space before tab (grep -n ' 	' src/*.{c,cc,h})
  (insert tab by pressing CTRL-v first)
- little indenting fixup in configure.ac.in (we indent using tabs, not
  spaces)

note: this should not change the actual code at all - if it does, feel
free to blame me personally ;)
 2009-12-28 21:32:07 +01:00
Phil Sutter
7d92e46533 include llua.h where it's really needed 2009-12-28 21:31:49 +01:00
Phil Sutter
46bd87b05e move extract_object_args_to_sub() to a more convenient place 2009-12-28 03:02:06 +01:00
Phil Sutter
c4c2377d0e drop commas at end of enum in top.h 2009-12-28 03:02:06 +01:00
Phil Sutter
dcb35db39d check return value of write() 2009-12-28 03:02:05 +01:00
Phil Sutter
e99118cf2e fix for unused results in tailhead.c 2009-12-28 03:02:05 +01:00
Phil Sutter
1ff3f84068 fix for unused results in mboxscan.c 2009-12-28 03:02:05 +01:00
Phil Sutter
43ee33a28d check return type of dup() in exec.c 2009-12-28 03:02:05 +01:00
Phil Sutter
ac8bb1489d fix for unused results in eve.c 2009-12-28 03:02:05 +01:00
Phil Sutter
6e53e3278d implement a safe_asprintf for timeinfo.c 2009-12-28 03:02:05 +01:00
Phil Sutter
aa95dde706 fix for unused results in smapi.c 2009-12-28 03:02:05 +01:00
Phil Sutter
8662e6630e fix for unused results in linux.c 2009-12-28 03:02:05 +01:00
Phil Sutter
c986aa6346 fix unused result warnings in mail.c 2009-12-28 03:02:05 +01:00
Brenden Matthews
fb33419cd4 Add CMake build support for Lua bindings. 2009-12-17 19:46:26 -08:00
Brenden Matthews
32c5f451b9 Minor build fixes 2009-12-17 18:55:54 -08:00
Brenden Matthews
51ff65ede0 Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-12-17 18:52:05 -08:00
Phil Sutter
0522832350 cleanup apcupsd a bit, fix some whitespace errors 2009-12-17 23:07:15 +01:00
Phil Sutter
9b66a4715b hide smapi internal functions and cleanup header 2009-12-17 22:45:00 +01:00
Phil Sutter
861988be24 font_h could be used uninitialised (so it says) 2009-12-17 22:42:52 +01:00
Phil Sutter
bf1e5108ab we shall not ignore the return value of functions declared with warn_unused_result 2009-12-17 22:42:52 +01:00
Phil Sutter
1724a1fe49 ISO C++ forbids variable length arrays 2009-12-17 22:42:52 +01:00
Phil Sutter
de049dcbde --enable-testing rejects commas at end of enumerator lists 2009-12-17 22:42:47 +01:00
Phil Sutter
4229fbd380 introduce a generic priority queue implementation 2009-12-13 17:10:45 +01:00
Phil Sutter
bb72583a95 simplify this conditional a bit 2009-12-13 03:42:14 +01:00
Phil Sutter
bad6d62b31 little header cleanup in conky.cc 2009-12-13 02:54:48 +01:00
Phil Sutter
8bc17ca311 top: add update callbacks conditionally, drop useless check 2009-12-12 19:50:36 +01:00
Phil Sutter
8045e7f714 drop enum text_object_type and all references to it's members 
After some minor rewrite of the top parser (which was in fact the only
real user of the obj->type field left since introduction of text object
callbacks), there is no need for the obj->type field anymore.
 2009-12-12 15:56:00 +01:00
Phil Sutter
5c86a80614 fix $scroll color reset (add missing callback) 2009-12-12 15:43:39 +01:00
Pavel Labath
52b5fe11ed Fix race condition in update_stat() 2009-12-11 22:54:11 +01:00
Pavel Labath
a49000ba22 Eliminate warnings in mail.c 
PS: functions pop3_thread and imap_thread look ridiculously similar. It may be worth merging them
at some point.
 2009-12-11 21:34:41 +01:00
Nikolas Garofil
6d4ba8b2f4 Fix anonymous enum warning 2009-12-11 17:58:25 +01:00
Brenden Matthews
48e834d1eb More work on CMake build system. 2009-12-10 20:37:56 -08:00
Brenden Matthews
07e2002b03 Build libtcp-portmon as a separate library. 2009-12-10 15:19:13 -08:00
Pavel Labath
316198a0c3 Explicitly cast NULL to the specific type for compilers that (for some unknown reason) require it 2009-12-10 23:42:22 +01:00
Pavel Labath
b4feb01818 Fix memory allocation problem in exec.c 
Bug reported by c0nv1ct.
 2009-12-10 23:09:56 +01:00
Brenden Matthews
b6331b4eb6 Switch some more bits to C++, more CMake changes. 2009-12-09 20:05:32 -08:00
Phil Sutter
475b00e709 drop local definitions of _GNU_SOURCE since it's passed to gcc 2009-12-10 02:03:56 +01:00
Pavel Labath
2790d35e06 Set CXXFLAGS in-line with current CFLAGS settings (autoconf) 
Also, replaced #define _GNU_SOURCE (in config.h) with -D_GNU_SOURCE command-line parameter
because, for some reason g++ defines it implicitly and then complains about multiple definitions.
Also, removed -Winline from C(XX)FLAGS because it causes a lot of warnings for c++ code that
can't be easily removed and are not very significant.
 2009-12-09 23:59:08 +01:00
Pavel Labath
78da8a1946 Update cmake to address portmon change. 2009-12-09 23:59:07 +01:00
Pavel Labath
e9d4e32f8f Replace GHashTable with tr1::unordered_map in tcp_portmon 
This means portmon no longer depends on glib.
 2009-12-09 23:59:07 +01:00
Brenden Matthews
8c9ed7b109 Minor build fixes. 2009-12-07 21:16:11 -08:00
Brenden Matthews
11c76e4c0d More CMake work. 2009-12-07 20:46:49 -08:00
Pavel Labath
b1cbc64f60 Remove some strange network related code 
Reported by norsetto.
This code disallows network traffic to be 0.
Brenden says it once had a purpose, but noone can think of what would that be atm.
 2009-12-07 21:13:04 +01:00
Brenden Matthews
d80cacd4b7 Handle build.h, too. 2009-12-07 11:51:00 -08:00
Brenden Matthews
c5cbb3c38f Produce error if src/config.h exists. 2009-12-07 10:08:01 -08:00
Brenden Matthews
4dcce0b386 Improve platform stuff. 2009-12-07 09:35:43 -08:00
Phil Sutter
4baba32459 replace modulo by bitwise AND for hash table lookups 
This operation is a lot faster, but depends on the hash table size
be a power of 2 (so HTABSIZE - 1 is a row of 1's). Also a define for the
magic value cleans things up a bit.
 2009-12-06 21:49:27 +01:00
Phil Sutter
36f6af922b improve hash_process() by inserting at bucket's top instead of bottom 2009-12-06 17:28:30 +01:00
Brenden Matthews
0406000351 More CMake build work, added Lua support. 2009-12-05 18:45:26 -08:00
Brenden Matthews
07cb6efdaf More work on CMake build system (see README.cmake for instructions). 2009-12-05 12:00:10 -08:00
Phil Sutter
3764c883c7 convert mixer bars to double 2009-12-04 22:18:54 +01:00
Phil Sutter
1160e74d35 convert fs bars to double 2009-12-04 22:18:54 +01:00
Phil Sutter
361e5eba83 convert exec bars to double 2009-12-04 22:18:54 +01:00
Phil Sutter
b2c305a995 convert execbarval to double 2009-12-04 22:18:54 +01:00
Phil Sutter
3361ea907b convert *speedgraphval to double 2009-12-04 22:18:54 +01:00
Phil Sutter
a68a523d40 convert diskiographval_* to double 2009-12-04 22:18:54 +01:00
Phil Sutter
1382915d1e convert loadgraphval to double 2009-12-04 22:18:54 +01:00
Phil Sutter
f74ae19944 convert apcupsd_loadbarval to double 2009-12-04 22:18:54 +01:00
Phil Sutter
c52ee46cc3 convert entropy_barval to double 2009-12-04 22:18:54 +01:00
Phil Sutter
2fc1efa8d5 convert lua_barval to double 2009-12-04 22:18:54 +01:00
Phil Sutter
f1a57e40aa convert audacious_barval to double 2009-12-04 22:18:53 +01:00
Phil Sutter
e2e7c47c48 convert xmms2_barval to double 2009-12-04 22:18:53 +01:00
Phil Sutter
202bbf01ff convert mpd_barval to double 2009-12-04 22:18:53 +01:00
Phil Sutter
9e587ae6d5 convert smapi_bat_barval to double 2009-12-04 22:18:53 +01:00
Phil Sutter
db2b056969 convert swap_barval to double 2009-12-04 22:18:53 +01:00
Phil Sutter
c5a8949784 convert mem_barval to double 2009-12-04 22:18:53 +01:00
Phil Sutter
d46a2cb1b2 convert cpu_barval to double 2009-12-04 22:18:53 +01:00
Phil Sutter
bfd7eabc0f convert get_battery_perct_bar to double 2009-12-04 22:18:53 +01:00
Phil Sutter
4133d8fdbe convert wireless_link_barval to double 2009-12-04 22:18:53 +01:00
Phil Sutter
e5d32f4ad0 convert meter type object values from uint8_t to double 2009-12-04 22:17:40 +01:00
Phil Sutter
1e25633fc1 rename specials field "graph_scale" to a generic "scale" 2009-12-04 00:53:11 +01:00
Phil Sutter
82ef68aafa hook in the scale value for bar and gauge objects 
This patch already implements complete auto-scaling for bars and gauges,
therefore introducing a flags field in order to signal whether
auto-scaling is enabled (and the scale field contains just the max value
seen so far).
 2009-12-04 00:50:13 +01:00
Phil Sutter
dae785e5d0 introduce scale field for bar and gauge specials 2009-12-02 01:36:22 +01:00
Phil Sutter
a49fb53ea3 fix scaling for exec*graph 2009-12-01 23:59:12 +01:00
Pavel Labath
018ca8e0ef Fix $memgraph and $cpugraph in a way that doesn't break other things 2009-12-01 23:45:31 +01:00
Pavel Labath
24ebff6a62 Fix $memgraph (i think) 2009-12-01 14:20:35 +01:00
Nikolas Garofil
e24bc153b3 Fix building without X11 2009-12-01 14:07:22 +01:00
Nikolas Garofil
a2c9ac648d Fix compiling without C99 2009-12-01 12:35:23 +01:00
Phil Sutter
d3aafc4a75 reenable top for all target OS's 
Occurs to work fine on FreeBSD, the other BSD's probably need more work,
anyway.
 2009-12-01 00:45:17 +01:00
Phil Sutter
d4bc07b1f1 fix for compiling on freebsd 2009-12-01 00:32:33 +01:00
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
Phil Sutter
2dca262c00 convert if_smapi_bat_installed to callbacks.iftest 2009-12-01 00:32:31 +01:00
Phil Sutter
9887bfdfdf convert smapi_bat_perc to callbacks.percentage 2009-12-01 00:32:31 +01:00
Phil Sutter
bc1b82771f convert mpd_percent to callbacks.percentage 2009-12-01 00:32:31 +01:00
Phil Sutter
61591def8e convert mixer values to callbacks.percentage 2009-12-01 00:32:31 +01:00
Phil Sutter
36a202091e convert fs_*_perc to callbacks.percentage 2009-12-01 00:32:31 +01:00
Phil Sutter
61c4efb305 convert entropy_perc to callbacks.percentage 2009-12-01 00:32:31 +01:00
Phil Sutter
0631b2ab2e convert swapperc to callbacks.percentage 2009-12-01 00:32:22 +01:00
Phil Sutter
feba298efa convert memperc to callbacks.percentage 2009-12-01 00:31:09 +01:00
Phil Sutter
07f82f5cb6 convert cpu to callbacks.percentage 2009-12-01 00:29:28 +01:00
Phil Sutter
79f5726832 merge loadgraph to callbacks.graphval 2009-12-01 00:29:28 +01:00
Phil Sutter
bd752e8506 merge {down,up}speedgraph to callbacks.graphval 2009-12-01 00:29:28 +01:00
Phil Sutter
fe05542318 merge diskiographs to callbacks.graphval 2009-12-01 00:29:28 +01:00
Phil Sutter
9581914f7d reuse barval callbacks where applicable 2009-12-01 00:28:53 +01:00
Phil Sutter
cba2460397 merge apcupsd_loadbar to callbacks.barval 2009-12-01 00:07:07 +01:00
Phil Sutter
4988947829 convert xmms2_bar to callbacks.barval 2009-12-01 00:06:23 +01:00
Phil Sutter
997805c46b convert smapi_bat_bar to callbacks.barval 2009-12-01 00:05:20 +01:00
Phil Sutter
fcd3d58960 convert mpd_bar to callbacks.barval 2009-12-01 00:04:35 +01:00
Phil Sutter
f79c58ef47 merge mixer bars to callbacks.barval 2009-12-01 00:02:48 +01:00
Phil Sutter
4d7f2e720d merge lua_bar to callbacks.barval 2009-12-01 00:02:04 +01:00
Phil Sutter
4f8e700d64 convert fs bars to callbacks.barval 2009-12-01 00:01:04 +01:00
Phil Sutter
a5ff5d39d0 merge execibar to callbacks.barval 2009-11-30 23:59:13 +01:00
Phil Sutter
95fbecc385 merge entropy_bar to callbacks.barval 2009-11-30 23:58:09 +01:00
Phil Sutter
b78664d8c5 merge audacious_bar to callbacks.barval 2009-11-30 23:57:04 +01:00
Phil Sutter
086829b017 convert swapbar to callbacks 2009-11-30 23:55:48 +01:00
Phil Sutter
d2f3ae7e15 convert mem{gauge,graph,bar} to callbacks 2009-11-30 23:54:52 +01:00
Phil Sutter
b2b9155514 fix execigauge conversion to callbacks 2009-11-30 23:49:58 +01:00
Phil Sutter
685d4ca4e8 fix execbar merge to callbacks 2009-11-30 23:48:54 +01:00
Phil Sutter
4e63422d10 battery_bar: convert to callbacks.barval 2009-11-30 23:48:04 +01:00
Phil Sutter
a11a1a1253 wireless_link_bar: convert to callbacks.barval 2009-11-30 23:35:49 +01:00
Phil Sutter
c85295202b convert cpubar to callbacks.barval 2009-11-30 23:34:20 +01:00
Phil Sutter
06a4650f60 if_xmms2_connected: convert to callbacks.iftest 2009-11-29 22:21:49 +01:00
Phil Sutter
cec0f3b8c6 cleanup mpd code 2009-11-29 22:21:49 +01:00
Phil Sutter
41f32f8766 if_mpd_playing: convert to callbacks.iftest 2009-11-29 22:21:49 +01:00
Phil Sutter
482f2d50b4 if_mixer_mute: convert to callbacks.iftest 2009-11-29 22:21:49 +01:00
Phil Sutter
5249c9da04 if_mounted: convert to callbacks.iftest 2009-11-29 22:21:49 +01:00
Phil Sutter
9af79a4907 if_up: convert to callbacks.iftest 2009-11-29 22:21:49 +01:00
Phil Sutter
27c1207cd1 if_gw: convert to callbacks.iftest 2009-11-29 22:21:49 +01:00
Phil Sutter
bb70c21c36 nvidia: convert to callbacks.print 2009-11-29 22:21:49 +01:00
Phil Sutter
0188eb0aaa top: convert to callbacks.print 2009-11-29 22:21:49 +01:00
Phil Sutter
1832cf79c9 ioscheduler: convert to callbacks.print 2009-11-29 22:21:49 +01:00
Phil Sutter
712caa8ab3 convert obsd_* to callbacks.print (completely untested) 2009-11-29 22:21:49 +01:00
Phil Sutter
a249b9bc44 convert disk_protect to callbacks.print 2009-11-29 22:21:49 +01:00
Phil Sutter
2660cb7590 convert execpi to callbacks.print 2009-11-29 22:21:49 +01:00
Phil Sutter
60ad080d1d convert pb_battery to callbacks.print 2009-11-29 22:21:49 +01:00
Phil Sutter
3f83bd34f4 convert laptop_mode to callbacks.print 2009-11-29 22:21:49 +01:00
Phil Sutter
f3cafc6a7c convert gw_* objects to callbacks.print 2009-11-29 22:21:49 +01:00
Phil Sutter
faa47450ad convert sony_fanspeed to callbacks.print 2009-11-29 22:21:49 +01:00
Phil Sutter
42b71217e3 loadgraph: convert to callbacks.print 2009-11-29 22:21:49 +01:00
Phil Sutter
ee40c63542 xmms2: outsource code and convert to callbacks.print 2009-11-29 22:21:48 +01:00
Phil Sutter
6bf79b7ebe combine: convert to callbacks.print 2009-11-29 22:21:48 +01:00
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
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
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
Phil Sutter
70e5afe5ac ifblock: fix clash with specials when freeing objects 
Murphy hit me again: in my naive attempt to fix the clash between
ifblocks and objects parsing text objects due to the double use of the
'sub' field, I overlooked this problem with reusing the 'special_data'
field. So here comes the real thing (TM), donating ifblocks their own
field for pointing to the jump target.
 2009-11-16 19:52:12 +01:00
Phil Sutter
44f76f4876 drop leftover freq_dynamic code in freebsd.c and openbsd.c 
As the comment states, those functions were originally copied from
linux.c; in fact just the code which has been removed due to licensing
issues.
 2009-11-16 19:41:06 +01:00
Pavel Labath
e97b67aa20 IPv6 support for $tcp_portmon 
In theory, this may fail to compile on ancient systems that don't have IPv6 types (struct
sockaddr_in6 et al.) available. If it turns out that such systems are still in use, the best way
to solve it would be to provide dummy declarations via configure tests.
 2009-11-16 18:17:16 +01:00
Nikolas Garofil
84d6095c40 Use seconds instead of centiseconds as unit for $pid_time_kernelmode, $pid_time_usermode and $pid_time 2009-11-16 16:59:41 +01:00