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
4910d33524
Fix comment removal stuff so that it doesn't break $color.
2009-05-12 18:05:51 -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
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
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
Nikolas Garofil
c1e47013ef
Bugfix: sometimes segfaults with cpubar
2009-05-07 18:44:45 +02:00
Brenden Matthews
af55c4afb1
Use a reduction here.
2009-05-05 17:43:45 -06:00
Brenden Matthews
fde096c435
Added some completely pointless OpenMP optimizations(?)
2009-05-05 17:36:12 -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
