1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-28 13:00:45 +00:00
Commit Graph

2838 Commits

Author SHA1 Message Date
Pavel Labath
8ff9b58c3b Fix 'nvidia with ncurses segfaults' (sf.net #3006233)
Additionally, add a nvidia_display variable. This enables the $nvidia variable to be used without
out_to_x yes (X11 support still has to be built in, you just don't have to use it).
2010-08-13 15:23:11 +02:00
Pavel Labath
14511b19ea Make $fs_used_perc and $fs_bar report used space correctly
they reported fs->size - fs->avail, which is not correct if fs has super-user reserved blocks.

note that now $fs_used_perc and $fs_free_perc need not add up to 100%, but that is consistent
with what $fs_used and $fs_free do.
2010-08-12 20:58:21 +02:00
Pavel Labath
699d6bed40 Fix buffer overflows in eve.c (sf.net #3034056) 2010-08-12 17:26:07 +02:00
Pavel Labath
074271b430 Fix gcc warning 2010-07-29 16:31:30 +02:00
Pavel Labath
968f5f4201 auto_ptr is deprecated 2010-06-26 12:33:55 +02:00
Pavel Labath
dad4b80c8f Fix double-free bug in mysql.cc 2010-06-23 19:06:32 +02:00
Pavel Labath
b5a4d899ab Make mysql_* lua settings 2010-06-22 01:34:55 +02:00
Pavel Labath
c33d617179 make templateN a lua setting 2010-06-21 00:37:58 +02:00
Pavel Labath
76a1b17e5c make out_to_http a lua setting 2010-06-20 19:31:17 +02:00
Pavel Labath
8c41d3183e make http_refresh a lua setting 2010-06-20 19:15:56 +02:00
Pavel Labath
78ba5c2800 Merge remote branch 'origin/master' into lua-config
Conflicts:
	src/conky.cc
	src/conky.h
	src/top.cc
2010-06-20 19:09:13 +02:00
Pavel Labath
e70df5e477 Ignore spaces in {} when breaking up arguments to $lua 2010-06-18 17:55:49 +02:00
Pavel Labath
945b52b9a6 Use pass-by-reference paramers in ccurl_thread where possible 2010-06-17 15:19:31 +02:00
Pavel Labath
1cf1b5c631 Fix overflow in ccurl_thread interval caused by 0f213c89 2010-06-17 15:12:42 +02:00
Pavel Labath
b82250d551 Small build fix & zero playtime and progress bars when XMMS2 playback is stopped.
patch contributed by sleipner
2010-06-13 19:10:59 +02:00
Pavel Labath
cccbf3b4c0 Add a CMAKE variable for the patch program 2010-06-13 19:09:07 +02:00
Pavel Labath
c80deb2d69 Fix "wrong type of arguments for cairo_set_dash", sf.net #3014648
I am not particularly proud of this solution. If you have a better one, feel free to implement
it.
2010-06-13 18:57:07 +02:00
Pavel Labath
2232641b8e Change the >=gcc-4.4 test from warning into an error
This reverts commit 37355406a8.
2010-06-10 19:19:49 +02:00
Pavel Labath
0f213c89f2 Simplify timed_thread time calculations with some c++0x magic 2010-06-10 19:19:49 +02:00
Pavel Labath
6642004d61 gcc-4.5 compatibility fix 2010-06-10 19:19:49 +02:00
Pavel Labath
e5c9172de3 Use reference parameters where possible 2010-06-10 19:19:49 +02:00
Nikolas Garofil
99fc975780 Add support for $wireless_freq 2010-06-07 10:50:02 +02:00
Nikolas Garofil
7b9d69950c Docs for $wireless_channel 2010-06-07 10:06:07 +02:00
Nikolas Garofil
6ccde5e7e7 Add support for $wireless_channel (based on a patch by Timothy Ball) 2010-06-07 09:54:25 +02:00
Nikolas Garofil
b5800a3418 Use fixed-width fonts with out_to_http so that everything lands where it should land 2010-06-05 14:27:20 +02:00
Nikolas Garofil
7a2e292429 Change multiple spaces in  -s when out_to_http is used 2010-06-05 14:05:08 +02:00
Nikolas Garofil
e7eae4ec8f Change newlines in "<br />"-s when out_to_http is used 2010-06-05 02:08:50 +02:00
Nikolas Garofil
6ab9167e38 update syntax files 2010-06-04 15:52:30 +02:00
Nikolas Garofil
edc45d41f2 Add support for http_refresh 2010-06-04 15:47:01 +02:00
Nikolas Garofil
54d4e6518d Add support for out_to_http 2010-06-04 14:41:12 +02:00
Alexander Graf
1180733e13 ${top}: fix bug of living dead processes
This fixes a bug occurred with 0b3e3c637e.
Dead processes still appeared in ${top} under FreeBSD and OpenBSD.  This was
because I forgot to update the g_time variable which is used as time stamp in
the process list.

Signed-off-by: Alexander Graf <agraf@znc.in>
2010-06-03 22:11:57 +02:00
Nikolas Garofil
3fa1ca15e1 Fix previous commit 2010-06-02 19:28:40 +02:00
Nikolas Garofil
d80c372a5c Fix segfault in mail folder (SF: 3007493) 2010-06-02 18:00:38 +02:00
Alexander Graf
319ff32283 shorten top compare functions
A substraction is used instead of if, else if, else.  This is much
shorter.

Signed-off-by: Alexander Graf <agraf@znc.in>
2010-05-30 17:52:00 +02:00
Nikolas Garofil
bf7c2bafc2 fix tiny memleak when $top is used wrong 2010-05-30 17:13:40 +02:00
Alexander Graf
0b3e3c637e ${top}: big cleanup
Linux-specific code in top.cc was moved to linux.cc.

Redundant code (e.g. the parts sorting by CPU usage, CPU time or memory
usage) was removed.  Sorting etc. happens in top.cc, whilst
platform-dependent code in linux.cc, freebsd.cc or openbsd.cc just
builds up the process table.

In the Linux code, some functions had a return value which was never
evaluated.  They return void now.

I tested it on FreeBSD and Linux;  The OpenBSD port does not compile
anyway.  I changed the OpenBSD parts, too, so that it will be less
effort to get conky working under OpenBSD.

Signed-off-by: Alexander Graf <agraf@znc.in>
2010-05-30 13:55:50 +02:00
Alexander Graf
cc35a00a30 Fix segmentation violation bug in freebsd.cc
Last patch removed a needed strndup().

Signed-off-by: Alexander Graf <agraf@znc.in>
Signed-off-by: Pavel Labath <pavelo@centrum.sk>
2010-05-28 18:58:23 +02:00
Alexander Graf
b0e5e2cd22 ${top} improvements for FreeBSD
- Displaying of CPU time of the processes now works
- ${top_time} (sorting by CPU time) works
- Using memcpy() instead of many sequential assignments (more clear,
  less lines, maybe faster, less effort to change something)

Signed-off-by: Alexander Graf <agraf@znc.in>
Signed-off-by: Pavel Labath <pavelo@centrum.sk>
2010-05-28 18:58:23 +02:00
Nikolas Garofil
53b167a84a Let $ical show recurring events that had the first start in the past but have one of the next starts in the future.
Each recurring event is only showed once, maybe i'll change this in the future
2010-05-25 17:33:55 +02:00
Nikolas Garofil
4bc136be88 Bugfix: $alignr had some problems after commit 40452c9712
Example:
TEXT
alfa bravo
charlie ${alignr}delta
echo ${alignr}foxtrot

Note to self:
It could be that this fix brings back part of the bug that
40452c9712 fixed. Check this !
2010-05-24 21:04:42 +02:00
Alexander Graf
fbd7ad0152 Accept top_name_width on FreeBSD
It was inside #ifdef __linux__, though it is not Linux specific.

Signed-off-by: Alexander Graf <agraf@znc.in>
Signed-off-by: Pavel Labath <pavelo@centrum.sk>
2010-05-23 21:54:42 +02:00
Alexander Graf
696d841e97 Compile under FreeBSD
This allows compilation under FreeBSD without errors.

read_tcpip.cc:  Avoid using of SOCK_NONBLOCK argument for socket().
SOCK_NONBLOCK is Linux-specific and its use was substituted with a
fcntl() call after socket().

freebsd.cc:  Change return type of update_*() to int, as required by
common.h.

Signed-off-by: Alexander Graf <agraf@znc.in>
Signed-off-by: Pavel Labath <pavelo@centrum.sk>
2010-05-23 21:54:42 +02:00
Cesare Tirabassi
7a61fe8504 Fix battery_bar not parsing arguments correctly (sf: #2998034, lp: #569195) 2010-05-23 11:25:19 +02:00
Nikolas Garofil
4256da3b7f forgot to change header in previous commit 2010-05-09 22:42:06 +02:00
Nikolas Garofil
9838bb2cde Make sure audacious-code compiles 2010-05-09 22:07:12 +02:00
Nikolas Garofil
9cb4583429 Bugfix: mem-problems in ical-code 2010-05-07 02:10:49 +02:00
Nikolas Garofil
78e9a69b4e Bugfix: memleaks in rss-code 2010-05-06 17:29:09 +02:00
Nikolas Garofil
f7980ca5a1 Bugfix: BUILD_WEATHER is replaced by BUILD_WEATHER_METAR and BUILD_WEATHER_XOAP 2010-05-06 16:09:17 +02:00
Nikolas Garofil
f6ab74f3a6 Bugfix: RSS interval was in secs instead of mins 2010-05-06 11:54:47 +02:00
Nikolas Garofil
a9b12b3074 Make building with RSS possible 2010-05-06 01:46:07 +02:00