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
1,571 Commits 5 Branches 46 Tags 22 MiB
476296be5c
Commit Graph

1045 Commits

Author SHA1 Message Date
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