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
d8603c3b71
Added support for the Lua programming language.
...
Changelog update.
2009-05-17 22:03:37 -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
e18e051b66
Fix docs.
2009-05-16 17:19:15 -06: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
Toni Spets
95f6748baa
Updated AUTHORS to match Lua stuff, also updated my email
2009-05-16 20:32:47 +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
Brenden Matthews
08fbc21c19
Merge branch 'master' into lua
2009-05-15 13:51:43 -06:00
Toni Spets
0ea5fa1468
disable OpenMP by default, i386 optimization problems
2009-05-15 22:39:47 +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
Phil Sutter
a2512e7c4f
add interesting parts of my latest commits to the changelog
2009-05-12 22:50:43 +02:00
Nikolas Garofil
e0b2f75433
Don't check if_gw twice
2009-05-12 20:25:40 +02:00
Phil Sutter
a07a082d76
add documentation about --print-config
2009-05-12 01:58:41 +02:00
Phil Sutter
16d551b208
add system-wide config to FILES section
2009-05-12 01:31:47 +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
