summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/de/Makefile.am1
-rw-r--r--doc/de/autogen/completions.xml203
-rw-r--r--doc/de/autogen/weechat_commands.xml10
-rw-r--r--doc/de/autogen/weechat_options.xml2
-rw-r--r--doc/de/dev/plugin_c_api.de.xml142
-rw-r--r--doc/docgen.pl107
-rw-r--r--doc/en/Makefile.am1
-rw-r--r--doc/en/autogen/completions.xml203
-rw-r--r--doc/en/autogen/weechat_commands.xml10
-rw-r--r--doc/en/autogen/weechat_options.xml2
-rw-r--r--doc/en/dev/plugin_c_api.en.xml142
-rw-r--r--doc/fr/Makefile.am1
-rw-r--r--doc/fr/autogen/completions.xml203
-rw-r--r--doc/fr/autogen/weechat_commands.xml10
-rw-r--r--doc/fr/autogen/weechat_options.xml2
-rw-r--r--doc/fr/dev/plugin_c_api.fr.xml142
-rw-r--r--doc/include_autogen.xml4
17 files changed, 868 insertions, 317 deletions
diff --git a/doc/de/Makefile.am b/doc/de/Makefile.am
index 4f7f54b5e..35741d472 100644
--- a/doc/de/Makefile.am
+++ b/doc/de/Makefile.am
@@ -23,6 +23,7 @@ BOOK_AUTOGEN_INCLUDE = ../include_autogen.xml \
autogen/aspell_options.xml \
autogen/charset_commands.xml \
autogen/charset_options.xml \
+ autogen/completions.xml \
autogen/demo_commands.xml \
autogen/fifo_infos.xml \
autogen/irc_commands.xml \
diff --git a/doc/de/autogen/completions.xml b/doc/de/autogen/completions.xml
new file mode 100644
index 000000000..946666323
--- /dev/null
+++ b/doc/de/autogen/completions.xml
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ********* WARNING! *********
+
+ This file is autogenerated with docgen.pl script. *** DO NOT EDIT! ***
+ docgen.pl builds XML doc files to include in many languages
+-->
+
+<row>
+ <entry>alias</entry>
+ <entry>alias</entry>
+ <entry>list of alias</entry>
+</row>
+<row>
+ <entry>aspell</entry>
+ <entry>aspell_langs</entry>
+ <entry>list of supported langs for aspell</entry>
+</row>
+<row>
+ <entry>irc</entry>
+ <entry>irc_channel</entry>
+ <entry>current IRC channel</entry>
+</row>
+<row>
+ <entry>irc</entry>
+ <entry>irc_channel_nicks_hosts</entry>
+ <entry>nicks and hostnames of current IRC channel</entry>
+</row>
+<row>
+ <entry>irc</entry>
+ <entry>irc_channel_topic</entry>
+ <entry>topic of current IRC channel</entry>
+</row>
+<row>
+ <entry>irc</entry>
+ <entry>irc_channels</entry>
+ <entry>IRC channels (on all servers)</entry>
+</row>
+<row>
+ <entry>irc</entry>
+ <entry>irc_ignores_numbers</entry>
+ <entry>numbers for defined ignores</entry>
+</row>
+<row>
+ <entry>irc</entry>
+ <entry>irc_msg_part</entry>
+ <entry>default part message for IRC channel</entry>
+</row>
+<row>
+ <entry>irc</entry>
+ <entry>irc_server</entry>
+ <entry>current IRC server</entry>
+</row>
+<row>
+ <entry>irc</entry>
+ <entry>irc_server_nick</entry>
+ <entry>nick on current IRC server</entry>
+</row>
+<row>
+ <entry>irc</entry>
+ <entry>irc_server_nicks</entry>
+ <entry>nicks on all channels of current IRC server</entry>
+</row>
+<row>
+ <entry>irc</entry>
+ <entry>irc_servers</entry>
+ <entry>IRC servers (internal names)</entry>
+</row>
+<row>
+ <entry>irc</entry>
+ <entry>nick</entry>
+ <entry>nicks of current IRC channel</entry>
+</row>
+<row>
+ <entry>lua</entry>
+ <entry>lua_script</entry>
+ <entry>list of scripts</entry>
+</row>
+<row>
+ <entry>perl</entry>
+ <entry>perl_script</entry>
+ <entry>list of scripts</entry>
+</row>
+<row>
+ <entry>python</entry>
+ <entry>python_script</entry>
+ <entry>list of scripts</entry>
+</row>
+<row>
+ <entry>ruby</entry>
+ <entry>ruby_script</entry>
+ <entry>list of scripts</entry>
+</row>
+<row>
+ <entry>tcl</entry>
+ <entry>tcl_script</entry>
+ <entry>list of scripts</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>bars_names</entry>
+ <entry>names of bars</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>bars_options</entry>
+ <entry>options for bars</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>buffers_names</entry>
+ <entry>names of buffers</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>buffers_numbers</entry>
+ <entry>numbers of buffers</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>buffers_plugins_names</entry>
+ <entry>names of buffers (including plugins names)</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>commands</entry>
+ <entry>commands (weechat and plugins)</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>config_files</entry>
+ <entry>configuration files</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>config_option_values</entry>
+ <entry>values for a configuration option</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>config_options</entry>
+ <entry>configuration options</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>filename</entry>
+ <entry>filename</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>filters_names</entry>
+ <entry>names of filters</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>infolists</entry>
+ <entry>names of infolists hooked</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>infos</entry>
+ <entry>names of infos hooked</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>keys_codes</entry>
+ <entry>key codes</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>nicks</entry>
+ <entry>nicks in nicklist of current buffer</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>plugins_commands</entry>
+ <entry>commands defined by plugins</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>plugins_names</entry>
+ <entry>names of plugins</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>proxies_names</entry>
+ <entry>names of proxies</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>proxies_options</entry>
+ <entry>options for proxies</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>weechat_commands</entry>
+ <entry>weechat commands</entry>
+</row>
+<row>
+ <entry>xfer</entry>
+ <entry>nick</entry>
+ <entry>nicks of DCC chat</entry>
+</row>
diff --git a/doc/de/autogen/weechat_commands.xml b/doc/de/autogen/weechat_commands.xml
index 5e4e6be3c..b385619bd 100644
--- a/doc/de/autogen/weechat_commands.xml
+++ b/doc/de/autogen/weechat_commands.xml
@@ -150,14 +150,14 @@ functions for command line
Cette commande est utilisée par les associations de touches ou les extensions.
</programlisting>
-<command>/key [key [command [args]]] | [unbind key] | [reset -yes] | [missing]</command>
+<command>/key [bind key [command [args]]] | [unbind key] | [reset -yes] | [missing]</command>
<programlisting>
belegen/freigeben von Tasten
- key: display or bind this key to a command
- unbind: unbind a key
- reset: restore bindings to the default values and delete ALL personal bindings (use carefully!)
- missing: add missing keys (using default bindings)
+ bind: bind a command to a key or display command bound to key
+ unbind: remove a key binding
+ reset: restore bindings to the default values and delete ALL personal bindings (use carefully!)
+missing: add missing keys (using default bindings)
</programlisting>
<command>/layout [[save | apply | reset] [buffers | windows]]</command>
diff --git a/doc/de/autogen/weechat_options.xml b/doc/de/autogen/weechat_options.xml
index ead661fea..b1c9deed1 100644
--- a/doc/de/autogen/weechat_options.xml
+++ b/doc/de/autogen/weechat_options.xml
@@ -572,7 +572,7 @@
<para>type: string</para>
</listitem>
<listitem>
- <para>values: any string (default value: '%n|%(irc_channels)')</para>
+ <para>values: any string (default value: '%(nicks)|%(irc_channels)')</para>
</listitem>
</itemizedlist>
diff --git a/doc/de/dev/plugin_c_api.de.xml b/doc/de/dev/plugin_c_api.de.xml
index 669a13179..e04330536 100644
--- a/doc/de/dev/plugin_c_api.de.xml
+++ b/doc/de/dev/plugin_c_api.de.xml
@@ -1836,7 +1836,7 @@ void weechat_exec_on_files (
<option>callback</option>: function called for each file
found, arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -2490,7 +2490,7 @@ struct t_config_file *weechat_config_new (
configuration file is reloaded with /reload (optional, may be
NULL), arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -2629,7 +2629,7 @@ struct t_config_section *weechat_config_new_section (
except if options in your section need custom function),
arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -2681,7 +2681,7 @@ struct t_config_section *weechat_config_new_section (
is written in file (should be NULL for most cases, except if your
section needs to be written by a custom function), arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -2727,7 +2727,7 @@ struct t_config_section *weechat_config_new_section (
<option>callback_write_default</option>: callback called when
default values for section must be written in file, arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -2769,7 +2769,7 @@ struct t_config_section *weechat_config_new_section (
new option is created in section (NULL if section does not allow
new options to be created), arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -2821,7 +2821,7 @@ struct t_config_section *weechat_config_new_section (
option is deleted (NULL if section does not allow options to be
deleted), arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -3095,7 +3095,7 @@ struct t_config_option *weechat_config_new_option (
<option>callback_check_value</option>: callback called to check
new value for an option (optional), arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -3136,7 +3136,7 @@ struct t_config_option *weechat_config_new_option (
<option>callback_change</option>: callback called when value of
option has changed (optional), arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -3172,7 +3172,7 @@ struct t_config_option *weechat_config_new_option (
<option>callback_delete</option>: callback called when option
will be deleted (optional), arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -3727,7 +3727,7 @@ void *weechat_config_option_get_pointer (
<para>
<option>property</option>: property name:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Property</entry>
@@ -4656,7 +4656,7 @@ const char *weechat_prefix (const char *prefix);
<para>
<option>prefix</option>: name of prefix:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Prefix</entry>
@@ -5037,11 +5037,26 @@ struct t_hook *weechat_hook_command (
completions are possible for one argument, separated by "|".
Default completion codes are:
<informaltable colsep="0" frame="none">
+ <tgroup cols="3">
+ <thead>
+ <row>
+ <entry>Plugin</entry>
+ <entry>Code</entry>
+ <entry>Description</entry>
+ </row>
+ </thead>
+ <tbody>
+ &completions.xml;
+ </tbody>
+ </tgroup>
+ </informaltable>
+ Special codes:
+ <informaltable colsep="0" frame="none">
<tgroup cols="2">
<thead>
<row>
<entry>Code</entry>
- <entry>Completion</entry>
+ <entry>Description</entry>
</row>
</thead>
<tbody>
@@ -5053,71 +5068,6 @@ struct t_hook *weechat_hook_command (
<entry>%*</entry>
<entry>Repeat last completion</entry>
</row>
- <row>
- <entry>%b</entry>
- <entry>Buffers names</entry>
- </row>
- <row>
- <entry>%B</entry>
- <entry>Buffers names (with plugin name)</entry>
- </row>
- <row>
- <entry>%c</entry>
- <entry>Configuration files</entry>
- </row>
- <row>
- <entry>%f</entry>
- <entry>Filename</entry>
- </row>
- <row>
- <entry>%F</entry>
- <entry>Filters</entry>
- </row>
- <row>
- <entry>%h</entry>
- <entry>Commands hooked</entry>
- </row>
- <row>
- <entry>%i</entry>
- <entry>Infos hooked</entry>
- </row>
- <row>
- <entry>%I</entry>
- <entry>Infolists hooked</entry>
- </row>
- <row>
- <entry>%n</entry>
- <entry>Nick</entry>
- </row>
- <row>
- <entry>%o</entry>
- <entry>Configuration option</entry>
- </row>
- <row>
- <entry>%p</entry>
- <entry>Plugin name</entry>
- </row>
- <row>
- <entry>%P</entry>
- <entry>Plugin commands</entry>
- </row>
- <row>
- <entry>%r</entry>
- <entry>Bar names</entry>
- </row>
- <row>
- <entry>%v</entry>
- <entry>Value of configuration option</entry>
- </row>
- <row>
- <entry>%w</entry>
- <entry>WeeChat commands</entry>
- </row>
- <row>
- <entry>%(xxx)</entry>
- <entry>Custom completion by plugin (xxx is a completion
- code added by a plugin)</entry>
- </row>
</tbody>
</tgroup>
</informaltable>
@@ -5128,7 +5078,7 @@ struct t_hook *weechat_hook_command (
<option>callback</option>: function called when command is used,
arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -5244,7 +5194,7 @@ struct t_hook *weechat_hook_command_run (
<option>callback</option>: function called when command is run,
arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -5351,7 +5301,7 @@ struct t_hook *weechat_hook_timer (
<option>callback</option>: function called when time is reached,
arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -5452,7 +5402,7 @@ struct t_hook *weechat_hook_fd (
<option>callback</option>: function called when a selected event
occurs, arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -5546,7 +5496,7 @@ struct t_hook *weechat_hook_process (
<option>callback</option>: function called when data from child
is available, or when child has ended, arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -5684,7 +5634,7 @@ struct t_hook *weechat_hook_connect (
<option>callback</option>: function called when connection is ok
or failed, arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -5858,7 +5808,7 @@ struct t_hook *weechat_hook_print (
<option>callback</option>: function called when message is
printed, arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -5981,7 +5931,7 @@ struct t_hook *weechat_hook_signal (
<option>callback</option>: function called when signal is
received, arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -6124,7 +6074,7 @@ struct t_hook *weechat_hook_config (
<option>callback</option>: function called when configuration
option is changed, arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -6217,7 +6167,7 @@ struct t_hook *weechat_hook_completion (
is used (user is completing something using this item),
arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -6383,7 +6333,7 @@ struct t_hook *weechat_hook_modifier (
<option>callback</option>: function called when modifier is
received, arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -6547,7 +6497,7 @@ struct t_hook *weechat_hook_info (
<option>callback</option>: function called when info is asked,
arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -6642,7 +6592,7 @@ struct t_hook *weechat_hook_infolist (
<option>callback</option>: function called when infolist is asked,
arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -6805,7 +6755,7 @@ struct t_gui_buffer *weechat_buffer_new (
<option>input_callback</option>: function called when input text
is entered on buffer, arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -6845,7 +6795,7 @@ struct t_gui_buffer *weechat_buffer_new (
<option>close_callback</option>: function called when buffer is
closed, arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -7294,7 +7244,7 @@ void weechat_buffer_set (struct t_gui_buffer *buffer, const char *property,
<para>
<option>property</option>: property name:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Name</entry>
@@ -7522,7 +7472,7 @@ void weechat_buffer_set_pointer (struct t_gui_buffer *buffer, const char *proper
<para>
<option>property</option>: property name:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Name</entry>
@@ -9005,7 +8955,7 @@ const char *weechat_info_get (const char *info_name,
core or other plugin (see plugin doc for infos returned by
each plugin). WeeChat core infos are:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Info</entry>
diff --git a/doc/docgen.pl b/doc/docgen.pl
index 3faf9c347..6562cdb15 100644
--- a/doc/docgen.pl
+++ b/doc/docgen.pl
@@ -15,8 +15,8 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-# Documentation generator for WeeChat: build XML include files with commands
-# and options for WeeChat core and plugins.
+# Documentation generator for WeeChat: build XML include files with commands,
+# options, infos and completions for WeeChat core and plugins.
#
# Instructions to build config files yourself in WeeChat directories (replace
# all paths with your path to WeeChat):
@@ -39,7 +39,7 @@ use File::Basename;
my $version = "0.1";
-# -------------------------------[ config ]-------------------------------------
+# -------------------------------[ config ]------------------------------------
# default path where doc XML files will be written (should be doc/ in sources
# package tree)
@@ -82,10 +82,14 @@ my @ignore_options = ("aspell\\.dict\\..*",
"logger\\.mask\\..*",
"weechat\\.proxy\\..*",
"weechat\\.bar\\..*",
- "weechat\\.debug\\..*",
- );
+ "weechat\\.debug\\..*");
-# --------------------------------[ init ]--------------------------------------
+# completions to ignore
+my @ignore_completions_plugins = ("jabber");
+my @ignore_completions_items = ("jabber.*",
+ "weeget.*");
+
+# -------------------------------[ init ]--------------------------------------
weechat::register("docgen", "FlashCode <flashcode\@flashtux.org>", $version,
"GPL", "Doc generator for WeeChat 0.2.7", "", "");
@@ -93,7 +97,7 @@ weechat::hook_command("docgen", "Doc generator", "", "", "", "docgen");
weechat::config_set_plugin("path", $default_path)
if (weechat::config_get_plugin("path") eq "");
-# ------------------------------------------------------------------------------
+# -----------------------------------------------------------------------------
# get list of commands in a hash with 3 indexes: plugin, command, xxx
sub get_commands
@@ -192,6 +196,40 @@ sub get_infos
return %infos;
}
+# get list of completions hooked by plugins in a hash with 3 indexes: plugin, item, xxx
+sub get_completions
+{
+ my %completions;
+
+ # get completions hooked
+ my $infolist = weechat::infolist_get("hook", "", "completion");
+ while (weechat::infolist_next($infolist))
+ {
+ my $completion_item = weechat::infolist_string($infolist, "completion_item");
+ my $plugin = weechat::infolist_string($infolist, "plugin_name");
+ $plugin = "weechat" if ($plugin eq "");
+
+ # check if completion item is ignored or not
+ my $ignore = 0;
+ foreach my $mask (@ignore_completions_plugins)
+ {
+ $ignore = 1 if ($plugin =~ /${mask}/);
+ }
+ foreach my $mask (@ignore_completions_items)
+ {
+ $ignore = 1 if ($completion_item =~ /${mask}/);
+ }
+
+ if ($ignore ne 1)
+ {
+ $completions{$plugin}{$completion_item}{"description"} = weechat::infolist_string($infolist, "description");
+ }
+ }
+ weechat::infolist_free($infolist);
+
+ return %completions;
+}
+
# escape string for XML output
sub escape
{
@@ -207,6 +245,7 @@ sub docgen
my %plugin_commands = get_commands();
my %plugin_options = get_options();
my %plugin_infos = get_infos();
+ my %plugin_completions = get_completions();
# xml header (comment) for all files
my $xml_header =
@@ -235,6 +274,8 @@ sub docgen
my $num_files_options_updated = 0;
my $num_files_infos = 0;
my $num_files_infos_updated = 0;
+ my $num_files_completions = 0;
+ my $num_files_completions_updated = 0;
setlocale(LC_MESSAGES, $locale.".UTF-8");
my $d = Locale::gettext->domain_raw("weechat");
@@ -415,23 +456,65 @@ sub docgen
weechat::print("", weechat::prefix("error")."docgen error: unable to write file '$filename'");
}
}
+
+ # write completions hooked
+ my $filename = $dir."completions.xml";
+ if (open(FILE, ">".$filename.".tmp"))
+ {
+ print FILE $xml_header;
+ foreach my $plugin (sort keys %plugin_completions)
+ {
+ foreach my $completion_item (sort keys %{$plugin_completions{$plugin}})
+ {
+ my $description = $plugin_completions{$plugin}{$completion_item}{"description"};
+ $description = $d->get($description) if ($description ne "");
+
+ print FILE "<row>\n";
+ print FILE " <entry>".escape($plugin)."</entry>\n";
+ print FILE " <entry>".escape($completion_item)."</entry>\n";
+ print FILE " <entry>".escape($description)."</entry>\n";
+ print FILE "</row>\n";
+ }
+ }
+ #weechat::print("", "docgen: file ok: '$filename'");
+ my $rc = system("diff ".$filename." ".$filename.".tmp >/dev/null 2>&1");
+ if ($rc != 0)
+ {
+ system("mv -f ".$filename.".tmp ".$filename);
+ $num_files_updated++;
+ $num_files_completions_updated++;
+ }
+ else
+ {
+ system("rm ".$filename.".tmp");
+ }
+ $num_files++;
+ $num_files_completions++;
+ close(FILE);
+ }
+ else
+ {
+ weechat::print("", weechat::prefix("error")."docgen error: unable to write file '$filename'");
+ }
}
else
{
weechat::print("", weechat::prefix("error")."docgen error: directory '$dir' does not exist");
}
my $total_files = $num_files_commands + $num_files_options
- + $num_files_infos;
+ + $num_files_infos + $num_files_completions;
my $total_files_updated = $num_files_commands_updated + $num_files_options_updated
- + $num_files_infos_updated;
+ + $num_files_infos_updated + $num_files_completions_updated;
weechat::print("", "docgen: ".$locale.": ".$total_files." files ("
.$num_files_commands." cmd, "
.$num_files_options." opt, "
- .$num_files_infos." infos) -- "
+ .$num_files_infos." infos, "
+ .$num_files_completions." complt) -- "
.$total_files_updated." updated ("
.$num_files_commands_updated." cmd, "
.$num_files_options_updated." opt, "
- .$num_files_infos_updated." infos)");
+ .$num_files_infos_updated." infos, "
+ .$num_files_completions_updated." complt)");
}
weechat::print("", "docgen: total: ".$num_files." files (".$num_files_updated." updated)");
@@ -456,6 +539,8 @@ sub docgen
{
print FILE "<!ENTITY ".$plugin."_infos.xml SYSTEM \"autogen/".$plugin."_infos.xml\">\n";
}
+ print FILE "\n<!-- completions hooked -->\n\n";
+ print FILE "<!ENTITY completions.xml SYSTEM \"autogen/completions.xml\">\n";
close(FILE);
my $rc = system("diff ".$filename." ".$filename.".tmp >/dev/null 2>&1");
if ($rc != 0)
diff --git a/doc/en/Makefile.am b/doc/en/Makefile.am
index 030d8e9c5..641fcdc6f 100644
--- a/doc/en/Makefile.am
+++ b/doc/en/Makefile.am
@@ -23,6 +23,7 @@ BOOK_AUTOGEN_INCLUDE = ../include_autogen.xml \
autogen/aspell_options.xml \
autogen/charset_commands.xml \
autogen/charset_options.xml \
+ autogen/completions.xml \
autogen/demo_commands.xml \
autogen/fifo_infos.xml \
autogen/irc_commands.xml \
diff --git a/doc/en/autogen/completions.xml b/doc/en/autogen/completions.xml
new file mode 100644
index 000000000..946666323
--- /dev/null
+++ b/doc/en/autogen/completions.xml
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ********* WARNING! *********
+
+ This file is autogenerated with docgen.pl script. *** DO NOT EDIT! ***
+ docgen.pl builds XML doc files to include in many languages
+-->
+
+<row>
+ <entry>alias</entry>
+ <entry>alias</entry>
+ <entry>list of alias</entry>
+</row>
+<row>
+ <entry>aspell</entry>
+ <entry>aspell_langs</entry>
+ <entry>list of supported langs for aspell</entry>
+</row>
+<row>
+ <entry>irc</entry>
+ <entry>irc_channel</entry>
+ <entry>current IRC channel</entry>
+</row>
+<row>
+ <entry>irc</entry>
+ <entry>irc_channel_nicks_hosts</entry>
+ <entry>nicks and hostnames of current IRC channel</entry>
+</row>
+<row>
+ <entry>irc</entry>
+ <entry>irc_channel_topic</entry>
+ <entry>topic of current IRC channel</entry>
+</row>
+<row>
+ <entry>irc</entry>
+ <entry>irc_channels</entry>
+ <entry>IRC channels (on all servers)</entry>
+</row>
+<row>
+ <entry>irc</entry>
+ <entry>irc_ignores_numbers</entry>
+ <entry>numbers for defined ignores</entry>
+</row>
+<row>
+ <entry>irc</entry>
+ <entry>irc_msg_part</entry>
+ <entry>default part message for IRC channel</entry>
+</row>
+<row>
+ <entry>irc</entry>
+ <entry>irc_server</entry>
+ <entry>current IRC server</entry>
+</row>
+<row>
+ <entry>irc</entry>
+ <entry>irc_server_nick</entry>
+ <entry>nick on current IRC server</entry>
+</row>
+<row>
+ <entry>irc</entry>
+ <entry>irc_server_nicks</entry>
+ <entry>nicks on all channels of current IRC server</entry>
+</row>
+<row>
+ <entry>irc</entry>
+ <entry>irc_servers</entry>
+ <entry>IRC servers (internal names)</entry>
+</row>
+<row>
+ <entry>irc</entry>
+ <entry>nick</entry>
+ <entry>nicks of current IRC channel</entry>
+</row>
+<row>
+ <entry>lua</entry>
+ <entry>lua_script</entry>
+ <entry>list of scripts</entry>
+</row>
+<row>
+ <entry>perl</entry>
+ <entry>perl_script</entry>
+ <entry>list of scripts</entry>
+</row>
+<row>
+ <entry>python</entry>
+ <entry>python_script</entry>
+ <entry>list of scripts</entry>
+</row>
+<row>
+ <entry>ruby</entry>
+ <entry>ruby_script</entry>
+ <entry>list of scripts</entry>
+</row>
+<row>
+ <entry>tcl</entry>
+ <entry>tcl_script</entry>
+ <entry>list of scripts</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>bars_names</entry>
+ <entry>names of bars</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>bars_options</entry>
+ <entry>options for bars</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>buffers_names</entry>
+ <entry>names of buffers</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>buffers_numbers</entry>
+ <entry>numbers of buffers</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>buffers_plugins_names</entry>
+ <entry>names of buffers (including plugins names)</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>commands</entry>
+ <entry>commands (weechat and plugins)</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>config_files</entry>
+ <entry>configuration files</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>config_option_values</entry>
+ <entry>values for a configuration option</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>config_options</entry>
+ <entry>configuration options</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>filename</entry>
+ <entry>filename</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>filters_names</entry>
+ <entry>names of filters</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>infolists</entry>
+ <entry>names of infolists hooked</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>infos</entry>
+ <entry>names of infos hooked</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>keys_codes</entry>
+ <entry>key codes</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>nicks</entry>
+ <entry>nicks in nicklist of current buffer</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>plugins_commands</entry>
+ <entry>commands defined by plugins</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>plugins_names</entry>
+ <entry>names of plugins</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>proxies_names</entry>
+ <entry>names of proxies</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>proxies_options</entry>
+ <entry>options for proxies</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>weechat_commands</entry>
+ <entry>weechat commands</entry>
+</row>
+<row>
+ <entry>xfer</entry>
+ <entry>nick</entry>
+ <entry>nicks of DCC chat</entry>
+</row>
diff --git a/doc/en/autogen/weechat_commands.xml b/doc/en/autogen/weechat_commands.xml
index e9740ea33..fb714edf6 100644
--- a/doc/en/autogen/weechat_commands.xml
+++ b/doc/en/autogen/weechat_commands.xml
@@ -150,14 +150,14 @@ functions for command line
Cette commande est utilisée par les associations de touches ou les extensions.
</programlisting>
-<command>/key [key [command [args]]] | [unbind key] | [reset -yes] | [missing]</command>
+<command>/key [bind key [command [args]]] | [unbind key] | [reset -yes] | [missing]</command>
<programlisting>
bind/unbind keys
- key: display or bind this key to a command
- unbind: unbind a key
- reset: restore bindings to the default values and delete ALL personal bindings (use carefully!)
- missing: add missing keys (using default bindings)
+ bind: bind a command to a key or display command bound to key
+ unbind: remove a key binding
+ reset: restore bindings to the default values and delete ALL personal bindings (use carefully!)
+missing: add missing keys (using default bindings)
</programlisting>
<command>/layout [[save | apply | reset] [buffers | windows]]</command>
diff --git a/doc/en/autogen/weechat_options.xml b/doc/en/autogen/weechat_options.xml
index 0015063b2..20779ea41 100644
--- a/doc/en/autogen/weechat_options.xml
+++ b/doc/en/autogen/weechat_options.xml
@@ -572,7 +572,7 @@
<para>type: string</para>
</listitem>
<listitem>
- <para>values: any string (default value: '%n|%(irc_channels)')</para>
+ <para>values: any string (default value: '%(nicks)|%(irc_channels)')</para>
</listitem>
</itemizedlist>
diff --git a/doc/en/dev/plugin_c_api.en.xml b/doc/en/dev/plugin_c_api.en.xml
index b5f01bff4..f4a50efd7 100644
--- a/doc/en/dev/plugin_c_api.en.xml
+++ b/doc/en/dev/plugin_c_api.en.xml
@@ -1835,7 +1835,7 @@ void weechat_exec_on_files (
<option>callback</option>: function called for each file
found, arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -2489,7 +2489,7 @@ struct t_config_file *weechat_config_new (
configuration file is reloaded with /reload (optional, may be
NULL), arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -2628,7 +2628,7 @@ struct t_config_section *weechat_config_new_section (
except if options in your section need custom function),
arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -2680,7 +2680,7 @@ struct t_config_section *weechat_config_new_section (
is written in file (should be NULL for most cases, except if your
section needs to be written by a custom function), arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -2726,7 +2726,7 @@ struct t_config_section *weechat_config_new_section (
<option>callback_write_default</option>: callback called when
default values for section must be written in file, arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -2768,7 +2768,7 @@ struct t_config_section *weechat_config_new_section (
new option is created in section (NULL if section does not allow
new options to be created), arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -2820,7 +2820,7 @@ struct t_config_section *weechat_config_new_section (
option is deleted (NULL if section does not allow options to be
deleted), arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -3094,7 +3094,7 @@ struct t_config_option *weechat_config_new_option (
<option>callback_check_value</option>: callback called to check
new value for an option (optional), arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -3135,7 +3135,7 @@ struct t_config_option *weechat_config_new_option (
<option>callback_change</option>: callback called when value of
option has changed (optional), arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -3171,7 +3171,7 @@ struct t_config_option *weechat_config_new_option (
<option>callback_delete</option>: callback called when option
will be deleted (optional), arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -3726,7 +3726,7 @@ void *weechat_config_option_get_pointer (
<para>
<option>property</option>: property name:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Property</entry>
@@ -4655,7 +4655,7 @@ const char *weechat_prefix (const char *prefix);
<para>
<option>prefix</option>: name of prefix:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Prefix</entry>
@@ -5036,11 +5036,26 @@ struct t_hook *weechat_hook_command (
completions are possible for one argument, separated by "|".
Default completion codes are:
<informaltable colsep="0" frame="none">
+ <tgroup cols="3">
+ <thead>
+ <row>
+ <entry>Plugin</entry>
+ <entry>Code</entry>
+ <entry>Description</entry>
+ </row>
+ </thead>
+ <tbody>
+ &completions.xml;
+ </tbody>
+ </tgroup>
+ </informaltable>
+ Special codes:
+ <informaltable colsep="0" frame="none">
<tgroup cols="2">
<thead>
<row>
<entry>Code</entry>
- <entry>Completion</entry>
+ <entry>Description</entry>
</row>
</thead>
<tbody>
@@ -5052,71 +5067,6 @@ struct t_hook *weechat_hook_command (
<entry>%*</entry>
<entry>Repeat last completion</entry>
</row>
- <row>
- <entry>%b</entry>
- <entry>Buffers names</entry>
- </row>
- <row>
- <entry>%B</entry>
- <entry>Buffers names (with plugin name)</entry>
- </row>
- <row>
- <entry>%c</entry>
- <entry>Configuration files</entry>
- </row>
- <row>
- <entry>%f</entry>
- <entry>Filename</entry>
- </row>
- <row>
- <entry>%F</entry>
- <entry>Filters</entry>
- </row>
- <row>
- <entry>%h</entry>
- <entry>Commands hooked</entry>
- </row>
- <row>
- <entry>%i</entry>
- <entry>Infos hooked</entry>
- </row>
- <row>
- <entry>%I</entry>
- <entry>Infolists hooked</entry>
- </row>
- <row>
- <entry>%n</entry>
- <entry>Nick</entry>
- </row>
- <row>
- <entry>%o</entry>
- <entry>Configuration option</entry>
- </row>
- <row>
- <entry>%p</entry>
- <entry>Plugin name</entry>
- </row>
- <row>
- <entry>%P</entry>
- <entry>Plugin commands</entry>
- </row>
- <row>
- <entry>%r</entry>
- <entry>Bar names</entry>
- </row>
- <row>
- <entry>%v</entry>
- <entry>Value of configuration option</entry>
- </row>
- <row>
- <entry>%w</entry>
- <entry>WeeChat commands</entry>
- </row>
- <row>
- <entry>%(xxx)</entry>
- <entry>Custom completion by plugin (xxx is a completion
- code added by a plugin)</entry>
- </row>
</tbody>
</tgroup>
</informaltable>
@@ -5127,7 +5077,7 @@ struct t_hook *weechat_hook_command (
<option>callback</option>: function called when command is used,
arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -5243,7 +5193,7 @@ struct t_hook *weechat_hook_command_run (
<option>callback</option>: function called when command is run,
arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -5350,7 +5300,7 @@ struct t_hook *weechat_hook_timer (
<option>callback</option>: function called when time is reached,
arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -5451,7 +5401,7 @@ struct t_hook *weechat_hook_fd (
<option>callback</option>: function called when a selected event
occurs, arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -5545,7 +5495,7 @@ struct t_hook *weechat_hook_process (
<option>callback</option>: function called when data from child
is available, or when child has ended, arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -5683,7 +5633,7 @@ struct t_hook *weechat_hook_connect (
<option>callback</option>: function called when connection is ok
or failed, arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -5857,7 +5807,7 @@ struct t_hook *weechat_hook_print (
<option>callback</option>: function called when message is
printed, arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -5980,7 +5930,7 @@ struct t_hook *weechat_hook_signal (
<option>callback</option>: function called when signal is
received, arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -6123,7 +6073,7 @@ struct t_hook *weechat_hook_config (
<option>callback</option>: function called when configuration
option is changed, arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -6216,7 +6166,7 @@ struct t_hook *weechat_hook_completion (
is used (user is completing something using this item),
arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -6382,7 +6332,7 @@ struct t_hook *weechat_hook_modifier (
<option>callback</option>: function called when modifier is
received, arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -6546,7 +6496,7 @@ struct t_hook *weechat_hook_info (
<option>callback</option>: function called when info is asked,
arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -6641,7 +6591,7 @@ struct t_hook *weechat_hook_infolist (
<option>callback</option>: function called when infolist is asked,
arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -6804,7 +6754,7 @@ struct t_gui_buffer *weechat_buffer_new (
<option>input_callback</option>: function called when input text
is entered on buffer, arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -6844,7 +6794,7 @@ struct t_gui_buffer *weechat_buffer_new (
<option>close_callback</option>: function called when buffer is
closed, arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -7293,7 +7243,7 @@ void weechat_buffer_set (struct t_gui_buffer *buffer, const char *property,
<para>
<option>property</option>: property name:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Name</entry>
@@ -7521,7 +7471,7 @@ void weechat_buffer_set_pointer (struct t_gui_buffer *buffer, const char *proper
<para>
<option>property</option>: property name:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Name</entry>
@@ -9004,7 +8954,7 @@ const char *weechat_info_get (const char *info_name,
core or other plugin (see plugin doc for infos returned by
each plugin). WeeChat core infos are:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Info</entry>
diff --git a/doc/fr/Makefile.am b/doc/fr/Makefile.am
index 7c9c7e9fd..9483f23ee 100644
--- a/doc/fr/Makefile.am
+++ b/doc/fr/Makefile.am
@@ -23,6 +23,7 @@ BOOK_AUTOGEN_INCLUDE = ../include_autogen.xml \
autogen/aspell_options.xml \
autogen/charset_commands.xml \
autogen/charset_options.xml \
+ autogen/completions.xml \
autogen/demo_commands.xml \
autogen/fifo_infos.xml \
autogen/irc_commands.xml \
diff --git a/doc/fr/autogen/completions.xml b/doc/fr/autogen/completions.xml
new file mode 100644
index 000000000..92c4d092a
--- /dev/null
+++ b/doc/fr/autogen/completions.xml
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ********* WARNING! *********
+
+ This file is autogenerated with docgen.pl script. *** DO NOT EDIT! ***
+ docgen.pl builds XML doc files to include in many languages
+-->
+
+<row>
+ <entry>alias</entry>
+ <entry>alias</entry>
+ <entry>liste des alias</entry>
+</row>
+<row>
+ <entry>aspell</entry>
+ <entry>aspell_langs</entry>
+ <entry>liste des langues supportées pour aspell</entry>
+</row>
+<row>
+ <entry>irc</entry>
+ <entry>irc_channel</entry>
+ <entry>canal IRC courant</entry>
+</row>
+<row>
+ <entry>irc</entry>
+ <entry>irc_channel_nicks_hosts</entry>
+ <entry>pseudos et noms d'hôtes du canal IRC courant</entry>
+</row>
+<row>
+ <entry>irc</entry>
+ <entry>irc_channel_topic</entry>
+ <entry>titre du canal IRC courant</entry>
+</row>
+<row>
+ <entry>irc</entry>
+ <entry>irc_channels</entry>
+ <entry>canaux IRC (sur tous les serveurs)</entry>
+</row>
+<row>
+ <entry>irc</entry>
+ <entry>irc_ignores_numbers</entry>
+ <entry>numéros pour les ignores définis</entry>
+</row>
+<row>
+ <entry>irc</entry>
+ <entry>irc_msg_part</entry>
+ <entry>message de fin par défaut pour le canal IRC</entry>
+</row>
+<row>
+ <entry>irc</entry>
+ <entry>irc_server</entry>
+ <entry>serveur IRC courant</entry>
+</row>
+<row>
+ <entry>irc</entry>
+ <entry>irc_server_nick</entry>
+ <entry>pseudo sur le serveur IRC courant</entry>
+</row>
+<row>
+ <entry>irc</entry>
+ <entry>irc_server_nicks</entry>
+ <entry>pseudos sur tous les canaux du serveur IRC courant</entry>
+</row>
+<row>
+ <entry>irc</entry>
+ <entry>irc_servers</entry>
+ <entry>serveurs IRC (noms internes)</entry>
+</row>
+<row>
+ <entry>irc</entry>
+ <entry>nick</entry>
+ <entry>pseudos du canal IRC courant</entry>
+</row>
+<row>
+ <entry>lua</entry>
+ <entry>lua_script</entry>
+ <entry>liste des scripts</entry>
+</row>
+<row>
+ <entry>perl</entry>
+ <entry>perl_script</entry>
+ <entry>liste des scripts</entry>
+</row>
+<row>
+ <entry>python</entry>
+ <entry>python_script</entry>
+ <entry>liste des scripts</entry>
+</row>
+<row>
+ <entry>ruby</entry>
+ <entry>ruby_script</entry>
+ <entry>liste des scripts</entry>
+</row>
+<row>
+ <entry>tcl</entry>
+ <entry>tcl_script</entry>
+ <entry>liste des scripts</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>bars_names</entry>
+ <entry>noms des barres</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>bars_options</entry>
+ <entry>options pour les barres</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>buffers_names</entry>
+ <entry>noms des tampons</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>buffers_numbers</entry>
+ <entry>numéros des tampons</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>buffers_plugins_names</entry>
+ <entry>noms des tampons (incluant les noms d'extensions)</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>commands</entry>
+ <entry>commandes (weechat et extensions)</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>config_files</entry>
+ <entry>fichiers de configuration</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>config_option_values</entry>
+ <entry>valeurs pour une option de configuration</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>config_options</entry>
+ <entry>options de configuration</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>filename</entry>
+ <entry>nom de fichier</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>filters_names</entry>
+ <entry>noms des filtres</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>infolists</entry>
+ <entry>noms des infolistes accrochées</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>infos</entry>
+ <entry>noms des infos accrochées</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>keys_codes</entry>
+ <entry>codes des touches</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>nicks</entry>
+ <entry>pseudos dans la liste des pseudos du tampon courant</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>plugins_commands</entry>
+ <entry>commandes définies par les extensions</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>plugins_names</entry>
+ <entry>noms des extensions</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>proxies_names</entry>
+ <entry>noms des proxies</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>proxies_options</entry>
+ <entry>options pour les proxies</entry>
+</row>
+<row>
+ <entry>weechat</entry>
+ <entry>weechat_commands</entry>
+ <entry>commandes weechat</entry>
+</row>
+<row>
+ <entry>xfer</entry>
+ <entry>nick</entry>
+ <entry>pseudos de la discussion DCC</entry>
+</row>
diff --git a/doc/fr/autogen/weechat_commands.xml b/doc/fr/autogen/weechat_commands.xml
index e1f2412ed..dd720cb75 100644
--- a/doc/fr/autogen/weechat_commands.xml
+++ b/doc/fr/autogen/weechat_commands.xml
@@ -149,14 +149,14 @@ fonctions pour la ligne de commande
Cette commande est utilisée par les associations de touches ou les extensions.
</programlisting>
-<command>/key [touche [commande [args]]] | [unbind touche] | [reset -yes] | [missing]</command>
+<command>/key [bind touche [commande [args]]] | [unbind touche] | [reset -yes] | [missing]</command>
<programlisting>
associer/libérer des touches
- touche: voir ou associer cette touche à une commande
- unbind: supprimer l'association à une touche
- reset: restaure les touches aux valeurs par défaut et supprime TOUTES les touches personnelles (utiliser avec précaution !)
- missing: ajoute les touches manquantes (en utilisant les touches par défaut)
+ bind: associer une commande à une touche ou afficher la commande associée à la touche
+ unbind: supprimer l'association à une touche
+ reset: restaure les touches aux valeurs par défaut et supprime TOUTES les touches personnelles (utiliser avec précaution !)
+missing: ajoute les touches manquantes (en utilisant les touches par défaut)
</programlisting>
<command>/layout [[save | apply | reset] [buffers | windows]]</command>
diff --git a/doc/fr/autogen/weechat_options.xml b/doc/fr/autogen/weechat_options.xml
index 89ecdfebd..10b3c5087 100644
--- a/doc/fr/autogen/weechat_options.xml
+++ b/doc/fr/autogen/weechat_options.xml
@@ -572,7 +572,7 @@
<para>type: chaîne</para>
</listitem>
<listitem>
- <para>valeurs: toute chaîne (valeur par défaut: '%n|%(irc_channels)')</para>
+ <para>valeurs: toute chaîne (valeur par défaut: '%(nicks)|%(irc_channels)')</para>
</listitem>
</itemizedlist>
diff --git a/doc/fr/dev/plugin_c_api.fr.xml b/doc/fr/dev/plugin_c_api.fr.xml
index fcdf963bc..ecf45a0df 100644
--- a/doc/fr/dev/plugin_c_api.fr.xml
+++ b/doc/fr/dev/plugin_c_api.fr.xml
@@ -1836,7 +1836,7 @@ void weechat_exec_on_files (
<option>callback</option>: function called for each file
found, arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -2490,7 +2490,7 @@ struct t_config_file *weechat_config_new (
configuration file is reloaded with /reload (optional, may be
NULL), arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -2629,7 +2629,7 @@ struct t_config_section *weechat_config_new_section (
except if options in your section need custom function),
arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -2681,7 +2681,7 @@ struct t_config_section *weechat_config_new_section (
is written in file (should be NULL for most cases, except if your
section needs to be written by a custom function), arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -2727,7 +2727,7 @@ struct t_config_section *weechat_config_new_section (
<option>callback_write_default</option>: callback called when
default values for section must be written in file, arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -2769,7 +2769,7 @@ struct t_config_section *weechat_config_new_section (
new option is created in section (NULL if section does not allow
new options to be created), arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -2821,7 +2821,7 @@ struct t_config_section *weechat_config_new_section (
option is deleted (NULL if section does not allow options to be
deleted), arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -3095,7 +3095,7 @@ struct t_config_option *weechat_config_new_option (
<option>callback_check_value</option>: callback called to check
new value for an option (optional), arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -3136,7 +3136,7 @@ struct t_config_option *weechat_config_new_option (
<option>callback_change</option>: callback called when value of
option has changed (optional), arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -3172,7 +3172,7 @@ struct t_config_option *weechat_config_new_option (
<option>callback_delete</option>: callback called when option
will be deleted (optional), arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -3727,7 +3727,7 @@ void *weechat_config_option_get_pointer (
<para>
<option>property</option>: property name:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Property</entry>
@@ -4656,7 +4656,7 @@ const char *weechat_prefix (const char *prefix);
<para>
<option>prefix</option>: name of prefix:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Prefix</entry>
@@ -5037,11 +5037,26 @@ struct t_hook *weechat_hook_command (
completions are possible for one argument, separated by "|".
Default completion codes are:
<informaltable colsep="0" frame="none">
+ <tgroup cols="3">
+ <thead>
+ <row>
+ <entry>Plugin</entry>
+ <entry>Code</entry>
+ <entry>Description</entry>
+ </row>
+ </thead>
+ <tbody>
+ &completions.xml;
+ </tbody>
+ </tgroup>
+ </informaltable>
+ Special codes:
+ <informaltable colsep="0" frame="none">
<tgroup cols="2">
<thead>
<row>
<entry>Code</entry>
- <entry>Completion</entry>
+ <entry>Description</entry>
</row>
</thead>
<tbody>
@@ -5053,71 +5068,6 @@ struct t_hook *weechat_hook_command (
<entry>%*</entry>
<entry>Repeat last completion</entry>
</row>
- <row>
- <entry>%b</entry>
- <entry>Buffers names</entry>
- </row>
- <row>
- <entry>%B</entry>
- <entry>Buffers names (with plugin name)</entry>
- </row>
- <row>
- <entry>%c</entry>
- <entry>Configuration files</entry>
- </row>
- <row>
- <entry>%f</entry>
- <entry>Filename</entry>
- </row>
- <row>
- <entry>%F</entry>
- <entry>Filters</entry>
- </row>
- <row>
- <entry>%h</entry>
- <entry>Commands hooked</entry>
- </row>
- <row>
- <entry>%i</entry>
- <entry>Infos hooked</entry>
- </row>
- <row>
- <entry>%I</entry>
- <entry>Infolists hooked</entry>
- </row>
- <row>
- <entry>%n</entry>
- <entry>Nick</entry>
- </row>
- <row>
- <entry>%o</entry>
- <entry>Configuration option</entry>
- </row>
- <row>
- <entry>%p</entry>
- <entry>Plugin name</entry>
- </row>
- <row>
- <entry>%P</entry>
- <entry>Plugin commands</entry>
- </row>
- <row>
- <entry>%r</entry>
- <entry>Bar names</entry>
- </row>
- <row>
- <entry>%v</entry>
- <entry>Value of configuration option</entry>
- </row>
- <row>
- <entry>%w</entry>
- <entry>WeeChat commands</entry>
- </row>
- <row>
- <entry>%(xxx)</entry>
- <entry>Custom completion by plugin (xxx is a completion
- code added by a plugin)</entry>
- </row>
</tbody>
</tgroup>
</informaltable>
@@ -5128,7 +5078,7 @@ struct t_hook *weechat_hook_command (
<option>callback</option>: function called when command is used,
arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -5244,7 +5194,7 @@ struct t_hook *weechat_hook_command_run (
<option>callback</option>: function called when command is run,
arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -5351,7 +5301,7 @@ struct t_hook *weechat_hook_timer (
<option>callback</option>: function called when time is reached,
arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -5452,7 +5402,7 @@ struct t_hook *weechat_hook_fd (
<option>callback</option>: function called when a selected event
occurs, arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -5546,7 +5496,7 @@ struct t_hook *weechat_hook_process (
<option>callback</option>: function called when data from child
is available, or when child has ended, arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -5684,7 +5634,7 @@ struct t_hook *weechat_hook_connect (
<option>callback</option>: function called when connection is ok
or failed, arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -5858,7 +5808,7 @@ struct t_hook *weechat_hook_print (
<option>callback</option>: function called when message is
printed, arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -5981,7 +5931,7 @@ struct t_hook *weechat_hook_signal (
<option>callback</option>: function called when signal is
received, arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -6124,7 +6074,7 @@ struct t_hook *weechat_hook_config (
<option>callback</option>: function called when configuration
option is changed, arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -6217,7 +6167,7 @@ struct t_hook *weechat_hook_completion (
is used (user is completing something using this item),
arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -6383,7 +6333,7 @@ struct t_hook *weechat_hook_modifier (
<option>callback</option>: function called when modifier is
received, arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -6547,7 +6497,7 @@ struct t_hook *weechat_hook_info (
<option>callback</option>: function called when info is asked,
arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -6642,7 +6592,7 @@ struct t_hook *weechat_hook_infolist (
<option>callback</option>: function called when infolist is asked,
arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -6805,7 +6755,7 @@ struct t_gui_buffer *weechat_buffer_new (
<option>input_callback</option>: function called when input text
is entered on buffer, arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -6845,7 +6795,7 @@ struct t_gui_buffer *weechat_buffer_new (
<option>close_callback</option>: function called when buffer is
closed, arguments:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Type</entry>
@@ -7294,7 +7244,7 @@ void weechat_buffer_set (struct t_gui_buffer *buffer, const char *property,
<para>
<option>property</option>: property name:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Name</entry>
@@ -7522,7 +7472,7 @@ void weechat_buffer_set_pointer (struct t_gui_buffer *buffer, const char *proper
<para>
<option>property</option>: property name:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Name</entry>
@@ -9005,7 +8955,7 @@ const char *weechat_info_get (const char *info_name,
core or other plugin (see plugin doc for infos returned by
each plugin). WeeChat core infos are:
<informaltable colsep="0" frame="none">
- <tgroup cols="2">
+ <tgroup cols="3">
<thead>
<row>
<entry>Info</entry>
diff --git a/doc/include_autogen.xml b/doc/include_autogen.xml
index 633ff42a9..6ce8297f0 100644
--- a/doc/include_autogen.xml
+++ b/doc/include_autogen.xml
@@ -43,3 +43,7 @@
<!ENTITY tcl_infos.xml SYSTEM "autogen/tcl_infos.xml">
<!ENTITY weechat_infos.xml SYSTEM "autogen/weechat_infos.xml">
<!ENTITY xfer_infos.xml SYSTEM "autogen/xfer_infos.xml">
+
+<!-- completions hooked -->
+
+<!ENTITY completions.xml SYSTEM "autogen/completions.xml">