From 8cb63b0c8bc4c2ab1c59688bfe01d4ef2dd775e6 Mon Sep 17 00:00:00 2001 From: Pavel Labath Date: Sun, 12 Sep 2010 15:31:18 +0200 Subject: [PATCH] Update the default config file to match new syntax --- data/conky.conf | 116 +++++++++++++++++++++++++----------------------- src/conky.cc | 15 ++----- 2 files changed, 65 insertions(+), 66 deletions(-) diff --git a/data/conky.conf b/data/conky.conf index 8736f35a..be4d2b28 100644 --- a/data/conky.conf +++ b/data/conky.conf @@ -1,60 +1,65 @@ -# Conky, a system monitor, based on torsmo -# -# Any original torsmo code is licensed under the BSD license -# -# All code written since the fork of torsmo is licensed under the GPL -# -# Please see COPYING for details -# -# Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen -# Copyright (c) 2005-2010 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS) -# All rights reserved. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# +-- vim: ts=4 sw=4 noet ai cindent syntax=lua +--[[ +Conky, a system monitor, based on torsmo -alignment top_left -background no -border_width 1 -cpu_avg_samples 2 -default_color white -default_outline_color white -default_shade_color white -draw_borders no -draw_graph_borders yes -draw_outline no -draw_shades no -use_xft yes -xftfont DejaVu Sans Mono:size=12 -gap_x 5 -gap_y 60 -minimum_size 5 5 -net_avg_samples 2 -no_buffers yes -out_to_console no -out_to_stderr no -extra_newline no -own_window yes -own_window_class Conky -own_window_type desktop -stippled_borders 0 -update_interval 1.0 -uppercase no -use_spacer none -show_graph_scale no -show_graph_range no +Any original torsmo code is licensed under the BSD license -TEXT +All code written since the fork of torsmo is licensed under the GPL + +Please see COPYING for details + +Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen +Copyright (c) 2005-2010 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS) +All rights reserved. + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. +You should have received a copy of the GNU General Public License +along with this program. If not, see . +]] + +conky.config = { + alignment = 'top_left', + background = false, + border_width = 1, + cpu_avg_samples = 2, + default_color = 'white', + default_outline_color = 'white', + default_shade_color = 'white', + draw_borders = false, + draw_graph_borders = true, + draw_outline = false, + draw_shades = false, + use_xft = true, + font = 'DejaVu Sans Mono:size=12', + gap_x = 5, + gap_y = 60, + minimum_height = 5, + minimum_width = 5, + net_avg_samples = 2, + no_buffers = true, + out_to_console = false, + out_to_stderr = false, + extra_newline = false, + own_window = true, + own_window_class = 'Conky', + own_window_type = 'desktop', + stippled_borders = 0, + update_interval = 1.0, + uppercase = false, + use_spacer = 'none', + show_graph_scale = false, + show_graph_range = false +} + +conky.text = [[ ${scroll 16 $nodename - $sysname $kernel on $machine | } $hr ${color grey}Uptime:$color $uptime @@ -75,3 +80,4 @@ ${color lightgrey} ${top name 1} ${top pid 1} ${top cpu 1} ${top mem 1} ${color lightgrey} ${top name 2} ${top pid 2} ${top cpu 2} ${top mem 2} ${color lightgrey} ${top name 3} ${top pid 3} ${top cpu 3} ${top mem 3} ${color lightgrey} ${top name 4} ${top pid 4} ${top cpu 4} ${top mem 4} +]] diff --git a/src/conky.cc b/src/conky.cc index 327079e5..a5468643 100644 --- a/src/conky.cc +++ b/src/conky.cc @@ -3229,17 +3229,7 @@ int main(int argc, char **argv) //////////// XXX //////////////////////////////// lua::state &l = *state; try { - l.loadstring( - "print(conky.asnumber(conky.variables.asdf{}));\n" - "print(conky.astext(conky.variables.asdf{}));\n" - "print(conky.asnumber(conky.variables.zxcv{}));\n" - "print(conky.variables.asdf{}.text);\n" - "print(conky.variables.asdf{}.xxx);\n" - "conky.config = { alignment='top_left', asdf=47, [42]=47, out_to_x=true,\n" - " own_window_hints='above, skip_taskbar',\n" - " background_colour='pink', own_window=true, double_buffer=true,\n" - " update_interval=5, update_interval_on_battery=10};\n" - ); + l.loadfile(argv[1]); l.call(0, 0); conky::set_config_settings(l); std::cout << "config.alignment = " << text_alignment.get(l) << std::endl; @@ -3295,6 +3285,9 @@ int main(int argc, char **argv) catch(std::exception &e) { std::cerr << "caught exception: " << e.what() << std::endl; } +#endif +#ifdef BUILD_CURL + curl_global_cleanup(); #endif return 0; //////////// XXX ////////////////////////////////