Pavel Labath
9d0932d711
Use the new callback system instead of add_update_callback() & co.
2010-12-31 13:39:54 +01:00
Nikolas Garofil
c93f9817cb
Merge branch 'master' into lua-config
2010-11-23 18:50:48 +01:00
Nikolas Garofil
687407479f
Make sure template_ in calc_cpu_total() can also be TMPL_LONGPROC
2010-11-23 18:50:40 +01:00
Nikolas Garofil
fcf318c6dd
Fix bug with SF ID 3101185 (manual merge)
2010-11-20 17:18:34 +01:00
Nikolas Garofil
0ee557a4ee
Fix bug with SF ID 3101185
2010-11-20 16:59:32 +01:00
Pavel Labath
ad79c87376
Merge remote branch 'origin/master' into lua-config
...
Conflicts:
src/conky.cc
2010-11-16 22:55:33 +01:00
Nikolas Garofil
8123e447e2
Replace a CRIT_ERR in combine by trying,throwing and catching
...
PS: I want to replace all similar CRIT_ERR's like this, opinions ?
2010-11-16 13:41:44 +01:00
Nikolas Garofil
b5ff3eb411
Make lua required by cmake
2010-11-14 01:41:07 +01:00
Nikolas Garofil
e73da6b72e
Fix compiling without X11 support
2010-11-13 23:59:31 +01:00
Pavel Labath
0852aa4fcd
Merge remote branch 'origin/master' into lua-config
...
Conflicts:
src/ccurl_thread.cc
src/conky.cc
src/llua.cc
src/logging.h
src/nvidia.cc
2010-11-13 20:05:59 +01:00
Nikolas Garofil
33db46cef1
Fix building without Imlib2
2010-10-30 17:44:33 +02:00
Pavel Labath
9f7e696a85
Remove the $include variable
...
the way it is implemented now just wont work with the new config file. And i don't think that
many people used it anyway. Maybe add a replacement later?
2010-09-15 23:34:47 +02:00
Pavel Labath
ef2b39a97f
Make text_buffer_size a lua setting
2010-08-29 23:50:32 +02:00
Pavel Labath
a9893684ac
Make max_user_text a lua setting
2010-08-29 20:01:05 +02:00
Pavel Labath
b5a4d899ab
Make mysql_* lua settings
2010-06-22 01:34:55 +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
Nikolas Garofil
99fc975780
Add support for $wireless_freq
2010-06-07 10:50:02 +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
Cesare Tirabassi
7a61fe8504
Fix battery_bar not parsing arguments correctly (sf: #2998034 , lp: #569195 )
2010-05-23 11:25:19 +02:00
Nikolas Garofil
40452c9712
Bugfix: $alignr only worked on the first line of $execp, $execpi, $lua and $lua_parse
2010-05-05 22:02:28 +02:00
Pavel Labath
f81c29a42d
make out_to_ncurses a lua setting
...
this completes the porting of bool settings
2010-04-30 19:33:21 +02:00
Nikolas Garofil
3f7ecb3a26
Add support for $irc
2010-04-30 19:32:42 +02:00
Nikolas Garofil
a13c56a7a5
Add support for $ical
2010-04-27 16:42:21 +02:00
Nikolas Garofil
c2c743f542
complete stock error mesg
2010-04-24 18:26:17 +02:00
Nikolas Garofil
343a2f6842
fix bug in stock
2010-04-24 18:09:09 +02:00
Nikolas Garofil
00c869a2bf
Add almost all stock data yahoo provides
2010-04-24 14:57:04 +02:00
Nikolas Garofil
a2ae025f56
Add support for $tcp_ping
2010-04-24 01:40:24 +02:00
Pavel Labath
00e91d8c31
Merge remote branch 'origin/master' into lua-config
...
Conflicts:
src/conky.cc
src/x11.cc
2010-04-22 21:17:14 +02:00
Nikolas Garofil
ed0dd49dd8
Add some more stock data that yahoo is providing
2010-04-22 16:52:15 +02:00
Nikolas Garofil
89c2d4ecdd
curl
2010-04-19 14:54:03 +02:00
Nikolas Garofil
d6537aa678
Add support for $stock
2010-04-19 14:45:05 +02:00
Nikolas Garofil
a6e63bcaa0
Add support for MySQL
...
Warning: Altough the current version works (for me),
the syntax of the configoptions and vars will probably change
over time. Contact me if you have ideas.
The following is a example of how you can use it now:
mysql_host someserver.com
mysql_db my_database
mysql_user loginname
mysql_password "s3cr3t"
TEXT
${mysql select var1 from some_table}${mysql select var2 from some_table}
2010-04-18 17:52:41 +02:00
Nikolas Garofil
0ab2efc2b2
Add support for $no_update
2010-04-17 15:19:44 +02:00
Nikolas Garofil
0047a132ab
Merge read_tcp and read_udp as much as possible
2010-04-17 02:31:37 +02:00
Nikolas Garofil
19ad7d2cc3
Add support for $read_udp
2010-04-16 18:53:48 +02:00
Nikolas Garofil
0ab87b40a5
Improve unknown var error
2010-04-16 00:20:08 +02:00
Nikolas Garofil
5ef6de8822
Add support for $distribution
2010-04-15 16:05:42 +02:00
Nikolas Garofil
a734f86071
Bugfix: memleak at crash caused by missing arg
2010-04-15 13:00:54 +02:00
Nikolas Garofil
f5c147b160
Add support for $nodename_short
...
This is different implementation (compared to 9e3156a4a6
)
because 1.8.1 was still regular c instead of c++
2010-04-14 18:41:25 +02:00
Nikolas Garofil
a6b43da875
Bugfix: ac-adapter is sometimes called ADP1 in sysfs instead of AC
2010-04-12 12:33:24 +02:00
Nikolas Garofil
15326c502c
Bugfix: battery_bar should also work without argument
2010-04-11 19:13:14 +02:00
Nikolas Garofil
34f3547c0d
Bugfix: When the first line behind TEXT was a comment, the start of the second line wasn't parsed
2010-04-10 20:11:20 +02:00
Pavel Labath
0584d423e6
make default_{shade_,outline_,}color lua settings
2010-03-11 12:08:55 +01:00
Pavel Labath
ac8d4385eb
Make colorN a lua setting
2010-03-11 11:31:10 +01:00
Pavel Labath
12e98c7da5
Port out_to_x setting to lua-config
2010-02-25 22:28:34 +01:00
Nikolas Garofil
da76381300
Use free_and_zero in [st]*.cc where appropriate
2010-02-24 11:52:59 +01:00
Nikolas Garofil
f236523f30
Use free_and_zero in conky.cc and core.cc where appropriate
2010-02-23 22:06:04 +01:00
Nikolas Garofil
ade4f3fc0c
Minimize change in free_text_objects introduced by b88d69dbfc
2010-02-22 14:22:24 +01:00
Nikolas Garofil
b88d69dbfc
Implement fix from previous commit in another way to fix a leak that happens when conky closes
2010-02-21 20:15:08 +01:00
Nikolas Garofil
d184efb418
When using without argument, make sure that it shows the essid of the first device that has one instead of using the default network device (because most of the times this will be a non-wireless device)
2010-02-21 15:12:38 +01:00