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
