diff --git a/doc/config_settings.xml b/doc/config_settings.xml index 49ea3728..2d9ad359 100644 --- a/doc/config_settings.xml +++ b/doc/config_settings.xml @@ -775,7 +775,7 @@ - Update interval + Update interval @@ -785,7 +785,7 @@ - Update interval when running on batterypower + Update interval when running on batterypower diff --git a/doc/docs.xml b/doc/docs.xml index 706341e5..e826a9f3 100644 --- a/doc/docs.xml +++ b/doc/docs.xml @@ -16,7 +16,7 @@ Brenden Matthews - 2009-07-20 + 2009-07-28 conky diff --git a/doc/lua.xml b/doc/lua.xml index 2c397ef2..7ae3db87 100644 --- a/doc/lua.xml +++ b/doc/lua.xml @@ -1,188 +1,189 @@ - - - - - - - - - This function takes a string that is evaluated as - per Conky's TEXT section, and then returns a string - with the result. - - - - - - - - - - - - Sets Conky's update interval (in seconds) to 'number'. - - - - - - - - - - - - This table contains some information about - Conky's window. The following table describes the - values contained: - - - drawable - - - - visual - - - - display - - - - width - - - - height - - - - border_inner_margin - - - - border_outer_margin - - - - border_width - - - - text_start_x - - - - text_start_y - - - - text_width - - - - text_height - - - - NOTE: This table is only defined when X support - is enabled. - - - - - - - - - - - This table contains some information about - Conky's internal data. The following table describes the - values contained: - - - update_interval - - - - uptime - - - - - - - - - - - - - - A string containing the build info for this - particular instance of Conky, including the version, - build date, and architecture. - - - - - - - - - - - A string containing the build date for this - particular instance of Conky. - - - - - - - - - - - A string containing the build architecture for - this particular instance of Conky. - - - - - - - - - - - A string containing the version of the current - instance of Conky. - - - - - - - - - - - A string containing the path of the current Conky - configuration file. - - + + + + + + + + + This function takes a string that is evaluated as + per Conky's TEXT section, and then returns a string + with the result. + + + + + + + + + + + Sets Conky's update interval (in seconds) to + 'number'. + + + + + + + + + + + This table contains some information about + Conky's window. The following table describes the + values contained: + + + drawable + + + + visual + + + + display + + + + width + + + + height + + + + border_inner_margin + + + + border_outer_margin + + + + border_width + + + + text_start_x + + + + text_start_y + + + + text_width + + + + text_height + + + + NOTE: This table is only defined when X support + is enabled. + + + + + + + + + + + This table contains some information about + Conky's internal data. The following table describes + the values contained: + + + update_interval + + + + uptime + + + + + + + + + + + + + + A string containing the build info for this + particular instance of Conky, including the version, + build date, and architecture. + + + + + + + + + + + A string containing the build date for this + particular instance of Conky. + + + + + + + + + + + A string containing the build architecture for + this particular instance of Conky. + + + + + + + + + + + A string containing the version of the current + instance of Conky. + + + + + + + + + + + A string containing the path of the current Conky + configuration file. + + diff --git a/doc/variables.xml b/doc/variables.xml index a539389a..1d8be439 100644 --- a/doc/variables.xml +++ b/doc/variables.xml @@ -1264,9 +1264,9 @@ Displays first N lines of supplied text file. The - file is checked every 'next_check' update. If next_check - is not supplied, Conky defaults to 2. Max of 30 lines can be - displayed, or until the text buffer is filled. + file is checked every 'next_check' update. If next_check is + not supplied, Conky defaults to 2. Max of 30 lines can be + displayed, or until the text buffer is filled. @@ -1797,9 +1797,10 @@ Executes a Lua function with given parameters, then prints the returned string. See also 'lua_load' on how - to load scripts. Conky puts 'conky_' in front of function_name - to prevent accidental calls to the wrong function unless you - put you place 'conky_' in front of it yourself. + to load scripts. Conky puts 'conky_' in front of + function_name to prevent accidental calls to the wrong + function unless you put you place 'conky_' in front of it + yourself. @@ -1812,10 +1813,10 @@ Executes a Lua function with given parameters and draws a bar. Expects result value to be an integer between - 0 and 100. See also 'lua_load' on how to load scripts. + 0 and 100. See also 'lua_load' on how to load scripts. Conky puts 'conky_' in front of function_name to prevent - accidental calls to the wrong function unless you - put you place 'conky_' in front of it yourself. + accidental calls to the wrong function unless you put you + place 'conky_' in front of it yourself. @@ -1829,9 +1830,9 @@ Executes a Lua function with given parameters and draws a gauge. Expects result value to be an integer between 0 and 100. See also 'lua_load' on how to load - scripts. Conky puts 'conky_' in front of function_name - to prevent accidental calls to the wrong function unless you - put you place 'conky_' in front of it yourself. + scripts. Conky puts 'conky_' in front of function_name to + prevent accidental calls to the wrong function unless you + put you place 'conky_' in front of it yourself. @@ -1848,9 +1849,9 @@ load scripts. Takes the switch '-t' to use a temperature gradient, which makes the gradient values change depending on the amplitude of a particular graph value (try it and - see). Conky puts 'conky_' in front of function_name - to prevent accidental calls to the wrong function unless you - put you place 'conky_' in front of it yourself. + see). Conky puts 'conky_' in front of function_name to + prevent accidental calls to the wrong function unless you + put you place 'conky_' in front of it yourself. @@ -1863,20 +1864,10 @@ Executes a Lua function with given parameters as per $lua, then parses and prints the result value as per the syntax for Conky's TEXT section. See also 'lua_load' on - how to load scripts. Conky puts 'conky_' in front of function_name - to prevent accidental calls to the wrong function unless you - put you place 'conky_' in front of it yourself. - - - - - - - - - This function is deprecated. Please use the - conky_parse() Lua function instead. + how to load scripts. Conky puts 'conky_' in front of + function_name to prevent accidental calls to the wrong + function unless you put you place 'conky_' in front of it + yourself. @@ -2808,9 +2799,9 @@ Displays last N lines of supplied text file. The - file is checked every 'next_check' update. If next_check - is not supplied, Conky defaults to 2. Max of 30 lines can be - displayed, or until the text buffer is filled. + file is checked every 'next_check' update. If next_check is + not supplied, Conky defaults to 2. Max of 30 lines can be + displayed, or until the text buffer is filled. diff --git a/extras/nano/conky.nanorc b/extras/nano/conky.nanorc index b12d2662..84a9efaa 100644 --- a/extras/nano/conky.nanorc +++ b/extras/nano/conky.nanorc @@ -5,7 +5,7 @@ syntax "conky" "(\.*conkyrc.*$|conky.conf)" ## Configuration items -color green "\<(alias|alignment|append_file|background|border_inner_margin|border_margin|border_outer_margin|border_width|color0|color1|color2|color3|color4|color5|color6|color7|color8|color9|colorN|cpu_avg_samples|default_bar_size|default_color|default_gauge_size|default_graph_size|default_outline_color|default_shade_color|diskio_avg_samples|display|double_buffer|draw_borders|draw_graph_borders|draw_outline|draw_shades|extra_newline|font|format_human_readable|gap_x|gap_y|if_up_strictness|imap|imlib_cache_flush_interval|imlib_cache_size|lua_draw_hook_post|lua_draw_hook_pre|lua_load|mail_spool|max_port_monitor_connections|max_specials|max_user_text|maximum_width|minimum_size|mpd_host|mpd_password|mpd_port|music_player_interval|net_avg_samples|no_buffers|out_to_console|out_to_stderr|out_to_x|override_utf8_locale|overwrite_file|own_window|own_window_class|own_window_colour|own_window_hints|own_window_title|own_window_transparent|own_window_type|pad_percents|pop3|sensor_device|short_units|show_graph_range|show_graph_scale|stippled_borders|temperature_unit|template|template0|template1|template2|template3|template4|template5|template6|template7|template8|template9|text|text_buffer_size|top_cpu_separate|top_name_width|total_run_times|update_interval|uppercase|use_spacer|use_xft|xftalpha|xftfont)\>" +color green "\<(alias|alignment|append_file|background|border_inner_margin|border_outer_margin|border_width|color0|color1|color2|color3|color4|color5|color6|color7|color8|color9|colorN|cpu_avg_samples|default_bar_size|default_color|default_gauge_size|default_graph_size|default_outline_color|default_shade_color|diskio_avg_samples|display|double_buffer|draw_borders|draw_graph_borders|draw_outline|draw_shades|extra_newline|font|format_human_readable|gap_x|gap_y|if_up_strictness|imap|imlib_cache_flush_interval|imlib_cache_size|lua_draw_hook_post|lua_draw_hook_pre|lua_load|mail_spool|max_port_monitor_connections|max_specials|max_user_text|maximum_width|minimum_size|mpd_host|mpd_password|mpd_port|music_player_interval|net_avg_samples|no_buffers|out_to_console|out_to_stderr|out_to_x|override_utf8_locale|overwrite_file|own_window|own_window_class|own_window_colour|own_window_hints|own_window_title|own_window_transparent|own_window_type|pad_percents|pop3|sensor_device|short_units|show_graph_range|show_graph_scale|stippled_borders|temperature_unit|template|template0|template1|template2|template3|template4|template5|template6|template7|template8|template9|text|text_buffer_size|top_cpu_separate|top_name_width|total_run_times|update_interval|update_interval_on_battery|uppercase|use_spacer|use_xft|xftalpha|xftfont)\>" ## Configuration item constants color yellow "\<(above|below|bottom_left|bottom_right|bottom_middle|desktop|dock|no|none|normal|override|skip_pager|skip_taskbar|sticky|top_left|top_right|top_middle|middle_left|middle_right|undecorated|yes)\>" diff --git a/extras/vim/syntax/conkyrc.vim b/extras/vim/syntax/conkyrc.vim index f1180b00..a4f9fae8 100644 --- a/extras/vim/syntax/conkyrc.vim +++ b/extras/vim/syntax/conkyrc.vim @@ -12,7 +12,7 @@ endif syn region ConkyrcComment start=/^\s*#/ end=/$/ -syn keyword ConkyrcSetting alias alignment append_file background border_inner_margin border_margin border_outer_margin border_width color0 color1 color2 color3 color4 color5 color6 color7 color8 color9 colorN cpu_avg_samples default_bar_size default_color default_gauge_size default_graph_size default_outline_color default_shade_color diskio_avg_samples display double_buffer draw_borders draw_graph_borders draw_outline draw_shades extra_newline font format_human_readable gap_x gap_y if_up_strictness imap imlib_cache_flush_interval imlib_cache_size lua_draw_hook_post lua_draw_hook_pre lua_load mail_spool max_port_monitor_connections max_specials max_user_text maximum_width minimum_size mpd_host mpd_password mpd_port music_player_interval net_avg_samples no_buffers out_to_console out_to_stderr out_to_x override_utf8_locale overwrite_file own_window own_window_class own_window_colour own_window_hints own_window_title own_window_transparent own_window_type pad_percents pop3 sensor_device short_units show_graph_range show_graph_scale stippled_borders temperature_unit template template0 template1 template2 template3 template4 template5 template6 template7 template8 template9 text text_buffer_size top_cpu_separate top_name_width total_run_times update_interval uppercase use_spacer use_xft xftalpha xftfont +syn keyword ConkyrcSetting alias alignment append_file background border_inner_margin border_outer_margin border_width color0 color1 color2 color3 color4 color5 color6 color7 color8 color9 colorN cpu_avg_samples default_bar_size default_color default_gauge_size default_graph_size default_outline_color default_shade_color diskio_avg_samples display double_buffer draw_borders draw_graph_borders draw_outline draw_shades extra_newline font format_human_readable gap_x gap_y if_up_strictness imap imlib_cache_flush_interval imlib_cache_size lua_draw_hook_post lua_draw_hook_pre lua_load mail_spool max_port_monitor_connections max_specials max_user_text maximum_width minimum_size mpd_host mpd_password mpd_port music_player_interval net_avg_samples no_buffers out_to_console out_to_stderr out_to_x override_utf8_locale overwrite_file own_window own_window_class own_window_colour own_window_hints own_window_title own_window_transparent own_window_type pad_percents pop3 sensor_device short_units show_graph_range show_graph_scale stippled_borders temperature_unit template template0 template1 template2 template3 template4 template5 template6 template7 template8 template9 text text_buffer_size top_cpu_separate top_name_width total_run_times update_interval update_interval_on_battery uppercase use_spacer use_xft xftalpha xftfont syn keyword ConkyrcConstant \ above diff --git a/src/conky.c b/src/conky.c index 55fefb62..2e74b080 100644 --- a/src/conky.c +++ b/src/conky.c @@ -8175,15 +8175,6 @@ static void load_config_file(const char *f) CONF("show_graph_range") { show_graph_range = string_to_bool(value); } - CONF("border_margin") { - ERR("border_margin is deprecated, please use window.border_inner_margin instead"); - if (value) { - window.border_inner_margin = strtol(value, 0, 0); - if (window.border_inner_margin < 0) window.border_inner_margin = 0; - } else { - CONF_ERR; - } - } CONF("border_inner_margin") { if (value) { window.border_inner_margin = strtol(value, 0, 0);