Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-20 03:51:18 +00:00
Code Issues Releases Activity
3,901 Commits 5 Branches 46 Tags 22 MiB
5859d76741
Commit Graph

2697 Commits

Author SHA1 Message Date
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
Nikolas Garofil
7b05f78de8 Added support for $pid_time_usermode, $pid_time_kernelmode and $pid_time 2009-11-16 15:30:57 +01:00
Nikolas Garofil
015d275098 Add support for $pid_nice and $pid_priority 2009-11-16 15:01:43 +01:00
Nikolas Garofil
f93aa2a68d Added support for $pid_threads and $pid_thread_list 2009-11-16 09:54:17 +01:00
Nikolas Garofil
f3e250df55 Bugfix: make sure $else works correct and without memleaks 2009-11-16 08:39:05 +01:00
Nikolas Garofil
5eebf1c516 Fix invalid free for all $if_-vars 2009-11-16 00:21:49 +01:00
Nikolas Garofil
f0211cd43d fix invalid free in if_up 2009-11-15 23:45:33 +01:00
Pavel Labath
ec879680d2 Forgot to set top_running when $running_processes is used 2009-11-15 23:00:14 +01:00
Nikolas Garofil
2ed76a345f Added support for $pid_vmpeak, $pid_vmsize, $pid_vmlck, $pid_vmhwm, $pid_vmrss, $pid_vmdata, $pid_vmstk, $pid_vmexe, $pid_vmlib, $pid_vmpte 2009-11-15 19:44:37 +01:00
Pavel Labath
72412c463b Rename $running_processes to $running_threads, implement real $running_processes 2009-11-15 17:55:03 +01:00
Nikolas Garofil
2c2e87061b Added support for $gid_name 2009-11-15 17:46:41 +01:00
Nikolas Garofil
3fa868f35b Added support for $uid_name 2009-11-15 17:21:55 +01:00
Nikolas Garofil
d38049fb96 Added support for $pid_uid, $pid_euid, $pid_suid, $pid_fsuid, $pid_gid, $pid_egid, $pid_sgid and $pid_fsgid 2009-11-15 14:49:55 +01:00
Nikolas Garofil
b8e6b1a58d Add support for $pid_parent 2009-11-15 13:26:40 +01:00
Phil Sutter
68278e4a45 yet another fix for FreeBSD (somehow sneaked through last time) 2009-11-14 16:47:30 +01:00
Phil Sutter
40792b7d05 fix compiling for freebsd 
Tested using default options, lua disabled as only lua50 available in
7.2-RELEASE.
 2009-11-15 01:36:17 +01:00
Phil Sutter
8f1eae1b94 add generated files for profiling to clean list 2009-11-15 01:36:17 +01:00
Nikolas Garofil
038e182c38 argument of $cmdline_to_pid doesnt have to be the full commandline 2009-11-15 00:51:38 +01:00
Nikolas Garofil
7b6e01b869 fix last commit 2009-11-14 22:17:41 +01:00
Nikolas Garofil
fa459f0539 Make it possible to use other vars as arguments for the $pid-vars, add support for $pid_state_short, add support for $cmdline_to_pid 2009-11-14 22:07:54 +01:00
Cesare Tirabassi
e582acf1a0 Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-11-14 15:58:06 +01:00
Cesare Tirabassi
0ee5e9935a Refactoring of commit 363cf1ab73 
The problem with the original commit was that some session-managers set
stdin to /dev/null for the processes they launch, therefore the variable
wasn't very effective.
This commit change the variable conky_user_time to user_time.
This variable has a mandatory argument, a console identifier
(eg. tty7, pts/0, etc.).
Once called, this will list how long the user for the given console has been
logged in for.
This commit also allows multiple user_time to be specified for different
consoles, as well as correctly handle a conky restart.
 2009-11-14 15:57:45 +01:00
Nikolas Garofil
1a4c2c61e8 Shrink proc.c 2009-11-14 15:08:41 +01:00
Nikolas Garofil
44de7fe6be Support for $pid_state 2009-11-14 13:58:07 +01:00
Pavel Labath
6db3b5809d Add middle_middle alignment, mostly for completeness 2009-11-13 21:35:49 +01:00
Nikolas Garofil
ab0b80e495 Added support for $pid_chroot 2009-11-13 16:54:40 +01:00
Cesare Tirabassi
f1272dbd31 Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-11-13 16:36:49 +01:00
Cesare Tirabassi
363cf1ab73 Add $conky_user_time (sf.net #2830919) 
The bug reporter asks if it is possible to add a variable giving the "current
user time" only, since the variable user_times reports the times for ALL
logged users.
AFAIK, the only info one can gather inside conky, is the login time for the
tty connected to conky's standard input.
This commit adds support for it (it should work on any posix compliant *nix).
Note that in coherence with the definition, the variable is called
conky_user_time (for a single user stand-alone machine used as a desktop
this would be the "current" user time).
 2009-11-13 16:30:04 +01:00
Nikolas Garofil
e9d92ae717 Fix bug in $pid_openfiles 2009-11-13 16:29:44 +01:00
Phil Sutter
bde5845077 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. :)
 2009-11-13 00:47:23 +01:00
Nikolas Garofil
52df1d2bf2 Merge branch 'master' of ssh://git.omp.am/home/omp/git/conky 2009-11-13 00:38:13 +01:00
Nikolas Garofil
52629bef61 Added support for $pid_openfiles 2009-11-13 00:36:46 +01:00
Phil Sutter
8922603b91 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.
 2009-11-13 00:02:16 +01:00
Phil Sutter
e787870eb4 top: fix segfault for $if_running 
The "name" field may be zero, which makes strcmp() freak out.
 2009-11-13 00:02:16 +01:00
Nikolas Garofil
e26c9977f2 fix potential bugs in snprintf 2009-11-12 21:48:15 +01:00
Nikolas Garofil
1d0b68e60d Fix building without C99 2009-11-12 21:33:57 +01:00
Nikolas Garofil
6c4f069f00 Added support for $pid_exe and $pid_stdin, $pid_stdout and $pid_stderr 2009-11-12 20:34:43 +01:00
Nikolas Garofil
6b20156a1b Added support for $pid_environ_list 2009-11-12 15:42:18 +01:00
Nikolas Garofil
d595a65077 Add support for $pid_environ 2009-11-11 22:56:12 +01:00
Nikolas Garofil
cb96b3bcca Add cwd to $pid and split into $pid_cmdline and $pid_cwd 2009-11-11 16:27:19 +01:00
Nikolas Garofil
aa761584db fix previous commit 2009-11-11 13:44:50 +01:00
Nikolas Garofil
db99693091 fix tiny compile problem 2009-11-11 13:43:14 +01:00
Nikolas Garofil
65cf0439a0 Fix memleak and change literals to defines 2009-11-11 13:23:05 +01:00
Nikolas Garofil
8276da8777 Add proc.c and proc.h 2009-11-11 11:33:28 +01:00
Nikolas Garofil
46dd6ca513 Add support for ${pid cmdline} 2009-11-11 10:55:25 +01:00
Nikolas Garofil
827be3bde8 Fix $if_mpd_playing and $mpd_percent when you stop playing a song, thanks Sakari Matikka 2009-11-10 13:23:00 +01:00
Nikolas Garofil
ccbaf9ea89 Fix memleak 2009-11-10 00:15:30 +01:00
Nikolas Garofil
7025477402 Fix $scroll only scrolls once 2009-11-09 02:38:20 +01:00
Nikolas Garofil
e292dd5e28 Fix segfault and memleaks in curl 2009-11-08 21:49:28 +01:00
Phil Sutter
37071ccd8e 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. ;)
 2009-11-08 20:20:47 +01:00
Phil Sutter
581c86f070 fix conversion bug when freeing exec objects 2009-11-08 20:20:47 +01:00
Nikolas Garofil
a1e199c85a Fix building with metar but without xoap 2009-11-08 18:00:13 +01:00
Nikolas Garofil
ce99d1a782 Use a define for the maximum number of network devices 2009-11-07 23:46:46 +01:00
Nikolas Garofil
aad43bea8d Added support for $threads and fixed $processes on Linux 2009-11-07 18:14:04 +01:00
Nikolas Garofil
1ed564fd0b Revert "Added support for and fixed on Linux" 
This reverts commit 43c7c0373b.
 2009-11-07 18:13:21 +01:00
Nikolas Garofil
43c7c0373b Added support for and fixed on Linux 2009-11-07 18:06:07 +01:00
Nikolas Garofil
ff1fab20c2 Fix building with --disable-xft and add ncurses to the -v option 2009-11-07 15:32:03 +01:00
Nikolas Garofil
68ca9485da Fix building with --disable-iostats 2009-11-07 13:21:47 +01:00
Nikolas Garofil
74145a7fef Fix building with --disable-x11 --disable-lua --disable-ncurses 2009-11-07 12:21:48 +01:00
Phil Sutter
e909cdd4eb 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.
 2009-11-06 00:10:00 +01:00
Phil Sutter
c88d01af95 weather: fix this embarrassing bug 2009-11-05 22:27:34 +01:00
Phil Sutter
556751c8c9 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.)
 2009-11-03 23:24:09 +01:00
Phil Sutter
e08bc8fad7 enum special_types: define nonspecial for completeness 2009-11-03 23:23:23 +01:00
Phil Sutter
4dd54b3df6 if_gw: no need to free unused obj->data.s 2009-11-03 23:23:23 +01:00
Phil Sutter
f61d8d108f text_object: completely remove the need for data.ifblock 2009-11-03 23:23:23 +01:00
Phil Sutter
9a770295d1 drop useless ifblock.str 2009-11-03 23:23:23 +01:00
Phil Sutter
66c187e7a1 no need to save the args passed to if_empty and if_match 2009-11-03 23:23:23 +01:00
Phil Sutter
7304378d73 drop a few unused fields from struct text_object 2009-11-03 23:23:23 +01:00
Phil Sutter
d9ec45b25d drop struct text_object field pair, since it got unused due to latest commits 2009-11-03 23:23:23 +01:00
Phil Sutter
76b433c809 drop struct text_object field f 2009-11-03 23:23:23 +01:00
Phil Sutter
f98a360089 drop now unused SIZE_DEFAULTS macro 2009-11-03 23:23:23 +01:00
Phil Sutter
041059f1c2 specials: convert stippled_hr object to new style 2009-11-03 23:23:23 +01:00
Phil Sutter
3458db80aa specials: convert tab object to new style 2009-11-03 23:23:23 +01:00
Phil Sutter
50e2b5961a specials: convert gauge objects to new style 2009-11-03 23:23:23 +01:00
Phil Sutter
bbec0db498 specials: convert graph objects to new style 2009-11-03 23:23:23 +01:00
Phil Sutter
a4777c7c55 misc smaller fixes 2009-11-03 23:23:23 +01:00
Phil Sutter
22251dca51 specials: introduce dedicated per-object data and merge graph objects 2009-11-03 23:23:23 +01:00
Phil Sutter
0bed05997b review load* code 2009-11-03 23:23:23 +01:00
Phil Sutter
42dfb7ac69 move loadavg and loadgraph code to common.c 2009-11-03 23:23:23 +01:00
Phil Sutter
63079a2075 local_mails: convert to generic object payload 
This also includes a little header include cleanup.
 2009-11-03 23:23:22 +01:00
Phil Sutter
90ed7d8a2c mail: convert to generic object payload 2009-11-03 23:23:22 +01:00
Phil Sutter
35ecbb3330 mail: use a private common struct mail_s instead of info.mail 2009-11-03 23:23:22 +01:00
Phil Sutter
ac99833646 text_object: use field i instead of cpu_index 2009-11-03 23:23:22 +01:00
Phil Sutter
3a365bcd33 if_up: convert to generic object payload 2009-11-03 23:23:22 +01:00
Phil Sutter
2112b1f0ee drop now unused sensor field 2009-11-03 23:23:22 +01:00
Phil Sutter
0de0047bdc obsd_sensors: cleanup code (untested) 2009-11-03 23:23:22 +01:00
Phil Sutter
f2188a67a1 ibm: convert to generic object payload 2009-11-03 23:23:22 +01:00
Phil Sutter
c8f07daceb net_stats: convert to generic object payload 2009-11-03 23:23:22 +01:00
Phil Sutter
0740e91911 diskio: convert to generic object payload 2009-11-03 23:23:22 +01:00
Phil Sutter
aa4d61d3d7 combine: convert to generic object payload 2009-11-03 23:23:22 +01:00
Phil Sutter
64ec783475 scroll: convert to generic object payload 2009-11-03 23:23:22 +01:00
Phil Sutter
bf9263bc5e read_tcp: convert to generic object payload 2009-11-03 23:23:22 +01:00
Phil Sutter
b74e0494de exec: convert to generic object payload 2009-11-03 23:23:22 +01:00
Phil Sutter
0dc60481cf top: convert to generic object payload 2009-11-03 23:23:22 +01:00
Phil Sutter
4b0c1d3226 mboxscan: convert to generic object payload 2009-11-03 23:23:22 +01:00
Phil Sutter
dd36fc4caa mixer: convert to generic object payload 2009-11-03 23:23:22 +01:00
Phil Sutter
c45decda5e curl: convert to generic object payload 2009-11-03 23:23:22 +01:00
Phil Sutter
4716969cc6 weather objects: convert to generic object payload 2009-11-03 23:23:22 +01:00
Phil Sutter
046ae1dd61 rss: convert to generic object payload 2009-11-03 23:23:22 +01:00
Phil Sutter
9202a9da87 eve: convert to generic object payload 2009-11-03 23:23:22 +01:00
Phil Sutter
94ac89e091 sysfs objects: convert to generic object payload 2009-11-03 23:23:22 +01:00
Phil Sutter
d2be5980ca tcp_portmon: convert to generic object payload 2009-11-03 23:23:22 +01:00
Phil Sutter
8d1640f30b fs_*: convert to generic object payload 2009-11-03 23:23:22 +01:00
Phil Sutter
f31e5cefe7 fs_bar, fs_bar_free: convert to generic object payload 2009-11-03 23:23:22 +01:00
Phil Sutter
f6942c8c98 tailhead: convert to generic object payload 2009-11-03 23:23:22 +01:00
Phil Sutter
1d73d82b87 convert tztime to generic object payload 2009-11-03 23:23:22 +01:00
Phil Sutter
8165a91f0a nvidia: convert to generic text object payload 2009-11-03 23:23:22 +01:00
Phil Sutter
eff3f75014 text_object: introduce a generic payload pointer 2009-11-03 23:23:22 +01:00
Phil Sutter
d1b2c7eac3 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.
 2009-11-03 01:50:28 +01:00
Phil Sutter
fa9135f9df mail: put imap and pop3 code to where it belongs 2009-11-03 01:50:28 +01:00
Phil Sutter
8b76d8fb60 net_stats: outsource network-related objects 2009-11-03 01:50:28 +01:00
Phil Sutter
9efa29be28 combine: outsource code 2009-11-03 01:50:28 +01:00
Phil Sutter
37658b540b scroll: outsource code 2009-11-03 01:50:28 +01:00
Phil Sutter
24d9e8bf24 read_tcp: outsource code 2009-11-03 01:50:28 +01:00
Phil Sutter
7a168c377b 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.
 2009-11-03 01:50:28 +01:00
Phil Sutter
2631f42820 ibm: put specific code to where it belongs 2009-11-03 01:50:28 +01:00
Phil Sutter
7fc1c801aa gw_info: move code to where it belongs 2009-11-03 01:50:28 +01:00
Cesare Tirabassi
27a2a253a8 Fix indenting of last commit 2009-11-01 18:42:29 +01:00
Cesare Tirabassi
4ea99e27f1 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?
 2009-11-01 18:37:48 +01:00
Phil Sutter
f7f3b37807 rss.h: drop useless header include 2009-10-12 23:04:41 +02:00
Phil Sutter
d1ed9c8399 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.
 2009-10-12 23:00:06 +02:00
Phil Sutter
a106b52698 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.
 2009-10-12 21:33:02 +02:00
Phil Sutter
ad8dd36cb7 weather objects: move init and print code to weather.c 2009-10-12 21:33:02 +02:00
Phil Sutter
6a2f58a25c rss: move init and print code into rss.c 2009-10-12 21:33:02 +02:00
Phil Sutter
ddca4aac68 spend some time with eve.{c,h} 
* minimise core code hooks
* drop useless exporting of private functions (and make them static)
* reorder functions in eve.c so no prototypes are needed
* drop massive header include and add double include barrier in eve.h
 2009-10-12 21:33:02 +02:00
Phil Sutter
700a32b2e7 sysfs objects: merge init and print routines 2009-10-12 21:33:02 +02:00
Phil Sutter
da7876468f tcp_portmon: drop useless function pointer cast, use OBJ_ARG 2009-10-12 21:33:02 +02:00
Phil Sutter
4d70cf07b8 fs_bar, fs_bar_free: merge init and print routines 2009-10-12 21:33:02 +02:00
Phil Sutter
b9a28c37a8 tail, head: use OBJ_ARG to simplify code 2009-10-12 21:33:02 +02:00
Phil Sutter
a529ac52de hddtemp: drop dead code (custom per-object data) 2009-10-12 21:33:02 +02:00
Cesare Tirabassi
066af067f0 Fix global info.desktop variables were incorrectly freed, sf #2876647 2009-10-12 13:38:48 +02:00
Phil Sutter
ea92e63a44 tztime: fix argument parsing bug, clarify docs 2009-10-04 04:03:21 +02:00
Phil Sutter
1e893ec6e3 iconv: outsource code into it's own file 
While testing, I found two already existing bugs:
* the variable 'a' passed to iconv_convert() needs to be passed by
  reference in order to allow for the desired side effect.
* Somehow the trailing junk after an iconv_conversion to a shorter
  string messes things up (and gets printed!). I couldn't exactly find
  out why this happens, but setting (*p) = 0; solves this problem.
 2009-10-04 03:41:45 +02:00
Phil Sutter
adf9d23927 outsource time, utime and tztime into a separate file 2009-10-04 03:24:04 +02:00
Phil Sutter
e3e77ce75e move the SIZE_DEFAULTS() macro to where it belongs to 2009-10-04 03:24:04 +02:00
Brenden Matthews
584d05d2ad Add the -p/--pause command line option. 2009-10-03 14:26:39 -07:00
Brenden Matthews
88a8799bf5 Improve IMAP/POP3 code, fix compiler error. 2009-09-30 18:06:18 -07:00
Brenden Matthews
7fc4d40eb2 Allow spaces in mail folder names for pop/imap. 
For example, you can specify "-f '[Gmail]/All Mail'" in your mail args
to view all mails in your Google mail IMAP folder.
 2009-09-27 10:40:06 -07:00
Brenden Matthews
4a0676d4d0 Fix IMAP IDLE with Google's IMAP service. 2009-09-26 18:38:55 -07:00
Pavel Labath
28978461a7 Put OBJ(image) in $ifdefs 
so that conky produces more meaningful error message when compiled without imlib
 2009-09-25 14:43:46 +02:00
Pavel Labath
bfda285567 Make -d switch work again 
-d was broken because fork-to-background was done after the update thread creation, so the
threads ended up in the wrong process. This delays the thread creation until after the fork.
 2009-09-22 18:19:08 +02:00
Phil Sutter
cfccea4079 do not block when reading inotify_fd 
Originally, I was experiencing sporadic lockups when reading inotify_fd;
which is strange, since it is protected by select(). This should fix it
despite of the original problem.
 2009-09-20 19:04:45 +02:00
Phil Sutter
d163293f66 index processes in a hash table for faster lookup 2009-09-20 16:10:05 +02:00
Pavel Labath
596449c902 It feels much better to let the thread exit voluntarily instead of violently killing it 2009-09-20 14:38:57 +02:00
Phil Sutter
d45aa362b0 fixup for ncurses output 2009-09-20 13:52:46 +02:00
Phil Sutter
4823b1f428 drop duplicate code 2009-09-20 13:18:10 +02:00
Phil Sutter
3569ece513 minor indentation fixup 2009-09-20 13:16:43 +02:00
Phil Sutter
e391fa40a9 this was looking wrong 2009-09-20 13:16:43 +02:00
Phil Sutter
15e262a3ca minor simplification of get_string_width_special() 2009-09-20 13:16:20 +02:00
Phil Sutter
4840de39cd update machinery: keep threads persistent 
Create each thread upon registration of the callback function, then use
semaphores to signal when it's time to update and when updating is
finished.
Many thanks to pavelo who originally came up with the idea for this.
 2009-09-20 13:14:08 +02:00
Phil Sutter
2cb45085e0 simplify get_string_width() a bit 2009-09-20 13:12:56 +02:00
Pavel Labath
7ad3e34e34 OBJ -> OBJ_ARG; apparently forgotten in 9f22ba 2009-09-15 23:54:31 +02:00
Phil Sutter
fea72bd8f8 top.c: fix for unsigned underflow 
Yes, I also thought these are monotonic counters. But it seems like they
are not, at least sometimes the value decreases by 1 leading to a very
very high cpu usage percentage being printed.
 2009-09-15 23:16:39 +02:00
Phil Sutter
7fa59c6c90 better zero out allocated memory 2009-09-15 23:16:39 +02:00
Phil Sutter
b7b9329e38 update machinery: run each update callback in it's own thread 2009-09-15 23:16:39 +02:00
Phil Sutter
925ac2b7ba read_tcp: get rid of heavy indenting 2009-09-15 23:16:35 +02:00
Phil Sutter
9f22bab657 core: add OBJ_ARG() and OBJ_IF_ARG() to force arguments 
These macros can be used just like their OBJ() and OBJ_IF()
counterparts, just that they bail out hard when arg is unset. While
here, also cleanup the macro definition by using __* macros and fully
cleanup the macro namespace when the job is done.

Although this makes conky kind of less robust when it comes to
configuration errors, aborting is the right thing to do to avoid
ambiguity between unknown text objects.
 2009-09-15 23:12:15 +02:00
Phil Sutter
77cc646080 imlib2: don't flood warnings on non-existing images 2009-09-15 23:12:15 +02:00
Phil Sutter
f33affdc03 do not unconditionally overwrite a variable after conditionally setting it 2009-09-15 23:12:15 +02:00
Phil Sutter
ed3d73c094 minor indenting fixup 2009-09-15 23:12:15 +02:00
Phil Sutter
fa896bec98 apcupsd: drop init_apcupsd() since it was called at the wrong place 
Normally, this is not enough reason to remove code, but in this case it
means that either the tester always had $nvidia (if enabled) or $combine
also in her setup, or it was working without (which I guess, since there
is duplicate code in update_apcupsd()).
 2009-09-15 23:12:15 +02:00
Phil Sutter
9dd360ecdb update machinery: add some documentation 2009-09-15 23:12:15 +02:00
Pavel Labath
09c0bccf55 Move vi modelines closer to the beginning, so they're more likely to be actually used. 2009-09-12 12:50:51 +02:00
Phil Sutter
a00bd4ad5e update machinery: fix accidential naming conflict 2009-09-09 22:56:10 +02:00
Phil Sutter
466a253a8c update machinery: fix for update_stat() on linux 2009-09-09 22:52:09 +02:00
Pavel Labath
3736b141aa Fix window width calculation when $lua returns newlines 
I just hope it doesn't break anything.
 2009-09-09 21:15:18 +02:00
Phil Sutter
f33bcb36ef update machinery: fix top objects 
This is a bit messy, but since the top update stuff could use a rewrite
anyway, this should do.
 2009-09-07 01:49:44 +02:00
Phil Sutter
d32879faaa update machinery: let CALLBACK() die again 
There are no INFO_* variables any more, so the argument passed to OBJ()
is always a function pointer or zero. By checking the argument passed in
add_update_callback(), the branch in the OBJ() macro can be dropped,
too.
 2009-09-07 01:22:16 +02:00
Phil Sutter
e83fb84c55 update machinery: clean up 
* Remove leftover INFO_* values from object definitions which didn't
  trigger anything.
* Drop the whole INFO_* enum as it's values are not used anymore.
 2009-09-07 01:12:11 +02:00
Phil Sutter
e044093735 update machinery: complete transition 
* Drop all need_mask alterations (no idea why there were here at all,
  but surely not sane since they are missing in the non-linux
  functions).
* Drop the update delay for update_meminfo(), as parsing /proc should
  not lead to abnormal overhead.
* Check for x_initialised from inside update_x11info(), so we can call
  it unconditionally.
 2009-09-07 01:05:33 +02:00
Phil Sutter
d7c7f06aca rework the update machinery to use callbacks 
Besides improving performance when updating stuff, we ideally have no
text object specific code in update_stuff() anymore (aside some
leftovers).

The macros in construct_text_object() have gotten a bit crazier than
they were before:
* using CALLBACK(&func) instead of an INFO_* parameter to OBJ() will
  make it add the given callback to the list of callbacks to be iterated
  over at each update interval.
* BEWARE: the above assumes function pointer values to be > 0!
* This implicitly fixes a bug in the code: passing 0 as INFO_* value
  led to selecting INFO_MAIL (1 << 0 == 1).
* Now it would select INFO_CPU (== 0), which got unused and therefore is
  not a problem at all (the 0 value should be unused in enums anyway).

This needs some more work, then we should be able to drop the whole
INFO_* enum. Then CALLBACK() can die again and with it goes the ugly
casting stuff done to distinguish callbacks from INFO_* values.
 2009-09-07 00:36:02 +02:00
Phil Sutter
8cf8c4dac3 move the static last_*_update variables into the function 2009-09-06 21:57:19 +02:00
Phil Sutter
5a3b7c074b Rewrite hddtemp support for better scaling 
Instead of connecting once for each object, have a central update
routine (limiting support to only a single hddtemp daemon to connect
to).
 2009-09-06 21:53:53 +02:00
Phil Sutter
56142a7cd4 cleanup src/Makefile.am 
Since the files mentioned in conky_SOURCES are already included in the
distfile, no need to specify them again in EXTRA_DIST.
 2009-09-05 03:30:12 +02:00
Phil Sutter
12ab00cd2e move the ncurses.h include from conky.h to core.c 
Fixes some namespace error with libmpdclient.c.
 2009-09-04 00:08:57 +02:00
Phil Sutter
ff199355f6 outsource the whole template object machinery 2009-09-04 00:08:17 +02:00
Cesare Tirabassi
75ce3b259b Fix if_running not working on linux when a top flavour is not running 2009-09-03 23:13:14 +02:00
Cesare Tirabassi
08e40c1fe8 Don't abort diskio objects initialisation if the given device doesn't exist, we could have these objects iffed; closes LP: #405188 2009-08-14 18:32:39 +02:00
Cesare Tirabassi
bf1dea5e4e Precised last two weather_forecast xpaths 2009-08-11 16:10:35 +02:00
Cesare Tirabassi
141c229afc Add day and date data_type to 2009-08-10 22:46:21 +02:00
Nikolas Garofil
bfb065502d Add global ncurses headerfile and make sure timeout in mailcode doesn't clash with timeout from ncurses 2009-08-08 03:20:47 +02:00
Nikolas Garofil
74b61f9730 Undo adding local ncurses.h header-file added by b4b0228d09 . 
The headerfile used globally should be used instead of one in the local dir.
If conky can't find it, it should be fixed in configure.ac.in or Makefile.am,
and not in the code.
 2009-08-08 02:54:07 +02:00
Nikolas Garofil
834804c265 Fix: Add header needed for read_tcp 2009-08-08 02:49:28 +02:00
Phil Sutter
b4b0228d09 include ncurses.h in core.c 2009-08-08 00:28:26 +02:00
Brenden Matthews
043cf686c6 Revert "Uhh..ansohus" 
This reverts commit 9827726ae5.

Or this.
 2009-08-07 01:24:24 -06:00
Brenden Matthews
d7838b87bf Revert "Merge branch 'master' of git.omp.am:/home/omp/git/conky" 
This reverts commit d710ea8b9d, reversing
changes made to 9827726ae5.

Also didn't meant to push this.
 2009-08-07 01:23:27 -06:00
Brenden Matthews
098e28598f Revert "auesnthaeou" 
This reverts commit 70adc04fc2.

Oops, didn't mean to push this.  I'll start a new branch now (so I don't
do this again...).
 2009-08-07 01:21:56 -06:00
Brenden Matthews
70adc04fc2 auesnthaeou 2009-08-06 21:56:40 -06:00
Brenden Matthews
d710ea8b9d Merge branch 'master' of git.omp.am:/home/omp/git/conky 
Conflicts:
	src/conky.h
 2009-08-06 14:21:50 -06:00
Nikolas Garofil
db1c0061b0 Fix: rename timeout in mpdcode to prevent clashes with timeout in ncurses 2009-08-06 16:35:06 +02:00
Nikolas Garofil
157537fc30 Fix buildproblems introduced by 3f4127080e . inet.h is used by read_tcp and timeout is renamed to prevent clashes with timeout in ncurses 2009-08-06 15:28:07 +02:00
Brenden Matthews
9827726ae5 Uhh..ansohus 2009-08-06 00:54:40 -06:00
Brenden Matthews
3f4127080e Started on breaking up conky.c. 
These changes will likely result in breakage, particularly with
different features enabled/disabled.
 2009-08-05 16:46:51 -06:00
Brenden Matthews
c29301d02a Move xdbe swap stuff into x11.c. 2009-08-05 15:41:56 -06:00
Brenden Matthews
4e88abde40 Finish c60209f6d0. 2009-08-05 15:33:41 -06:00
Brenden Matthews
c60209f6d0 Swap Xdbe buffers when resizing window. 2009-08-05 15:21:59 -06:00
Brenden Matthews
2904720a58 Don't clear entire X window, just drawing area. 2009-08-05 14:40:53 -06:00
Brenden Matthews
7b93ad8071 Don't pass mouse clicks when window is desktop type. 2009-08-05 14:35:33 -06:00
Brenden Matthews
2115d925e4 Code formatting. 2009-08-05 14:35:20 -06:00
Cesare Tirabassi
4d35595e5e fix compilation error due to initial declaration in for loop being not compliant with C99 2009-08-05 17:55:09 +02:00
Cesare Tirabassi
0cd29676c0 Add xoap error handler to weather-forecast too 2009-08-05 17:50:24 +02:00
Cesare Tirabassi
e16511be02 Set refresh period for the 5 days forecast to 3 and a half hours, in accordance to Exhibit B of EULA 2009-08-05 17:26:25 +02:00
Brenden Matthews
f10ffe07c4 Fix invalid call to close(). 2009-08-04 23:06:13 -06:00
Brenden Matthews
fbf746e53c Fix broken RSS code. 2009-08-04 22:56:19 -06:00
Brenden Matthews
e41f3e4f7b Fix parsing of XOAP xml. 
Also made the XOAP cloud condition match that of the NOAA stuff
(lowercase).
 2009-08-04 21:15:08 -06:00
Nikolas Garofil
c99e092246 Gcc complains too much when build without X11 and NCurses 2009-08-04 22:13:06 +02:00
Cesare Tirabassi
fc54981da8 Fix major memory leak in prss.c 2009-08-04 14:28:24 +02:00
Nikolas Garofil
d69b3b56f0 Fix: reloading turned ncurses off 2009-08-04 13:46:59 +02:00
Brenden Matthews
aec2ac5448 Let's try __attribute__ this time for unused vars. 2009-08-03 13:48:18 -06:00
Brenden Matthews
3b13ae971e Do the UNUSED() thing another way. 2009-08-03 13:34:47 -06:00
Brenden Matthews
581f59528b Spell 'of' correctly. 2009-08-03 12:57:22 -06:00
Brenden Matthews
efa5a211b7 Better fix for unused var problem. 2009-08-03 12:56:41 -06:00
Brenden Matthews
ecfcfacce3 Fix compiler warning. 2009-08-03 12:54:21 -06:00
Brenden Matthews
aa142b0941 Revert "Compilation fix for weather stuff." 
This reverts commit 63229dac63.
 2009-08-03 12:52:10 -06:00
Brenden Matthews
63229dac63 Compilation fix for weather stuff. 2009-08-03 12:48:52 -06:00
Brenden Matthews
05330f24a3 Merge branch 'master' of git.omp.am:/home/omp/git/conky 
Conflicts:
	src/conky.c
 2009-08-03 12:41:07 -06:00
Brenden Matthews
51ddee12dd Fix imlib2 context. 2009-08-03 12:39:44 -06:00
Cesare Tirabassi
2118fc5889 Merge branch 'master' into weather-forecast 2009-08-03 19:59:36 +02:00
Cesare Tirabassi
36ae626ab8 Add parser initialisation and cleanup 2009-08-03 19:58:21 +02:00
Nikolas Garofil
37e2bb471b Support for in ncurses 2009-08-03 19:36:47 +02:00
Cesare Tirabassi
4fe70ad0e6 weather: change hardcoded constant 5 to FORECAST_DAYS macro 2009-08-03 11:49:26 +02:00
Cesare Tirabassi
d707d536bb Fix bad memory allocation 2009-08-03 00:24:39 +02:00
Cesare Tirabassi
14b7acdab6 Add weather_forecast object 2009-08-02 23:54:44 +02:00
Brenden Matthews
dbf3448031 Update conky_window Lua table when it changes. 2009-08-01 15:11:18 -06:00
Brenden Matthews
47b2869028 Code formatting. 2009-08-01 15:01:00 -06:00
Brenden Matthews
358a2b989e Add lua_startup_hook. 2009-08-01 14:36:38 -06:00
Brenden Matthews
41aed41e35 Add lua_shutdown_hook. 2009-08-01 14:30:14 -06:00
Nikolas Garofil
44b82311b9 Added support for out_to_ncurses 
All ERR()'s are renamed to NORM_ERR() and box to mbox so that they don't
clash with things in ncurses.h .
Ncurses is enabled by default when building conky but can be disabled with
--disable-ncurses .
At the moment configure doesn't check if ncurses is actually available.
I'm adding support for ncurses so that we can make as much things as possible
that are only available in X11 also available in console in the future.
 2009-08-01 20:45:43 +02:00
Nikolas Garofil
763ae568a7 Fix reloading config after 7ff2a71aa0 2009-08-01 12:14:10 +02:00
Cesare Tirabassi
01e66c7f8c Bug fix: make -X,--display actually work, improve error message if display not found 2009-08-01 09:34:21 +02:00
Nikolas Garofil
7ff2a71aa0 Added $include var to load configfiles inside of other configfiles 2009-07-31 15:28:55 +02:00
Cesare Tirabassi
8af1f24624 minor fix to allow out-of-tree builds 2009-07-31 13:50:33 +02:00
Brenden Matthews
be145bd55d Removed alias config option due to brokenness. 
The alias option was broken by fb8ccd7a05,
and it seems like trying to make it work again will only result in
breakage for env var substitution anyway.
 2009-07-31 00:33:06 -06:00
Cesare Tirabassi
38e544ee25 weather: add icon data_type for xoap 2009-07-29 22:22:24 +02:00
Nikolas Garofil
8f3150d8f6 Merge branch 'master' of ssh://git.omp.am/home/omp/git/conky 2009-07-29 21:27:19 +02:00
Nikolas Garofil
9ad3b9d8bc Fix: make sure 51c928a8ef works when programs terminate by themselves 2009-07-29 21:27:00 +02:00
Cesare Tirabassi
7bfff20e5d Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-07-29 18:04:57 +02:00
Cesare Tirabassi
580fa3a52d correct typo in error message 2009-07-29 18:04:34 +02:00
Nikolas Garofil
51c928a8ef Fix: kill zombies without breaking b963c2827f 2009-07-29 11:43:16 +02:00
Cesare Tirabassi
81c691d15a add emacs indentation variables to source files in line with current vim settings 2009-07-28 23:44:22 +02:00
Brenden Matthews
ec517ecb26 Remove deprecated stuff from docs and conky.c (for 1.7.3). 2009-07-28 12:43:45 -06:00
Brenden Matthews
da4b542ae6 Added some Lua API stuff. 
Added conky_set_update_interval() API call, which allows you to change
Conky's update interval from a Lua script.  Added the 'conky_info' table
to global Lua context, which still needs populating with stuff (right
now it only contains the current update interval and the system uptime).
 2009-07-28 12:38:43 -06:00
Nikolas Garofil
e124064892 Fix: Always include stuff that used to use popen because it's now using pid_popen 2009-07-28 15:59:17 +02:00
Brenden Matthews
6c6711aa6d Fix problem with invalid window props? 
We should check to make sure the atom actually exists before trying to
retrieve the property.
 2009-07-27 21:01:55 -06:00
Brenden Matthews
73eaf0cfc3 Clean up x11.c a bit. 2009-07-27 15:34:06 -06:00
Cesare Tirabassi
da06200e43 Fix user_times bug (launchpad #405188). 2009-07-27 15:09:18 -06:00
Brenden Matthews
dd6133b055 Fix linking error with Lua extras disabled. 2009-07-27 15:03:21 -06:00
Brenden Matthews
d97cd93a1c Add vim modelines. 2009-07-27 14:47:31 -06:00
Brenden Matthews
73d36a59c0 Be more intelligent about handling tolua++ user types. 2009-07-27 14:07:36 -06:00
Nikolas Garofil
ca0f8f8712 Fix: If there is no battery then we don't care about the status 2009-07-27 13:34:20 +02:00
Nikolas Garofil
3e41b36fdf use EXIT_SUCCESS and EXIT_FAILURE instead of 0 and 1 when calling exit 2009-07-27 01:29:57 +02:00
Cesare Tirabassi
ffe5d5f104 Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-07-26 13:04:11 +02:00
Cesare Tirabassi
94cd289aec clean the stack when llua_update_window_table is called with a window table not yet populated 2009-07-26 13:03:41 +02:00
Nikolas Garofil
b963c2827f Fix: conky waited indefinitely on programs started with \$exec-alike vars if those programs don't quit. 
Conky now kills the program when it should start the next update, this makes using things like tail with
the -f option possible in a \$exec.

I am not pushing this to 1.7.2 because this is a pretty big change in the code and it is not really
a bugfix but more a usability-problem-fix (if that term would exist).
 2009-07-26 02:26:22 +02:00
Nikolas Garofil
4d37d021e1 Handle if popen should fail 2009-07-25 14:36:55 +02:00
Nikolas Garofil
febc5306e2 Don't place conky_ in front of lua functionnames if it's already there 2009-07-25 12:03:09 +02:00
Nikolas Garofil
7ce38ecf09 Fix: Make sure lua works without X11 2009-07-25 02:42:31 +02:00
Nikolas Garofil
ca04b9a3c7 just making bdf5e87c92 easier to read 2009-07-24 16:17:03 +02:00
Cesare Tirabassi
bdf5e87c92 workaround to fix feed_title being processed when not yet parsed 2009-07-24 14:48:54 +02:00
Cesare Tirabassi
0be6e37e07 Fixed parsing of rss parameters (last 2 are optional) and typo in rss.c; there is still a problem with feed_titlesince data->title doesn't get filled before processing 2009-07-24 13:07:20 +02:00
Nikolas Garofil
381b47a0a9 Don't do useless checks 2009-07-24 12:39:48 +02:00
Nikolas Garofil
875c7c3129 Support for update_interval_on_battery 2009-07-24 12:06:44 +02:00
Nikolas Garofil
ce8d124ce6 Merge branch 'master' of ssh://git.omp.am/home/omp/git/conky 2009-07-24 11:45:33 +02:00
Nikolas Garofil
44ca4647b8 bugfix 2009-07-24 11:44:17 +02:00
Cesare Tirabassi
0081fcab60 Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-07-24 11:32:02 +02:00
Cesare Tirabassi
f5c8964510 Revert "the why recasting when you can simply declare it commit ..." 
This reverts commit b2a30ea478.
 2009-07-24 11:30:27 +02:00
Nikolas Garofil
3322b2a9a9 Merge branch 'master' of ssh://git.omp.am/home/omp/git/conky 2009-07-24 11:12:35 +02:00
Nikolas Garofil
feedc8e7fa Fix unclosed file in get_battery_stuff 2009-07-24 11:09:00 +02:00
Cesare Tirabassi
b2a30ea478 the why recasting when you can simply declare it commit ... 2009-07-23 23:58:27 +02:00
Cesare Tirabassi
d349fe56b2 Changed xoap parsing method to xpath, in preparation to include forecast data 2009-07-23 23:46:23 +02:00
Nikolas Garofil
922db9af82 Fix CRIT_ERR everywhere 2009-07-23 20:30:53 +02:00
Nikolas Garofil
7e7a193b74 Fix memleak in $weather 2009-07-23 18:50:39 +02:00
Nikolas Garofil
03a0e8ae19 Fix bug SF ID 2814810 (wrong output with execp and execpi) 2009-07-23 13:33:49 +02:00
Nikolas Garofil
ccd51857c1 Let $tail and $head work with FIFOs again (was disabled by commit 41a7cffbe7 ), and fix memory bug when to_real_path is used in init_tailhead 2009-07-22 22:08:31 +02:00
Nikolas Garofil
41a7cffbe7 Fix bug with SF id 2808272 (tail and head) 
To fix this bug the tail and head code was rewritten, everything should still
work except tailing a FIFO instead of a normal head.
 2009-07-21 23:41:47 +02:00
Nikolas Garofil
caf0731565 Fix multiline stuff when build with X11 but output_to_x turned off. 
This commit reverts 725a3ba43a and fixes 5967d28511
 2009-07-21 12:39:09 +02:00
Brenden Matthews
e973de66cf Fix multiline stuff without X11. 2009-07-20 20:11:33 -06:00
Brenden Matthews
725a3ba43a Revert "Fix multiline strings displayed on 1 line when output to x is not used" 
This reverts commit 5967d28511.
 2009-07-20 17:46:22 -06:00
Nikolas Garofil
5967d28511 Fix multiline strings displayed on 1 line when output to x is not used 2009-07-21 00:47:02 +02:00
Brenden Matthews
9cda78c023 Clarify weather opts, refactor some weather code. 2009-07-20 13:17:44 -06:00
Brenden Matthews
f169e0e071 Actually apply c1cf1232e0. 2009-07-20 12:40:32 -06:00
Brenden Matthews
38015c6600 Document curl stuff better. 2009-07-20 12:04:53 -06:00
Nikos Ntarmos
739e47f9ec Teach freebsd.c to use the new CRIT_ERR format 
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-07-20 11:51:02 -06:00
Brenden Matthews
d3013bc410 Better argument handling for rss/curl/weather. 2009-07-20 09:59:31 -06:00
Nikolas Garofil
911eb4dc59 Include timed_thread.h when needed 2009-07-20 17:42:17 +02:00
Brenden Matthews
961274bc56 Oops, add missing files. 2009-07-20 09:21:33 -06:00
Brenden Matthews
f46eb1b6cb Fix minor memleak. 2009-07-20 00:40:23 -06:00
Brenden Matthews
64394fa7da Merge branch 'master' of git.omp.am:/home/omp/git/conky 
Conflicts:
	configure.ac.in
 2009-07-19 23:45:55 -06:00
Brenden Matthews
c05c157ead Overhauled RSS and weather, added $curl. 
I've taken the curl stuff out of weather and RSS and moved it into it's
own entity.  It should be easier to create curl-based objects if needed
now.
 2009-07-19 23:43:36 -06:00
Nikolas Garofil
09d41cb0b6 Fix building without X11 support broke after commits f1c47e5fc4 and 670e9a0eb1 2009-07-20 01:02:27 +02:00
Cesare Tirabassi
ba414d8ab8 fix out-of-tree builds 2009-07-20 00:43:41 +02:00
Brenden Matthews
80a71ea8bd Handle curl errors better (in weather and rss). 2009-07-19 15:28:19 -06:00
Brenden Matthews
e76f0c8587 Exit properly when forking. 2009-07-19 14:55:41 -06:00
Nikolas Garofil
4c41ec843a fix hardcoding 2009-07-19 21:56:07 +02:00
Nikolas Garofil
f1c47e5fc4 Fix instead of workaround for d0edfa7004 2009-07-19 21:28:14 +02:00
Brenden Matthews
4139ec096f Code formatting. 2009-07-19 12:12:42 -06:00
Brenden Matthews
90932b87e1 Update MPD elapsed/progress when stopped. 2009-07-19 11:59:20 -06:00
Cesare Tirabassi
50fd16d8bd add XOAP to list of compiled-in features, if enabled 2009-07-19 18:14:22 +02:00
Nikolas Garofil
d0edfa7004 Workaround for bug SF id 2819128 ($color inside $scroll disabled) 2009-07-19 00:36:05 +02:00
Brenden Matthews
1f1b846a2d Specials can be within multi-line objects. 2009-07-18 14:25:57 -06:00
Brenden Matthews
52ad674e51 Substitute newlines for everything but text. 2009-07-18 14:00:02 -06:00
Brenden Matthews
9c4ebef376 Oops, fix multiline stuff. 2009-07-18 13:49:52 -06:00
Brenden Matthews
670e9a0eb1 Multiline alignment support, some other misc stuff. 
Added support for X alignment across multi-lined objects (i.e., using
$alignr with $exec).  This may be a bit buggy.  Disabled OpenMP code
until GCC's implementation stabilizes (it's causing too many problems).
A couple Lua API changes.
 2009-07-18 13:46:36 -06:00
Cesare Tirabassi
5eef83d90a add compilation switch --enable-xoap to be able to use www.weather.com as a source of weather data 2009-07-18 21:29:27 +02:00
Cesare Tirabassi
3bb9b4b6b5 Revert "Undid last 3 commits, see rest of the comment for the reason:" 
First of all, we may or may not agree, but I consider reverting my
commits without prior discussion as a minimum unpolite.
I also don't like sites that oblige to register, thats the very reason
why I went with noaa first (and why I use that myself).
Howver, weather.com has a couple of nice features forom an user
viewpoint:

1. Their icons can be used to add a visual quality to the weather
report.
2. They have forecast data, which is not possible to have with noaa
(using TAF its an option, but its going to be very difficult and will
be limited in time and scope).

Nobody is obliged to do anything, people who likes noaa will use noaa,
people that don't mind register or wants the additional benefit will use
weather.com.
Having libxms2 as a dragged depends is, first of all, also with other
options (rss and eve), second we can try to work around it with an
additional compilation flag if really deemed necessary.

This reverts commit d872562942.
 2009-07-18 19:13:37 +02:00
Nikolas Garofil
d872562942 Undid last 3 commits, see rest of the comment for the reason: 
I am not really comfortable with adding support to the conky-code
for sites that only work when you register, that's more something
for in a script.
But the biggest reason I undid the commits is that it is now
impossible to compile conky with support for weather if you don't
have the xml libs installed. Users used to be able to compile with
support for weather (using the other site) without xml2.
If you really want to include this other site in the conky code
then split WEATHER in WEATHERCOM and WEATHERNOAA (altough my personal
opinion is that weather.com should only be supported with scripts)
 2009-07-18 16:22:43 +02:00
Cesare Tirabassi
7b38e810f2 add one missing ifdef to conditionally compile weather code 2009-07-18 16:07:17 +02:00
Cesare Tirabassi
806b840646 Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-07-18 16:00:49 +02:00
Cesare Tirabassi
46fc4a0564 Added www.weather.com as an additional source of weather data 2009-07-18 15:59:43 +02:00
Nikolas Garofil
4284490080 If nothing is read, n1 and n2 are not guaranteed to be 0 2009-07-18 11:37:15 +02:00
Nikolas Garofil
b94569b27b Fix reloading config without X11 2009-07-18 10:49:16 +02:00
Cesare Tirabassi
cba36f279b weather: use expf if --enable_math is given, otherwise use fast 3rd order approximation 2009-07-18 07:57:04 +02:00
Nikolas Garofil
85deafa500 Fix bug in $scroll (if there were only 2 args the 2nd couldn't be numerical) 2009-07-18 01:15:09 +02:00
Nikolas Garofil
e905c7d4f1 Fix building without X11 after commit 20d4c4370a 2009-07-17 18:37:46 +02:00
Nikolas Garofil
20d4c4370a Fix memleaks when reloading configuration and place same parts of main() and reload_config() in a seperate function 2009-07-17 18:01:41 +02:00
Nikolas Garofil
06de5573e8 Fix a lot of unimportant memleaks caused by a CRIT_ERR 2009-07-16 20:28:23 +02:00
Nikolas Garofil
63a8c677b3 Show warnings when not running in X and vars like desktop or monitor are used 2009-07-16 00:31:22 +02:00
Nikolas Garofil
4ec308ef12 Fix freeing unregistered mem when build when running without X 2009-07-15 23:55:22 +02:00
Nikolas Garofil
4c241bbf16 Fix all memleaks that are clearly visible, 
the default config should now run without memleaks, valgrind will
still report memleaks caused by the own_window-lines and the xft-lines
(in some cases) but those are caused by code that's not part of conky
 2009-07-15 16:33:18 +02:00
Nikolas Garofil
4addf71241 Make 16768a5ad4 C90-compliant 2009-07-14 19:17:14 +02:00
Cesare Tirabassi
1e5bc370e4 Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-07-14 18:47:00 +02:00
Cesare Tirabassi
16768a5ad4 Fix Property Change Events are passes also to OWN_WINDOW 2009-07-14 18:46:15 +02:00
Nikolas Garofil
cd92949e67 Fix strange effects on desktop caused by 4a14668772 2009-07-14 18:10:43 +02:00
Nikolas Garofil
cfa94a967b Fix memleaks introduced by g7bbde2b 2009-07-14 18:05:49 +02:00
Nikolas Garofil
d75fb18bf8 Fix building with strict compilers 2009-07-14 17:43:27 +02:00
Cesare Tirabassi
7bbde2be73 refactored desktop info code so that its only called on X property events; TO DO doesn't work with own_window 2009-07-14 16:57:51 +02:00
Nikolas Garofil
4a14668772 Fix a part of the memleaks in the X-related code, 
if you remove all lines above TEXT in defconfig.h,
then it should run without memleaks.
 2009-07-14 16:07:33 +02:00
Nikolas Garofil
c924bbe194 Fix memleaks when running with total_run_times 2009-07-14 12:47:24 +02:00
Brenden Matthews
0352b96f39 Use OBJ_THREAD() for weather, get rid of pointless return. 2009-07-13 16:11:21 -06:00
Brenden Matthews
73194dee89 Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-07-13 15:21:42 -06:00
Brenden Matthews
74c19cf8e4 Fix minor $weather memleak. 2009-07-13 15:21:25 -06:00
Cesare Tirabassi
602edfea15 Fix compilation with --disable-own-window (sf.net #2820716) 2009-07-13 23:19:32 +02:00
Nikolas Garofil
ed4d2ce0b1 Remove old,unused desktop-finding code 2009-07-13 17:32:33 +02:00
Nikolas Garofil
448476317f Fix minor memleak (fonts) 2009-07-13 15:04:57 +02:00
Cesare Tirabassi
6793959916 weather: removed constraints of 3 locations per uri from docs; corrected possible buffer overflow 2009-07-13 11:31:20 +02:00
Brenden Matthews
e1011c0d13 Refactor some of the new weather code, fix docs. 
I moved the weather stuff into its own thread, and also fixed up some
abuse of <simplelist> formatting throughout the docs.  Hopefully we can
keep things a little more uniform from now on.
 2009-07-12 23:31:57 -06:00
Brenden Matthews
ee64345f7c Fix Lua window table segfault. 2009-07-12 21:38:35 -06:00
Cesare Tirabassi
d3f1e6288c Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-07-12 21:18:28 +02:00
Nikolas Garofil
d6525d8790 Fix minor memleak 2009-07-12 20:01:31 +02:00
Nikolas Garofil
dc9e6436cc fix: segfault when TEXT is missing and build with x11 2009-07-12 19:42:10 +02:00
Cesare Tirabassi
14c30feaea Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-07-12 18:46:07 +02:00
Nikolas Garofil
ef13d53938 Fix: free_fonts tries sometimes tries to free much 
When build with support for x11 and ran with a empty config this resulted in a segfault.
 2009-07-12 18:29:50 +02:00
Nikolas Garofil
f6472cbbb5 Fix memleak when build with X11 but turned off in config 2009-07-12 14:52:58 +02:00
Nikolas Garofil
dc4087fcff Ugly workaround for segfaults when build with x11 and lua 2009-07-12 12:28:22 +02:00
Cesare Tirabassi
e11015528e free info.x11.desktop.name in free_text_objects() 2009-07-12 11:58:34 +02:00
Cesare Tirabassi
df17a54301 Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-07-12 11:45:33 +02:00
Nikolas Garofil
9e6fb9c2fe Fix building without math but with X11 2009-07-12 00:51:17 +02:00
Nikolas Garofil
f4fd1648e9 Fix: reading mem after its freed (current_config) 2009-07-12 00:05:53 +02:00
Cesare Tirabassi
88ae603cf5 Add support for $desktop, $desktop_number and $desktop_name 
Should work with any window manager that supports the
freedesktop.org Window Manager Specification
(see http://www.freedesktop.org/wiki/Specifications/wm-spec).

I have tested succesfully with openbox but some more testing with other
wm would be needed!

Support is built-in; if it is not acceptable to loose cpu cycles for this
at every conky refresh step than it should be conditionally compiled.
 2009-07-11 10:50:02 +02:00
Brenden Matthews
c494feafe1 Fix build errors with --disable-x11. 2009-07-10 10:07:39 -06:00
Brenden Matthews
2fa5f97edb A whole bunch of changes, mostly Lua related. 
Improved Lua API (lua_read_parse has been removed in favour of the
conky_parse() Lua API call).  The docs have been improved to reflect the
recent Lua API stuff as well.  Introduced new Lua Cairo and Imlib2
bindings, which require the tolua++ tool.  Fixed some other
miscellaneous doc related things.
 2009-07-09 22:47:41 -06:00
Nikolas Garofil
9065d1f422 Added support for swapfree 2009-07-09 20:12:52 +02:00
Nikolas Garofil
3659131192 Fix memleaks in CRIT_ERR 2009-07-08 15:51:08 +02:00
Brenden Matthews
def86cbb35 Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-07-07 17:34:02 -06:00
Brenden Matthews
ce19f6ee6a Handle thread death better (sf.net #2818145). 2009-07-07 17:33:38 -06:00
Nikolas Garofil
553528cb3d Fix memleak triggered by (and others) 2009-07-08 00:35:20 +02:00
Cesare Tirabassi
18ecbef1ae weather: lets make this compliant to prehistoric standards and at the same time working ... 2009-07-07 18:08:54 +02:00
Nikolas Garofil
ce9d9e3298 fix minor memleak when closing conky 2009-07-07 17:27:57 +02:00
Nikolas Garofil
1070c60768 Fixed mixed code and declarations (not allowed in some C standards, like C90) 2009-07-07 15:38:13 +02:00
Cesare Tirabassi
09e55bcc7e weather: add more weather modifiers 2009-07-07 12:08:24 +02:00
Cesare Tirabassi
15be8ad175 weather: corrected typo 2009-07-07 11:16:25 +02:00
Cesare Tirabassi
476296be5c weather: changed ifs in parsing routine to switch/case and corrected TCU handling 2009-07-07 11:13:07 +02:00
Cesare Tirabassi
1171ab38a5 Added support for $weather (experimental). 
Download, parse and display METAR data from the NWS.

icao must be a valid icao for the required location
(see for instance https://pilotweb.nas.faa.gov/qryhtml/icao/).

data_type must be one of the following:

last_update   : display the date (yyyy/mm/dd) and time (UTC)
	        of the last update.
temperature_C : display air temperature in degree Celsius.
temperature_F : display air temperature in degree Fahrenheit.
cloud_cover   : display the highest cloud cover status.
pressure      : display air pressure in millibar.
wind_speed    : display wind speed in km/hour.
wind_dir      : display wind direction.
wind_dir_DEG  : display compass wind direction.
humidity      : display relative humidity in %.
weather       : display any relevant weather event (rain, snow, etc.).

delay_in_minutes (optional, default 30) cannot be lower than 30 min.
Up to 3 stations can be simultaneously queried.

Use --enable-weather to compile this in.
 2009-07-07 00:20:12 +02:00
Brenden Matthews
ae6c02b0c8 Improve docs and parsing of graph args further. 2009-07-04 22:03:12 -06:00
Brenden Matthews
52c68c094c Improved parsing of graph arguments. 
Removed "log"|"normal" arguments in	favour of -l switch.
 2009-07-04 21:43:45 -06:00
Brenden Matthews
14d90ad7d1 Fix some minor leaky code. 2009-07-04 21:13:00 -06:00
Brenden Matthews
e2caa58923 Remove newline with comment only lines in TEXT. 2009-07-04 20:57:41 -06:00
Nils Schweinsberg
aaca08fc97 Fix escaping of comments in TEXT (sf.net #2813390, thanks Nils). 2009-07-02 00:36:37 -06:00
Nikolas Garofil
c84d9f8b26 Fix segfault in to_real_path 2009-06-29 16:04:00 +02:00
Phil Sutter
775d591a68 fix a few memleaks 2009-06-22 02:00:11 +02:00
Phil Sutter
867a842b3f fix for testing and debug on FreeBSD 
(Probably not complete yet)
 2009-06-22 02:00:11 +02:00
Phil Sutter
912ed67d03 fix conf_cookie for FreeBSD 
While here, also clean up the #ifdef mess created
around the whole config output support.
 2009-06-22 01:59:26 +02:00
Phil Sutter
c6a5a060cf Use the internal process list for if_running on Linux 2009-06-20 01:46:59 +02:00
Phil Sutter
98e6f41bfa exiting early on error definitely sanitises indenting here 2009-06-20 01:45:05 +02:00
Brenden Matthews
11d5286a40 Some Imlib2 refactoring. 2009-06-14 21:05:11 -06:00
Ole Christian Tvedt
5f31a052bb Fixed $if_mpd_playing. Would not return false after true. 
Previously, is_playing was never returned to 0 even if a song stopped
playing.

Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-06-14 20:07:59 -06:00
Ole Christian Tvedt
9048af353a Read MPD connection data from environment. 
Most MPD clients read the MPD_HOST and MPD_PORT
environment variables. Now, conky will too.

MPD_HOST can be either "hostname" or "password@hostname".

If a user specifies a host in the configuration, the
password set in MPD_HOST will be ignored. This is to
prevent the password from being sent to the wrong host.

In other words, if the host is specified in the conky
configuration, the password must be too (if there is
one).

Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-06-14 20:07:59 -06:00
Brenden Matthews
8b9f0b6851 Fixup some imlib2 flush interval stuff. 2009-06-14 16:12:12 -06:00
Brenden Matthews
b78650d29a Approach the per-image cache control another way. 2009-06-14 14:50:30 -06:00
Brenden Matthews
be75e07c9d Increase backwards compat for border_margin. 
Even though border_margin is deprecated, we'll set border_inner_margin
anyway so lazy people won't complain too much.
 2009-06-14 12:24:18 -06:00
Lassi Selander
b4f88ff319 Fix XMMS2 related crash (sf.net #2806111 and #2805310, thanks Lassi). 2009-06-14 12:03:50 -06:00
Ole Christian Tvedt
23e89dca08 Added own_window_type panel 
The panel type reserves space along the edge of the
screen, just like regular DE panels, taskbars and the
like. I have tested it for several hours now with lots
of different settings, and it seems to be working fine.

Works especially well with alignment top_??? or
bottom_??? and single-line output. Something like
this:

  own_window yes
  own_window_type panel

  alignment bottom_left
  maximum_width 1680
  minimum_size 1680
  gap_x 0
  gap_y 0

  stippled_borders 1
  draw_borders yes

  update_interval 3.0

  TEXT
  $nodename $tab $freq_g ${color grey}GHz$color $tab $memperc% ${color grey}RAM$color $tab $cpu% ${color grey}CPU $tab etc...etc...$alignr${time %F %R}

The line after TEXT is supposed to be on one line,
just in case some channel has messed it up.

Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-06-13 17:46:09 -06:00
Pavel Labath
9e976d9dc4 Better parsing of process names containing funky chars 2009-06-14 00:02:50 +02:00
Nikolas Garofil
f2176e6f54 Added support for blink 2009-06-13 23:52:41 +02:00
Brenden Matthews
9ce2c8ba07 Fix regression in Lua inotify stuff. 2009-06-13 13:40:27 -06:00
Ole Christian Tvedt
74340eaa9c A mainly cosmetic update. 
One useless "if (own_window)" check was removed. It is already inside another
identical check, and so will always evaluate to true.

One strncmp against the word "dock" was limited to four characters instead of
seven, for consistency with the other checks in the configuration parsing code.

Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-06-13 13:21:38 -06:00
Brenden Matthews
26d7547c1e Ugh...finish ca340d2643. 2009-06-13 13:19:40 -06:00
Brenden Matthews
ca340d2643 Fix inotify segfault (sf.net #2804886). 
Fix segfault due to bad checking of return values for inotify code
(sf.net #2804886)
 2009-06-13 13:17:18 -06:00
Nikolas Garofil
0108d14e68 Added 2009-06-13 01:48:54 +02:00
Pavel Labath
c0d1c313e9 Support for per-task I/O statistics - $top_io 
Basically, I just added three new process properties (io_read, io_write, io_perc - representing
the amount of I/O done by the process during the update interval) and $top_io, that sorts
processes based on io_perc.

Atm, it's completely #ifdef'd, since it requires kernel support. But that creates some wierd
looking syntax at some places, so it may be better to remove some ifdefs.  It even may be
possible to completely remove the ifdefs (ie. convert them to #ifdef linux) since the code will
compile just fine even if the kernel doesn't support I/O accounting. I'll leave that for someone
else to decide.
 2009-06-12 19:39:45 +02:00
Brenden Matthews
d114bcf58a Pixel perfect borders? 2009-06-11 22:35:19 -06:00
Brenden Matthews
e45db41a9d Added border_inner_margin and border_outer_margin. 
The border_margin config option is now deprecated.  This also resolves
an issue with weird border_margin values causing X to crash.
 2009-06-11 19:07:21 -06:00
Brenden Matthews
357901e6f2 Apply fs stat changes to fs_free_perc also (thanks Cesare). 2009-06-11 01:28:11 -06:00
Brenden Matthews
8e55089537 Revert b6e691e8ac, fix original problem. 2009-06-10 14:13:17 -06:00
Brenden Matthews
eb722bf30d Revert "Clarify fs free stats." 
This reverts commit da65a4bcf8.
 2009-06-10 14:09:34 -06:00
Brenden Matthews
1571bb1aad Fix regression with loading of non-Xft fonts (sf.net #2804324). 2009-06-10 14:08:39 -06:00
Brenden Matthews
da65a4bcf8 Clarify fs free stats. 2009-06-10 11:31:24 -06:00
Brenden Matthews
2469b9bea9 Fixed a regression with font rendering. 
Fixed a regression which causes fonts to not be rendered properly with
certain types of windows.
 2009-06-09 18:39:26 -06:00
Pavel Labath
6586d47813 Fix comments in TEXT section 
When a '#' is found in TEXT, section remove_comments() is called.  However, that function doesn't
limit itself to removing that particular comment. Instead, it greedily removes all "comments" from
the string, including those in ${color $abcdef} constructs. This, obviously, makes a mess of
things.

Solution: I added a new function, remove_comment(), that only removes the current comment.

Note: Atm, the function doesn't delete the newline, since that was the current behavior, and is
the natural one for the config section. However, for the TEXT it seems better to delete the \n
too, to avoid blank lines.

Note2: this also fixes the bug in strfold(), which incorectly copied the string, truncating it by
one byte.

Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-06-09 14:56:19 -06:00
Vincent Breitmoser
f3aa025872 Added format_human_readable option (sf.net #2803345, thanks Vincent). 2009-06-09 14:52:18 -06:00
Nikolas Garofil
c392152d3a extra displayoptions for battery_short and make sure full isn't handled as unknown 2009-06-08 21:15:18 +02:00
Nikos Ntarmos
3361596592 Include sys/param.h for FreeBSD 
We need this on FreeBSD as some of the constants used in ucred.h and
mount.h are defined there.

Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-06-08 13:05:20 -06:00
Nikos Ntarmos
d934d11e48 Check for deleted and not expunged emails 
This should fix bug #2802529. I've also revamped the X-Mozilla-Status
header handling which was kind of fishy till now.

Disclaimer: I have no mbox folders around to test it.

Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-06-08 13:05:20 -06:00
Nikolas Garofil
25e46ca341 Fix compiling without X11 2009-06-07 18:41:10 +02:00
Nikolas Garofil
b11f2466af need_to_load_fonts shouldn't be used without X11 2009-06-07 15:01:48 +02:00
Brenden Matthews
a9c8ae4145 Make device argument optional for most net stats. 
We can use DEFAULTNETDEV for more than just up/downspeedgraph.
 2009-06-06 22:56:29 -06:00
Brenden Matthews
00e559aef8 reload_config() fix, fix default net graph args. 
Closing the X display on reload caused some weirdness.  We can just
leave it open between reloads.  For whatever reason we had a macro
inside quotes for the default net device.
 2009-06-06 22:53:40 -06:00
Brenden Matthews
815dcf872d Update command opts docs. 2009-06-06 18:10:20 -06:00
Brenden Matthews
e5abd481cd Fix some stupidity in 33754ecebe. 2009-06-06 17:42:02 -06:00
Brenden Matthews
33754ecebe Let lua_graph behave more like other graphs. 
Changed llua_getinteger() to llua_getnumber() returning a double, so
that you can use floating point values in graphs etc.  Lua graph will
scale like other graphs (except execgraph) by default now, and you can
manually set a scale with the scale argument.
 2009-06-06 17:25:34 -06:00
Brenden Matthews
8e81d4e816 Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-06-06 12:20:13 -06:00
Pavel Labath
aa68da1ce6 Fix bug in template code. 
Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-06-06 12:18:46 -06:00
Nikolas Garofil
e4934b9f08 Let wireless_link_bar work in shell 2009-06-06 20:04:20 +02:00
Phil Sutter
3170b5191a Add a better fix for the $addr update problem 
In general, initialising last_update_time to next_update_time upon
startup doesn't make sense, as some update functions check for the
distance between the two being higher than a given epsilon to prevent
updating too often. This means that they won't trigger when
update_stuff() is being run for the first time.
 2009-06-06 18:18:31 +02:00
Phil Sutter
26ecdcf562 Revert "Bugfix: $addr and $addrs couldn't find ip's before the first update." 
This reverts commit 8ffb8b238d.

Surely, there is a better solution for that.
 2009-06-06 18:14:06 +02:00
Nikolas Garofil
8ffb8b238d Bugfix: $addr and $addrs couldn't find ip's before the first update. 
When you started "$updates|${addr eth0}" displayed "0|No Address",
after the first update you got something normal like "1|192.168.0.1"
This patch should fix this.
 2009-06-06 17:41:51 +02:00
Brenden Matthews
22733a0b4a Fix 6994caa18b. 
Introduced a regression with commit
6994caa18b by getting too happy with
OpenMP.
 2009-06-06 03:56:22 -06:00
Brenden Matthews
384a41cb6e Unbreak $combine. 2009-06-06 03:04:36 -06:00
Brenden Matthews
4b35fe5db4 s/IMLIB2/Imlib2/g 2009-06-06 02:32:51 -06:00
Brenden Matthews
8686ce0347 Apparently some people want more than 64 fonts. 2009-06-06 02:13:42 -06:00
Pavel Labath
c76b7f577d A couple more fixes for the template machinery 
Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-06-05 21:07:32 -06:00
Phil Sutter
20e4e19f83 add entropy_perc 
There is no rounding done, so e.g. 3.6% get 3%. But double casting and
calling round_to_int() is just too ugly.
 2009-06-04 22:51:25 +02:00
Phil Sutter
9d7fc86275 branch conditionally 
In case of undefined MATH there were empty branches which could lead to
decreased performance in totally unoptimised code. ;)
 2009-06-04 22:00:52 +02:00
Phil Sutter
8407d6b3c9 clarify what the preprocessor define does here 2009-06-04 21:46:45 +02:00
Nikolas Garofil
f3fd389ea0 read_tcp werkt maar moet nog stresstesten ondergaan 2009-06-04 19:39:18 +02:00
Nikolas Garofil
25a6fca902 Let entropy_bar, mpd_bar and apcupsd_loadbar work in shell 2009-06-04 18:45:58 +02:00
Brenden Matthews
ff57d1a85e Make Imlib2 global cache flushing actually work. 2009-06-03 13:31:16 -06:00
Brenden Matthews
904354f93b Added some better cache control options for Imlib2. 2009-06-03 13:24:53 -06:00
Nikolas Garofil
3656bced46 some c standards only allow initialisations at the start of a function 2009-06-03 19:17:45 +02:00
Nikolas Garofil
1085ec48cc Make it possible to compile without C99 2009-06-03 18:24:48 +02:00
Nikolas Garofil
5388fc33f6 Let lua_bar work in shell 2009-06-03 17:58:00 +02:00
Toni Spets
09ac517343 Merge OpenBSD patches from ports 2009-06-03 09:16:23 +03:00
Brenden Matthews
6994caa18b Minor refactoring for template code. 2009-06-02 14:51:46 -06:00
Pavel Labath
44ead331cd Make templates work with --disable-x11 
part of the template-handling code was in #ifdef X11, which caused conky to dump core when
compiled without x11.

as a bonus, I changed tests !=' ' to !isspace in two places as it was causing strange effects

Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-06-02 14:48:59 -06:00
Pavel Labath
8540821323 Fix core dumps while handling templates 
Conky would dump core when encountering templates with no parameters (both $templateX and
${templateX}) and when the line contained improperly nested {}.

Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-06-02 14:48:59 -06:00
Nikolas Garofil
abf515d901 Let execibar work in shell 2009-06-02 21:23:00 +02:00
Nikolas Garofil
7807d369ad Let battery_bar work in shell 2009-06-02 19:16:21 +02:00
Nikolas Garofil
1a9d0bdccd Let fs_bar and fs_bar_free work in shell 2009-06-01 16:09:34 +02:00
Nikolas Garofil
faa9086168 Let cpubar work in shell 2009-06-01 15:07:24 +02:00
Nikolas Garofil
0b8b6ccbae Let swapbar work in shell 2009-06-01 13:48:04 +02:00
Nikolas Garofil
bfc791f08b Let membar work in shell 2009-06-01 12:19:25 +02:00
Pavel Labath
0cb91fc3db Fix mouse click coordinates forwarded to the desktop window 
Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-05-31 22:18:12 -06:00
Nikolas Garofil
c3df719716 Created a function to call bars in shell (not only execbar) 
TODO use this function in other places
 2009-06-01 02:23:47 +02:00
Nikolas Garofil
c91e2ed38e Make sure that no X11 stuff is in the binary when not requested 2009-05-31 16:48:16 +02:00
Nikolas Garofil
01bc44aaf6 Don't check if output to X is requested when compiled without X 2009-05-31 16:29:12 +02:00
Brenden Matthews
295203dd4c Fix an issue with reload_config()? 2009-05-30 21:06:49 -06:00
Phil Sutter
533075032a Fix hostname resolution for mpd_host 
When getaddrinfo() returns an IPv6 address, connect() fails since mpd
does not support IPv6. Reproduced by adding the name "localhost" to the
"::1" entry in /etc/hosts.

Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-05-30 19:55:06 -06:00
Alexander Graf
0632693be7 Fix if_existing 
The if_existing with 2 arguments checking whether a file contains a specified
string did not work. This is fixed by this patch.

Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-05-30 16:21:42 -06:00
Brenden Matthews
39071d28e8 Be more graceful when handling IMAP problems. 2009-05-29 23:31:03 -06:00
Brenden Matthews
a31efb7fbe Fix default sizing for bars/graphs/gauges. 
Conflicts:

	src/conky.c
 2009-05-29 14:05:10 -06:00
Nikos Ntarmos
15eb14da5c conf_cookie is there for kFreeBSD as well 
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-05-29 10:57:17 -06:00
Nikos Ntarmos
8553e33763 Include bsd/bsd.h on kFreeBSD 
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-05-29 10:57:17 -06:00
Brenden Matthews
650c39b602 Compilation fixes, fix a segfault on shutdown. 
There was a missing 'break' in a switch/case statement which caused a
segfault on shutdown when using $if_up.
 2009-05-28 21:27:56 -06:00
Nikos Ntarmos
b51d06d178 Gracefully exit from main_loop() 
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-05-28 21:27:56 -06:00
Nikos Ntarmos
c03655bdfa free(3) previously strdup(3)'ed disp 
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-05-28 21:27:56 -06:00
Nikos Ntarmos
613a440fdc XDestroyRegion(3) only for non-NULL regions 
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-05-28 21:27:55 -06:00
Nikos Ntarmos
0c62f02553 XCloseDisplay(3) on re-init_X11() 
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-05-28 21:27:55 -06:00
Nikos Ntarmos
ff72a55691 No need to check for loop variable value 
If the first for-loop succedds in finding the desired interface, it will return to its caller. The only way we drop to the second for-loop is if nothing is found thus far, so no need to check for (i == 16).

Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-05-28 21:27:55 -06:00
Nikos Ntarmos
33451a9420 free(3) previously strndup(3)'ed diskio.dev 
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-05-28 21:27:55 -06:00
Nikos Ntarmos
dc2a8e1de8 free(3) strdup(3)'ed templates array 
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-05-28 21:27:55 -06:00
Nikos Ntarmos
a8300acbc5 free(3) previously strndup(3)'ed netstats.dev 
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-05-28 21:27:55 -06:00
Brenden Matthews
ed5dbc02bb Simplify graph gradient stuff. 2009-05-26 11:44:16 -06:00
Brenden Matthews
d65c33146e OMPtimize the gradient stuff. 2009-05-26 03:14:52 -06:00
Brenden Matthews
b0f37a63e8 Let the graphs be bigger. 2009-05-24 23:31:35 -06:00
Brenden Matthews
35a72f5a95 Fix some minor graph related bugs. 2009-05-24 23:16:36 -06:00
Brenden Matthews
d03df4a367 Allow ~/... and $HOME/... paths for more stuff. 2009-05-24 22:33:47 -06:00
Brenden Matthews
f1cc5cf032 Actually fix hddtemp parsing. 2009-05-24 18:15:05 -06:00
Brenden Matthews
1c4044252c Revert "Fix array bounds problem in hddtemp code." 
This reverts commit d0de7cbd63.
 2009-05-24 18:02:46 -06:00
Brenden Matthews
c92272a943 Fix segfault on reload. 2009-05-24 17:49:50 -06:00
Brenden Matthews
d0de7cbd63 Fix array bounds problem in hddtemp code. 2009-05-24 17:09:38 -06:00
Brenden Matthews
4a08fab0e6 Fix clipping, enable alpha for imlib2. 2009-05-24 16:52:48 -06:00
Brenden Matthews
4ec728fa42 Added fancy new 'temperature gradients' feature. 
See docs for more details on 'temperature gradients', which can be
turned on with the -t switch on graphs.  Also improved parsing of
options with $execgraph and $execigraph, but may cause some breakage.
 2009-05-24 15:53:32 -06:00
Brenden Matthews
ee9364522a Some OpenMP related fixes. 
Fixes for commit 9c331dce49.
 2009-05-24 14:02:33 -06:00
Brenden Matthews
19ca4c071a Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-05-24 13:48:10 -06:00
Brenden Matthews
4bfd545d2f Clip out imlib2 buffer properly. 2009-05-24 13:47:44 -06:00
Joe Myre
7b7d038035 Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-05-24 14:24:07 -05:00
Brenden Matthews
06044bf7e5 Try and fix weirdness with hwmon/i2c/platform options. 2009-05-24 13:07:27 -06:00
Joe Myre
9c331dce49 omped it up 2009-05-24 10:41:35 -05:00
Brenden Matthews
bf2d9de16a Add OpenMP to list of compiled in features (for -v). 2009-05-23 21:18:06 -06:00
Nikos Ntarmos
45e403f553 Allow src/apcupsd.c to compile cleanly on FreeBSD. 
Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-05-23 21:08:32 -06:00
Nikos Ntarmos
12d0d1477f Integrate FreeBSD diskio support. 
This diff moves Linux-specific parts of diskio.c into linux.c and uses
the remaining diskio functions to correctly implement this functionality
for FreeBSD. It also hooks diskio.c to the FreeBSD build.

Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-05-23 21:08:32 -06:00
Nikos Ntarmos
0880c1722d Remove unused variables and rearrange includes. 
Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-05-23 21:08:31 -06:00
Nikos Ntarmos
38d4030e65 conf_cookie valid only for Linux. 
Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-05-23 21:08:31 -06:00
Brenden Matthews
396494d4a0 Fixed parsing of $hwmon? 2009-05-23 21:01:59 -06:00
Brenden Matthews
c9951a3bac Better checking for cases when inotify doesn't work. 2009-05-22 12:48:46 -06:00
Brenden Matthews
0dc7041e6f Fix other parsing bug with hwmon. 2009-05-22 12:30:09 -06:00
Brenden Matthews
1779ef3efd Fix (possibly overkill) hwmon parsing bug. 2009-05-22 12:29:41 -06:00
Brenden Matthews
7f0929d03c Fix imlib2 cache setting. 2009-05-22 11:23:05 -06:00
Brenden Matthews
445fde109c Fix backwards width/height args for image drawing. 2009-05-22 01:39:38 -06:00
Brenden Matthews
3ad217e447 Use original image size when not specified. 2009-05-22 01:18:07 -06:00
Brenden Matthews
b6dea2fce6 Oops, null pointer. 2009-05-20 11:53:43 -06:00
Brenden Matthews
a25e030036 Oh yeah, make sure it compiles without inotify. 
Also removed BSD licensing stuff that pertains to old torsmo code.
 2009-05-19 22:56:33 -06:00
Brenden Matthews
75d1a054be Add message to show the Lua script was reloaded. 2009-05-19 22:51:50 -06:00
Brenden Matthews
011e52650b Added inotify support for reloading Lua scripts automagically. 2009-05-19 22:49:42 -06:00
Brenden Matthews
dd5fbeb41b Improve reload_config() window destruction/creation. 2009-05-19 21:34:43 -06:00
Brenden Matthews
baaba76678 Handle inotify stuff a bit better. 2009-05-19 20:35:02 -06:00
Brenden Matthews
0d3726d352 Oops, remove printf(). 2009-05-19 20:23:44 -06:00
Brenden Matthews
ba0eb5d85d Inotify support. 
Added inotify support to reload the config when modified automatically
on systems that support it
 2009-05-19 17:14:34 -06:00
Brenden Matthews
e05fc3ba38 Don't need a prev ptr in this list. 2009-05-18 15:49:40 -06:00
Filipe Ferreira
5552f4135e Patch to fix rounding error with CPU values. 2009-05-17 23:30:10 -06:00
Brenden Matthews
6477962dc9 Added support for rending images by way of IMLIB2. 2009-05-17 23:11:22 -06:00
Brenden Matthews
ddcc8ceb70 Merge branch 'master' into imlib2 
Conflicts:
	extras/nano/conky.nanorc
	extras/vim/syntax/conkyrc.vim
 2009-05-17 22:11:40 -06:00
Brenden Matthews
6abbbd50f0 Merge branch 'lua' 
Conflicts:
	src/specials.c
 2009-05-17 22:00:44 -06:00
Brenden Matthews
e7bf480d48 Fix null pointer boog in $top stuff. 2009-05-17 21:59:05 -06:00
Brenden Matthews
694b736f64 Merge branch 'master' into lua 2009-05-17 20:58:13 -06:00
Nikolas Garofil
914af765e4 execbar can now be used in the shell even when compiled with x11 support 2009-05-17 13:38:51 +02:00
Brenden Matthews
353f0b6ad7 More work on imlib2 stuff. 
Seems to be some rendering corruption which I'm not sure the reason for,
but other than that I think it works okay.
 2009-05-16 23:47:02 -06:00
Brenden Matthews
1dc7731f6d Merge branch 'master' into imlib2 2009-05-16 22:24:45 -06:00
Brenden Matthews
41e46ffe41 Oops, remove debug printf(). 2009-05-16 22:24:22 -06:00
Brenden Matthews
d26b946b7b Merge branch 'master' into imlib2 2009-05-16 18:37:11 -06:00
Brenden Matthews
72d15db78a Merge branch 'master' into lua 2009-05-16 18:37:04 -06:00
Brenden Matthews
344fa8498d Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-05-16 18:28:19 -06:00
Brenden Matthews
d642a3f659 Fixed comment stuff for real this time? 2009-05-16 18:28:04 -06:00
Nikolas Garofil
94d75cc494 add missing var 2009-05-17 01:33:43 +02:00
Brenden Matthews
f2a69f37ad Merge branch 'master' into lua 2009-05-16 17:08:50 -06:00
Brenden Matthews
debf4ec597 Remove unused var. 2009-05-16 17:08:37 -06:00
Brenden Matthews
dd606eb5ae Merge branch 'master' of git.omp.am:/home/omp/git/conky into lua 
Conflicts:
	src/specials.c
 2009-05-16 17:05:30 -06:00
Brenden Matthews
b661dbf5a7 More lua stuff. 2009-05-16 17:04:26 -06:00
Nikolas Garofil
dae78fb875 Execbar can now also be used on the shell 2009-05-17 00:37:22 +02:00
Brenden Matthews
69718f5b75 Oh my, parse lua output. 2009-05-16 15:06:29 -06:00
Brenden Matthews
72d2aad026 Merge branch 'master' into lua 2009-05-16 14:55:24 -06:00
Brenden Matthews
0e21a804ee Couple minor lua changes. 2009-05-16 14:55:05 -06:00
Toni Spets
453908953f Moved the Lua function calling to it's own function 2009-05-16 20:57:43 +03:00
Toni Spets
da5704fd74 Specifically ask for an integer from Lua for percentage 2009-05-16 20:37:53 +03:00
Nikolas Garofil
3762c5cb10 Use a builtin config without X11-support when compiled without it 
also, make sure X isn't initialised when compiled without x11-support
 2009-05-16 15:57:01 +02:00
Nikolas Garofil
2c35099b82 Bugfix: Segfault when starting with no configfile. 2009-05-16 13:14:45 +02:00
Toni Spets
66ba6e36c9 * Fix leaks 
* Fix HUP behaviour - scripts are now reloaded on HUP
* Remove unneccessary calls to llua_close()
 2009-05-15 23:35:18 +03:00
Toni Spets
b5934e5f69 Remove new lines from ERR messages 2009-05-15 23:01:08 +03:00
Toni Spets
90c9ac2723 Fix old copyright year 
Change all fprintf's to ERR()
 2009-05-15 21:48:11 +03:00
Toni Spets
a64e9f8950 Lua scripting support, initial commit 2009-05-15 21:08:51 +03:00
Brenden Matthews
b4ca1d146f Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-05-13 12:29:09 -06:00
Brenden Matthews
9e79881b5f Fix remove_comments()? 2009-05-13 12:28:53 -06:00
Nikolas Garofil
4db2119a2b Bugfix: segfault with wrong config 
Altough the following configuration is wrong, it should only produce a error
about a missing $endif but instead it also produced a segmentation fault:

TEXT
$if_gw$gw_ip$else
 2009-05-13 20:25:14 +02:00
Brenden Matthews
1b94e22b5c Merge branch 'master' into imlib2 2009-05-12 18:07:20 -06:00
Brenden Matthews
4910d33524 Fix comment removal stuff so that it doesn't break $color. 2009-05-12 18:05:51 -06:00
Brenden Matthews
18b174e967 Merge branch 'master' into imlib2 
Conflicts:
	src/Makefile.am
 2009-05-12 17:52:49 -06:00
Nikolas Garofil
e0b2f75433 Don't check if_gw twice 2009-05-12 20:25:40 +02:00
Phil Sutter
580043075e relying on the return value of scanf when using %n is bad 2009-05-12 00:49:40 +02:00
Phil Sutter
5d69d0378f fix human readable precision calculation 
This bug was quite hard to trigger (happens only with values 9.995-9.999
and 99.95-99.99), but I made it. ;)
 2009-05-12 00:49:40 +02:00
Phil Sutter
322d77942a hwmon: add args for value precalculation 2009-05-12 00:49:40 +02:00
Phil Sutter
ae7996bdd1 fix hwmon for 2.6.29, simplify code a bit 2009-05-12 00:49:40 +02:00
Nikolas Garofil
a01f968677 Bugfix: if_gw only outputs if another gw var is in the if block (sf id 2784627) 2009-05-11 19:47:24 +02:00
Nikolas Garofil
ae1b6c50e6 Remove even more x11-stuff with --disable-x11 2009-05-11 18:37:12 +02:00
Jaromir Smrcek
22601ff864 APC UPS fixes. 2009-05-10 13:37:04 -06:00
Nikolas Garofil
829201517e no x11-stuff for apcupsd when disabled 2009-05-10 21:18:20 +02:00
Brenden Matthews
8cb0027f45 Various fixes. 
Added missing apcupsd.[hc], added apcupsd_loadgauge, fixed compilation
errors, updated docs & syntax stuff.
 2009-05-10 13:11:09 -06:00
Jaromir Smrcek
cf2c61b588 Added support for APC UPS daemon monitoring. 2009-05-10 12:58:06 -06:00
Brenden Matthews
d224810235 Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-05-10 11:52:32 -06:00
Lassi Selander
1399b4483f Fix for previous xmms2 patch. 2009-05-10 11:44:57 -06:00
Nikolas Garofil
c53813a49f no gauges, bars, ... when compiled without X11 2009-05-10 14:14:21 +02:00
Nikolas Garofil
09ad5ce3f1 optimize previous commit (thanks Plague) 2009-05-10 13:44:13 +02:00
Nikolas Garofil
f7568b0753 strcpy shouldn't be used for overlapping strings 2009-05-10 13:14:54 +02:00
Nikolas Garofil
2afe66ed01 Bugfix: removing comments worked only partially 
All lines behind a comment line were also removed, comments should also be able
to start in the middle of line, \# shouldn't be replaced if it's in a comment
 2009-05-10 12:48:22 +02:00
Brenden Matthews
197c4d5bc3 Update docs, remove deprecated code. 2009-05-09 23:30:42 -06:00
Brenden Matthews
80aaadb48f Merge branch 'master' into imlib2 2009-05-09 21:14:39 -06:00
Brenden Matthews
24f97c45c6 Allow the use of '#' for comments within text area (can be escaped with '\#'. 
Also refactored some code relating to the config file loading (since
there was some duplication of code).
 2009-05-09 20:10:55 -06:00
Brenden Matthews
9dc5411681 Fix backwards mail stuff. 2009-05-09 19:20:05 -06:00
Brenden Matthews
db06b5f953 Fix build errors. 2009-05-09 11:20:04 -06:00
Nikolas Garofil
10495ed282 Bugfix: vars related to graphics produced wrong output when not running in X 2009-05-09 14:06:58 +02:00
Brenden Matthews
a45c8c9da4 Add missing source files (genius here). 2009-05-08 14:42:34 -06:00
Brenden Matthews
f7c793a514 Merge branch 'master' into imlib2 2009-05-08 14:38:55 -06:00
Nikolas Garofil
9153318329 Only include disp when needed 2009-05-08 16:04:16 +02:00
Nikolas Garofil
bd99fe5d81 Bugfix: run update_uname also without X11 2009-05-08 14:57:19 +02:00
Brenden Matthews
fdadbbf98e Added top_name_width config option. 2009-05-07 17:49:32 -06:00
Brenden Matthews
a1fc53be97 Merge branch 'master' into imlib2 2009-05-07 12:49:13 -06:00
Nikolas Garofil
c1e47013ef Bugfix: sometimes segfaults with cpubar 2009-05-07 18:44:45 +02:00
Brenden Matthews
31ed5ba178 Some work on imlib2 stuff. 2009-05-05 21:45:05 -06:00
Brenden Matthews
76dedfd563 Merge branch 'master' into imlib2 2009-05-05 17:44:12 -06:00
Brenden Matthews
af55c4afb1 Use a reduction here. 2009-05-05 17:43:45 -06:00
Brenden Matthews
8fbb3a9cfe Merge branch 'master' into imlib2 2009-05-05 17:36:38 -06:00
Brenden Matthews
fde096c435 Added some completely pointless OpenMP optimizations(?) 2009-05-05 17:36:12 -06:00
Brenden Matthews
d6e5a6491f Merge branch 'master' into imlib2 2009-05-04 13:22:51 -06:00
Brenden Matthews
eb2b7a4f30 Removed bits about BSD license. 2009-05-04 13:20:42 -06:00
Brenden Matthews
1b24763df1 Add copyright/license stuff to sony.[ch]. 2009-05-04 13:19:44 -06:00
Brenden Matthews
0d31ff0f4f Missing files, fix last commit. 
Added sony.[ch] stuff, as well as the important change from commit
3dd1738fb9
 2009-05-04 13:15:46 -06:00
Brenden Matthews
f6fe653401 Revert "Combine can now use other chars to seperate vars (used to be only space)" 
This reverts commit 3dd1738fb9.
 2009-05-04 13:13:51 -06:00
Nikolas Garofil
3dd1738fb9 Combine can now use other chars to seperate vars (used to be only space) 
Also undid the last change because sony.h was not included, feel free to submit
it again if you include this file and other sourcefiles needed (there is also
no definition of get_sony_fanspeed). If sony systems already have this file and
a definition of this function, please update the configure file so that support
for this is disabled by default and can be enabled by sony owners.
 2009-05-04 12:58:52 +02:00
Yeon-Hyeong Yang
f8a6a4035c Added Sony VAIO fanspeed info (thanks Yeon-Hyeong). 
Also removed the README and man page from the repo, as they don't really
need to be there and just cause conflicts.
 2009-05-03 21:23:59 -06:00
Brenden Matthews
a98a927116 Merge branch 'master' into imlib2 
Conflicts:
	configure.ac.in
	src/conky.c
 2009-05-01 23:29:21 -06:00
Brenden Matthews
27fff0d9cb Fixed $texeci regression. 2009-05-01 23:05:06 -06:00
Yeon-Hyeong Yang
68ea7a7859 Added diskio_avg_samples patch (thanks Yeon-Hyeong) 2009-05-01 17:03:59 -06:00
Brenden Matthews
e8e6d1c819 Few misc doc related things. 
Added the (incomplete) check_docs.py, to 'synchronize' the docs with the
code, as well as vim/nano syntax stuff.

Removed some unused OBJ_* stuff from text_objects.h, and updated docs
with some missing things.  Also removed a couple deprecated objects
which were still documented.
 2009-05-01 16:53:50 -06:00
Nikolas Garofil
e05e9ece8e Added the combine variable 2009-04-30 21:05:59 +02:00
Jérôme Plût
ff9154216b Make ALSA mixers available on Linux, and added $if_mixer_mute. 2009-04-28 10:56:49 -06:00
Brenden Matthews
2dfc0ee6b4 Fix minor environment variable bug. 2009-04-28 10:54:43 -06:00
Brenden Matthews
d1b6548c55 Minor for for mail args parsing. 2009-04-28 10:19:28 -06:00
Lassi Selander
49aee8707a Various XMMS2 updates (thanks Lassi). 2009-04-28 10:02:24 -06:00
Phil Sutter
fb8ccd7a05 fix for enviroment variable expansion 2009-04-26 22:49:46 +02:00
Nikolas Garofil
6bc19d0396 Workaround for the problem that $goto only moves the first rss-item by making 
it possible to specify the number of spaces you want in front of each rss-item
 2009-04-19 00:42:01 +02:00
Nikolas Garofil
86b91db305 Bugfix: compilation without X11 broke after latest patches 2009-04-13 14:42:31 +02:00
Brenden Matthews
506f6ecc3b Special default & gauge fixes. 2009-04-09 20:10:08 -06:00
Brenden Matthews
38ee788da4 Added default_bar/graph/gauge_size config options (thanks wire64 for the idea) 2009-04-09 16:00:40 -06:00
Or Cohen
b6e691e8ac Minor fix for fs_used_perc, fs_free and fs_free_perc 2009-04-09 15:34:12 -06:00
Brenden Matthews
ea34b2c5e5 Fix xmms2 related compilation error? 2009-04-09 15:33:50 -06:00
Phil Sutter
7001e95186 be consistent when parsing args of cpu objects 
The inconsistent naming of the cpu parameter in the docs led me to this,
so I also simplified parsing by introducing the macro SCAN_CPU(). Note
that this introduces a syntactical change to the config: the cpuN
argument now has to be passed at first position to $cpugraph.
 2009-04-04 01:25:33 +02:00
Nikos Ntarmos
f91faa64b8 Add X11 display argument/conf entry (FR #2474243) 
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-04-01 16:46:16 -06:00
Brenden Matthews
a301b24a8e Fix compile error. 2009-03-29 23:35:42 -06:00
Brenden Matthews
f05829ad9a Update copyright stuff, fix conky.conf weirdness. 2009-03-29 22:55:51 -06:00
Brenden Matthews
0d4f9499eb Fixed bug in template stuff. 2009-03-29 20:27:38 -06:00
Nikos Ntarmos
99a496b3ea Adding if_up support for FreeBSD. 
Moved interface_up(...) from linux.{c.h} to common.{c,h} and taught it
to check for ENXIO as well to make it work on FreeBSD.

Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
 2009-03-29 01:25:57 +01:00
Nikos Ntarmos
50bac84006 Bringing FreeBSD up to date with latest commits 
Several things were broken after the switch to 1.7-rc branches. This
diff fixes all compilations issues and updates some functions that were
left empty previously.

Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
 2009-03-29 01:25:51 +01:00
Nikos Ntarmos
15bd2ca5ec sysfs is a Linux-only feature. 
Moving sysfs-related functions and defs out of common.h and into
linux.h, as sysfs exists only on Linux, and updating openbsd.c,
netbsd.c, and freebsd.c accordingly.

Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
 2009-03-29 01:25:48 +01:00
Nikos Ntarmos
b3a91362de Extra includes to fix compiling on FreeBSD 
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
 2009-03-29 01:25:43 +01:00
Nikos Ntarmos
b1da4bfdaa Fix a typo and teach linux code to use data 
Typo: __LINUX__ was used in a conditional code block, while the rest of
      the code uses __linux__

data: free_text_objects(...) #define's 'data' to be 'obj->data' to make
	  the code more compact. The linux-specific parts of the code still
	  used obj->data, which should expand to obj->obj->data, which is
	  wrong.

Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
 2009-03-29 01:25:33 +01:00
Phil Sutter
2c3d57d841 add eval object, evaluating it's args 
This object makes use of the possibility to escape dollar signs in TEXT.
Take the following example in the conkyrc:
| $${downspeed ${gw_iface}}
will be evaluated to (assuming the gw_iface is eth0):
| ${downspeed eth0}
and finally interpreted to print the gateway interface's downspeed rate.
 2009-03-24 01:25:13 +01:00
Phil Sutter
12a40fd0a9 fix dollar escape in TEXT 
The idea found in the code is any double dollar ($$) is being treated as
explicit dollar sign ($) instead of the start of a text object
reference. Due to missing update of the 's' variable, when creating a
text object for the text following the second dollar sign, the later was
prepended, leading to a double dollar in the output.
 2009-03-24 00:40:22 +01:00
Phil Sutter
363bed34ac fix temporary printing of "(null)" for mpd vars 
To minimise the chance of printing variables in an undefined state, call
free() as late as possible (i.e., right before strdup()'ing the new
value).
 2009-03-23 23:46:10 +01:00
Brenden Matthews
4c77eed1c3 Couple minor fixes. 
Make X11_initialise() work as it should, clarified IBM/Lenovo aka smapi
support in configure script.
 2009-03-19 13:42:21 -06:00
Brenden Matthews
5378d13cfb some imlib2 work 2009-03-18 22:02:25 -06:00
Brenden Matthews
d399a128c9 Make print_config() stuff match configure. 2009-03-18 00:29:01 -06:00
Nikolas Garofil
37c460ed05 Fix: make sure compiling without X11 works 2009-03-17 18:36:46 +01:00
Brenden Matthews
293f6ad7e2 Fix possible mem leak with net stats. 2009-03-16 15:56:37 -06:00
Nikolas Garofil
2d524ce450 Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-03-16 21:21:11 +01:00
Nikolas Garofil
a074cb972a No limits for environment variables 
Use dynamic allocated memory for skey and svalue,
allocate the length of value so that there are no limits,
but don't use the %a gnu extension to maintain compatibility
 2009-03-16 21:14:22 +01:00
Brenden Matthews
613df97a6c Fix wacky net speed values on startup. 2009-03-16 14:14:18 -06:00
Brenden Matthews
c5e8f97619 Make gauge stuff look a little less funny. 2009-03-16 13:40:22 -06:00
Brenden Matthews
41b62122f5 Unbreak alias stuff. 
It was broken by commit 98c64d8b3e, I did
a lowsy job of checking the patch over.
 2009-03-16 13:22:22 -06:00
aner
98c64d8b3e I added Gagues to monitor variables 
Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-03-15 19:36:11 -06:00
Nikos Ntarmos
e275b05242 Disk i/o support on FreeBSD patch. 
Patch sf.net id #2657227 (thanks Nikos).
 2009-03-15 19:11:49 -06:00
Brenden Matthews
513752626e Fix compilation errors. 
I hope I didn't break the alias stuff.
 2009-03-15 18:35:45 -06:00
Nikolas Garofil
8bcc287958 fix problems with negative numbers (sf.net id #2644593) (thanks Zhoushen Huang) 2009-03-15 17:09:35 +01:00
Nikolas Garofil
9c0f04bc10 bugfix: segfault when nothing x11-related is mentioned before TEXT 2009-03-15 01:17:32 +01:00
Nikolas Garofil
d1baa243a8 Added alias configfile setting 
This patch is written by a anonymous author, see patch on sf.net
id #2663691 . I changed it a bit so that it can't overwrite
existing environment variables and updated the docs and syntaxfiles
 2009-03-07 15:12:09 +01:00
Phil Sutter
72e217fae2 fix padding of $processes 
Padding to 4 digits allows for max 9999 processes, which should really
be more than enough for systems running conky. ;)
 2009-03-01 21:12:16 +01:00
Phil Sutter
e6a9c02d11 fix padding in temp_print 2009-03-01 21:03:49 +01:00
Phil Sutter
ed42437dfc introduce percent_print() for printing percentages 2009-03-01 20:53:47 +01:00
Phil Sutter
44c5a10e04 rewrite human_readable() to minimise padding 
Also fix spaced_print(): when given a width of e.g. 3, output at least 3
characters, not 2 as it was before.
 2009-03-01 20:24:22 +01:00
Nikolas Garofil
09ac943a3a if_updatenr added 2009-03-01 15:10:01 +01:00
Phil Sutter
a9a59e5d28 move the custom defined memrchr to the right place 
And make it static, as tailhead.c is the only user of it.
 2009-02-25 00:23:56 +01:00
Phil Sutter
745eec145f fix 966a05a984 2009-02-23 23:28:12 +01:00
Phil Sutter
64af164666 add help text for --print-config option 
While here, fix also -C for builds with --disable-x11.
 2009-02-22 19:05:53 +01:00
Phil Sutter
e3ed9c62fb whitespace cleanup 2009-02-22 19:05:52 +01:00
Phil Sutter
2c44e6dccf remove x11 dependency of fonts 
Instead, we just ignore them. Less errors in output, little less
ifdef's.
 2009-02-22 19:04:42 +01:00
Phil Sutter
e28f79a133 split off specials from conky.c 
As a side effect, font and colour specific stuff got outsourced, too.
This is because the apropriate functions are used by conky.c as well as
specials.c, so they should be kept on their own.

In the long term I hope for positive impact on the X11 integration mess.
(Take e.g. the mass of X11 ifdefs cluttering conky.c.) Though this
commit contains no optimisations in this direction, just plain
outsourcing, to ensure minimised (intended: none) changes to conky's
interface behaviour.
 2009-02-22 19:04:33 +01:00
Phil Sutter
3cd87aadf8 fix for building with --disable-x11 2009-02-22 03:08:28 +01:00
Phil Sutter
90a3e8de80 merge tail and head into a single source file 
This allows having the same init-function for both objects. Code size
could be further reduced, as the print-functions share some code, too.
 2009-02-22 03:00:35 +01:00
Phil Sutter
20809f3198 put tail and head code into separate files 
In fact these two objects share a lot of code, so the bigger plan is to
merge them into a single file to share equal code.

This should not change anything to the code flow, besides making conky
startup a bit more robust due to less use of CRIT_ERR.
 2009-02-22 03:00:26 +01:00
Phil Sutter
77c59b260d merge ibm-acpi and smapi together 
Well, not really. I don't dare putting it all together into a single
source file, as that would just not make sense. Instead, this patch
eliminates the --enable-smapi configure option and all related checks,
replacing them with the equivalents from --enable-ibm.
 2009-02-22 02:58:42 +01:00
Phil Sutter
d500f1005a outsource ibm-acpi stuff into it's own source file 
Despite this is actually not much code and could stay inside linux.c as
well, this makes sense as I want to combine smapi and ibm-acpi
functionality. Virtually every user of a notebook made by IBM/Lenovo
will want both, so this should be a feature not a bug.

Besides making the ibm-acpi objects being built optionally, this should
not change anything to the code flow.
 2009-02-22 02:58:29 +01:00
Phil Sutter
4161f90c6f rewrite linux diskio code 
Instead of using a hardcoded maximum number of slots for
stats of different disks, use a linked list. Also since the algorithm to
update each device's counters is the same for updating the totals, share
equal code, which in my eyes not only saves a bunch of LoC, but also
drastically increases readability.
 2009-02-22 02:57:11 +01:00
Phil Sutter
a619cb3e3c fix potential segfault 
The segfault can be triggered by using any diskio object with a
non-existent device, as prepare_diskio_stat() then returns 0 and the
call to obj->data.diskio->current in conky.c:4050 pulls the trigger.

In fact, it's not a problem when the device doesn't exist, as
update_diskio() simply won't fill in any values. So skip the check and
upon device node appearance everything goes it's normal way.

While there, also eliminate double readout of the last line of
/proc/diskstats: after the last line has been read, FEOF is not yet set.
BUT fgets() will return NULL when trying to read the next line. So
better check for fgets()'s return value instead of using feof().

Also strncmp() is useless here, since we really want to compare the full
paths. Besides, text_buffer_size also should be big enough to not make a
difference here.
 2009-02-22 02:55:22 +01:00
Phil Sutter
65c27816c4 fix coding style of the last few patches 
Also, note that free() does not zero the passed pointer. So conditional
freeing always needs to look like this:
| if (var) {
|     free(var);
|     var = 0;
| }
 2009-02-22 02:54:44 +01:00
Brenden Matthews
f92978c5e5 No space between number and units please. 2009-02-17 22:50:43 -07:00
Sattvik
482dd1b82f Null mpd variables should have an empty string patch sf.net id #2564747. 2009-02-17 22:42:08 -07:00
Tamim Khan
d1180b4729 XMMS2 fix and refactoring patch sf.net id #2579357 (thanks Tamim). 2009-02-17 22:29:42 -07:00
Nicolas Sierro
cf77d3f1f9 Extended support for local Maildir patch sf.net id #2561323 (thanks Nicolas). 2009-02-17 22:26:15 -07:00
Martin Tůma
f7aeae2c01 Fix shown battery status patch. 
Fix shown battery status when the battery is not charging any more but is not full charged patch sf.net id #2556056 (thanks Martin).
 2009-02-17 22:19:25 -07:00
Alexander Monakov
24ddc9665e Fix nvidia memory frequency reading patch sf.net id #2493134. 2009-02-17 22:10:15 -07:00
Alexander Monakov
966a05a984 Fix diskio_read/write patch sf.net id #2493084 (thanks Alexander). 2009-02-17 22:04:38 -07:00
Kim Holviala
27bb931e41 Patch by Kim Holviala sf.net id #2484548. 
* change the height of execbar and execibar to be the same as other
		bars have by default (6 pixels)
		* treat mixer values as percentages as they're usually 0-100 (switch
		to spaced_print() with pad_percents)
		* change temp_print() from snprintf() to spaced_print()
		* remove decimals from temp_print() as none of the current sources can
		supply values smaller than 1 degree (C or F, doesn't matter)
		* add a space between number and the unit in human_readable()
		* fix number printing in human_readable()
		* network $upspeed and $downspeed now use human_readable()
 2009-02-17 22:00:23 -07:00
Swoög
b516e19440 Patch to add $battery_short variable. 2009-02-17 21:49:45 -07:00
Brenden Matthews
b4cd98868f Misc compilation fixes. 2009-02-17 21:45:06 -07:00
Nikolas Garofil
1085d2b27e out_to_x can now be turned off 2009-02-15 18:58:03 +01:00
Nikolas Garofil
65bae86ca7 append_file output method 2009-02-12 22:45:18 +01:00
Nikolas Garofil
3a11f1469f overwrite_file output method 2009-02-12 22:35:00 +01:00
Nikolas Garofil
4c25a9680e Added output_to_stderr 2009-02-10 09:43:20 +01:00
Brenden Matthews
c3003dc1a3 Fix my last 'fix'. 2009-02-09 12:36:10 -07:00
Brenden Matthews
850f7dfbc1 Fix warning on older versions of gcc. 2009-02-08 10:29:49 -07:00
Brenden Matthews
5b9d47c039 Couple fixes for the top_time stuff. 2009-02-08 10:13:54 -07:00
Alexander Graf
9da5648d2a better combine top, top_mem and top_time handlers 2009-02-08 17:19:10 +01:00
Alexander Graf
e6c9ff751c Also free process list when ${top_time} is used 2009-02-08 16:16:12 +01:00
Alexander Graf
1ac4104e0b top.c: Allow heavier optimization 
This makes it possible for the compiler to do better optimizations by
adding "static" to functions which do not need to be exported.

Since some of them (e.g. the compare_*() functions) are called very
often, this may decrease conky's need of resources a bit.
 2009-02-08 16:13:45 +01:00
Alexander Graf
04623066d7 Don't do unneeded sp_acopy() calls 2009-02-08 16:05:42 +01:00
Alexander Graf
9c679bf33f Add ${top_time} sorting processes by CPU time 2009-02-07 15:01:50 +01:00
mipas
cd49afbd19 Build fix patch 
This patch fixes build errors on some platforms due to missing includes.
 2008-12-22 20:59:42 -07:00
Phil Sutter
c54b96fb24 simplify declaration of ifblock objects 
Like OBJ_THREAD, OBJ_IF automatically calls obj_be_ifblock_if() when the
object matches.
 2008-12-22 19:43:12 +01:00
Phil Sutter
dd31cc77eb use a global struct moc_s 
Since there is no choice of which moc player to get information from,
all moc objects' data source can be identical. Also hide some internal
data (the thread e.g.). Since from now on there can only be one moc
thread (not highlander ;), we don't need to treat the thread object
specially.

While here, fix indenting.
 2008-12-22 19:36:24 +01:00
Phil Sutter
2f3fb23ff7 separate parsing and interpreting text objects for certain objects 
All objects parsing text into objects formerly parsed and evaluated
their arguments each update interval. This does only make sense when the
parsed text could change between updates, which is the case for execp
and execpi objects, but none of the others. So have them parse the text
when creating them, so each update interval only the output has to be
re-extracted.

In fact, this should give a performance boost when using any of the
affected objects, as parsing the input text is quite expensive since
we're evaluating templates.
 2008-12-22 18:36:44 +01:00
Phil Sutter
2de1840b39 move and add function prototypes to src/conky.c 2008-12-22 17:55:21 +01:00
Phil Sutter
da7bc63996 do not use a global ifblock stack 
Using a global ifblock stack for all parsed ifblock objects causes
problems when doing sub-parsing in objects taking other objects as
parameters, because the possibly non-empty stack at startup leads to
false alarm when checking for stack emptiness after parsing the objects.

Use a void ** as the object to pass around, so callers don't need to
know struct ifblock_stack_obj.
 2008-12-22 17:49:38 +01:00
Phil Sutter
05624868e3 treat mpd opjects as non-threaded 
In fact, they are. But we don't want to treat them as those, because
the rewrite made the only situation when threaded objects matter
uncritical, i.e. when an object calls calling parse_conky_vars().
 2008-12-20 16:17:22 +01:00
Phil Sutter
b31af01d91 add if_match object comparing strings, floats and ints 
In general, argument types should match, but for combined long and
double usage the long is being converted to double before evaluation.

A few examples:
${if_match ${cpu} < 30}
${if_match "asdf" != "qwer"}
${if_match 0.5 < 0.50001}
${if_match 49.999 < 50}
 2008-12-20 16:14:57 +01:00
Phil Sutter
1a35a68bca fix segfault for diskiograph 
The crux is to split args between those for scan_graph() on one hand and
prepare_diskio_stat() on the other hand. To make the code working with
minimal changes, move the yet optional devicename to the end.

General note on graphs:
- for all graphs there exist the optional arguments for scan_graph()
  which come first and are optional (intended duplicate)
- all other args are object specific, and may be optional as well
 2008-12-18 15:18:53 +01:00
Phil Sutter
757983ab56 internal rewrite of mpd support 
Handle mpd internal information inside mpd.c. Use a refcounter to check
if the mpd-information can be freed (maybe useless). Remove the now
useless "full" flag of free_text_objects.
 2008-12-18 13:40:21 +01:00
Brenden Matthews
35a2d09c5f Merge branch 'master' of git://nwl.cc/~n0-1/conky 2008-12-17 17:03:33 -07:00
Phil Sutter
f85c1ea5a6 Make gateway objects also detect routes with missing RTF_GATEWAY flag 
This was a bug, not a feature. From the FreeBSD manpage rtentry(9):

| Vt struct sockaddr *rt_gateway;
|
| The "target" of the route, which can either represent a destination in
| its own right (some protocols will put a link-layer address here), or
| some intermediate stop on the way to that destination (if the
| RTF_GATEWAY flag is set).

So for a default route with "dest" and "mask" both zero, either
RTF_GATEWAY is present, or "gate" is zero.
 2008-12-17 02:37:07 +01:00
Brenden Matthews
479a06508f Possible fix for minor IMAP idle bug. 2008-12-15 21:55:48 -07:00
Itai Zukerman
bb817b2cf7 Patch to allow escaping newlines in the config. 2008-12-15 21:17:56 -07:00
Brenden Matthews
621bad14f8 Merge branch 'master' of git://nwl.cc/~n0-1/conky 2008-12-15 21:01:58 -07:00
Phil Sutter
d321573c2d simplify human_readable 
The only change of behaviour occurs when adjusting the unit of positive
values. For some reason 1000LL was used, which has now been replaced by
1024LL. Usage of abs() and MAX() might be OS dependent, but it should
not be too hard to implement them by hand if they're missing somewhere.
 2008-12-16 03:21:30 +01:00
Phil Sutter
d744f9bfbb make use_spacer an enum 
It was a static int before, holding the (already defined) enum's value,
which doesn't make sense. Also it's used only inside conky.c. Since
enums can't be assigned other values than what are defined, we can skip
checking for illegal spacer value at each invocation of spaced_print,
and then also drop the function name argument, which apparently didn't
make sense at all, because use_spacer is a global option.
 2008-12-16 02:56:26 +01:00
Phil Sutter
0720a4fbc9 simplify diskio stats 
Instead of splitting information, use diskio_stats[0] in diskio.c for
the totals. This saves a few branches, and frees some data from struct
information.
 2008-12-16 02:32:30 +01:00
Brenden Matthews
2b128b7a7c Merge branch 'master' of git://nwl.cc/~n0-1/conky 2008-12-15 18:00:05 -07:00
Phil Sutter
9a85812e06 here comes the big header include rewrite 
Some statics are now defined by configure.ac.in, conky.h got a lot
smaller, which I see as a positive sign.

This patch should not change any functionality, just change what's
defined where. Some features I did/could not test are probably broken,
also compiling for any other OS surely won't complete now. Though I
think fixing these problems is as easy as including some missing
headers.

I've done compile checks with the following configure options:
./configure --enable-eve --enable-rss --enable-smapi
	--enable-wlan --enable-debug --enable-testing

So what needs to be tested is:
- audacious
- BMPx
- xmms2
- nvidia
 2008-12-15 23:12:33 +01:00
Phil Sutter
ec174bedf2 outsource ifblock and text_object helpers 2008-12-15 23:03:39 +01:00
Phil Sutter
ca66a26813 put text_object stuff into an own header 
For now this is only the object type enum and struct text_object, but it
will do to prepare further outsourcing from both conky.c and conky.h.
 2008-12-15 23:03:39 +01:00
Phil Sutter
fb4b8fd005 organise text objects in a linked list 
In fact, this eases code a lot. Even the ifblock handling, which was the
biggest problem of the rewrite, could be cleaned up a lot.
 2008-12-15 23:03:39 +01:00
Phil Sutter
62a6c0cbac have a maximum width for all variable length mpd vars 
Thanks to FreakGuard (IRC) preparing this one.
 2008-12-15 19:40:54 +01:00
Phil Sutter
0f7ac0f5af simplify free_text_objects a bit 2008-12-15 19:40:45 +01:00
Phil Sutter
a98d6e06ac simplify if_existing evaluation 2008-12-15 19:40:37 +01:00
Brenden Matthews
60fc99ef71 Merge branch 'master' of git://nwl.cc/~n0-1/conky 
Conflicts:
	configure.ac.in
 2008-12-14 22:42:20 -07:00
Phil Sutter
334447308f enable DEV_NAME to handle symlinks 
Using a macro is not possible anymore, so have a function dev_name() do
the job. Functionality is the same as the old DEV_NAME, unless the
specified path is a symlink in which case it's being dereferenced first.

To save callers from having to free the returned string, a static local
buffer is used (effectively rendering the function non-reentrant).
 2008-12-14 17:53:31 +01:00
Phil Sutter
1ddb6a88b9 use the builtin config also as a default one 
This depends on fopencookie, which is linux-specific. For BSD, there is
a similar function called funopen, which can be used as a drop-in
replacement.
 2008-12-14 15:45:30 +01:00
Brenden Matthews
650be03fd4 Improve behaviour of $pb_battery. 2008-12-13 20:55:45 -07:00
Brenden Matthews
0a5942a94b Move imap/pop3 stuff into mail.c 2008-12-14 04:22:36 +01:00
Brenden Matthews
77506c0e80 Move imap/pop3 stuff into mail.c 2008-12-13 19:53:05 -07:00
Phil Sutter
5445c8890a fix disk_protect for linux-2.6.27 
The path for the sysfs attribute has changed. Also negative values show
disabled disk protect, so catch this when interpreting the file's
content.
 2008-12-14 02:51:50 +01:00
Phil Sutter
7a6ce89226 implement sample config printing support 
This patch makes Conky print a sample config when being called with the
'-C' flag.

A short test showed an increase of ~10kbytes of the conky binary's size.
 2008-12-12 15:38:01 +01:00
Phil Sutter
19a6e7c925 rewrite tcp-portmon hooks 
Global variables belonging to tcp-portmon are now separated from
conky.c, cleaning up struct information and struct text_object a bit.
 2008-12-11 15:28:21 +01:00
Phil Sutter
4b89c3b17d make semantics of custom strndup() comply with glibc 
From strdup(3):
| If s is longer than n, only n characters are copied, and a
| terminating null byte ('\0') is added.

So allocate at most n+1 bytes and make sure the last one is zero, as
strncpy() doesn't add it itself.

So in fact to allow a maximum space for string dup of 23, strndup() has
to be called like this:
| dup = strndup(src, 23 - 1);

FIXME: Find the critical points in code this change touches and make
sure the invocation there is correct.
 2008-12-11 15:28:21 +01:00
Phil Sutter
f96e77c91b rewrite template engine completely 
Two things that pissed me off about the old one:
* only limited support for nesting templates
* totally broken output when using conditionals inside a template

The later one was the hard one to fix. ;)
It requires to already have the full text substituted before the text
objects are being created from it. Generating only the contained objects
broke, because the conditionals got wrong offsets to jump to.

After that was fixed, full nesting support is realised by simply
repeating the replacement until no more template objects are found.
 2008-12-11 15:28:21 +01:00
Brenden Matthews
5a69344055 Fix call to timed_thread_test(). 2008-12-09 16:37:24 -07:00
Brenden Matthews
dc3ed8df13 Removing old svn keywords. 2008-12-09 16:35:49 -07:00
Brenden Matthews
5a5e7fd8e2 Fix broken cpu usage stuff (due to a previous commit). 2008-12-09 16:15:06 -07:00
Brenden Matthews
a40cfd9702 Add an option to timed_thread_test() to not wait for the interval period (so that IMAP IDLE works better) 2008-12-09 01:37:59 -07:00
Phil Sutter
bb079848b1 rewrite hddtemp 2008-12-08 16:01:15 +01:00
Phil Sutter
a92601f069 fix for renamed DEBUG2 macro (again) 2008-12-08 15:05:29 +01:00
Phil Sutter
92bdce5d1a set conky in dock mode to be withdrawn 
Withdrawn windows are those you get from applications supporting the
'-w' flag, like e.g. gkrellm or all those sweet WindowMaker dockapps
(wmcpu and Co.). In Fluxbox, these windows are drawn into the slit. Most
other window managers put them into their "taskbar", AFAIK.
This patch makes Conky act exactly the same if the following settings
are selected:

| own_window yes
| own_window_type dock
 2008-12-08 01:45:12 +01:00
Phil Sutter
f5259295cf make unit of all temperatures selectable 
This introduces a new configuration variable called "temperature_unit",
specifying the unit of all temperature sensors. To achieve this, each
object outputting a temperature has to call temp_print() like so:
| temp_print(p, p_max_size, <temp val as double>, <unit of val>);
to specify the input temperature unit, either one of the constants
TEMP_CELSIUS or TEMP_FAHRENHEIT.
 2008-12-08 01:45:12 +01:00
Phil Sutter
1a4e4b3b69 fix runtime debugging macros 
Sadly, configure --enable-debug defines the macro DEBUG which conflicts
with the level1 debugging output macro. Rename them to DBG() and DBG2().
 2008-12-08 01:42:19 +01:00
Brenden Matthews
e2c49531f3 Limit $battery_percent to 100 (bug 2145006) 2008-12-07 15:58:40 -07:00
Brenden Matthews
39ba74a590 Don't put unit with hddtemp values for consistency (bug 2133107) 2008-12-07 15:54:40 -07:00
Brenden Matthews
1fcbecf4af Fix broken $execbar (bug 2133709) 2008-12-07 15:49:04 -07:00
Brenden Matthews
5626eade7f Fix last 'fix' 2008-12-07 15:44:10 -07:00
Brenden Matthews
9345e2bb8f Allow more than 9 CPUs for CPU stats (bug 2155500) 2008-12-07 15:34:46 -07:00
Brenden Matthews
6fab949926 Removing $freq_dyn and $freq_dyn_g 
I have decided to remove $freq_dyn and $freq_dyn_g due to license issues
(see sf.net tracker bug #2166612)
 2008-12-07 15:15:57 -07:00
Brenden Matthews
112772e361 Add some more debug messages to imap/pop3 stuff, refactor some pop3 
code, add filename:lineno to DEBUG() macro.
 2008-12-07 01:08:27 -07:00
Erik Waling
51fe4fa419 Fetch volume through Audacious API (thanks Erik) 2008-12-07 00:38:06 -07:00
Cesare Tirabassi
b64203b547 Fix for buffer overflow with $execi (thanks Cesare) 2008-12-07 00:31:53 -07:00
Lassi Selander
20b2d2f464 Adds a variable if_xmms2_connected to hide objects when xmms2d is not 
running (thanks Lassi)
 2008-12-07 00:22:05 -07:00
Pavol Rusnak
e4e9cf4311 Fix for wrong usage of strncat (thanks Pavol) 2008-12-07 00:18:34 -07:00
Phil
d1b139f8e2 since DEV_NAME() is used when calling, this check is needless 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1274 7f574dfc-610e-0410-a909-a81674777703
 2008-12-06 19:10:27 +00:00
Phil
c4b98f0762 Add debugging output at runtime 
The new command line option '-D' ('--debug') increases debugging level by one.
For debugging output a user could be interested in, use the macros DEBUG() and
DEBUG2(). Functionality is equal to the ERR() macro. DEBUG2() prints stuff only
if debugging level is greater one, which means that '--debug' has been
specified more than once. This patch also includes usage of the macros for the
new template object (as debugging syntax errors in templates is one thing a
user potentially needs to do).


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1273 7f574dfc-610e-0410-a909-a81674777703
 2008-11-30 20:53:20 +00:00
Phil
ecb3004c0f improve template support 
* handle escaped characters in parameters to the template object, too
* add samples to the documentation
* do some code cleanup by outsourcing the string substitution into it's
  own function


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1271 7f574dfc-610e-0410-a909-a81674777703
 2008-11-29 13:02:42 +00:00
Phil
ce5eb880e7 add support for template objects 
Basically you can define a template like this:

| template0 \1:\n   ${fs_free \2} / ${fs_used \2}

and use it later like this:

| ${template0 root /}
| ${template0 boot /boot}

which is exactly the same as the following:

| root:
|    ${fs_free /} / ${fs_used /}
| boot:
|    ${fs_free /boot} / ${fs_used /boot}

hope you like it, I do already. :)


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1270 7f574dfc-610e-0410-a909-a81674777703
 2008-11-29 01:34:54 +00:00
Phil
820e0d24c4 fix my own fix 
The second parameter is optional, so have conky act accordingly. This time I
tested using either two or three params and it worked flawlessly.


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1269 7f574dfc-610e-0410-a909-a81674777703
 2008-11-04 23:25:28 +00:00
Phil
f44003e07c fix a potential segfault 
* happened when passing wrong arguments to ${scroll}, particularly with only
  one instead of the mandatory two unsigned ints
* as it's not clear whether %n will change the value returned by sscanf or not,
  use a solution that works in both situations (%n incrementing the return
  value or not)


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1268 7f574dfc-610e-0410-a909-a81674777703
 2008-11-04 21:42:48 +00:00
Brenden Matthews
4be537a020 * Added $if_mpd_playing patch (thanks tarpman) 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1267 7f574dfc-610e-0410-a909-a81674777703
 2008-10-08 11:44:27 +00:00
Brenden Matthews
1ab4b8ec51 * Applied OpenBSD patches 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1266 7f574dfc-610e-0410-a909-a81674777703
 2008-10-08 11:41:16 +00:00
Brenden Matthews
e5fd6f8027 add openbsd.h to EXTRA_DIST 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1264 7f574dfc-610e-0410-a909-a81674777703
 2008-10-01 18:12:02 +00:00
Brenden Matthews
bb74efed2e remove quality debugging code 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1263 7f574dfc-610e-0410-a909-a81674777703
 2008-09-29 01:38:57 +00:00
Brenden Matthews
7ea81e1913 add $mixer docs 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1262 7f574dfc-610e-0410-a909-a81674777703
 2008-09-29 01:37:33 +00:00
Brenden Matthews
c5fcc5c6f1 handle BYE from server when idling (IMAP stuff) 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1261 7f574dfc-610e-0410-a909-a81674777703
 2008-09-26 21:29:02 +00:00
Brenden Matthews
1849db04e1 respect IMAP IDLE timeout period 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1260 7f574dfc-610e-0410-a909-a81674777703
 2008-09-26 21:09:48 +00:00
Brenden Matthews
ae92753584 close socket before exiting thread 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1259 7f574dfc-610e-0410-a909-a81674777703
 2008-09-25 18:29:04 +00:00
Brenden Matthews
3115cd8389 improving IMAP IDLE support, more 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1258 7f574dfc-610e-0410-a909-a81674777703
 2008-09-25 04:01:47 +00:00
Brenden Matthews
e80ec4cc5f improving IMAP IDLE support 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1257 7f574dfc-610e-0410-a909-a81674777703
 2008-09-25 03:11:24 +00:00
Brenden Matthews
c15287e798 fix small bug in imap idle stuff 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1256 7f574dfc-610e-0410-a909-a81674777703
 2008-09-24 21:04:29 +00:00
Brenden Matthews
39270e951f add $Id$ to moc stuff 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1255 7f574dfc-610e-0410-a909-a81674777703
 2008-09-24 20:56:09 +00:00
Brenden Matthews
dfc4d44203 oops; forgot to add moc.[ch] 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1253 7f574dfc-610e-0410-a909-a81674777703
 2008-09-24 20:53:58 +00:00
Brenden Matthews
7de6c1d061 * Introduced (buggy) support for IMAP IDLE 
* Added support for MOC (the console audio player) (thanks henux)
* Added scroll step patch (thanks asto)


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1252 7f574dfc-610e-0410-a909-a81674777703
 2008-09-24 06:59:45 +00:00
Brenden Matthews
0c2c9dd038 * Added small patch to support negative values (such as negative disk capacity) (thanks hinokind) 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1251 7f574dfc-610e-0410-a909-a81674777703
 2008-09-12 05:03:38 +00:00
Brenden Matthews
6769495e10 * Improve Conky's overall interval timing 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1250 7f574dfc-610e-0410-a909-a81674777703
 2008-09-12 03:01:33 +00:00
Brenden Matthews
8bb6b479a8 * Improve timed_thread timing 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1249 7f574dfc-610e-0410-a909-a81674777703
 2008-09-11 22:27:19 +00:00
Brenden Matthews
0c59779528 maybe fix missing include bug (http://bugs.gentoo.org/show_bug.cgi?id=235233) 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1247 7f574dfc-610e-0410-a909-a81674777703
 2008-09-11 15:44:48 +00:00
Brenden Matthews
7996b9d05c oops, remove debug stuff 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1246 7f574dfc-610e-0410-a909-a81674777703
 2008-09-11 03:22:37 +00:00
Brenden Matthews
4ca31d2ce4 * Improved hddtemp support 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1245 7f574dfc-610e-0410-a909-a81674777703
 2008-09-11 03:21:39 +00:00
Brenden Matthews
068f6b5b09 * Fixed bug with freq_dyn on x86_64 (thanks Miroslav) 
* Fixed buffer overflow in update_net_stats() (thanks Miroslav)
* Small fix for nvidia mem freq (thanks Cezary)

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1244 7f574dfc-610e-0410-a909-a81674777703
 2008-09-08 04:48:13 +00:00
Phil
56ba0250ab fix error reporting for battery_* variables 
* reproduce with a config displaying stuff for BAT0 and BAT1
  while only BAT0 is installed: the call to get_battery_stuff()
  for the existent BAT0 will reset the static variable rep and
  the errors for BAT1 will be reported over and over again
* this fix is not perfect: if both batteries are missing, only
  the first errors will be reported; but better than flooding the
  terminal


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1243 7f574dfc-610e-0410-a909-a81674777703
 2008-09-01 23:46:48 +00:00
Phil
3adb16ea40 another indentation (and some whitespace) fixup 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1242 7f574dfc-610e-0410-a909-a81674777703
 2008-09-01 23:08:09 +00:00
Phil
36e34a3c8d enable max length argument for mpd_smart 
* this also fixes mpd_title for changing lengths, e.g.
  ${mpd_title 2} ${mpd_title 3} ${mpd_title 4}


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1241 7f574dfc-610e-0410-a909-a81674777703
 2008-09-01 22:30:54 +00:00
Phil
e873442ec5 fix indenting in construct_text_object() 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1240 7f574dfc-610e-0410-a909-a81674777703
 2008-09-01 22:05:24 +00:00
Brenden Matthews
740eca5cf2 * Fix compile error when MPD support not enabled 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1236 7f574dfc-610e-0410-a909-a81674777703
 2008-08-14 17:10:41 +00:00
Roman Bogorodskiy
6a5691ab70 We continue our good old tradition of breaking FreeBSD 
code right before the release. This time, somebody refactored
the code to use freebsd.h, but forgot to include
freebsd.h to EXTRA_DIST, so the resulting tarball was
missing it and non-buildable on FreeBSD, thank you, kind man,
for doing it, please keep up breaking FreeBSD port, it's a 
great pleasure for me to fix it all the time, and don't
even think to drop me email or ask me on IRC, I like
surprises very much.


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1235 7f574dfc-610e-0410-a909-a81674777703
 2008-08-07 06:07:50 +00:00
Brenden Matthews
6cbffa71ef remove hardcoded retry stuff; put -Werror back in (who the fk removed that?) 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1234 7f574dfc-610e-0410-a909-a81674777703
 2008-08-05 18:43:24 +00:00
Brenden Matthews
961b70b6e6 * Add option to specify number of retries for IMAP/POP3 stuff (via -r) 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1233 7f574dfc-610e-0410-a909-a81674777703
 2008-08-05 18:00:30 +00:00
Phil
d23271777d little simplification and improvement of $nvidia 
* check only the unique part of the argument
* print temperatures like all others (%.1f)
* do argument parsing in nvidia.c (so all specific stuff is at one place)
* little header cleanup


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1231 7f574dfc-610e-0410-a909-a81674777703
 2008-08-03 13:27:00 +00:00
Brenden Matthews
c5dbd0afa9 add missing xmms2.h to dist 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1229 7f574dfc-610e-0410-a909-a81674777703
 2008-07-30 02:03:42 +00:00
Brenden Matthews
1577667a70 s/kiB/KiB/g 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1227 7f574dfc-610e-0410-a909-a81674777703
 2008-07-20 02:05:11 +00:00
Brenden Matthews
b9bdafb0df improve last fix a bit 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1226 7f574dfc-610e-0410-a909-a81674777703
 2008-07-17 03:14:37 +00:00
Brenden Matthews
69ff93d0ea * Fixed bug with $if_empty and $mpd_* vars (sf.net #2008752) 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1225 7f574dfc-610e-0410-a909-a81674777703
 2008-07-17 02:38:04 +00:00
Brenden Matthews
ae4bd7cdf9 fix missing include 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1224 7f574dfc-610e-0410-a909-a81674777703
 2008-07-15 01:05:37 +00:00
Nikolas Garofil
23321c408d made defines of some literal values and defines to configure.ac.in 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1223 7f574dfc-610e-0410-a909-a81674777703
 2008-07-12 10:25:05 +00:00
Nikolas Garofil
8745d71edf Proper indenting for eve-code, made a define of the default netdev, and moved some defines to configure.ac.in 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1222 7f574dfc-610e-0410-a909-a81674777703
 2008-07-12 01:22:40 +00:00
Nikolas Garofil
47462b5d1e solve warnings 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1221 7f574dfc-610e-0410-a909-a81674777703
 2008-07-09 23:05:48 +00:00
Philip Kovacs
b58d412441 removed gnulib completely. use a simple getnameinfo function check for --enable-portmon. 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1218 7f574dfc-610e-0410-a909-a81674777703
 2008-07-07 20:09:37 +00:00
Nikolas Garofil
9094035f8e Fix bug in optional normal/log argument for graphs 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1217 7f574dfc-610e-0410-a909-a81674777703
 2008-07-06 13:04:29 +00:00
Nikolas Garofil
97de8557b2 Made log/normal argument for graphs optional 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1216 7f574dfc-610e-0410-a909-a81674777703
 2008-07-06 10:56:59 +00:00
Roman Bogorodskiy
67d66b03eb - Use u_int instead of unsigned long for storing 
vm related values returned by sysctl
- Minor style fix in preproccessor comments


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1215 7f574dfc-610e-0410-a909-a81674777703
 2008-07-06 09:25:28 +00:00
Philip Kovacs
a2775d30d1 --libtool version of gnulib installed 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1211 7f574dfc-610e-0410-a909-a81674777703
 2008-07-03 23:28:51 +00:00
Philip Kovacs
5619ce52ad adjust #includes 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1208 7f574dfc-610e-0410-a909-a81674777703
 2008-07-01 19:43:24 +00:00
Nikolas Garofil
fec88c0429 Compilation with --enable-testing works by removing stdio.h 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1207 7f574dfc-610e-0410-a909-a81674777703
 2008-07-01 17:33:21 +00:00
Philip Kovacs
c7c822426c latest gnulib sources 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1206 7f574dfc-610e-0410-a909-a81674777703
 2008-07-01 14:46:13 +00:00
Nikolas Garofil
72f416212f configure option for mathfunctions 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1204 7f574dfc-610e-0410-a909-a81674777703
 2008-07-01 11:13:40 +00:00
Philip Kovacs
5ce58e014e Add libgnu convenience lib, modules stdio and getaddrinfo. 
We now make no assumption about availability of functions
such as snprintf and getnameinfo.  If the target machine 
doesnt have them, libgnu provides them.



git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1203 7f574dfc-610e-0410-a909-a81674777703
 2008-07-01 01:26:02 +00:00
Philip Kovacs
003785e754 Remove recently added _POSIX_C_SOURCE 200112L as it conflicts 
with feature requirements for glibc when using snprintf.


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1200 7f574dfc-610e-0410-a909-a81674777703
 2008-06-30 00:56:01 +00:00
Nikolas Garofil
5884358016 Get rid of obsolete gethostbyaddr and getservbyport 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1199 7f574dfc-610e-0410-a909-a81674777703
 2008-06-29 09:26:15 +00:00
Brenden Matthews
35e1932ad1 fix missing entries in Makefile.am 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1198 7f574dfc-610e-0410-a909-a81674777703
 2008-06-29 00:27:09 +00:00
Brenden Matthews
896863e2d8 Added support for EVE-Online skill monitoring (thanks Asbjørn); fixed up/downspeedgraph segfault 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1197 7f574dfc-610e-0410-a909-a81674777703
 2008-06-28 20:14:04 +00:00
Brenden Matthews
66079c5585 Added sysfs AC adapter support patch (thanks Byron); Small compilation error fix 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1196 7f574dfc-610e-0410-a909-a81674777703
 2008-06-28 19:17:49 +00:00
Phil
7f09a767f0 (re)define FALSE and TRUE, non-existent on my system 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1195 7f574dfc-610e-0410-a909-a81674777703
 2008-06-25 21:06:54 +00:00
Phil
28478344ab two new smapi variables and a bit of documentation improvement 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1194 7f574dfc-610e-0410-a909-a81674777703
 2008-06-25 10:08:27 +00:00
Nikolas Garofil
312d3d6de8 Merge with conky1-extra, Changelog contains the changes 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1193 7f574dfc-610e-0410-a909-a81674777703
 2008-06-21 20:37:58 +00:00
Nikolas Garofil
c1c34ae443 'inline' removed from functions that are called from different files 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1187 7f574dfc-610e-0410-a909-a81674777703
 2008-06-21 14:18:44 +00:00
Kevin Lyles
54120a3d83 Re-arranged some if statements to reduce redundancy 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1185 7f574dfc-610e-0410-a909-a81674777703
 2008-06-21 09:25:37 +00:00
Kevin Lyles
02dad6a2cb Consolidated all barnum code into get_barnum 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1184 7f574dfc-610e-0410-a909-a81674777703
 2008-06-21 09:25:29 +00:00
Kevin Lyles
bca75f302c Consolidated all popen calls (and repeated surrounding code) into read_exec 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1183 7f574dfc-610e-0410-a909-a81674777703
 2008-06-21 09:25:22 +00:00
Kevin Lyles
415d927a0e Removed some redundancies between imap and pop3 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1182 7f574dfc-610e-0410-a909-a81674777703
 2008-06-21 09:25:16 +00:00
Kevin Lyles
9a6f79b0e2 Renamed all my_infos to the more-descriptive tmp_info 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1181 7f574dfc-610e-0410-a909-a81674777703
 2008-06-21 09:25:03 +00:00
Kevin Lyles
e7e874ac61 Renamed more global variables with global_ prefix 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1180 7f574dfc-610e-0410-a909-a81674777703
 2008-06-21 09:24:56 +00:00
Kevin Lyles
e528397a02 Replaced the global text_object array and count with a text_object_list 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1179 7f574dfc-610e-0410-a909-a81674777703
 2008-06-21 09:24:51 +00:00
Kevin Lyles
01ca7ad07a Added comments to a couple of non-obvious lines (to me, anyway) 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1178 7f574dfc-610e-0410-a909-a81674777703
 2008-06-21 09:24:39 +00:00
Kevin Lyles
d79958ac84 Split help output into a separate function 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1171 7f574dfc-610e-0410-a909-a81674777703
 2008-06-19 19:59:30 +00:00
Kevin Lyles
5a8b03fba7 Moved global diskio variables into info 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1170 7f574dfc-610e-0410-a909-a81674777703
 2008-06-19 19:58:07 +00:00
Kevin Lyles
2fd832f6b0 Refactored out some redundancy in the tab conversion code 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1169 7f574dfc-610e-0410-a909-a81674777703
 2008-06-19 19:57:12 +00:00
Kevin Lyles
6d4829ca83 Removed some redundancy in mpd_elapsed and mpd_length 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1168 7f574dfc-610e-0410-a909-a81674777703
 2008-06-19 19:56:30 +00:00
Kevin Lyles
9ffbf32b1d Changed addr to print "No Address" when there is no address 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1167 7f574dfc-610e-0410-a909-a81674777703
 2008-06-19 19:54:31 +00:00
Kevin Lyles
bb80900ca6 Refactored format_seconds and format_seconds_short 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1165 7f574dfc-610e-0410-a909-a81674777703
 2008-06-19 07:04:11 +00:00
Kevin Lyles
40f2fcfd7b Fixed compilation issues with --enable-testing 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1164 7f574dfc-610e-0410-a909-a81674777703
 2008-06-19 06:17:53 +00:00
Nikolas Garofil
2e2765393e magic nums to defines and don't check ut_name and ut_line length because it can't be larger then UT_NAMESIZE and UT_LINESIZE 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1162 7f574dfc-610e-0410-a909-a81674777703
 2008-06-17 20:44:06 +00:00
Nikolas Garofil
6472addc09 3 Bufferoverflows in a struct utmp 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1161 7f574dfc-610e-0410-a909-a81674777703
 2008-06-16 20:12:39 +00:00
Philip Kovacs
d036b5de5c move audacious defs into header 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1159 7f574dfc-610e-0410-a909-a81674777703
 2008-06-16 19:40:28 +00:00
Philip Kovacs
6bb956c6e0 restore audacious functionality broken by previous header spliting commits. 
headers are for interfaces and typedefs, not data.


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1157 7f574dfc-610e-0410-a909-a81674777703
 2008-06-15 20:17:37 +00:00
Kevin Lyles
c72a564cea Removed all trailing whitespace 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1156 7f574dfc-610e-0410-a909-a81674777703
 2008-06-15 18:38:33 +00:00
Roman Bogorodskiy
00b26c0834 More or less working on FreeBSD now. 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1155 7f574dfc-610e-0410-a909-a81674777703
 2008-06-15 07:08:52 +00:00
Kevin Lyles
610b0b628d Split conky.h into several smaller header files 
In order to do this correctly:
	Removed duplicate includes
	Fixed mpd functions to accept mpd_s instead of information
	Freed mpd.h of any need to include conky.h (mpd.c still includes it for the constants)



git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1154 7f574dfc-610e-0410-a909-a81674777703
 2008-06-14 18:41:12 +00:00
Kevin Lyles
59704d5e3e Moved struct process to top.h 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1153 7f574dfc-610e-0410-a909-a81674777703
 2008-06-14 05:32:46 +00:00
Nikolas Garofil
83bf37fe85 Bugfix: execgraph scale 0-0 instead of 0-100 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1149 7f574dfc-610e-0410-a909-a81674777703
 2008-06-08 20:39:07 +00:00
Nikolas Garofil
26bea66044 Bugfix: didn't work 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1143 7f574dfc-610e-0410-a909-a81674777703
 2008-06-08 11:16:51 +00:00
Nikolas Garofil
a306817910 Bugfix: same text multiple times caused by if-family 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1141 7f574dfc-610e-0410-a909-a81674777703
 2008-06-07 19:11:29 +00:00
Nikolas Garofil
538dbe4e91 Bugfix: DEV_NAME tried to read uninitialised mem 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1139 7f574dfc-610e-0410-a909-a81674777703
 2008-06-07 12:34:07 +00:00
Nikolas Garofil
b24e258165 small changes to let code compile with enable-testing 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1134 7f574dfc-610e-0410-a909-a81674777703
 2008-06-06 12:14:15 +00:00
Nikolas Garofil
3969388b4a Bugfix: Lines printed to STDOUT with out_to_console were printed twice 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1127 7f574dfc-610e-0410-a909-a81674777703
 2008-06-04 22:35:02 +00:00
Nikolas Garofil
a9624c80cc Bugfix: chars followed by backspace should not be displayed 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1126 7f574dfc-610e-0410-a909-a81674777703
 2008-06-04 08:51:15 +00:00
Nikolas Garofil
07269f678d Bugfix: gw_iface with a empty routingtable no longer causes a crash 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1124 7f574dfc-610e-0410-a909-a81674777703
 2008-06-04 08:09:49 +00:00
Brenden Matthews
8f8d5c1c8c * Added --quiet patch (thanks sceptik) 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1123 7f574dfc-610e-0410-a909-a81674777703
 2008-06-03 21:01:40 +00:00
Brenden Matthews
7ff7c1083c * Added NVIDIA Graficcard support patch (thanks meissna) 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1122 7f574dfc-610e-0410-a909-a81674777703
 2008-06-03 20:46:15 +00:00
Phil
bd6196c6b0 configurable if_up, may check for: 
* IFF_UP flag,
* IFF_UP and IFF_RUNNING flags or
* IFF_UP, IFF_RUNNING flags and assigned address


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1121 7f574dfc-610e-0410-a909-a81674777703
 2008-05-30 11:30:58 +00:00
Brenden Matthews
a7da3b17bc docs; small code simplification 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1119 7f574dfc-610e-0410-a909-a81674777703
 2008-05-06 22:41:28 +00:00
Brenden Matthews
c70e1ead9f updating docs, syntax highlighting, code formatting 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1118 7f574dfc-610e-0410-a909-a81674777703
 2008-05-06 21:44:23 +00:00
Roman Bogorodskiy
947dfb558d Small portion of FreeBSD fixes: 
- diskio.c is not needed for freebsd
- sync cpu freq related functions prototypes
- cleanup #indef's

It still doesn't compile on FreeBSD though.


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1117 7f574dfc-610e-0410-a909-a81674777703
 2008-05-03 12:30:05 +00:00
Brenden Matthews
fda6b66eb9 * own_window_type dock patch (thanks Morgan). 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1115 7f574dfc-610e-0410-a909-a81674777703
 2008-04-29 21:31:04 +00:00
Brenden Matthews
fcb1260a39 exclude reserved IPs with if_up 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1113 7f574dfc-610e-0410-a909-a81674777703
 2008-04-22 22:59:04 +00:00
Brenden Matthews
39a00f4cfa fixed hddtemp problems as well as some other misc things 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1112 7f574dfc-610e-0410-a909-a81674777703
 2008-04-22 22:54:22 +00:00
Brenden Matthews
5c01c5991e fixed crash on realloc due to use of strncpy 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1111 7f574dfc-610e-0410-a909-a81674777703
 2008-04-22 21:54:49 +00:00
Brenden Matthews
1dafa537d4 add missing math.h include 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1110 7f574dfc-610e-0410-a909-a81674777703
 2008-04-17 20:46:29 +00:00
Brenden Matthews
5c32bc6bc8 include stdarg.h for va_start/va_end 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1109 7f574dfc-610e-0410-a909-a81674777703
 2008-04-17 20:40:53 +00:00
Brenden Matthews
feca8d2fb5 add missing include 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1107 7f574dfc-610e-0410-a909-a81674777703
 2008-04-16 01:36:55 +00:00
Brenden Matthews
801cf11545 * Added patch for the following (thanks larsko): 
* New $loadgraph to show a graph of load averages,
* add "show_graph_scale" option to turn off/on the showing of the
current max value for the graph,
* minor code fixes,
* update nano and vim syntax highlighting stuff.

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1104 7f574dfc-610e-0410-a909-a81674777703
 2008-04-13 04:10:35 +00:00
Brenden Matthews
4d7ecc7951 * Getting rid of goto usage throughout code. 
* Fix bug due to usage of gethostbyname() in threads (which is not
	reentrant) by using gethostbyname_r() when available.
	* Added patch for battery_time problem on 2.6.24 (thanks wedge).
	* Added patch to fix broken xmms2 stuff (thanks sleipner).
	* Added patch to fix SIGHUP/SIGUSR1 segfault (thanks norsetto).
	* Added patch to improve $if_up (thanks Aseem).


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1103 7f574dfc-610e-0410-a909-a81674777703
 2008-04-10 22:45:45 +00:00
Brenden Matthews
77f8e9bba7 define our own strndup() when its not available (thanks to Pippijn for the idea) 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1101 7f574dfc-610e-0410-a909-a81674777703
 2008-04-02 19:46:09 +00:00
Brenden Matthews
a6a4a4c548 * Replacing strdup() with strndup() throughout 
(this is probably going to break a few things)

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1100 7f574dfc-610e-0410-a909-a81674777703
 2008-04-02 18:44:49 +00:00
Brenden Matthews
d46bcb0945 * Added patch to use mail_spool correctly (thanks Kapil) 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1099 7f574dfc-610e-0410-a909-a81674777703
 2008-04-02 18:29:08 +00:00
Brenden Matthews
fa94cac75f * Fixed segfault when configuration doesn't contain TEXT block (thanks 
Pippijn).

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1098 7f574dfc-610e-0410-a909-a81674777703
 2008-04-02 02:12:57 +00:00
Brenden Matthews
011f03b50d docs 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1097 7f574dfc-610e-0410-a909-a81674777703
 2008-04-01 21:37:49 +00:00
Brenden Matthews
c6c02f6cf9 capitalization consistency 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1096 7f574dfc-610e-0410-a909-a81674777703
 2008-04-01 06:10:58 +00:00
Brenden Matthews
798207efbf bump version; doc fixes 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1094 7f574dfc-610e-0410-a909-a81674777703
 2008-04-01 04:59:00 +00:00
Phil
d923325773 make specifying hdd names more flexible 
* the macro DEV_NAME() "removes" any leading "/dev/"
  if existing
* the only object that needs the full path is hddtemp,
  so add code there to add "/dev/" if necessary
  (can't be done via macro)
* attempt to fix also the hddtemp output, as the
  "degree"-sign seems to be inserted in utf-8 and
  printed in latin.
* hddtemp breaks the rules by inserting the unit
  itself, but as it could be either "C" or "F", this
  would lead to confusion otherwise


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1091 7f574dfc-610e-0410-a909-a81674777703
 2008-03-31 15:33:54 +00:00
Brenden Matthews
be2cd44e6d doc cleanup 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1090 7f574dfc-610e-0410-a909-a81674777703
 2008-03-31 04:56:39 +00:00
Brenden Matthews
bbdbf3b4e3 fix possible mem leak in prepare_diskio_stat, fix return value on failure 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1088 7f574dfc-610e-0410-a909-a81674777703
 2008-03-31 03:56:03 +00:00
Brenden Matthews
0ee3efdc0f make diskio accept devices starting with "/dev/" 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1087 7f574dfc-610e-0410-a909-a81674777703
 2008-03-31 03:51:29 +00:00
Brenden Matthews
c2c6a63f5a * Added mem_res and mem_vsize to $top. 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1084 7f574dfc-610e-0410-a909-a81674777703
 2008-03-30 07:04:25 +00:00
Brenden Matthews
ceedc66f8d more battery cleanup 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1083 7f574dfc-610e-0410-a909-a81674777703
 2008-03-30 04:02:53 +00:00
Brenden Matthews
fbb58187b5 add more checking in libmpdclient; make battery stuff look the same for sysfs and proc 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1082 7f574dfc-610e-0410-a909-a81674777703
 2008-03-30 03:26:55 +00:00
Brenden Matthews
675b9fac96 mpd fix take 2 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1081 7f574dfc-610e-0410-a909-a81674777703
 2008-03-30 02:29:12 +00:00
Brenden Matthews
3efefaf182 * Fixed bug in libmpdclient that caused file descriptors to be left open. 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1080 7f574dfc-610e-0410-a909-a81674777703
 2008-03-30 01:23:04 +00:00
Phil
00eb4ec9af some relocation of header includes 
* conky.h must come first, because it includes config.h
  which again defines _GNU_SOURCE, which is necessary
  for strdup() & Co.
* declaring cpu_separate in top.h makes no sense, as it
  includes conky.h which declares cpu_separate itself


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1078 7f574dfc-610e-0410-a909-a81674777703
 2008-03-29 12:44:29 +00:00
Phil
a8bb0d7052 fix typo 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1077 7f574dfc-610e-0410-a909-a81674777703
 2008-03-29 11:49:10 +00:00
Phil
2da63063d8 make use of __attribute__ 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1076 7f574dfc-610e-0410-a909-a81674777703
 2008-03-29 11:35:02 +00:00
Phil
5c4fee8d32 implement upwards path traversal to find fs type 
* yes, this is a feature and right now there is something
  like a feature freeze.
* BUT I tested this with: /, /tmp, /dev/mapper, /dev, //,
  /mnt/, /tmp/bla (the last one was non-existent, creating
  it during runtime and even mounting tmpfs on it led to
  expected results.


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1074 7f574dfc-610e-0410-a909-a81674777703
 2008-03-29 11:09:47 +00:00
Phil
9d4c7ed14e improve header style 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1073 7f574dfc-610e-0410-a909-a81674777703
 2008-03-29 10:13:25 +00:00
Phil
871689ef5b no 'a' modifier in C99 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1072 7f574dfc-610e-0410-a909-a81674777703
 2008-03-29 10:11:16 +00:00
Phil
d75301498a remove unused global mail_s instance 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1071 7f574dfc-610e-0410-a909-a81674777703
 2008-03-29 09:59:27 +00:00
Phil
ab63c2b024 rename all shadowing variables for -Wshadow 
* sadly intuitive names like "time" or "index" are already
  globally defined (functions in time.h and string.h)


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1070 7f574dfc-610e-0410-a909-a81674777703
 2008-03-29 09:58:09 +00:00
Phil
a16a96911a fix register_iconv 
* not sure but this looked completely wrong, as 'iconv'
  is a function.
* if iconv_cd is NULL, iconv_count is 0 and therefore
  realloc should do the same as malloc here.


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1069 7f574dfc-610e-0410-a909-a81674777703
 2008-03-29 07:24:25 +00:00
Phil
2913a71216 the big relocation patch 
* this moves all declarations to the beginning of their block
  to prevent mixed declarations and code


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1068 7f574dfc-610e-0410-a909-a81674777703
 2008-03-29 06:24:04 +00:00
Phil
4766f33456 don't use %Lu here, too 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1067 7f574dfc-610e-0410-a909-a81674777703
 2008-03-29 05:28:33 +00:00
Phil
42a62c0178 clear naming for the global text objects 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1066 7f574dfc-610e-0410-a909-a81674777703
 2008-03-29 05:23:45 +00:00
Phil
963bb6211c fix thread definitions 
* we code against interfaces (void *f(void *))
* casting function pointers to object pointers
  is a no-no says gcc


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1065 7f574dfc-610e-0410-a909-a81674777703
 2008-03-29 05:14:35 +00:00
Phil
fea715f038 declaring info in common.c is redundant 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1064 7f574dfc-610e-0410-a909-a81674777703
 2008-03-29 04:55:41 +00:00
Phil
36a18732ea ISO C99 forbids named variadic macros 
* also at least a single variadic argument must be
  specified, so this (absolutely perfect) code doesn't
  work
* this should fix it without changing the way the
  macros are to be called


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1063 7f574dfc-610e-0410-a909-a81674777703
 2008-03-29 04:47:10 +00:00
Brenden Matthews
cb653c0baa fix segfault 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1062 7f574dfc-610e-0410-a909-a81674777703
 2008-03-29 04:41:37 +00:00
Phil
d151828d23 make intense use of const keyword 
* accidential writes to const char * are being detected
  at compile time
* also clean up casting at some places


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1059 7f574dfc-610e-0410-a909-a81674777703
 2008-03-29 03:45:36 +00:00
Phil
418b3d62e0 match signedness and format when scanning into variables 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1058 7f574dfc-610e-0410-a909-a81674777703
 2008-03-29 03:01:48 +00:00
Phil
ac2dd1b34b use %llu instead of %Lu 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1057 7f574dfc-610e-0410-a909-a81674777703
 2008-03-29 02:28:38 +00:00
Phil
ef3f404cca fix potential segfault in get_ioscheduler(). 
returning a const char * instead of a char * will lead to
trouble if the string is then tried to be free()'d.


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1056 7f574dfc-610e-0410-a909-a81674777703
 2008-03-29 02:19:36 +00:00
Phil
e306a2c2e8 some linting on function definitions 
* instead of empty args "void" should always be specified.
  Using this, the compiler can detect incorrect function calls,
  like with update_stuff().
* No args seems to be interpreted as "unspecified args" by the
  compiler, as with update_mail_count(). So no checking for
  correctness of arguments when calling was done at all.
* This is not complete yet, as I still don't have any BSD for
  testing.


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1055 7f574dfc-610e-0410-a909-a81674777703
 2008-03-29 02:01:03 +00:00
Brenden Matthews
59c5fe4d11 oh yeah, battery_percent too 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1054 7f574dfc-610e-0410-a909-a81674777703
 2008-03-28 23:23:21 +00:00
Brenden Matthews
60985a41e7 * Fixed messed up percentages (fs_free_perc, fs_used_perc, mpd_percent). 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1053 7f574dfc-610e-0410-a909-a81674777703
 2008-03-28 23:17:01 +00:00
Brenden Matthews
8de47c132d adding missing include to smapi code 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1052 7f574dfc-610e-0410-a909-a81674777703
 2008-03-27 20:01:27 +00:00
Brenden Matthews
5c9e2dcbfc minor updates; changing package naming to meet http://devmanual.gentoo.org/ebuild-writing/file-format/index.html guidelines to begin doing prereleases 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1051 7f574dfc-610e-0410-a909-a81674777703
 2008-03-27 19:46:35 +00:00
Brenden Matthews
a56e669356 * Fixed battery_bar default size 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1049 7f574dfc-610e-0410-a909-a81674777703
 2008-03-24 21:44:50 +00:00
Phil
3966025939 fix indenting in linux.c 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1048 7f574dfc-610e-0410-a909-a81674777703
 2008-03-24 20:43:55 +00:00
Phil
749fb99edd two conky fixes 
* opened file for laptop_mode wasn't closed again
* hopefully fix reading interface addresses


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1047 7f574dfc-610e-0410-a909-a81674777703
 2008-03-24 20:35:20 +00:00
Phil
004d1cb7ba disk_protect - show queue protection state 
* disk protection needs a kernel patch and is useful in combination with hdaps


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1045 7f574dfc-610e-0410-a909-a81674777703
 2008-03-24 20:08:16 +00:00
Phil
d6953f4864 check validity of specified config 
* I accidentially used wrong args when testing conky -> segfault
* reproduce using 'conky -c /this/doesnt/exist'
* code should be portable, but untested on freebsd


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1044 7f574dfc-610e-0410-a909-a81674777703
 2008-03-24 19:24:55 +00:00
Brenden Matthews
c2c01423a8 * $battery_bar sysfs fix (thanks Marcus) 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1043 7f574dfc-610e-0410-a909-a81674777703
 2008-03-24 05:09:09 +00:00
Brenden Matthews
7613414296 * Fixed linux.c compilation problem due to (suspected) broken linux 
headers


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1042 7f574dfc-610e-0410-a909-a81674777703
 2008-03-24 03:38:28 +00:00
Brenden Matthews
902ff4ca5c fixed compilation with --disable-x11 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1041 7f574dfc-610e-0410-a909-a81674777703
 2008-03-23 17:26:41 +00:00
Phil
6a528f4e17 support displaying current nameservers 
* gathers information from /etc/resolv.conf
* included (still commented) code to prevent reading too often,
  as I'm not sure whether reading from a real FS (not /proc or /sys)
  could generate higher load in some cases -> comments please!


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1035 7f574dfc-610e-0410-a909-a81674777703
 2008-03-22 22:58:26 +00:00
Phil
bcbca8cb5b enable displaying the used ioscheduler for a given disk 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1034 7f574dfc-610e-0410-a909-a81674777703
 2008-03-22 21:10:43 +00:00
Phil
d2ed065fdd laptop_mode displays the current laptop mode 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1033 7f574dfc-610e-0410-a909-a81674777703
 2008-03-22 20:13:51 +00:00
Phil
929f1d5878 fixed another memleak issue in smapi.c 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1032 7f574dfc-610e-0410-a909-a81674777703
 2008-03-22 19:39:43 +00:00
Phil
8fd27c0026 make default gateway information accessible 
* gw_iface prints the interface having a default gateway
* gw_ip prints the gatway's ip
* if_gw jumps if no default gateway exists
* when there are multiple gateways, gw_iface and gw_ip
  only print "multiple" when they are different (allows
  basic debugging of ones networking setup)


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1031 7f574dfc-610e-0410-a909-a81674777703
 2008-03-22 19:06:09 +00:00
Phil
1fa2c2f809 bury dead code 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1030 7f574dfc-610e-0410-a909-a81674777703
 2008-03-22 18:21:46 +00:00
Phil
9b222e23e9 hopefully fix spaced_print 
* when printing only width bytes to buf, with
  width being set to pad_percents which itself
  is set by the user to zero, nothing is printed
* in the unlikely (but possible) case of width > size,
  this could lead to a segfault


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1029 7f574dfc-610e-0410-a909-a81674777703
 2008-03-22 18:18:25 +00:00
Phil
c1cb65ff6d smapi review 
* rewrote some functions in src/smapi.c for more
  simplicity and less malloc/free hell
* added object cleanup in free_text_objects(),
  valgrind said it was missing
* fixed indenting in construct_text_object()
* fixed use of spaced_print() in generate_text_internal()


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1028 7f574dfc-610e-0410-a909-a81674777703
 2008-03-22 18:08:47 +00:00
Brenden Matthews
94bb46b868 added $execpi, new ebuild, various other misc updates 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1027 7f574dfc-610e-0410-a909-a81674777703
 2008-03-22 06:10:54 +00:00
Brenden Matthews
ed92bf7f60 small fix for newly introduced bug in non-xft font loading--thanks Phil 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1025 7f574dfc-610e-0410-a909-a81674777703
 2008-03-21 23:39:38 +00:00
Brenden Matthews
14f23fb664 fixing warning 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1024 7f574dfc-610e-0410-a909-a81674777703
 2008-03-21 23:17:37 +00:00
Brenden Matthews
934c3a94e8 fixing up text_buffer_size stuff 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1021 7f574dfc-610e-0410-a909-a81674777703
 2008-03-20 21:28:19 +00:00
Brenden Matthews
4fe68fcc04 fixing problem where p_max_size becomes <1 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1020 7f574dfc-610e-0410-a909-a81674777703
 2008-03-20 20:56:13 +00:00
Brenden Matthews
46e129e7b1 * Added CRLF characters to POP3 and IMAP stuff (should play nicer with 
some servers now).
	* Added preliminary support for parsing the output of external commands
	(via $execp)


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1019 7f574dfc-610e-0410-a909-a81674777703
 2008-03-20 20:33:31 +00:00
Brenden Matthews
e48d5ce71e cleaning up 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1018 7f574dfc-610e-0410-a909-a81674777703
 2008-03-20 19:22:29 +00:00
Brenden Matthews
a76c4fb437 trying to fix more leaks 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1017 7f574dfc-610e-0410-a909-a81674777703
 2008-03-20 05:28:23 +00:00
Brenden Matthews
2698046591 2008-03-19 
* Fixed a number of small memory leaks.
	* Performed some minor profiling on Conky; introduced
	small_text_buffer_size and large_text_buffer_size config options instead
	of just text_buffer_size.
	* Fixed some minor bugs introduced by new patches.


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1014 7f574dfc-610e-0410-a909-a81674777703
 2008-03-19 22:28:23 +00:00
Brenden Matthews
4ad58c9d04 adding $Id$ 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1013 7f574dfc-610e-0410-a909-a81674777703
 2008-03-18 17:10:27 +00:00
Brenden Matthews
6928262418 adding missing files 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1012 7f574dfc-610e-0410-a909-a81674777703
 2008-03-18 17:09:47 +00:00
Brenden Matthews
b77da1255a updating new file props 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1011 7f574dfc-610e-0410-a909-a81674777703
 2008-03-18 17:08:22 +00:00
Brenden Matthews
a1452f5db4 * Applied 12 patches: 
1) sysfs battery support (for Linux >=2.6.24) (thanks Kapil)
        2) Improved audacious support patch (thanks Miroslav)
        3) tp_smapi support patch for IBM laptops (thanks Phil)
        4) user info patch (thanks Roland)
        5) added conky build info patch (thanks Roland)
        6) added if_up patch (thanks Phil)
        7) added reload on SIGHUP patch (thanks Jonas)
        8) added pad percentages patch (thanks Jonas)
        9) added fs_type patch (thanks Ryan)
        10) added xmms2 fixes patch (thanks Lassi)
        11) fix sysfs crash patch (thanks Phil)
        12) multiple ip patch ($addrs)
    * Added more alignment support (top_middle, bottom_middle, middle_left,
    and middle_right).


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1010 7f574dfc-610e-0410-a909-a81674777703
 2008-03-18 00:23:16 +00:00
Brenden Matthews
dd3b471f2d * Applied 2 patches: 
1) sysfs battery support (for Linux >=2.6.24) (thanks Kapil)
		2) Improved audacious support patch (thanks Miroslav)


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1009 7f574dfc-610e-0410-a909-a81674777703
 2008-03-17 22:27:20 +00:00
Roman Bogorodskiy
ae8c4198b8 Fix compilation. 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1008 7f574dfc-610e-0410-a909-a81674777703
 2008-02-24 16:35:18 +00:00
Kevin Lyles
3d26a4880e Reformatted all code 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1007 7f574dfc-610e-0410-a909-a81674777703
 2008-02-20 20:30:45 +00:00
Kevin Lyles
3cf1a29768 Refactored the top and top_mem handling to use a switch statement 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1006 7f574dfc-610e-0410-a909-a81674777703
 2008-02-20 10:01:31 +00:00
Kevin Lyles
9c3ae23a15 Fixed a few minor type issues 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1005 7f574dfc-610e-0410-a909-a81674777703
 2008-02-20 10:01:23 +00:00
Kevin Lyles
c96f5b1143 Removed unused macros and removed X11 options from the options string unless X11 is enabled 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1004 7f574dfc-610e-0410-a909-a81674777703
 2008-02-20 10:01:13 +00:00
Kevin Lyles
32c8f71eaa Added missing break statements and a missing freebsd kernel check 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1003 7f574dfc-610e-0410-a909-a81674777703
 2008-02-20 10:01:00 +00:00
Kevin Lyles
2a7a05342f Fixed a typo and re-added an accidentally removed line 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1002 7f574dfc-610e-0410-a909-a81674777703
 2008-02-20 10:00:45 +00:00
Kevin Lyles
9a44d8b1c8 Fixed broken compilation on FreeBSD 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1001 7f574dfc-610e-0410-a909-a81674777703
 2008-02-19 18:48:54 +00:00
Kevin Lyles
e7b786d79a Fixed round_to_int to handle negative numbers properly 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1000 7f574dfc-610e-0410-a909-a81674777703
 2008-02-19 03:33:12 +00:00
Kevin Lyles
e39a3ad8e4 Fixed some typos and restored a few accidentally removed lines in the recent diskio patch. 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@999 7f574dfc-610e-0410-a909-a81674777703
 2008-02-10 11:14:19 +00:00
Brenden Matthews
d8a95d90b0 adding license header 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@998 7f574dfc-610e-0410-a909-a81674777703
 2008-02-09 02:28:31 +00:00
Brenden Matthews
433b564e14 * Applied 2 patches: 
1) Add diskio for individual devices
        2) Improved output of units, added "short_units" option


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@996 7f574dfc-610e-0410-a909-a81674777703
 2008-02-09 02:21:06 +00:00
Brenden Matthews
35b4ed3aff 2008-01-05 
* Applied some more submitted patches:
        1) Add long forms of (most of) the command-line options.
        2) Added an option (top_cpu_separate) that emulates top's "separate
        cpus" option.  Processor usage is shown as a percentage of a
        single processor on your system, instead of a percentage
        of all processors combined.
        3) Adds a parameter (time) to top and top_mem that will show the
        cumulative CPU time of a process.
        4) Simplified integer rounding.
        5) Fixed the window width when a goto is used.
        6) Fixed the window width when an offset is used.
        (thanks Kevin Lyles).


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@994 7f574dfc-610e-0410-a909-a81674777703
 2008-01-06 01:35:14 +00:00
Philip Kovacs
651be79121 applied submitted patches for get_ibm_acpi_volume bug, 
realtime clock bug and kFreeBSD support (thanks KPH).


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@993 7f574dfc-610e-0410-a909-a81674777703
 2007-12-31 00:00:35 +00:00
Philip Kovacs
622c190e37 Conky 1.4.9 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@990 7f574dfc-610e-0410-a909-a81674777703
 2007-11-22 19:38:17 +00:00
Philip Kovacs
238fa198f0 clean up audacious legacy code; adjust ebuilds 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@989 7f574dfc-610e-0410-a909-a81674777703
 2007-11-17 04:13:20 +00:00
Philip Kovacs
3048e239d2 Added support for Audacious 1.4.0 via --enable-audacious=yes|no|legacy: 
(use 'yes' for audacious >= 1.4.0, 'legacy' for prior versions).



git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@988 7f574dfc-610e-0410-a909-a81674777703
 2007-11-17 03:43:21 +00:00
Philip Kovacs
dd572d3d24 Fix compilation error with --disable-x11 (bug #1830373). 
Bump doc stylesheet from 4.3 to 4.4.



git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@987 7f574dfc-610e-0410-a909-a81674777703
 2007-11-14 21:41:08 +00:00
Toni Spets
bc984b40d4 Fixed cpu_count variable and one incorrectly typed ifdef 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@986 7f574dfc-610e-0410-a909-a81674777703
 2007-11-04 13:14:55 +00:00
Toni Spets
68a853c285 SMP code for OpenBSD contributed by Paul Sonkoly 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@985 7f574dfc-610e-0410-a909-a81674777703
 2007-11-04 11:20:55 +00:00
Philip Kovacs
73e578ee19 fix mpd_smart bug #1822773 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@984 7f574dfc-610e-0410-a909-a81674777703
 2007-10-31 22:49:09 +00:00
Philip Kovacs
723771f304 add system config file to -v output 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@982 7f574dfc-610e-0410-a909-a81674777703
 2007-10-23 22:06:02 +00:00
Philip Kovacs
c08db2aba5 Externalize default config file: /conky/conky.conf 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@981 7f574dfc-610e-0410-a909-a81674777703
 2007-10-23 21:52:11 +00:00
Philip Kovacs
7c07529932 Remove ${tail /var/log/Xorg.0.log} from default text 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@979 7f574dfc-610e-0410-a909-a81674777703
 2007-10-21 23:36:53 +00:00
Philip Kovacs
03d011678b Initialize music_player_interval so built-in .conkyrc actual works. 
Lower timed_thread minimum timing interval from 50 usecs to 10 usecs.



git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@978 7f574dfc-610e-0410-a909-a81674777703
 2007-10-21 18:04:53 +00:00
Philip Kovacs
fed57b7a50 start 1.4.9-svn; separate assert messages for clarity 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@977 7f574dfc-610e-0410-a909-a81674777703
 2007-10-20 23:35:25 +00:00
Philip Kovacs
8d81c9a6d7 conky 1.4.8 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@974 7f574dfc-610e-0410-a909-a81674777703
 2007-10-18 21:12:27 +00:00
Philip Kovacs
441cedd2ad struct alignment patch #1812924 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@973 7f574dfc-610e-0410-a909-a81674777703
 2007-10-17 20:31:27 +00:00
Philip Kovacs
0a7cb47470 fix uninitialized var warning 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@970 7f574dfc-610e-0410-a909-a81674777703
 2007-10-03 01:43:40 +00:00
Brenden Matthews
58c1eb36c3 Multiple mailbox patch (thanks Ben Kibbey) 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@969 7f574dfc-610e-0410-a909-a81674777703
 2007-10-02 23:57:41 +00:00
Brenden Matthews
da182541fb oops; don't clear mpd stuff after setting status 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@968 7f574dfc-610e-0410-a909-a81674777703
 2007-10-02 23:51:49 +00:00
Brenden Matthews
2d10c4c08d * Small fix for $ibm_volume (thanks Kapil Hari Paranjape) 
* Patch so $tail can read from a fifo file descriptor (thanks Ben Kibbey)


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@966 7f574dfc-610e-0410-a909-a81674777703
 2007-09-28 20:16:16 +00:00
Brenden Matthews
7e2b84c93e small mpd fix (fixes minor breakage in recent mpd improvements) 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@965 7f574dfc-610e-0410-a909-a81674777703
 2007-09-28 19:50:58 +00:00
Toni Spets
60f4ea4fb7 OpenBSD cleanups, remove unsupported printf flag and fix non-dynamic cpu_freq 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@964 7f574dfc-610e-0410-a909-a81674777703
 2007-09-17 04:40:13 +00:00
Philip Kovacs
fadea17e90 revise my comments for clarity 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@962 7f574dfc-610e-0410-a909-a81674777703
 2007-09-02 17:14:15 +00:00
Philip Kovacs
94e918914d thread stuff 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@961 7f574dfc-610e-0410-a909-a81674777703
 2007-09-02 05:08:28 +00:00
Brenden Matthews
965031790a * Zero out imap and pop3 stuff when the connection fails 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@960 7f574dfc-610e-0410-a909-a81674777703
 2007-09-02 04:36:09 +00:00
Philip Kovacs
62f8ff9be7 mpd_interval -> music_player_interval 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@957 7f574dfc-610e-0410-a909-a81674777703
 2007-09-02 04:26:08 +00:00
Brenden Matthews
87e4c550e4 * Fixed some minor memory leaks associated with SIGUSR1 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@956 7f574dfc-610e-0410-a909-a81674777703
 2007-09-02 03:58:22 +00:00
Philip Kovacs
39a3bfe8f8 fix your math dummy 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@955 7f574dfc-610e-0410-a909-a81674777703
 2007-09-02 03:29:38 +00:00
Brenden Matthews
16ea4f6587 * Improved performance slightly 
* Added mpd_interval config option to specify an update interval for the
    mpd thread

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@954 7f574dfc-610e-0410-a909-a81674777703
 2007-09-02 03:02:33 +00:00
Philip Kovacs
38d2cdfc84 revert common.c 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@953 7f574dfc-610e-0410-a909-a81674777703
 2007-09-02 02:25:01 +00:00
Philip Kovacs
cdbfb7dd53 timed thread code 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@952 7f574dfc-610e-0410-a909-a81674777703
 2007-09-02 02:22:46 +00:00
Philip Kovacs
578609461f timed thread stuff 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@951 7f574dfc-610e-0410-a909-a81674777703
 2007-09-02 01:10:09 +00:00
Philip Kovacs
4515925991 timed thread stuff 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@950 7f574dfc-610e-0410-a909-a81674777703
 2007-09-02 00:58:42 +00:00
Philip Kovacs
06f05f5da8 timed thread work 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@949 7f574dfc-610e-0410-a909-a81674777703
 2007-09-01 21:18:52 +00:00
Philip Kovacs
9001e6857e timed thread work 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@948 7f574dfc-610e-0410-a909-a81674777703
 2007-09-01 21:07:40 +00:00
Philip Kovacs
4cdffa16c3 timed thread changes 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@947 7f574dfc-610e-0410-a909-a81674777703
 2007-09-01 20:40:34 +00:00
Brenden Matthews
c09d5346a0 fix var clearing stuff in mpd thread 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@946 7f574dfc-610e-0410-a909-a81674777703
 2007-09-01 20:36:56 +00:00
Brenden Matthews
0863020b6e unlock mutexes correctly 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@945 7f574dfc-610e-0410-a909-a81674777703
 2007-09-01 18:18:26 +00:00
Brenden Matthews
0ae51e37ee fix clearing issue with mpd 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@944 7f574dfc-610e-0410-a909-a81674777703
 2007-08-31 23:45:41 +00:00
Philip Kovacs
6c052dae9b Fix timed thread race condition, seen esp. on new kernel scheduler (cfs). 
Fix $audacious_title not being displayed when no length argument indicated.



git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@943 7f574dfc-610e-0410-a909-a81674777703
 2007-08-31 21:35:30 +00:00
Brenden Matthews
ef272217d9 * _Really_ fix mpd SIGPIPE issues 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@942 7f574dfc-610e-0410-a909-a81674777703
 2007-08-31 18:32:51 +00:00
Brenden Matthews
c16e2a66fe fixup mpd stuff 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@936 7f574dfc-610e-0410-a909-a81674777703
 2007-08-31 03:37:32 +00:00
Brenden Matthews
12baf6c0b4 some small fixes for mpd stuff 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@935 7f574dfc-610e-0410-a909-a81674777703
 2007-08-31 02:05:02 +00:00
Brenden Matthews
2fcd64d59e * Use timed_thread for mpd 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@934 7f574dfc-610e-0410-a909-a81674777703
 2007-08-30 17:21:30 +00:00
Brenden Matthews
9b71a6cd7b * Fixed issue with SIGPIPE and mpd 
* Updated COPYING (with more clarifications)

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@927 7f574dfc-610e-0410-a909-a81674777703
 2007-08-27 20:26:58 +00:00
Brenden Matthews
196235df06 adding prss.h to makefile.am so its actually included in the dist 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@926 7f574dfc-610e-0410-a909-a81674777703
 2007-08-24 02:00:18 +00:00
Roman Bogorodskiy
2addde8cc4 Never commit stuff before you're going to bed. 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@925 7f574dfc-610e-0410-a909-a81674777703
 2007-08-22 05:11:06 +00:00
Roman Bogorodskiy
3c0aaee4dc Fix a typo - variable was used before declarated and 
the code was broken, though it was under #ifdef i386,
so conky compiled fine on other arches.


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@924 7f574dfc-610e-0410-a909-a81674777703
 2007-08-21 18:40:08 +00:00
Philip Kovacs
10a5ee6074 hwmon leveraging existing code 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@922 7f574dfc-610e-0410-a909-a81674777703
 2007-08-13 23:14:01 +00:00
Philip Kovacs
f72122bd06 svn merge -rHEAD:918 . 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@921 7f574dfc-610e-0410-a909-a81674777703
 2007-08-13 19:09:33 +00:00
Toni Spets
f296609096 really apply the hwmon patch (tracker item 1650894) 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@919 7f574dfc-610e-0410-a909-a81674777703
 2007-08-13 17:33:41 +00:00
Philip Kovacs
1b509f9357 platform stuff 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@918 7f574dfc-610e-0410-a909-a81674777703
 2007-08-13 00:56:42 +00:00
Philip Kovacs
33943bda7c * Added var $platform which is similar to $i2c and accommodates the conversion 
of many devices from /sys/bus/i2c/devices to /sys/bus/platform/devices.
* Removed config item post_21_kernel since it forced all i2c device lookups
    to go to /sys/bus/platform/devices and some people may need a mix of both
    i2c and platform devices.



git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@917 7f574dfc-610e-0410-a909-a81674777703
 2007-08-13 00:28:48 +00:00
Toni Spets
dc676df556 That one neither 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@916 7f574dfc-610e-0410-a909-a81674777703
 2007-08-10 21:17:53 +00:00
Toni Spets
73869df9af Whoops. Didn't see that coming. 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@915 7f574dfc-610e-0410-a909-a81674777703
 2007-08-10 21:16:44 +00:00
Toni Spets
116ff7b661 Removed more unused stuff from openbsd.c 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@914 7f574dfc-610e-0410-a909-a81674777703
 2007-08-10 21:14:06 +00:00
Philip Kovacs
69a3ce9b9a fix unused parameter warning 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@913 7f574dfc-610e-0410-a909-a81674777703
 2007-08-10 21:08:09 +00:00
Toni Spets
fc7c9b5fae Removed ACPI battery code for OpenBSD 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@912 7f574dfc-610e-0410-a909-a81674777703
 2007-08-10 21:06:30 +00:00
Toni Spets
dbe5ee1f3f Didn't remove all references to linkstatus ;-) 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@910 7f574dfc-610e-0410-a909-a81674777703
 2007-08-10 20:57:14 +00:00
Toni Spets
8370c19025 Remove deprecated linkstatus completely from conky source 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@909 7f574dfc-610e-0410-a909-a81674777703
 2007-08-10 20:51:36 +00:00
Toni Spets
5dbf418c2d Fixed wireless documentation. Fixed wireless quality display when its zero. Added copyright notes. 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@907 7f574dfc-610e-0410-a909-a81674777703
 2007-08-10 20:38:58 +00:00
Philip Kovacs
64b34981f3 update copywrite dates where appropriate 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@905 7f574dfc-610e-0410-a909-a81674777703
 2007-08-10 20:09:43 +00:00
Brenden Matthews
27b4c8550c clarifying licensing 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@904 7f574dfc-610e-0410-a909-a81674777703
 2007-08-10 19:53:44 +00:00
Toni Spets
772619e99a Probably fixed wireless spacer 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@903 7f574dfc-610e-0410-a909-a81674777703
 2007-08-08 08:59:44 +00:00
Toni Spets
b8b4694fca Incorrectly pasted stuff in configure.ac.in screwed the build process. Updated ChangeLog. 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@902 7f574dfc-610e-0410-a909-a81674777703
 2007-08-08 02:12:46 +00:00
Toni Spets
6b553ec7de Added spacer for wireless variables. Fixed some tabs. Disabled old wireless code. 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@900 7f574dfc-610e-0410-a909-a81674777703
 2007-08-07 23:18:02 +00:00
Toni Spets
602998c06d Added wireless_link_qual_perc. Cleaned unused variables from wireless code. Updated prss source. Had 6 hours of sleep. 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@898 7f574dfc-610e-0410-a909-a81674777703
 2007-08-07 22:05:06 +00:00
Toni Spets
f5c69ca5a5 Whoops. Need some lunch -> 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@897 7f574dfc-610e-0410-a909-a81674777703
 2007-08-07 12:54:13 +00:00
Toni Spets
a3e81ae59f RSS was not really disabled when it was supposed to be. Experimental wireless support. 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@896 7f574dfc-610e-0410-a909-a81674777703
 2007-08-07 12:51:08 +00:00
Toni Spets
43f30219e9 Fixed incorrect ACPI battery percentage (using last known full capacity instead of designed capacity) 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@895 7f574dfc-610e-0410-a909-a81674777703
 2007-08-07 06:17:25 +00:00
Toni Spets
3bc35afa30 Fixed major issues with ACPI batteries 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@894 7f574dfc-610e-0410-a909-a81674777703
 2007-08-07 06:05:19 +00:00
Roman Bogorodskiy
cf49198176 Remove freebsd wifi stuff since the API seems to be 
changed and I have no wifi devices to test it.


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@893 7f574dfc-610e-0410-a909-a81674777703
 2007-08-06 16:42:48 +00:00
Brenden Matthews
7793867d6b * Updated to libmpdclient 0.13.0 
* Added post_21_kernel config param to specify kernels 2.6.22 and newer
    so i2c works properly


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@890 7f574dfc-610e-0410-a909-a81674777703
 2007-08-05 22:16:26 +00:00
Brenden Matthews
f95d63bf56 * Fixed potential issue on FreeBSD when nprocs < 10 (thanks zotrix) 
* Added support for multiple batteries when using acpi (thanks Phil)
    * a bunch of code cleanups (thanks Psychon)
    * added max length paramater to mpd_title (thinks fow)
    * a number of small bug fixes


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@889 7f574dfc-610e-0410-a909-a81674777703
 2007-08-05 04:47:21 +00:00
Toni Spets
906e7e8bfd Removed the first new line in RSS titles 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@888 7f574dfc-610e-0410-a909-a81674777703
 2007-07-19 16:32:00 +00:00
Philip Kovacs
55811b7f53 Fix displaying 4 GB traffic after reloading network driver, patch #1754260. thanks sohalt. 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@886 7f574dfc-610e-0410-a909-a81674777703
 2007-07-15 18:21:04 +00:00
Philip Kovacs
c559001bab Fix PID display, patch #1753934. thanks sohalt. 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@885 7f574dfc-610e-0410-a909-a81674777703
 2007-07-15 18:11:35 +00:00
Philip Kovacs
6c95750cc6 Right-justify top/top_mem vars (pid/cpu/mem} so they align on the decimal. 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@881 7f574dfc-610e-0410-a909-a81674777703
 2007-06-23 00:29:54 +00:00
Toni Spets
204886795a Fixed crash when RSS feed item didn't have title 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@879 7f574dfc-610e-0410-a909-a81674777703
 2007-06-06 14:19:09 +00:00
Philip Kovacs
02960c2c7f fix scan_font nonsense 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@878 7f574dfc-610e-0410-a909-a81674777703
 2007-06-05 19:02:51 +00:00
Philip Kovacs
a2cfdd4c67 fix scan_font nonsense 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@877 7f574dfc-610e-0410-a909-a81674777703
 2007-06-05 18:54:39 +00:00
Toni Spets
2c8426dcc7 Again fixed things in the RSS code. Removed possible trailing \n from RSS data. Hopefully fixed iconv memory freeing problems. Graps had non-freed malloced data. 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@876 7f574dfc-610e-0410-a909-a81674777703
 2007-06-03 11:20:47 +00:00
Toni Spets
3872bafeef Fixed memory leaks found with valgrind 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@875 7f574dfc-610e-0410-a909-a81674777703
 2007-06-03 09:18:54 +00:00
Toni Spets
615fb19723 Crashing in RSS code probably fixed. Memory leak in prss fixed. 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@874 7f574dfc-610e-0410-a909-a81674777703
 2007-06-03 08:58:05 +00:00
Toni Spets
b6d1465635 RSS updates: more flexible output and updated prss code 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@873 7f574dfc-610e-0410-a909-a81674777703
 2007-06-02 08:17:33 +00:00
Toni Spets
92e5028b99 Working multifeed RSS - needs testing 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@872 7f574dfc-610e-0410-a909-a81674777703
 2007-06-01 15:49:49 +00:00
Toni Spets
a4841496e1 Forgot to uncomment one line in the RSS code. 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@870 7f574dfc-610e-0410-a909-a81674777703
 2007-06-01 11:46:14 +00:00
Toni Spets
f874e4e441 libcurl support added to download RSS feeds (automake and autoconf scripts still needs updating) 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@869 7f574dfc-610e-0410-a909-a81674777703
 2007-06-01 11:37:19 +00:00
Toni Spets
3fdb6b7027 New initial RSS code. Parser written by Sisu (Mikko Sysikaski) with more portable libxml2. It is still unstable and in development.\n\nNote: automake and autoconf scripts needs to be updated to support libxml2\! 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@868 7f574dfc-610e-0410-a909-a81674777703
 2007-06-01 10:42:57 +00:00
Toni Spets
90b318f9cb cleaned openbsd code and changed warning/error printf's to ERR/CRIT_ERR 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@867 7f574dfc-610e-0410-a909-a81674777703
 2007-05-06 13:00:35 +00:00
Roman Bogorodskiy
904d5c9afa Oops, forgot to add rss.c file. 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@866 7f574dfc-610e-0410-a909-a81674777703
 2007-05-06 12:59:31 +00:00
Roman Bogorodskiy
85fdf4bf7e - Remove debug printf's from RSS code 
- Don't eat last char of the RSS title


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@865 7f574dfc-610e-0410-a909-a81674777703
 2007-05-06 12:33:38 +00:00
Roman Bogorodskiy
3b03ca2a76 Experimental RSS code. 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@864 7f574dfc-610e-0410-a909-a81674777703
 2007-05-06 12:17:13 +00:00
Toni Spets
d5634abad4 apm should work with openbsd now 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@863 7f574dfc-610e-0410-a909-a81674777703
 2007-05-06 12:13:38 +00:00
Toni Spets
a2fbf01fe2 fixed apm_adapter for both openbsd and freebsd and some build warnings cleaned 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@862 7f574dfc-610e-0410-a909-a81674777703
 2007-05-06 09:32:21 +00:00
Toni Spets
f9cab2a051 get_battery_* stubs for openbsd.c 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@861 7f574dfc-610e-0410-a909-a81674777703
 2007-05-06 07:25:00 +00:00
Roman Bogorodskiy
60764129c1 Fix build on teh free bds. 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@859 7f574dfc-610e-0410-a909-a81674777703
 2007-05-05 16:46:12 +00:00
Philip Kovacs
60b842df90 added color[0-9] variable patch (thanks jieryn) 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@858 7f574dfc-610e-0410-a909-a81674777703
 2007-04-25 17:22:06 +00:00
Roman Bogorodskiy
7515d8319a Fix build on FreeBSD on arches !(i386 or amd64). 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@857 7f574dfc-610e-0410-a909-a81674777703
 2007-04-15 04:58:41 +00:00
Brenden Matthews
fc72692cc7 * Added if_existing patch for string matching (thanks cromka) 
* Added hwmon support (thanks flitsch)
* Some xmms2 updates (thanks sleipner)
* Added $battery_percent and $battery_bar (thanks akash)


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@855 7f574dfc-610e-0410-a909-a81674777703
 2007-04-06 06:11:53 +00:00
Brenden Matthews
3d9d260f4c Added if_empty patch (thanks Erik) 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@854 7f574dfc-610e-0410-a909-a81674777703
 2007-04-06 05:01:48 +00:00
Roman Bogorodskiy
a38ecf286d Not sure if a right fix, but no segault at least. 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@851 7f574dfc-610e-0410-a909-a81674777703
 2007-03-28 18:43:53 +00:00
Roman Bogorodskiy
164839a299 Fix build on all platforms that doesn't have memrchr() function, 
not just workaround it for OpenBSD only.


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@850 7f574dfc-610e-0410-a909-a81674777703
 2007-03-28 17:53:40 +00:00
Brenden Matthews
f528f66c49 woops, forget to add openbsd source 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@849 7f574dfc-610e-0410-a909-a81674777703
 2007-03-01 01:46:11 +00:00
Brenden Matthews
0ab1d8b96a * OpenBSD support added to Conky (thanks hifi) 
* Updated mboxscan stuff (thanks calmar)


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@848 7f574dfc-610e-0410-a909-a81674777703
 2007-03-01 01:43:43 +00:00
Philip Kovacs
ed0a7b31ba fix uninitialized warnings 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@845 7f574dfc-610e-0410-a909-a81674777703
 2007-02-26 20:56:43 +00:00
Philip Kovacs
4f7f4bf11e conky 1.4.6-svn trunk 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@836 7f574dfc-610e-0410-a909-a81674777703
 2007-02-25 23:35:53 +00:00
Philip Kovacs
70add5d09d include missing mboxscan.h; 
fix signedness warnings


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@832 7f574dfc-610e-0410-a909-a81674777703
 2007-02-14 19:45:18 +00:00
Brenden Matthews
45acd5c3b9 * Added buffer_text_size option to change the size of the buffer for 
things like $exec, $tail, et cetera
* Added $mboxscan which lets you display the Subject and From fields
from recent email in an mbox file
* Disambiguated (is that a word?) $cpu docs


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@831 7f574dfc-610e-0410-a909-a81674777703
 2007-02-12 01:03:10 +00:00
Philip Kovacs
b85ae9209b fallback to gettimeofday () if no clock_gettime () (mac os) 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@830 7f574dfc-610e-0410-a909-a81674777703
 2007-01-15 00:02:38 +00:00
Philip Kovacs
1ff451efdd api change for dexter_timedsampler_new 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@829 7f574dfc-610e-0410-a909-a81674777703
 2007-01-10 02:57:58 +00:00
Philip Kovacs
6776714d9a remove ftp.[ch] from src/Makefile.am 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@827 7f574dfc-610e-0410-a909-a81674777703
 2007-01-08 01:34:00 +00:00
Philip Kovacs
c268b7130e claen up warnings 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@826 7f574dfc-610e-0410-a909-a81674777703
 2007-01-08 01:27:30 +00:00
Philip Kovacs
3006f7574a add config.rpath to satisfy AM_ICONV 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@825 7f574dfc-610e-0410-a909-a81674777703
 2007-01-08 01:10:12 +00:00
Philip Kovacs
75a8cfc091 fix warnings 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@824 7f574dfc-610e-0410-a909-a81674777703
 2006-12-29 23:38:57 +00:00
Brenden Matthews
5cfe6b093d head/tail rewrite patch 
diskio read/write patch
added check for zlib to configure script

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@823 7f574dfc-610e-0410-a909-a81674777703
 2006-12-29 23:14:31 +00:00
Brenden Matthews
2ab7627099 removing useless code 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@821 7f574dfc-610e-0410-a909-a81674777703
 2006-12-28 05:15:36 +00:00
Philip Kovacs
302fae854c clear conky vars on disconnect/failure to open files 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@820 7f574dfc-610e-0410-a909-a81674777703
 2006-12-26 20:49:35 +00:00
Brenden Matthews
c7f9e4033a upgrading libmpdclient to 0.12.0 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@819 7f574dfc-610e-0410-a909-a81674777703
 2006-12-23 08:06:36 +00:00
Philip Kovacs
1c35f432e5 Conky 1.5.0 -- client/server prototype 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@818 7f574dfc-610e-0410-a909-a81674777703
 2006-12-23 06:01:16 +00:00
Philip Kovacs
c42fe7b6ab add license info to timed thread modules; update NEWS 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@817 7f574dfc-610e-0410-a909-a81674777703
 2006-12-13 16:54:59 +00:00
Philip Kovacs
9405f780d6 Conky 1.4.5 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@815 7f574dfc-610e-0410-a909-a81674777703
 2006-12-13 01:57:46 +00:00
Philip Kovacs
5ff932ff21 split battery off into battery and battery_time 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@814 7f574dfc-610e-0410-a909-a81674777703
 2006-12-12 23:21:14 +00:00
Philip Kovacs
a2429c3197 simplify battery expressions 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@813 7f574dfc-610e-0410-a909-a81674777703
 2006-12-12 03:24:29 +00:00
Philip Kovacs
c15f5d485c fix battery issues 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@812 7f574dfc-610e-0410-a909-a81674777703
 2006-12-12 01:20:10 +00:00
Philip Kovacs
4e8212d978 close pop3/imap sockets 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@811 7f574dfc-610e-0410-a909-a81674777703
 2006-12-11 19:04:58 +00:00
Philip Kovacs
09fda8a54f fix boundary error in portmon code 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@810 7f574dfc-610e-0410-a909-a81674777703
 2006-12-10 05:57:37 +00:00
Philip Kovacs
91ca82eb3b fix peek table bug with new portmon code 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@809 7f574dfc-610e-0410-a909-a81674777703
 2006-12-10 05:11:54 +00:00
Philip Kovacs
e4713dc790 use GLib GHashTable for port monitors 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@806 7f574dfc-610e-0410-a909-a81674777703
 2006-12-09 05:40:08 +00:00
Philip Kovacs
e881609a07 complete/correct source and authorship attribution 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@805 7f574dfc-610e-0410-a909-a81674777703
 2006-12-08 02:45:14 +00:00
Roman Bogorodskiy
de84fcac2a Fix ${freq} and ${freq_g} on FreeBSD. 
Reported by:	Karsten Rothemund <karsten@photor.de>


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@804 7f574dfc-610e-0410-a909-a81674777703
 2006-12-03 18:10:21 +00:00
Philip Kovacs
03d0ad83b8 test_timed_thread: acquire mutex before calculating future time 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@803 7f574dfc-610e-0410-a909-a81674777703
 2006-12-02 23:07:21 +00:00
Philip Kovacs
fe7f6b52be acquire mutex before pthread_cond_timedwait 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@802 7f574dfc-610e-0410-a909-a81674777703
 2006-12-02 00:02:25 +00:00
Philip Kovacs
90f79edbea entropy: close fp1 on fp2 open failure 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@801 7f574dfc-610e-0410-a909-a81674777703
 2006-12-01 22:47:40 +00:00
Philip Kovacs
afcae6eba5 add max_length to audacious_title 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@800 7f574dfc-610e-0410-a909-a81674777703
 2006-12-01 00:29:12 +00:00
Philip Kovacs
9a016c9377 added , , for crypto freaks 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@797 7f574dfc-610e-0410-a909-a81674777703
 2006-11-30 20:46:34 +00:00
Philip Kovacs
57688b94d5 remove sleep() calls from pop2/imap code; remove debug statements on terminal. e.g. hints, thread destruction 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@796 7f574dfc-610e-0410-a909-a81674777703
 2006-11-28 07:26:57 +00:00
Philip Kovacs
9609a330d8 add max_specials config item with default 512. really closes bug #1574523 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@793 7f574dfc-610e-0410-a909-a81674777703
 2006-11-22 21:53:54 +00:00
Philip Kovacs
a860dd581b fix compile error with --disable-xdamage when Xdamage.h not present 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@784 7f574dfc-610e-0410-a909-a81674777703
 2006-11-20 20:17:46 +00:00
Philip Kovacs
73aa3c2b4c how about actually reading the battery vars -- doh 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@782 7f574dfc-610e-0410-a909-a81674777703
 2006-11-18 23:39:43 +00:00
Philip Kovacs
f6243f409a ebuild changes for gvim/vim 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@780 7f574dfc-610e-0410-a909-a81674777703
 2006-11-15 22:27:37 +00:00
Philip Kovacs
b85f8a65bc linkstatus formatting 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@779 7f574dfc-610e-0410-a909-a81674777703
 2006-11-15 20:35:32 +00:00
Philip Kovacs
ef3d0a19fe linkstatus now follows use_spacer. closes bug #1577580 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@778 7f574dfc-610e-0410-a909-a81674777703
 2006-11-15 20:24:43 +00:00
Philip Kovacs
d9cc831fdd fix reported memory var overflow by using unsigned long long 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@775 7f574dfc-610e-0410-a909-a81674777703
 2006-11-15 03:28:37 +00:00
Philip Kovacs
358abc96c0 typo 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@774 7f574dfc-610e-0410-a909-a81674777703
 2006-11-15 01:49:47 +00:00
Philip Kovacs
7173afcbdf set ptr to NULL after free 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@773 7f574dfc-610e-0410-a909-a81674777703
 2006-11-15 01:48:06 +00:00