diff --git a/ChangeLog.adoc b/ChangeLog.adoc index e00c35565..687e54e4a 100644 --- a/ChangeLog.adoc +++ b/ChangeLog.adoc @@ -27,6 +27,7 @@ New features:: * api: add hashtable with variables in plugin structure * irc: add server option "split_msg_max_length" * logger: add option logger.look.backlog_conditions (issue #1132) + * scripts: add configuration file for each script plugin (_python.conf_, _perl.conf_, ...) * scripts: add "eval" option in script commands and info "xxx_eval" (python, perl, ruby, lua and guile) (issue #128) * scripts: add infos "xxx_interpreter" and "xxx_version" in script plugins (issue #1075) * scripts: add option "version" in script commands (issue #1075) diff --git a/ReleaseNotes.adoc b/ReleaseNotes.adoc index cf55fae2a..54c5bcff4 100644 --- a/ReleaseNotes.adoc +++ b/ReleaseNotes.adoc @@ -20,6 +20,27 @@ https://weechat.org/files/changelog/ChangeLog-devel.html[ChangeLog] [[v2.1]] == Version 2.1 (under dev) +[[v2.1_script_plugin_check_license]] +=== Option to check license of scripts loaded + +A configuration file has been added for each script plugin: _python.conf_, +_perl.conf_, _ruby.conf_, ... + +Therefore the option to check license of loaded scripts has been moved from +_plugins.var..check_license_ (type: string) to the plugin +configuration file (type: boolean, default is _off_). + +List of options moved: + +* _plugins.var.python.check_license_ (string) moved to _python.look.check_license_ (boolean) +* _plugins.var.perl.check_license_ (string) moved to _perl.look.check_license_ (boolean) +* _plugins.var.ruby.check_license_ (string) moved to _ruby.look.check_license_ (boolean) +* _plugins.var.lua.check_license_ (string) moved to _lua.look.check_license_ (boolean) +* _plugins.var.tcl.check_license_ (string) moved to _tcl.look.check_license_ (boolean) +* _plugins.var.guile.check_license_ (string) moved to _guile.look.check_license_ (boolean) +* _plugins.var.javascript.check_license_ (string) moved to _javascript.look.check_license_ (boolean) +* _plugins.var.php.check_license_ (string) moved to _php.look.check_license_ (boolean) + [[v2.1_option_name_completion]] === Completion for /set and /help commands diff --git a/doc/cs/weechat.1.cs.adoc b/doc/cs/weechat.1.cs.adoc index b4e413464..03de6ad29 100644 --- a/doc/cs/weechat.1.cs.adoc +++ b/doc/cs/weechat.1.cs.adoc @@ -74,26 +74,48 @@ $HOME/.weechat/charset.conf:: $HOME/.weechat/exec.conf:: konfigurační soubor pro _exec_ plugin -// TRANSLATION MISSING $HOME/.weechat/fifo.conf:: - configuration file for _fifo_ plugin + konfigurační soubor pro _fifo_ plugin -// TRANSLATION MISSING $HOME/.weechat/fset.conf:: - configuration file for _fset_ plugin + konfigurační soubor pro _fset_ plugin + +$HOME/.weechat/guile.conf:: + konfigurační soubor pro _guile_ plugin $HOME/.weechat/irc.conf:: konfigurační soubor pro _irc_ plugin +$HOME/.weechat/javascript.conf:: + konfigurační soubor pro _javascript_ plugin + $HOME/.weechat/logger.conf:: konfigurační soubor pro _logger_ plugin +$HOME/.weechat/lua.conf:: + konfigurační soubor pro _lua_ plugin + +$HOME/.weechat/perl.conf:: + konfigurační soubor pro _perl_ plugin + +$HOME/.weechat/php.conf:: + konfigurační soubor pro _php_ plugin + +$HOME/.weechat/python.conf:: + konfigurační soubor pro _python_ plugin + $HOME/.weechat/relay.conf:: konfigurační soubor pro _relay_ plugin +$HOME/.weechat/ruby.conf:: + konfigurační soubor pro _ruby_ plugin + $HOME/.weechat/script.conf:: konfigurační soubor pro _script_ plugin +$HOME/.weechat/tcl.conf:: + konfigurační soubor pro _tcl_ plugin + $HOME/.weechat/trigger.conf:: konfigurační soubor pro _trigger_ plugin diff --git a/doc/de/autogen/user/guile_options.adoc b/doc/de/autogen/user/guile_options.adoc new file mode 100644 index 000000000..645b53512 --- /dev/null +++ b/doc/de/autogen/user/guile_options.adoc @@ -0,0 +1,9 @@ +// +// This file is auto-generated by script docgen.py. +// DO NOT EDIT BY HAND! +// +* [[option_guile.look.check_license]] *guile.look.check_license* +** Beschreibung: pass:none[check the license of scripts when they are loaded: if the license is different from the plugin license, a warning is displayed] +** Typ: boolesch +** Werte: on, off +** Standardwert: `+off+` diff --git a/doc/de/autogen/user/javascript_options.adoc b/doc/de/autogen/user/javascript_options.adoc new file mode 100644 index 000000000..3f3479186 --- /dev/null +++ b/doc/de/autogen/user/javascript_options.adoc @@ -0,0 +1,9 @@ +// +// This file is auto-generated by script docgen.py. +// DO NOT EDIT BY HAND! +// +* [[option_javascript.look.check_license]] *javascript.look.check_license* +** Beschreibung: pass:none[check the license of scripts when they are loaded: if the license is different from the plugin license, a warning is displayed] +** Typ: boolesch +** Werte: on, off +** Standardwert: `+off+` diff --git a/doc/de/autogen/user/lua_options.adoc b/doc/de/autogen/user/lua_options.adoc new file mode 100644 index 000000000..3fe591618 --- /dev/null +++ b/doc/de/autogen/user/lua_options.adoc @@ -0,0 +1,9 @@ +// +// This file is auto-generated by script docgen.py. +// DO NOT EDIT BY HAND! +// +* [[option_lua.look.check_license]] *lua.look.check_license* +** Beschreibung: pass:none[check the license of scripts when they are loaded: if the license is different from the plugin license, a warning is displayed] +** Typ: boolesch +** Werte: on, off +** Standardwert: `+off+` diff --git a/doc/de/autogen/user/perl_options.adoc b/doc/de/autogen/user/perl_options.adoc new file mode 100644 index 000000000..832e22425 --- /dev/null +++ b/doc/de/autogen/user/perl_options.adoc @@ -0,0 +1,9 @@ +// +// This file is auto-generated by script docgen.py. +// DO NOT EDIT BY HAND! +// +* [[option_perl.look.check_license]] *perl.look.check_license* +** Beschreibung: pass:none[check the license of scripts when they are loaded: if the license is different from the plugin license, a warning is displayed] +** Typ: boolesch +** Werte: on, off +** Standardwert: `+off+` diff --git a/doc/de/autogen/user/php_options.adoc b/doc/de/autogen/user/php_options.adoc new file mode 100644 index 000000000..50697fc3f --- /dev/null +++ b/doc/de/autogen/user/php_options.adoc @@ -0,0 +1,9 @@ +// +// This file is auto-generated by script docgen.py. +// DO NOT EDIT BY HAND! +// +* [[option_php.look.check_license]] *php.look.check_license* +** Beschreibung: pass:none[check the license of scripts when they are loaded: if the license is different from the plugin license, a warning is displayed] +** Typ: boolesch +** Werte: on, off +** Standardwert: `+off+` diff --git a/doc/de/autogen/user/python_options.adoc b/doc/de/autogen/user/python_options.adoc new file mode 100644 index 000000000..1f4f36ff2 --- /dev/null +++ b/doc/de/autogen/user/python_options.adoc @@ -0,0 +1,9 @@ +// +// This file is auto-generated by script docgen.py. +// DO NOT EDIT BY HAND! +// +* [[option_python.look.check_license]] *python.look.check_license* +** Beschreibung: pass:none[check the license of scripts when they are loaded: if the license is different from the plugin license, a warning is displayed] +** Typ: boolesch +** Werte: on, off +** Standardwert: `+off+` diff --git a/doc/de/autogen/user/ruby_options.adoc b/doc/de/autogen/user/ruby_options.adoc new file mode 100644 index 000000000..ac532185d --- /dev/null +++ b/doc/de/autogen/user/ruby_options.adoc @@ -0,0 +1,9 @@ +// +// This file is auto-generated by script docgen.py. +// DO NOT EDIT BY HAND! +// +* [[option_ruby.look.check_license]] *ruby.look.check_license* +** Beschreibung: pass:none[check the license of scripts when they are loaded: if the license is different from the plugin license, a warning is displayed] +** Typ: boolesch +** Werte: on, off +** Standardwert: `+off+` diff --git a/doc/de/autogen/user/tcl_options.adoc b/doc/de/autogen/user/tcl_options.adoc new file mode 100644 index 000000000..fefdaf1d3 --- /dev/null +++ b/doc/de/autogen/user/tcl_options.adoc @@ -0,0 +1,9 @@ +// +// This file is auto-generated by script docgen.py. +// DO NOT EDIT BY HAND! +// +* [[option_tcl.look.check_license]] *tcl.look.check_license* +** Beschreibung: pass:none[check the license of scripts when they are loaded: if the license is different from the plugin license, a warning is displayed] +** Typ: boolesch +** Werte: on, off +** Standardwert: `+off+` diff --git a/doc/de/weechat.1.de.adoc b/doc/de/weechat.1.de.adoc index 07e9317b2..f61c55428 100644 --- a/doc/de/weechat.1.de.adoc +++ b/doc/de/weechat.1.de.adoc @@ -79,18 +79,42 @@ $HOME/.weechat/fifo.conf:: $HOME/.weechat/fset.conf:: Konfigurationsdatei für _fset_ Erweiterung +$HOME/.weechat/guile.conf:: + Konfigurationsdatei für _guile_ Erweiterung + $HOME/.weechat/irc.conf:: Konfigurationsdatei für _irc_ Erweiterung +$HOME/.weechat/javascript.conf:: + Konfigurationsdatei für _javascript_ Erweiterung + $HOME/.weechat/logger.conf:: Konfigurationsdatei für _logger_ Erweiterung +$HOME/.weechat/lua.conf:: + Konfigurationsdatei für _lua_ Erweiterung + +$HOME/.weechat/perl.conf:: + Konfigurationsdatei für _perl_ Erweiterung + +$HOME/.weechat/php.conf:: + Konfigurationsdatei für _php_ Erweiterung + +$HOME/.weechat/python.conf:: + Konfigurationsdatei für _python_ Erweiterung + $HOME/.weechat/relay.conf:: Konfigurationsdatei für _relay_ Erweiterung +$HOME/.weechat/ruby.conf:: + Konfigurationsdatei für _ruby_ Erweiterung + $HOME/.weechat/script.conf:: Konfigurationsdatei für _script_ Erweiterung +$HOME/.weechat/tcl.conf:: + Konfigurationsdatei für _tcl_ Erweiterung + $HOME/.weechat/trigger.conf:: Konfigurationsdatei für _trigger_ Erweiterung diff --git a/doc/de/weechat_user.de.adoc b/doc/de/weechat_user.de.adoc index f0d77ba60..0c3efe413 100644 --- a/doc/de/weechat_user.de.adoc +++ b/doc/de/weechat_user.de.adoc @@ -564,24 +564,32 @@ Folgende Dateien befinden sich im WeeChat-Heimatverzeichnis: [width="100%",cols="1m,3,6",options="header"] |=== -| Datei | Beschreibung | sensible Daten -| weechat.conf | Hauptkonfiguration von WeeChat | möglich (Beispiel: Auflistung der Channels im Buffers-Layout). -| sec.conf | Konfigurationsdatei mit sensiblen Daten | *Ja, hoch sensibel*: diese Datei sollte niemals weitergegeben werden. -| plugins.conf | Konfigurationsdatei für Erweiterungen | möglich, hängt von der Erweiterung/Skript ab. -| alias.conf | Konfigurationsdatei: Alias-Erweiterung | möglich, hängt von den Aliases ab. -| aspell.conf | Konfiguration für _aspell_-Erweiterung | Nein. -| buflist.conf | Konfiguration für _buflist_-Erweiterung | Nein. -| charset.conf | Konfiguration für _charset_-Erweiterung | Nein. -| exec.conf | Konfiguration für _exec_-Erweiterung | Nein. -| fifo.conf | Konfiguration für _fifo_-Erweiterung | Nein. -| fset.conf | Konfiguration für _fset_-Erweiterung | Nein. -| irc.conf | Konfiguration für _irc_-Erweiterung | *Ja*: Datei kann Passwörter für Server, Nickserv oder Channels enthalten (sofern diese nicht in `sec.conf` gesichert sind). -| logger.conf | Konfiguration für _logger_-Erweiterung | Nein. -| relay.conf | Konfiguration für _relay_-Erweiterung | Nein. -| script.conf | Konfiguration für _script_-Erweiterung | Nein. -| trigger.conf | Konfiguration für _trigger_-Erweiterung | möglich, hängt von den Triggern ab. -| xfer.conf | Konfiguration für _xfer_-Erweiterung | Nein. -| weechat.log | WeeChat Logdateien | Nein. +| Datei | Beschreibung | sensible Daten +| weechat.conf | Hauptkonfiguration von WeeChat | möglich (Beispiel: Auflistung der Channels im Buffers-Layout). +| sec.conf | Konfigurationsdatei mit sensiblen Daten | *Ja, hoch sensibel*: diese Datei sollte niemals weitergegeben werden. +| plugins.conf | Konfigurationsdatei für Erweiterungen | möglich, hängt von der Erweiterung/Skript ab. +| alias.conf | Konfigurationsdatei: Alias-Erweiterung | möglich, hängt von den Aliases ab. +| aspell.conf | Konfiguration für _aspell_-Erweiterung | Nein. +| buflist.conf | Konfiguration für _buflist_-Erweiterung | Nein. +| charset.conf | Konfiguration für _charset_-Erweiterung | Nein. +| exec.conf | Konfiguration für _exec_-Erweiterung | Nein. +| fifo.conf | Konfiguration für _fifo_-Erweiterung | Nein. +| fset.conf | Konfiguration für _fset_-Erweiterung | Nein. +| guile.conf | Konfiguration für _guile_-Erweiterung | Nein. +| irc.conf | Konfiguration für _irc_-Erweiterung | *Ja*: Datei kann Passwörter für Server, Nickserv oder Channels enthalten (sofern diese nicht in `sec.conf` gesichert sind). +| javascript.conf | Konfiguration für _javascript_-Erweiterung | Nein. +| logger.conf | Konfiguration für _logger_-Erweiterung | Nein. +| lua.conf | Konfiguration für _lua_-Erweiterung | Nein. +| perl.conf | Konfiguration für _perl_-Erweiterung | Nein. +| php.conf | Konfiguration für _php_-Erweiterung | Nein. +| python.conf | Konfiguration für _python_-Erweiterung | Nein. +| relay.conf | Konfiguration für _relay_-Erweiterung | Nein. +| ruby.conf | Konfiguration für _ruby_-Erweiterung | Nein. +| script.conf | Konfiguration für _script_-Erweiterung | Nein. +| tcl.conf | Konfiguration für _tcl_-Erweiterung | Nein. +| trigger.conf | Konfiguration für _trigger_-Erweiterung | möglich, hängt von den Triggern ab. +| xfer.conf | Konfiguration für _xfer_-Erweiterung | Nein. +| weechat.log | WeeChat Logdateien | Nein. |=== [IMPORTANT] @@ -3425,6 +3433,126 @@ Optionen: include::autogen/user/script_options.adoc[] +[[python_options]] +==== Python Optionen + +Sektionen in Datei _python.conf_: + +[width="100%",cols="3m,6m,16",options="header"] +|=== +| Sektion | Steuerbefehl | Beschreibung +| look | /set python.look.* | Erscheinungsbild. +|=== + +Optionen: + +include::autogen/user/python_options.adoc[] + +[[perl_options]] +==== Perl Optionen + +Sektionen in Datei _perl.conf_: + +[width="100%",cols="3m,6m,16",options="header"] +|=== +| Sektion | Steuerbefehl | Beschreibung +| look | /set perl.look.* | Erscheinungsbild. +|=== + +Optionen: + +include::autogen/user/perl_options.adoc[] + +[[ruby_options]] +==== Ruby Optionen + +Sektionen in Datei _ruby.conf_: + +[width="100%",cols="3m,6m,16",options="header"] +|=== +| Sektion | Steuerbefehl | Beschreibung +| look | /set ruby.look.* | Erscheinungsbild. +|=== + +Optionen: + +include::autogen/user/ruby_options.adoc[] + +[[lua_options]] +==== Lua Optionen + +Sektionen in Datei _lua.conf_: + +[width="100%",cols="3m,6m,16",options="header"] +|=== +| Sektion | Steuerbefehl | Beschreibung +| look | /set lua.look.* | Erscheinungsbild. +|=== + +Optionen: + +include::autogen/user/lua_options.adoc[] + +[[tcl_options]] +==== Tcl Optionen + +Sektionen in Datei _tcl.conf_: + +[width="100%",cols="3m,6m,16",options="header"] +|=== +| Sektion | Steuerbefehl | Beschreibung +| look | /set tcl.look.* | Erscheinungsbild. +|=== + +Optionen: + +include::autogen/user/tcl_options.adoc[] + +[[guile_options]] +==== Guile Optionen + +Sektionen in Datei _guile.conf_: + +[width="100%",cols="3m,6m,16",options="header"] +|=== +| Sektion | Steuerbefehl | Beschreibung +| look | /set guile.look.* | Erscheinungsbild. +|=== + +Optionen: + +include::autogen/user/guile_options.adoc[] + +[[javascript_options]] +==== Javascript Optionen + +Sektionen in Datei _javascript.conf_: + +[width="100%",cols="3m,6m,16",options="header"] +|=== +| Sektion | Steuerbefehl | Beschreibung +| look | /set javascript.look.* | Erscheinungsbild. +|=== + +Optionen: + +include::autogen/user/javascript_options.adoc[] + +[[php_options]] +==== PHP Optionen + +Sektionen in Datei _php.conf_: + +[width="100%",cols="3m,6m,16",options="header"] +|=== +| Sektion | Steuerbefehl | Beschreibung +| look | /set php.look.* | Erscheinungsbild. +|=== + +Optionen: + +include::autogen/user/php_options.adoc[] + [[trigger_plugin]] === Trigger diff --git a/doc/docgen.py b/doc/docgen.py index f3cb3a697..6ebca43ca 100644 --- a/doc/docgen.py +++ b/doc/docgen.py @@ -99,14 +99,14 @@ PLUGIN_LIST = { 'logger': 'o', 'relay': 'o', 'script': 'o', - 'perl': '', - 'python': '', - 'ruby': '', - 'lua': '', - 'tcl': '', - 'guile': '', - 'javascript': '', - 'php': '', + 'perl': 'o', + 'python': 'o', + 'ruby': 'o', + 'lua': 'o', + 'tcl': 'o', + 'guile': 'o', + 'javascript': 'o', + 'php': 'o', 'trigger': 'o', 'xfer': 'co', } diff --git a/doc/en/autogen/user/guile_options.adoc b/doc/en/autogen/user/guile_options.adoc new file mode 100644 index 000000000..e0ad87642 --- /dev/null +++ b/doc/en/autogen/user/guile_options.adoc @@ -0,0 +1,9 @@ +// +// This file is auto-generated by script docgen.py. +// DO NOT EDIT BY HAND! +// +* [[option_guile.look.check_license]] *guile.look.check_license* +** description: pass:none[check the license of scripts when they are loaded: if the license is different from the plugin license, a warning is displayed] +** type: boolean +** values: on, off +** default value: `+off+` diff --git a/doc/en/autogen/user/javascript_options.adoc b/doc/en/autogen/user/javascript_options.adoc new file mode 100644 index 000000000..9b8e69c58 --- /dev/null +++ b/doc/en/autogen/user/javascript_options.adoc @@ -0,0 +1,9 @@ +// +// This file is auto-generated by script docgen.py. +// DO NOT EDIT BY HAND! +// +* [[option_javascript.look.check_license]] *javascript.look.check_license* +** description: pass:none[check the license of scripts when they are loaded: if the license is different from the plugin license, a warning is displayed] +** type: boolean +** values: on, off +** default value: `+off+` diff --git a/doc/en/autogen/user/lua_options.adoc b/doc/en/autogen/user/lua_options.adoc new file mode 100644 index 000000000..7f2700edc --- /dev/null +++ b/doc/en/autogen/user/lua_options.adoc @@ -0,0 +1,9 @@ +// +// This file is auto-generated by script docgen.py. +// DO NOT EDIT BY HAND! +// +* [[option_lua.look.check_license]] *lua.look.check_license* +** description: pass:none[check the license of scripts when they are loaded: if the license is different from the plugin license, a warning is displayed] +** type: boolean +** values: on, off +** default value: `+off+` diff --git a/doc/en/autogen/user/perl_options.adoc b/doc/en/autogen/user/perl_options.adoc new file mode 100644 index 000000000..97331f993 --- /dev/null +++ b/doc/en/autogen/user/perl_options.adoc @@ -0,0 +1,9 @@ +// +// This file is auto-generated by script docgen.py. +// DO NOT EDIT BY HAND! +// +* [[option_perl.look.check_license]] *perl.look.check_license* +** description: pass:none[check the license of scripts when they are loaded: if the license is different from the plugin license, a warning is displayed] +** type: boolean +** values: on, off +** default value: `+off+` diff --git a/doc/en/autogen/user/php_options.adoc b/doc/en/autogen/user/php_options.adoc new file mode 100644 index 000000000..6a7828228 --- /dev/null +++ b/doc/en/autogen/user/php_options.adoc @@ -0,0 +1,9 @@ +// +// This file is auto-generated by script docgen.py. +// DO NOT EDIT BY HAND! +// +* [[option_php.look.check_license]] *php.look.check_license* +** description: pass:none[check the license of scripts when they are loaded: if the license is different from the plugin license, a warning is displayed] +** type: boolean +** values: on, off +** default value: `+off+` diff --git a/doc/en/autogen/user/python_options.adoc b/doc/en/autogen/user/python_options.adoc new file mode 100644 index 000000000..6511fc0d3 --- /dev/null +++ b/doc/en/autogen/user/python_options.adoc @@ -0,0 +1,9 @@ +// +// This file is auto-generated by script docgen.py. +// DO NOT EDIT BY HAND! +// +* [[option_python.look.check_license]] *python.look.check_license* +** description: pass:none[check the license of scripts when they are loaded: if the license is different from the plugin license, a warning is displayed] +** type: boolean +** values: on, off +** default value: `+off+` diff --git a/doc/en/autogen/user/ruby_options.adoc b/doc/en/autogen/user/ruby_options.adoc new file mode 100644 index 000000000..c769ecd0d --- /dev/null +++ b/doc/en/autogen/user/ruby_options.adoc @@ -0,0 +1,9 @@ +// +// This file is auto-generated by script docgen.py. +// DO NOT EDIT BY HAND! +// +* [[option_ruby.look.check_license]] *ruby.look.check_license* +** description: pass:none[check the license of scripts when they are loaded: if the license is different from the plugin license, a warning is displayed] +** type: boolean +** values: on, off +** default value: `+off+` diff --git a/doc/en/autogen/user/tcl_options.adoc b/doc/en/autogen/user/tcl_options.adoc new file mode 100644 index 000000000..9ce96a0dd --- /dev/null +++ b/doc/en/autogen/user/tcl_options.adoc @@ -0,0 +1,9 @@ +// +// This file is auto-generated by script docgen.py. +// DO NOT EDIT BY HAND! +// +* [[option_tcl.look.check_license]] *tcl.look.check_license* +** description: pass:none[check the license of scripts when they are loaded: if the license is different from the plugin license, a warning is displayed] +** type: boolean +** values: on, off +** default value: `+off+` diff --git a/doc/en/weechat.1.en.adoc b/doc/en/weechat.1.en.adoc index 3a5b9dc62..ee4e5ab58 100644 --- a/doc/en/weechat.1.en.adoc +++ b/doc/en/weechat.1.en.adoc @@ -79,18 +79,42 @@ $HOME/.weechat/fifo.conf:: $HOME/.weechat/fset.conf:: configuration file for _fset_ plugin +$HOME/.weechat/guile.conf:: + configuration file for _guile_ plugin + $HOME/.weechat/irc.conf:: configuration file for _irc_ plugin +$HOME/.weechat/javascript.conf:: + configuration file for _javascript_ plugin + $HOME/.weechat/logger.conf:: configuration file for _logger_ plugin +$HOME/.weechat/lua.conf:: + configuration file for _lua_ plugin + +$HOME/.weechat/perl.conf:: + configuration file for _perl_ plugin + +$HOME/.weechat/php.conf:: + configuration file for _php_ plugin + +$HOME/.weechat/python.conf:: + configuration file for _python_ plugin + $HOME/.weechat/relay.conf:: configuration file for _relay_ plugin +$HOME/.weechat/ruby.conf:: + configuration file for _ruby_ plugin + $HOME/.weechat/script.conf:: configuration file for _script_ plugin +$HOME/.weechat/tcl.conf:: + configuration file for _tcl_ plugin + $HOME/.weechat/trigger.conf:: configuration file for _trigger_ plugin diff --git a/doc/en/weechat_dev.en.adoc b/doc/en/weechat_dev.en.adoc index 0afb8b614..ab8296e61 100644 --- a/doc/en/weechat_dev.en.adoc +++ b/doc/en/weechat_dev.en.adoc @@ -183,6 +183,7 @@ WeeChat "core" is located in following directories: |    plugin-config.c | Plugin configuration options (file plugins.conf). |    plugin-script.c | Common functions used by script plugins. |    plugin-script-api.c | Script API functions: wrappers around some plugin API functions. +|    plugin-script-config.c | Script plugin configuration options (files python.conf, perl.conf, ...). |    weechat-plugin.h | Header designed to be distributed with WeeChat plugins, in order to compile them. |    alias/ | Alias plugin. |       alias.c | Main alias functions. diff --git a/doc/en/weechat_user.en.adoc b/doc/en/weechat_user.en.adoc index 1cb7a8c0b..acff003e8 100644 --- a/doc/en/weechat_user.en.adoc +++ b/doc/en/weechat_user.en.adoc @@ -556,24 +556,32 @@ The files in the WeeChat home directory are: [width="100%",cols="1m,3,6",options="header"] |=== -| File | Description | Sensitive data -| weechat.conf | Main WeeChat configuration file | Possible (example: list of channels in a saved buffers layout). -| sec.conf | Configuration file with secured data | *Yes, highly sensitive*: this file must never be shared with anyone. -| plugins.conf | Plugins configuration file | Possible, depends on plugins/scripts. -| alias.conf | Configuration file for _alias_ plugin | Possible, depends on aliases. -| aspell.conf | Configuration file for _aspell_ plugin | No. -| buflist.conf | Configuration file for _buflist_ plugin | No. -| charset.conf | Configuration file for _charset_ plugin | No. -| exec.conf | Configuration file for _exec_ plugin | No. -| fifo.conf | Configuration file for _fifo_ plugin | No. -| fset.conf | Configuration file for _fset_ plugin | No. -| irc.conf | Configuration file for _irc_ plugin | *Yes*: it can contain passwords for servers, nickserv and channels (if not stored in `sec.conf`). -| logger.conf | Configuration file for _logger_ plugin | No. -| relay.conf | Configuration file for _relay_ plugin | No. -| script.conf | Configuration file for _script_ plugin | No. -| trigger.conf | Configuration file for _trigger_ plugin | Possible, depends on triggers. -| xfer.conf | Configuration file for _xfer_ plugin | No. -| weechat.log | WeeChat log file | No. +| File | Description | Sensitive data +| weechat.conf | Main WeeChat configuration file | Possible (example: list of channels in a saved buffers layout). +| sec.conf | Configuration file with secured data | *Yes, highly sensitive*: this file must never be shared with anyone. +| plugins.conf | Plugins configuration file | Possible, depends on plugins/scripts. +| alias.conf | Configuration file for _alias_ plugin | Possible, depends on aliases. +| aspell.conf | Configuration file for _aspell_ plugin | No. +| buflist.conf | Configuration file for _buflist_ plugin | No. +| charset.conf | Configuration file for _charset_ plugin | No. +| exec.conf | Configuration file for _exec_ plugin | No. +| fifo.conf | Configuration file for _fifo_ plugin | No. +| fset.conf | Configuration file for _fset_ plugin | No. +| guile.conf | Configuration file for _guile_ plugin | No. +| irc.conf | Configuration file for _irc_ plugin | *Yes*: it can contain passwords for servers, nickserv and channels (if not stored in `sec.conf`). +| javascript.conf | Configuration file for _javascript_ plugin | No. +| logger.conf | Configuration file for _logger_ plugin | No. +| lua.conf | Configuration file for _lua_ plugin | No. +| perl.conf | Configuration file for _perl_ plugin | No. +| php.conf | Configuration file for _php_ plugin | No. +| python.conf | Configuration file for _python_ plugin | No. +| relay.conf | Configuration file for _relay_ plugin | No. +| ruby.conf | Configuration file for _ruby_ plugin | No. +| script.conf | Configuration file for _script_ plugin | No. +| tcl.conf | Configuration file for _tcl_ plugin | No. +| trigger.conf | Configuration file for _trigger_ plugin | Possible, depends on triggers. +| xfer.conf | Configuration file for _xfer_ plugin | No. +| weechat.log | WeeChat log file | No. |=== [IMPORTANT] @@ -3346,6 +3354,126 @@ Options: include::autogen/user/script_options.adoc[] +[[python_options]] +==== Python options + +Sections in file _python.conf_: + +[width="100%",cols="3m,6m,16",options="header"] +|=== +| Section | Control command | Description +| look | /set python.look.* | Look and feel. +|=== + +Options: + +include::autogen/user/python_options.adoc[] + +[[perl_options]] +==== Perl options + +Sections in file _perl.conf_: + +[width="100%",cols="3m,6m,16",options="header"] +|=== +| Section | Control command | Description +| look | /set perl.look.* | Look and feel. +|=== + +Options: + +include::autogen/user/perl_options.adoc[] + +[[ruby_options]] +==== Ruby options + +Sections in file _ruby.conf_: + +[width="100%",cols="3m,6m,16",options="header"] +|=== +| Section | Control command | Description +| look | /set ruby.look.* | Look and feel. +|=== + +Options: + +include::autogen/user/ruby_options.adoc[] + +[[lua_options]] +==== Lua options + +Sections in file _lua.conf_: + +[width="100%",cols="3m,6m,16",options="header"] +|=== +| Section | Control command | Description +| look | /set lua.look.* | Look and feel. +|=== + +Options: + +include::autogen/user/lua_options.adoc[] + +[[tcl_options]] +==== Tcl options + +Sections in file _tcl.conf_: + +[width="100%",cols="3m,6m,16",options="header"] +|=== +| Section | Control command | Description +| look | /set tcl.look.* | Look and feel. +|=== + +Options: + +include::autogen/user/tcl_options.adoc[] + +[[guile_options]] +==== Guile options + +Sections in file _guile.conf_: + +[width="100%",cols="3m,6m,16",options="header"] +|=== +| Section | Control command | Description +| look | /set guile.look.* | Look and feel. +|=== + +Options: + +include::autogen/user/guile_options.adoc[] + +[[javascript_options]] +==== Javascript options + +Sections in file _javascript.conf_: + +[width="100%",cols="3m,6m,16",options="header"] +|=== +| Section | Control command | Description +| look | /set javascript.look.* | Look and feel. +|=== + +Options: + +include::autogen/user/javascript_options.adoc[] + +[[php_options]] +==== PHP options + +Sections in file _php.conf_: + +[width="100%",cols="3m,6m,16",options="header"] +|=== +| Section | Control command | Description +| look | /set php.look.* | Look and feel. +|=== + +Options: + +include::autogen/user/php_options.adoc[] + [[trigger_plugin]] === Trigger diff --git a/doc/fr/autogen/user/guile_options.adoc b/doc/fr/autogen/user/guile_options.adoc new file mode 100644 index 000000000..d510b4ff7 --- /dev/null +++ b/doc/fr/autogen/user/guile_options.adoc @@ -0,0 +1,9 @@ +// +// This file is auto-generated by script docgen.py. +// DO NOT EDIT BY HAND! +// +* [[option_guile.look.check_license]] *guile.look.check_license* +** description: pass:none[vérifier la licence des scripts quand ils sont chargés : si la licence est différente de la licence de l'extension, un avertissement est affiché] +** type: booléen +** valeurs: on, off +** valeur par défaut: `+off+` diff --git a/doc/fr/autogen/user/javascript_options.adoc b/doc/fr/autogen/user/javascript_options.adoc new file mode 100644 index 000000000..8dd3a7532 --- /dev/null +++ b/doc/fr/autogen/user/javascript_options.adoc @@ -0,0 +1,9 @@ +// +// This file is auto-generated by script docgen.py. +// DO NOT EDIT BY HAND! +// +* [[option_javascript.look.check_license]] *javascript.look.check_license* +** description: pass:none[vérifier la licence des scripts quand ils sont chargés : si la licence est différente de la licence de l'extension, un avertissement est affiché] +** type: booléen +** valeurs: on, off +** valeur par défaut: `+off+` diff --git a/doc/fr/autogen/user/lua_options.adoc b/doc/fr/autogen/user/lua_options.adoc new file mode 100644 index 000000000..633ad80f2 --- /dev/null +++ b/doc/fr/autogen/user/lua_options.adoc @@ -0,0 +1,9 @@ +// +// This file is auto-generated by script docgen.py. +// DO NOT EDIT BY HAND! +// +* [[option_lua.look.check_license]] *lua.look.check_license* +** description: pass:none[vérifier la licence des scripts quand ils sont chargés : si la licence est différente de la licence de l'extension, un avertissement est affiché] +** type: booléen +** valeurs: on, off +** valeur par défaut: `+off+` diff --git a/doc/fr/autogen/user/perl_options.adoc b/doc/fr/autogen/user/perl_options.adoc new file mode 100644 index 000000000..adb81dc56 --- /dev/null +++ b/doc/fr/autogen/user/perl_options.adoc @@ -0,0 +1,9 @@ +// +// This file is auto-generated by script docgen.py. +// DO NOT EDIT BY HAND! +// +* [[option_perl.look.check_license]] *perl.look.check_license* +** description: pass:none[vérifier la licence des scripts quand ils sont chargés : si la licence est différente de la licence de l'extension, un avertissement est affiché] +** type: booléen +** valeurs: on, off +** valeur par défaut: `+off+` diff --git a/doc/fr/autogen/user/php_options.adoc b/doc/fr/autogen/user/php_options.adoc new file mode 100644 index 000000000..dfb9db028 --- /dev/null +++ b/doc/fr/autogen/user/php_options.adoc @@ -0,0 +1,9 @@ +// +// This file is auto-generated by script docgen.py. +// DO NOT EDIT BY HAND! +// +* [[option_php.look.check_license]] *php.look.check_license* +** description: pass:none[vérifier la licence des scripts quand ils sont chargés : si la licence est différente de la licence de l'extension, un avertissement est affiché] +** type: booléen +** valeurs: on, off +** valeur par défaut: `+off+` diff --git a/doc/fr/autogen/user/python_options.adoc b/doc/fr/autogen/user/python_options.adoc new file mode 100644 index 000000000..d2d5ebdd1 --- /dev/null +++ b/doc/fr/autogen/user/python_options.adoc @@ -0,0 +1,9 @@ +// +// This file is auto-generated by script docgen.py. +// DO NOT EDIT BY HAND! +// +* [[option_python.look.check_license]] *python.look.check_license* +** description: pass:none[vérifier la licence des scripts quand ils sont chargés : si la licence est différente de la licence de l'extension, un avertissement est affiché] +** type: booléen +** valeurs: on, off +** valeur par défaut: `+off+` diff --git a/doc/fr/autogen/user/ruby_options.adoc b/doc/fr/autogen/user/ruby_options.adoc new file mode 100644 index 000000000..26bb3417c --- /dev/null +++ b/doc/fr/autogen/user/ruby_options.adoc @@ -0,0 +1,9 @@ +// +// This file is auto-generated by script docgen.py. +// DO NOT EDIT BY HAND! +// +* [[option_ruby.look.check_license]] *ruby.look.check_license* +** description: pass:none[vérifier la licence des scripts quand ils sont chargés : si la licence est différente de la licence de l'extension, un avertissement est affiché] +** type: booléen +** valeurs: on, off +** valeur par défaut: `+off+` diff --git a/doc/fr/autogen/user/tcl_options.adoc b/doc/fr/autogen/user/tcl_options.adoc new file mode 100644 index 000000000..6f8635e91 --- /dev/null +++ b/doc/fr/autogen/user/tcl_options.adoc @@ -0,0 +1,9 @@ +// +// This file is auto-generated by script docgen.py. +// DO NOT EDIT BY HAND! +// +* [[option_tcl.look.check_license]] *tcl.look.check_license* +** description: pass:none[vérifier la licence des scripts quand ils sont chargés : si la licence est différente de la licence de l'extension, un avertissement est affiché] +** type: booléen +** valeurs: on, off +** valeur par défaut: `+off+` diff --git a/doc/fr/weechat.1.fr.adoc b/doc/fr/weechat.1.fr.adoc index 8fe50ae0e..18e0ded16 100644 --- a/doc/fr/weechat.1.fr.adoc +++ b/doc/fr/weechat.1.fr.adoc @@ -81,18 +81,42 @@ $HOME/.weechat/fifo.conf:: $HOME/.weechat/fset.conf:: fichier de configuration pour l'extension _fset_ +$HOME/.weechat/guile.conf:: + fichier de configuration pour l'extension _guile_ + $HOME/.weechat/irc.conf:: fichier de configuration pour l'extension _irc_ +$HOME/.weechat/javascript.conf:: + fichier de configuration pour l'extension _javascript_ + $HOME/.weechat/logger.conf:: fichier de configuration pour l'extension _logger_ +$HOME/.weechat/lua.conf:: + fichier de configuration pour l'extension _lua_ + +$HOME/.weechat/perl.conf:: + fichier de configuration pour l'extension _perl_ + +$HOME/.weechat/php.conf:: + fichier de configuration pour l'extension _php_ + +$HOME/.weechat/python.conf:: + fichier de configuration pour l'extension _python_ + $HOME/.weechat/relay.conf:: fichier de configuration pour l'extension _relay_ +$HOME/.weechat/ruby.conf:: + fichier de configuration pour l'extension _ruby_ + $HOME/.weechat/script.conf:: fichier de configuration pour l'extension _script_ +$HOME/.weechat/tcl.conf:: + fichier de configuration pour l'extension _tcl_ + $HOME/.weechat/trigger.conf:: fichier de configuration pour l'extension _trigger_ diff --git a/doc/fr/weechat_dev.fr.adoc b/doc/fr/weechat_dev.fr.adoc index 87aa2eee6..93ecfbcc1 100644 --- a/doc/fr/weechat_dev.fr.adoc +++ b/doc/fr/weechat_dev.fr.adoc @@ -185,6 +185,7 @@ Le cœur de WeeChat est situé dans les répertoires suivants : |    plugin-config.c | Options de configuration des extensions (fichier plugins.conf). |    plugin-script.c | Fonctions communes utilisés par les extensions pour les scripts. |    plugin-script-api.c | Fonctions pour l'API script : enveloppes autour de quelques fonctions de l'API extension. +|    plugin-script-config.c | Options de configuration des extensions pour les scripts (fichiers python.conf, perl.conf, ...). |    weechat-plugin.h | En-tête destiné à être distribué avec les extensions WeeChat, pour les compiler. |    alias/ | Extension Alias. |       alias.c | Fonctions principales pour les alias. diff --git a/doc/fr/weechat_user.fr.adoc b/doc/fr/weechat_user.fr.adoc index 59029cef6..a319ac142 100644 --- a/doc/fr/weechat_user.fr.adoc +++ b/doc/fr/weechat_user.fr.adoc @@ -568,24 +568,32 @@ Les fichiers dans le répertoire principal de WeeChat sont : [width="100%",cols="1m,3,6",options="header"] |=== -| Fichier | Description | Données sensibles -| weechat.conf | Fichier de configuration principal de WeeChat | Possible (par exemple : liste des canaux sauvés dans la disposition des tampons). -| sec.conf | Fichier de configuration avec les données sécurisées | *Oui, très sensibles*: ce fichier ne doit jamais être partagé avec quiconque. -| plugins.conf | Fichier de configuration des extensions | Possible, cela dépend des extensions/scripts. -| alias.conf | Fichier de configuration de l'extension _alias_ | Possible, cela dépend des alias. -| aspell.conf | Fichier de configuration de l'extension _aspell_ | Non. -| buflist.conf | Fichier de configuration de l'extension _buflist_ | Non. -| charset.conf | Fichier de configuration de l'extension _charset_ | Non. -| exec.conf | Fichier de configuration de l'extension _exec_ | Non. -| fifo.conf | Fichier de configuration de l'extension _fifo_ | Non. -| fset.conf | Fichier de configuration de l'extension _fset_ | Non. -| irc.conf | Fichier de configuration de l'extension _irc_ | *Oui*: il peut contenir des mots de passes pour les serveurs, nickserv et les canaux (si non stockés dans `sec.conf`). -| logger.conf | Fichier de configuration de l'extension _logger_ | Non. -| relay.conf | Fichier de configuration de l'extension _relay_ | Non. -| script.conf | Fichier de configuration de l'extension _script_ | Non. -| trigger.conf | Fichier de configuration de l'extension _trigger_ | Possible, cela dépend des triggers. -| xfer.conf | Fichier de configuration de l'extension _xfer_ | Non. -| weechat.log | Fichier de log WeeChat | Non. +| Fichier | Description | Données sensibles +| weechat.conf | Fichier de configuration principal de WeeChat | Possible (par exemple : liste des canaux sauvés dans la disposition des tampons). +| sec.conf | Fichier de configuration avec les données sécurisées | *Oui, très sensibles*: ce fichier ne doit jamais être partagé avec quiconque. +| plugins.conf | Fichier de configuration des extensions | Possible, cela dépend des extensions/scripts. +| alias.conf | Fichier de configuration de l'extension _alias_ | Possible, cela dépend des alias. +| aspell.conf | Fichier de configuration de l'extension _aspell_ | Non. +| buflist.conf | Fichier de configuration de l'extension _buflist_ | Non. +| charset.conf | Fichier de configuration de l'extension _charset_ | Non. +| exec.conf | Fichier de configuration de l'extension _exec_ | Non. +| fifo.conf | Fichier de configuration de l'extension _fifo_ | Non. +| fset.conf | Fichier de configuration de l'extension _fset_ | Non. +| guile.conf | Fichier de configuration de l'extension _guile_ | Non. +| irc.conf | Fichier de configuration de l'extension _irc_ | *Oui*: il peut contenir des mots de passes pour les serveurs, nickserv et les canaux (si non stockés dans `sec.conf`). +| javascript.conf | Fichier de configuration de l'extension _javascript_ | Non. +| logger.conf | Fichier de configuration de l'extension _logger_ | Non. +| lua.conf | Fichier de configuration de l'extension _lua_ | Non. +| perl.conf | Fichier de configuration de l'extension _perl_ | Non. +| php.conf | Fichier de configuration de l'extension _php_ | Non. +| python.conf | Fichier de configuration de l'extension _python_ | Non. +| relay.conf | Fichier de configuration de l'extension _relay_ | Non. +| ruby.conf | Fichier de configuration de l'extension _ruby_ | Non. +| script.conf | Fichier de configuration de l'extension _script_ | Non. +| tcl.conf | Fichier de configuration de l'extension _tcl_ | Non. +| trigger.conf | Fichier de configuration de l'extension _trigger_ | Possible, cela dépend des triggers. +| xfer.conf | Fichier de configuration de l'extension _xfer_ | Non. +| weechat.log | Fichier de log WeeChat | Non. |=== [IMPORTANT] @@ -3456,6 +3464,126 @@ Options : include::autogen/user/script_options.adoc[] +[[python_options]] +==== Options Python + +Sections dans le fichier _python.conf_ : + +[width="100%",cols="3m,6m,16",options="header"] +|=== +| Section | Commande de contrôle | Description +| look | /set python.look.* | Aspect/présentation. +|=== + +Options : + +include::autogen/user/python_options.adoc[] + +[[perl_options]] +==== Options Perl + +Sections dans le fichier _perl.conf_ : + +[width="100%",cols="3m,6m,16",options="header"] +|=== +| Section | Commande de contrôle | Description +| look | /set perl.look.* | Aspect/présentation. +|=== + +Options : + +include::autogen/user/perl_options.adoc[] + +[[ruby_options]] +==== Options Ruby + +Sections dans le fichier _ruby.conf_ : + +[width="100%",cols="3m,6m,16",options="header"] +|=== +| Section | Commande de contrôle | Description +| look | /set ruby.look.* | Aspect/présentation. +|=== + +Options : + +include::autogen/user/ruby_options.adoc[] + +[[lua_options]] +==== Options Lua + +Sections dans le fichier _lua.conf_ : + +[width="100%",cols="3m,6m,16",options="header"] +|=== +| Section | Commande de contrôle | Description +| look | /set lua.look.* | Aspect/présentation. +|=== + +Options : + +include::autogen/user/lua_options.adoc[] + +[[tcl_options]] +==== Options Tcl + +Sections dans le fichier _tcl.conf_ : + +[width="100%",cols="3m,6m,16",options="header"] +|=== +| Section | Commande de contrôle | Description +| look | /set tcl.look.* | Aspect/présentation. +|=== + +Options : + +include::autogen/user/tcl_options.adoc[] + +[[guile_options]] +==== Options Guile + +Sections dans le fichier _guile.conf_ : + +[width="100%",cols="3m,6m,16",options="header"] +|=== +| Section | Commande de contrôle | Description +| look | /set guile.look.* | Aspect/présentation. +|=== + +Options : + +include::autogen/user/guile_options.adoc[] + +[[javascript_options]] +==== Options Javascript + +Sections dans le fichier _javascript.conf_ : + +[width="100%",cols="3m,6m,16",options="header"] +|=== +| Section | Commande de contrôle | Description +| look | /set javascript.look.* | Aspect/présentation. +|=== + +Options : + +include::autogen/user/javascript_options.adoc[] + +[[php_options]] +==== Options PHP + +Sections dans le fichier _php.conf_ : + +[width="100%",cols="3m,6m,16",options="header"] +|=== +| Section | Commande de contrôle | Description +| look | /set php.look.* | Aspect/présentation. +|=== + +Options : + +include::autogen/user/php_options.adoc[] + [[trigger_plugin]] === Trigger diff --git a/doc/it/autogen/user/guile_options.adoc b/doc/it/autogen/user/guile_options.adoc new file mode 100644 index 000000000..923d1b49a --- /dev/null +++ b/doc/it/autogen/user/guile_options.adoc @@ -0,0 +1,9 @@ +// +// This file is auto-generated by script docgen.py. +// DO NOT EDIT BY HAND! +// +* [[option_guile.look.check_license]] *guile.look.check_license* +** descrizione: pass:none[check the license of scripts when they are loaded: if the license is different from the plugin license, a warning is displayed] +** tipo: bool +** valori: on, off +** valore predefinito: `+off+` diff --git a/doc/it/autogen/user/javascript_options.adoc b/doc/it/autogen/user/javascript_options.adoc new file mode 100644 index 000000000..6783f9e64 --- /dev/null +++ b/doc/it/autogen/user/javascript_options.adoc @@ -0,0 +1,9 @@ +// +// This file is auto-generated by script docgen.py. +// DO NOT EDIT BY HAND! +// +* [[option_javascript.look.check_license]] *javascript.look.check_license* +** descrizione: pass:none[check the license of scripts when they are loaded: if the license is different from the plugin license, a warning is displayed] +** tipo: bool +** valori: on, off +** valore predefinito: `+off+` diff --git a/doc/it/autogen/user/lua_options.adoc b/doc/it/autogen/user/lua_options.adoc new file mode 100644 index 000000000..aba338a53 --- /dev/null +++ b/doc/it/autogen/user/lua_options.adoc @@ -0,0 +1,9 @@ +// +// This file is auto-generated by script docgen.py. +// DO NOT EDIT BY HAND! +// +* [[option_lua.look.check_license]] *lua.look.check_license* +** descrizione: pass:none[check the license of scripts when they are loaded: if the license is different from the plugin license, a warning is displayed] +** tipo: bool +** valori: on, off +** valore predefinito: `+off+` diff --git a/doc/it/autogen/user/perl_options.adoc b/doc/it/autogen/user/perl_options.adoc new file mode 100644 index 000000000..733c3272b --- /dev/null +++ b/doc/it/autogen/user/perl_options.adoc @@ -0,0 +1,9 @@ +// +// This file is auto-generated by script docgen.py. +// DO NOT EDIT BY HAND! +// +* [[option_perl.look.check_license]] *perl.look.check_license* +** descrizione: pass:none[check the license of scripts when they are loaded: if the license is different from the plugin license, a warning is displayed] +** tipo: bool +** valori: on, off +** valore predefinito: `+off+` diff --git a/doc/it/autogen/user/php_options.adoc b/doc/it/autogen/user/php_options.adoc new file mode 100644 index 000000000..28f4befda --- /dev/null +++ b/doc/it/autogen/user/php_options.adoc @@ -0,0 +1,9 @@ +// +// This file is auto-generated by script docgen.py. +// DO NOT EDIT BY HAND! +// +* [[option_php.look.check_license]] *php.look.check_license* +** descrizione: pass:none[check the license of scripts when they are loaded: if the license is different from the plugin license, a warning is displayed] +** tipo: bool +** valori: on, off +** valore predefinito: `+off+` diff --git a/doc/it/autogen/user/python_options.adoc b/doc/it/autogen/user/python_options.adoc new file mode 100644 index 000000000..778293f71 --- /dev/null +++ b/doc/it/autogen/user/python_options.adoc @@ -0,0 +1,9 @@ +// +// This file is auto-generated by script docgen.py. +// DO NOT EDIT BY HAND! +// +* [[option_python.look.check_license]] *python.look.check_license* +** descrizione: pass:none[check the license of scripts when they are loaded: if the license is different from the plugin license, a warning is displayed] +** tipo: bool +** valori: on, off +** valore predefinito: `+off+` diff --git a/doc/it/autogen/user/ruby_options.adoc b/doc/it/autogen/user/ruby_options.adoc new file mode 100644 index 000000000..55ffda236 --- /dev/null +++ b/doc/it/autogen/user/ruby_options.adoc @@ -0,0 +1,9 @@ +// +// This file is auto-generated by script docgen.py. +// DO NOT EDIT BY HAND! +// +* [[option_ruby.look.check_license]] *ruby.look.check_license* +** descrizione: pass:none[check the license of scripts when they are loaded: if the license is different from the plugin license, a warning is displayed] +** tipo: bool +** valori: on, off +** valore predefinito: `+off+` diff --git a/doc/it/autogen/user/tcl_options.adoc b/doc/it/autogen/user/tcl_options.adoc new file mode 100644 index 000000000..e3f7627f9 --- /dev/null +++ b/doc/it/autogen/user/tcl_options.adoc @@ -0,0 +1,9 @@ +// +// This file is auto-generated by script docgen.py. +// DO NOT EDIT BY HAND! +// +* [[option_tcl.look.check_license]] *tcl.look.check_license* +** descrizione: pass:none[check the license of scripts when they are loaded: if the license is different from the plugin license, a warning is displayed] +** tipo: bool +** valori: on, off +** valore predefinito: `+off+` diff --git a/doc/it/weechat.1.it.adoc b/doc/it/weechat.1.it.adoc index 401790be7..7843c62d7 100644 --- a/doc/it/weechat.1.it.adoc +++ b/doc/it/weechat.1.it.adoc @@ -83,18 +83,42 @@ $HOME/.weechat/fifo.conf:: $HOME/.weechat/fset.conf:: configuration file for _fset_ plugin +$HOME/.weechat/guile.conf:: + configuration file for _guile_ plugin + $HOME/.weechat/irc.conf:: configuration file for _irc_ plugin +$HOME/.weechat/javascript.conf:: + configuration file for _javascript_ plugin + $HOME/.weechat/logger.conf:: configuration file for _logger_ plugin +$HOME/.weechat/lua.conf:: + configuration file for _lua_ plugin + +$HOME/.weechat/perl.conf:: + configuration file for _perl_ plugin + +$HOME/.weechat/php.conf:: + configuration file for _php_ plugin + +$HOME/.weechat/python.conf:: + configuration file for _python_ plugin + $HOME/.weechat/relay.conf:: configuration file for _relay_ plugin +$HOME/.weechat/ruby.conf:: + configuration file for _ruby_ plugin + $HOME/.weechat/script.conf:: configuration file for _script_ plugin +$HOME/.weechat/tcl.conf:: + configuration file for _tcl_ plugin + $HOME/.weechat/trigger.conf:: configuration file for _trigger_ plugin diff --git a/doc/it/weechat_user.it.adoc b/doc/it/weechat_user.it.adoc index 07f890b1c..e05952cd8 100644 --- a/doc/it/weechat_user.it.adoc +++ b/doc/it/weechat_user.it.adoc @@ -601,24 +601,32 @@ The files in the WeeChat home directory are: [width="100%",cols="1m,3,6",options="header"] |=== -| File | Description | Sensitive data -| weechat.conf | Main WeeChat configuration file | Possible (example: list of channels in a saved buffers layout). -| sec.conf | Configuration file with secured data | *Yes, highly sensitive*: this file must never be shared with anyone. -| plugins.conf | Plugins configuration file | Possible, depends on plugins/scripts. -| alias.conf | Configuration file for _alias_ plugin | Possible, depends on aliases. -| aspell.conf | Configuration file for _aspell_ plugin | No. -| buflist.conf | Configuration file for _buflist_ plugin | No. -| charset.conf | Configuration file for _charset_ plugin | No. -| exec.conf | Configuration file for _exec_ plugin | No. -| fifo.conf | Configuration file for _fifo_ plugin | No. -| fset.conf | Configuration file for _fset_ plugin | No. -| irc.conf | Configuration file for _irc_ plugin | *Yes*: it can contain passwords for servers, nickserv and channels (if not stored in `sec.conf`). -| logger.conf | Configuration file for _logger_ plugin | No. -| relay.conf | Configuration file for _relay_ plugin | No. -| script.conf | Configuration file for _script_ plugin | No. -| trigger.conf | Configuration file for _trigger_ plugin | Possible, depends on triggers. -| xfer.conf | Configuration file for _xfer_ plugin | No. -| weechat.log | WeeChat log file | No. +| File | Description | Sensitive data +| weechat.conf | Main WeeChat configuration file | Possible (example: list of channels in a saved buffers layout). +| sec.conf | Configuration file with secured data | *Yes, highly sensitive*: this file must never be shared with anyone. +| plugins.conf | Plugins configuration file | Possible, depends on plugins/scripts. +| alias.conf | Configuration file for _alias_ plugin | Possible, depends on aliases. +| aspell.conf | Configuration file for _aspell_ plugin | No. +| buflist.conf | Configuration file for _buflist_ plugin | No. +| charset.conf | Configuration file for _charset_ plugin | No. +| exec.conf | Configuration file for _exec_ plugin | No. +| fifo.conf | Configuration file for _fifo_ plugin | No. +| fset.conf | Configuration file for _fset_ plugin | No. +| guile.conf | Configuration file for _guile_ plugin | No. +| irc.conf | Configuration file for _irc_ plugin | *Yes*: it can contain passwords for servers, nickserv and channels (if not stored in `sec.conf`). +| javascript.conf | Configuration file for _javascript_ plugin | No. +| logger.conf | Configuration file for _logger_ plugin | No. +| lua.conf | Configuration file for _lua_ plugin | No. +| perl.conf | Configuration file for _perl_ plugin | No. +| php.conf | Configuration file for _php_ plugin | No. +| python.conf | Configuration file for _python_ plugin | No. +| relay.conf | Configuration file for _relay_ plugin | No. +| ruby.conf | Configuration file for _ruby_ plugin | No. +| script.conf | Configuration file for _script_ plugin | No. +| tcl.conf | Configuration file for _tcl_ plugin | No. +| trigger.conf | Configuration file for _trigger_ plugin | Possible, depends on triggers. +| xfer.conf | Configuration file for _xfer_ plugin | No. +| weechat.log | WeeChat log file | No. |=== [IMPORTANT] @@ -3570,6 +3578,158 @@ Options: include::autogen/user/script_options.adoc[] +// TRANSLATION MISSING +[[python_options]] +==== Python options + +// TRANSLATION MISSING +Sections in file _python.conf_: + +// TRANSLATION MISSING +[width="100%",cols="3m,6m,16",options="header"] +|=== +| Section | Control command | Description +| look | /set python.look.* | Look and feel. +|=== + +// TRANSLATION MISSING +Options: + +include::autogen/user/python_options.adoc[] + +// TRANSLATION MISSING +[[perl_options]] +==== Perl options + +// TRANSLATION MISSING +Sections in file _perl.conf_: + +// TRANSLATION MISSING +[width="100%",cols="3m,6m,16",options="header"] +|=== +| Section | Control command | Description +| look | /set perl.look.* | Look and feel. +|=== + +// TRANSLATION MISSING +Options: + +include::autogen/user/perl_options.adoc[] + +// TRANSLATION MISSING +[[ruby_options]] +==== Ruby options + +// TRANSLATION MISSING +Sections in file _ruby.conf_: + +// TRANSLATION MISSING +[width="100%",cols="3m,6m,16",options="header"] +|=== +| Section | Control command | Description +| look | /set ruby.look.* | Look and feel. +|=== + +// TRANSLATION MISSING +Options: + +include::autogen/user/ruby_options.adoc[] + +// TRANSLATION MISSING +[[lua_options]] +==== Lua options + +// TRANSLATION MISSING +Sections in file _lua.conf_: + +// TRANSLATION MISSING +[width="100%",cols="3m,6m,16",options="header"] +|=== +| Section | Control command | Description +| look | /set lua.look.* | Look and feel. +|=== + +// TRANSLATION MISSING +Options: + +include::autogen/user/lua_options.adoc[] + +// TRANSLATION MISSING +[[tcl_options]] +==== Tcl options + +// TRANSLATION MISSING +Sections in file _tcl.conf_: + +// TRANSLATION MISSING +[width="100%",cols="3m,6m,16",options="header"] +|=== +| Section | Control command | Description +| look | /set tcl.look.* | Look and feel. +|=== + +// TRANSLATION MISSING +Options: + +include::autogen/user/tcl_options.adoc[] + +// TRANSLATION MISSING +[[guile_options]] +==== Guile options + +// TRANSLATION MISSING +Sections in file _guile.conf_: + +// TRANSLATION MISSING +[width="100%",cols="3m,6m,16",options="header"] +|=== +| Section | Control command | Description +| look | /set guile.look.* | Look and feel. +|=== + +// TRANSLATION MISSING +Options: + +include::autogen/user/guile_options.adoc[] + +// TRANSLATION MISSING +[[javascript_options]] +==== Javascript options + +// TRANSLATION MISSING +Sections in file _javascript.conf_: + +// TRANSLATION MISSING +[width="100%",cols="3m,6m,16",options="header"] +|=== +| Section | Control command | Description +| look | /set javascript.look.* | Look and feel. +|=== + +// TRANSLATION MISSING +Options: + +include::autogen/user/javascript_options.adoc[] + +// TRANSLATION MISSING +[[php_options]] +==== PHP options + +// TRANSLATION MISSING +Sections in file _php.conf_: + +// TRANSLATION MISSING +[width="100%",cols="3m,6m,16",options="header"] +|=== +| Section | Control command | Description +| look | /set php.look.* | Look and feel. +|=== + +// TRANSLATION MISSING +Options: + +include::autogen/user/php_options.adoc[] + // TRANSLATION MISSING [[trigger_plugin]] === Trigger diff --git a/doc/ja/autogen/user/guile_options.adoc b/doc/ja/autogen/user/guile_options.adoc new file mode 100644 index 000000000..8647db466 --- /dev/null +++ b/doc/ja/autogen/user/guile_options.adoc @@ -0,0 +1,9 @@ +// +// This file is auto-generated by script docgen.py. +// DO NOT EDIT BY HAND! +// +* [[option_guile.look.check_license]] *guile.look.check_license* +** 説明: pass:none[check the license of scripts when they are loaded: if the license is different from the plugin license, a warning is displayed] +** タイプ: ブール +** 値: on, off +** デフォルト値: `+off+` diff --git a/doc/ja/autogen/user/javascript_options.adoc b/doc/ja/autogen/user/javascript_options.adoc new file mode 100644 index 000000000..0b9fd56a0 --- /dev/null +++ b/doc/ja/autogen/user/javascript_options.adoc @@ -0,0 +1,9 @@ +// +// This file is auto-generated by script docgen.py. +// DO NOT EDIT BY HAND! +// +* [[option_javascript.look.check_license]] *javascript.look.check_license* +** 説明: pass:none[check the license of scripts when they are loaded: if the license is different from the plugin license, a warning is displayed] +** タイプ: ブール +** 値: on, off +** デフォルト値: `+off+` diff --git a/doc/ja/autogen/user/lua_options.adoc b/doc/ja/autogen/user/lua_options.adoc new file mode 100644 index 000000000..ca20e2609 --- /dev/null +++ b/doc/ja/autogen/user/lua_options.adoc @@ -0,0 +1,9 @@ +// +// This file is auto-generated by script docgen.py. +// DO NOT EDIT BY HAND! +// +* [[option_lua.look.check_license]] *lua.look.check_license* +** 説明: pass:none[check the license of scripts when they are loaded: if the license is different from the plugin license, a warning is displayed] +** タイプ: ブール +** 値: on, off +** デフォルト値: `+off+` diff --git a/doc/ja/autogen/user/perl_options.adoc b/doc/ja/autogen/user/perl_options.adoc new file mode 100644 index 000000000..b4f321205 --- /dev/null +++ b/doc/ja/autogen/user/perl_options.adoc @@ -0,0 +1,9 @@ +// +// This file is auto-generated by script docgen.py. +// DO NOT EDIT BY HAND! +// +* [[option_perl.look.check_license]] *perl.look.check_license* +** 説明: pass:none[check the license of scripts when they are loaded: if the license is different from the plugin license, a warning is displayed] +** タイプ: ブール +** 値: on, off +** デフォルト値: `+off+` diff --git a/doc/ja/autogen/user/php_options.adoc b/doc/ja/autogen/user/php_options.adoc new file mode 100644 index 000000000..1de9f4a0a --- /dev/null +++ b/doc/ja/autogen/user/php_options.adoc @@ -0,0 +1,9 @@ +// +// This file is auto-generated by script docgen.py. +// DO NOT EDIT BY HAND! +// +* [[option_php.look.check_license]] *php.look.check_license* +** 説明: pass:none[check the license of scripts when they are loaded: if the license is different from the plugin license, a warning is displayed] +** タイプ: ブール +** 値: on, off +** デフォルト値: `+off+` diff --git a/doc/ja/autogen/user/python_options.adoc b/doc/ja/autogen/user/python_options.adoc new file mode 100644 index 000000000..c7334801b --- /dev/null +++ b/doc/ja/autogen/user/python_options.adoc @@ -0,0 +1,9 @@ +// +// This file is auto-generated by script docgen.py. +// DO NOT EDIT BY HAND! +// +* [[option_python.look.check_license]] *python.look.check_license* +** 説明: pass:none[check the license of scripts when they are loaded: if the license is different from the plugin license, a warning is displayed] +** タイプ: ブール +** 値: on, off +** デフォルト値: `+off+` diff --git a/doc/ja/autogen/user/ruby_options.adoc b/doc/ja/autogen/user/ruby_options.adoc new file mode 100644 index 000000000..fcfc351e6 --- /dev/null +++ b/doc/ja/autogen/user/ruby_options.adoc @@ -0,0 +1,9 @@ +// +// This file is auto-generated by script docgen.py. +// DO NOT EDIT BY HAND! +// +* [[option_ruby.look.check_license]] *ruby.look.check_license* +** 説明: pass:none[check the license of scripts when they are loaded: if the license is different from the plugin license, a warning is displayed] +** タイプ: ブール +** 値: on, off +** デフォルト値: `+off+` diff --git a/doc/ja/autogen/user/tcl_options.adoc b/doc/ja/autogen/user/tcl_options.adoc new file mode 100644 index 000000000..df1cfb47d --- /dev/null +++ b/doc/ja/autogen/user/tcl_options.adoc @@ -0,0 +1,9 @@ +// +// This file is auto-generated by script docgen.py. +// DO NOT EDIT BY HAND! +// +* [[option_tcl.look.check_license]] *tcl.look.check_license* +** 説明: pass:none[check the license of scripts when they are loaded: if the license is different from the plugin license, a warning is displayed] +** タイプ: ブール +** 値: on, off +** デフォルト値: `+off+` diff --git a/doc/ja/weechat.1.ja.adoc b/doc/ja/weechat.1.ja.adoc index 156bb4323..0aab9fe0a 100644 --- a/doc/ja/weechat.1.ja.adoc +++ b/doc/ja/weechat.1.ja.adoc @@ -79,18 +79,42 @@ $HOME/.weechat/fifo.conf:: $HOME/.weechat/fset.conf:: _fset_ プラグイン用の設定ファイル +$HOME/.weechat/guile.conf:: + _guile_ プラグイン用の設定ファイル + $HOME/.weechat/irc.conf:: _irc_ プラグイン用の設定ファイル +$HOME/.weechat/javascript.conf:: + _javascript_ プラグイン用の設定ファイル + $HOME/.weechat/logger.conf:: _logger_ プラグイン用の設定ファイル +$HOME/.weechat/lua.conf:: + _lua_ プラグイン用の設定ファイル + +$HOME/.weechat/perl.conf:: + _perl_ プラグイン用の設定ファイル + +$HOME/.weechat/php.conf:: + _php_ プラグイン用の設定ファイル + +$HOME/.weechat/python.conf:: + _python_ プラグイン用の設定ファイル + $HOME/.weechat/relay.conf:: _relay_ プラグイン用の設定ファイル +$HOME/.weechat/ruby.conf:: + _ruby_ プラグイン用の設定ファイル + $HOME/.weechat/script.conf:: _script_ プラグイン用の設定ファイル +$HOME/.weechat/tcl.conf:: + _tcl_ プラグイン用の設定ファイル + $HOME/.weechat/trigger.conf:: _trigger_ プラグイン用の設定ファイル diff --git a/doc/ja/weechat_dev.ja.adoc b/doc/ja/weechat_dev.ja.adoc index b277dd349..cafa3f56c 100644 --- a/doc/ja/weechat_dev.ja.adoc +++ b/doc/ja/weechat_dev.ja.adoc @@ -189,6 +189,8 @@ WeeChat "core" は以下のディレクトリに配置されています: |    plugin-config.c | プラグイン設定オプション (plugins.conf ファイル) |    plugin-script.c | スクリプトプラグインの共用関数 |    plugin-script-api.c | スクリプト API 関数: 一部のプラグイン API 関数のラッパー +// TRANSLATION MISSING +|    plugin-script-config.c | Script plugin configuration options (files python.conf, perl.conf, ...). |    weechat-plugin.h | WeeChat プラグインと一緒に配布されるヘッダファイル、プラグインのコンパイルに必要 |    alias/ | alias プラグイン |       alias.c | alias の主要関数 diff --git a/doc/ja/weechat_user.ja.adoc b/doc/ja/weechat_user.ja.adoc index 291f308b1..54b1b7dbe 100644 --- a/doc/ja/weechat_user.ja.adoc +++ b/doc/ja/weechat_user.ja.adoc @@ -559,24 +559,32 @@ WeeChat ホームディレクトリには以下のファイルが含まれます [width="100%",cols="1m,3,6",options="header"] |=== -| ファイル | 説明 | データ保護 -| weechat.conf | WeeChat の主要設定ファイル | 保護される場合もあります (例: 保存されたバッファレイアウトに含まれるチャンネルのリスト) -| sec.conf | 機密データを含む設定ファイル | *保護されます、機密性の高いデータ*: このファイルを誰かと共有してはいけません -| plugins.conf | プラグイン設定ファイル | 保護される場合もあります、プラグインおよびスクリプトに依存します -| alias.conf | _alias_ プラグイン用の設定ファイル | 保護される場合もあります、エイリアスに依存します -| aspell.conf | _aspell_ プラグイン用の設定ファイル | 保護されません -| buflist.conf | _buflist_ プラグイン用の設定ファイル | 保護されません -| charset.conf | _charset_ プラグイン用の設定ファイル | 保護されません -| exec.conf | _exec_ プラグイン用の設定ファイル | 保護されません -| fifo.conf | _fifo_ プラグイン用の設定ファイル | 保護されません -| fset.conf | _fset_ プラグイン用の設定ファイル | 保護されません -| irc.conf | _irc_ プラグイン用の設定ファイル | *保護されます*: サーバ、nickserv、チャンネルのパスワードを保存することが可能です (これらのデータが `sec.conf` に保存されない場合) -| logger.conf | _logger_ プラグイン用の設定ファイル | 保護されません -| relay.conf | _relay_ プラグイン用の設定ファイル | 保護されません -| script.conf | _script_ プラグイン用の設定ファイル | 保護されません -| trigger.conf | _trigger_ プラグイン用の設定ファイル | 保護される場合もあります、トリガに依存します -| xfer.conf | _xfer_ プラグイン用の設定ファイル | 保護されません -| weechat.log | WeeChat ログファイル | 保護されません +| ファイル | 説明 | データ保護 +| weechat.conf | WeeChat の主要設定ファイル | 保護される場合もあります (例: 保存されたバッファレイアウトに含まれるチャンネルのリスト) +| sec.conf | 機密データを含む設定ファイル | *保護されます、機密性の高いデータ*: このファイルを誰かと共有してはいけません +| plugins.conf | プラグイン設定ファイル | 保護される場合もあります、プラグインおよびスクリプトに依存します +| alias.conf | _alias_ プラグイン用の設定ファイル | 保護される場合もあります、エイリアスに依存します +| aspell.conf | _aspell_ プラグイン用の設定ファイル | 保護されません +| buflist.conf | _buflist_ プラグイン用の設定ファイル | 保護されません +| charset.conf | _charset_ プラグイン用の設定ファイル | 保護されません +| exec.conf | _exec_ プラグイン用の設定ファイル | 保護されません +| fifo.conf | _fifo_ プラグイン用の設定ファイル | 保護されません +| fset.conf | _fset_ プラグイン用の設定ファイル | 保護されません +| guile.conf | _guile_ プラグイン用の設定ファイル | 保護されません +| irc.conf | _irc_ プラグイン用の設定ファイル | *保護されます*: サーバ、nickserv、チャンネルのパスワードを保存することが可能です (これらのデータが `sec.conf` に保存されない場合) +| javascript.conf | _javascript_ プラグイン用の設定ファイル | 保護されません +| logger.conf | _logger_ プラグイン用の設定ファイル | 保護されません +| lua.conf | _lua_ プラグイン用の設定ファイル | 保護されません +| perl.conf | _perl_ プラグイン用の設定ファイル | 保護されません +| php.conf | _php_ プラグイン用の設定ファイル | 保護されません +| python.conf | _python_ プラグイン用の設定ファイル | 保護されません +| relay.conf | _relay_ プラグイン用の設定ファイル | 保護されません +| ruby.conf | _ruby_ プラグイン用の設定ファイル | 保護されません +| script.conf | _script_ プラグイン用の設定ファイル | 保護されません +| tcl.conf | _tcl_ プラグイン用の設定ファイル | 保護されません +| trigger.conf | _trigger_ プラグイン用の設定ファイル | 保護される場合もあります、トリガに依存します +| xfer.conf | _xfer_ プラグイン用の設定ファイル | 保護されません +| weechat.log | WeeChat ログファイル | 保護されません |=== [IMPORTANT] @@ -3340,6 +3348,134 @@ _script.conf_ ファイル内のセクション: include::autogen/user/script_options.adoc[] +// TRANSLATION MISSING +[[python_options]] +==== Python options + +_python.conf_ ファイル内のセクション: + +[width="100%",cols="3m,6m,16",options="header"] +|=== +| セクション | 操作コマンド | 説明 +| look | /set python.look.* | 外観 +|=== + +オプション: + +include::autogen/user/python_options.adoc[] + +// TRANSLATION MISSING +[[perl_options]] +==== Perl options + +_perl.conf_ ファイル内のセクション: + +[width="100%",cols="3m,6m,16",options="header"] +|=== +| セクション | 操作コマンド | 説明 +| look | /set perl.look.* | 外観 +|=== + +オプション: + +include::autogen/user/perl_options.adoc[] + +// TRANSLATION MISSING +[[ruby_options]] +==== Ruby options + +_ruby.conf_ ファイル内のセクション: + +[width="100%",cols="3m,6m,16",options="header"] +|=== +| セクション | 操作コマンド | 説明 +| look | /set ruby.look.* | 外観 +|=== + +オプション: + +include::autogen/user/ruby_options.adoc[] + +// TRANSLATION MISSING +[[lua_options]] +==== Lua options + +_lua.conf_ ファイル内のセクション: + +[width="100%",cols="3m,6m,16",options="header"] +|=== +| セクション | 操作コマンド | 説明 +| look | /set lua.look.* | 外観 +|=== + +オプション: + +include::autogen/user/lua_options.adoc[] + +// TRANSLATION MISSING +[[tcl_options]] +==== Tcl options + +_tcl.conf_ ファイル内のセクション: + +[width="100%",cols="3m,6m,16",options="header"] +|=== +| セクション | 操作コマンド | 説明 +| look | /set tcl.look.* | 外観 +|=== + +オプション: + +include::autogen/user/tcl_options.adoc[] + +// TRANSLATION MISSING +[[guile_options]] +==== Guile options + +_guile.conf_ ファイル内のセクション: + +[width="100%",cols="3m,6m,16",options="header"] +|=== +| セクション | 操作コマンド | 説明 +| look | /set guile.look.* | 外観 +|=== + +オプション: + +include::autogen/user/guile_options.adoc[] + +// TRANSLATION MISSING +[[javascript_options]] +==== Javascript options + +_javascript.conf_ ファイル内のセクション: + +[width="100%",cols="3m,6m,16",options="header"] +|=== +| セクション | 操作コマンド | 説明 +| look | /set javascript.look.* | 外観 +|=== + +オプション: + +include::autogen/user/javascript_options.adoc[] + +// TRANSLATION MISSING +[[php_options]] +==== PHP options + +_php.conf_ ファイル内のセクション: + +[width="100%",cols="3m,6m,16",options="header"] +|=== +| セクション | 操作コマンド | 説明 +| look | /set php.look.* | 外観 +|=== + +オプション: + +include::autogen/user/php_options.adoc[] + [[trigger_plugin]] === Trigger diff --git a/doc/pl/autogen/user/guile_options.adoc b/doc/pl/autogen/user/guile_options.adoc new file mode 100644 index 000000000..5e26f6539 --- /dev/null +++ b/doc/pl/autogen/user/guile_options.adoc @@ -0,0 +1,9 @@ +// +// This file is auto-generated by script docgen.py. +// DO NOT EDIT BY HAND! +// +* [[option_guile.look.check_license]] *guile.look.check_license* +** opis: pass:none[check the license of scripts when they are loaded: if the license is different from the plugin license, a warning is displayed] +** typ: bool +** wartości: on, off +** domyślna wartość: `+off+` diff --git a/doc/pl/autogen/user/javascript_options.adoc b/doc/pl/autogen/user/javascript_options.adoc new file mode 100644 index 000000000..db8064dfc --- /dev/null +++ b/doc/pl/autogen/user/javascript_options.adoc @@ -0,0 +1,9 @@ +// +// This file is auto-generated by script docgen.py. +// DO NOT EDIT BY HAND! +// +* [[option_javascript.look.check_license]] *javascript.look.check_license* +** opis: pass:none[check the license of scripts when they are loaded: if the license is different from the plugin license, a warning is displayed] +** typ: bool +** wartości: on, off +** domyślna wartość: `+off+` diff --git a/doc/pl/autogen/user/lua_options.adoc b/doc/pl/autogen/user/lua_options.adoc new file mode 100644 index 000000000..c7a015954 --- /dev/null +++ b/doc/pl/autogen/user/lua_options.adoc @@ -0,0 +1,9 @@ +// +// This file is auto-generated by script docgen.py. +// DO NOT EDIT BY HAND! +// +* [[option_lua.look.check_license]] *lua.look.check_license* +** opis: pass:none[check the license of scripts when they are loaded: if the license is different from the plugin license, a warning is displayed] +** typ: bool +** wartości: on, off +** domyślna wartość: `+off+` diff --git a/doc/pl/autogen/user/perl_options.adoc b/doc/pl/autogen/user/perl_options.adoc new file mode 100644 index 000000000..66deda54a --- /dev/null +++ b/doc/pl/autogen/user/perl_options.adoc @@ -0,0 +1,9 @@ +// +// This file is auto-generated by script docgen.py. +// DO NOT EDIT BY HAND! +// +* [[option_perl.look.check_license]] *perl.look.check_license* +** opis: pass:none[check the license of scripts when they are loaded: if the license is different from the plugin license, a warning is displayed] +** typ: bool +** wartości: on, off +** domyślna wartość: `+off+` diff --git a/doc/pl/autogen/user/php_options.adoc b/doc/pl/autogen/user/php_options.adoc new file mode 100644 index 000000000..852bd38ef --- /dev/null +++ b/doc/pl/autogen/user/php_options.adoc @@ -0,0 +1,9 @@ +// +// This file is auto-generated by script docgen.py. +// DO NOT EDIT BY HAND! +// +* [[option_php.look.check_license]] *php.look.check_license* +** opis: pass:none[check the license of scripts when they are loaded: if the license is different from the plugin license, a warning is displayed] +** typ: bool +** wartości: on, off +** domyślna wartość: `+off+` diff --git a/doc/pl/autogen/user/python_options.adoc b/doc/pl/autogen/user/python_options.adoc new file mode 100644 index 000000000..372d0dd86 --- /dev/null +++ b/doc/pl/autogen/user/python_options.adoc @@ -0,0 +1,9 @@ +// +// This file is auto-generated by script docgen.py. +// DO NOT EDIT BY HAND! +// +* [[option_python.look.check_license]] *python.look.check_license* +** opis: pass:none[check the license of scripts when they are loaded: if the license is different from the plugin license, a warning is displayed] +** typ: bool +** wartości: on, off +** domyślna wartość: `+off+` diff --git a/doc/pl/autogen/user/ruby_options.adoc b/doc/pl/autogen/user/ruby_options.adoc new file mode 100644 index 000000000..8efe29cd7 --- /dev/null +++ b/doc/pl/autogen/user/ruby_options.adoc @@ -0,0 +1,9 @@ +// +// This file is auto-generated by script docgen.py. +// DO NOT EDIT BY HAND! +// +* [[option_ruby.look.check_license]] *ruby.look.check_license* +** opis: pass:none[check the license of scripts when they are loaded: if the license is different from the plugin license, a warning is displayed] +** typ: bool +** wartości: on, off +** domyślna wartość: `+off+` diff --git a/doc/pl/autogen/user/tcl_options.adoc b/doc/pl/autogen/user/tcl_options.adoc new file mode 100644 index 000000000..7e41a19bf --- /dev/null +++ b/doc/pl/autogen/user/tcl_options.adoc @@ -0,0 +1,9 @@ +// +// This file is auto-generated by script docgen.py. +// DO NOT EDIT BY HAND! +// +* [[option_tcl.look.check_license]] *tcl.look.check_license* +** opis: pass:none[check the license of scripts when they are loaded: if the license is different from the plugin license, a warning is displayed] +** typ: bool +** wartości: on, off +** domyślna wartość: `+off+` diff --git a/doc/pl/weechat.1.pl.adoc b/doc/pl/weechat.1.pl.adoc index b6ad4d169..695fe97bf 100644 --- a/doc/pl/weechat.1.pl.adoc +++ b/doc/pl/weechat.1.pl.adoc @@ -80,18 +80,42 @@ $HOME/.weechat/fifo.conf:: $HOME/.weechat/fset.conf:: plik konfiguracyjny wtyczki _fset_ +$HOME/.weechat/guile.conf:: + plik konfiguracyjny wtyczki _guile_ + $HOME/.weechat/irc.conf:: plik konfiguracyjny wtyczki _irc_ +$HOME/.weechat/javascript.conf:: + plik konfiguracyjny wtyczki _javascript_ + $HOME/.weechat/logger.conf:: plik konfiguracyjny wtyczki _logger_ +$HOME/.weechat/lua.conf:: + plik konfiguracyjny wtyczki _lua_ + +$HOME/.weechat/perl.conf:: + plik konfiguracyjny wtyczki _perl_ + +$HOME/.weechat/php.conf:: + plik konfiguracyjny wtyczki _php_ + +$HOME/.weechat/python.conf:: + plik konfiguracyjny wtyczki _python_ + $HOME/.weechat/relay.conf:: plik konfiguracyjny wtyczki _relay_ +$HOME/.weechat/ruby.conf:: + plik konfiguracyjny wtyczki _ruby_ + $HOME/.weechat/script.conf:: plik konfiguracyjny wtyczki _script_ +$HOME/.weechat/tcl.conf:: + plik konfiguracyjny wtyczki _tcl_ + $HOME/.weechat/trigger.conf:: plik konfiguracyjny wtyczki _trigger_ diff --git a/doc/pl/weechat_user.pl.adoc b/doc/pl/weechat_user.pl.adoc index bafb42878..3c099a33f 100644 --- a/doc/pl/weechat_user.pl.adoc +++ b/doc/pl/weechat_user.pl.adoc @@ -563,24 +563,32 @@ Pliki tworzone w katalogu domowym WeeChat: [width="100%",cols="1m,3,6",options="header"] |=== -| Plik | Opis | Wrażliwe dane -| weechat.conf | Główny plik konfiguracyjny WeeChat | Możliwe (przykład: lista kanałów w zapisanym układzie buforów). -| sec.conf | Plik konfiguracyjny z zabezpieczonymi danymi | *Tak, bardzo prażliwe*: Tym plikiem nie powinno się z nikim dzielić. -| plugins.conf | Plik konfiguracyjny wtyczek | Możliwe, zależy od wtyczki/skryptu. -| alias.conf | Plik konfiguracyjny wtyczki _alias_ | Możliwe, zależy od aliasu. -| aspell.conf | Plik konfiguracyjny wtyczki _aspell_ | Nie. -| buflist.conf | Plik konfiguracyjny wtyczki _buflist_ | Nie. -| charset.conf | Plik konfiguracyjny wtyczki _charset_ | Nie. -| exec.conf | Plik konfiguracyjny wtyczki _exec_ | Nie. -| fifo.conf | Plik konfiguracyjny wtyczki _fifo_ | Nie. -| fset.conf | Plik konfiguracyjny wtyczki _fset_ | Nie. -| irc.conf | Plik konfiguracyjny wtyczki _irc_ | *Tak*: Może zawierać hasła dla serwerów, nickserva i kanałów (jeśli nie zostały zapisane w `sec.conf`). -| logger.conf | Plik konfiguracyjny wtyczki _logger_ | Nie. -| relay.conf | Plik konfiguracyjny wtyczki _relay_ | Nie. -| script.conf | Plik konfiguracyjny wtyczki _script_ | Nie. -| trigger.conf | Plik konfiguracyjny wtyczki _trigger_ | Możliwe, zależy od triggerów. -| xfer.conf | Plik konfiguracyjny wtyczki _xfer_ | Nie. -| weechat.log | Plik z logami WeeChat | Nie. +| Plik | Opis | Wrażliwe dane +| weechat.conf | Główny plik konfiguracyjny WeeChat | Możliwe (przykład: lista kanałów w zapisanym układzie buforów). +| sec.conf | Plik konfiguracyjny z zabezpieczonymi danymi | *Tak, bardzo prażliwe*: Tym plikiem nie powinno się z nikim dzielić. +| plugins.conf | Plik konfiguracyjny wtyczek | Możliwe, zależy od wtyczki/skryptu. +| alias.conf | Plik konfiguracyjny wtyczki _alias_ | Możliwe, zależy od aliasu. +| aspell.conf | Plik konfiguracyjny wtyczki _aspell_ | Nie. +| buflist.conf | Plik konfiguracyjny wtyczki _buflist_ | Nie. +| charset.conf | Plik konfiguracyjny wtyczki _charset_ | Nie. +| exec.conf | Plik konfiguracyjny wtyczki _exec_ | Nie. +| fifo.conf | Plik konfiguracyjny wtyczki _fifo_ | Nie. +| fset.conf | Plik konfiguracyjny wtyczki _fset_ | Nie. +| guile.conf | Plik konfiguracyjny wtyczki _guile_ | Nie. +| irc.conf | Plik konfiguracyjny wtyczki _irc_ | *Tak*: Może zawierać hasła dla serwerów, nickserva i kanałów (jeśli nie zostały zapisane w `sec.conf`). +| javascript.conf | Plik konfiguracyjny wtyczki _javascript_ | Nie. +| logger.conf | Plik konfiguracyjny wtyczki _logger_ | Nie. +| lua.conf | Plik konfiguracyjny wtyczki _lua_ | Nie. +| perl.conf | Plik konfiguracyjny wtyczki _perl_ | Nie. +| php.conf | Plik konfiguracyjny wtyczki _php_ | Nie. +| python.conf | Plik konfiguracyjny wtyczki _python_ | Nie. +| relay.conf | Plik konfiguracyjny wtyczki _relay_ | Nie. +| ruby.conf | Plik konfiguracyjny wtyczki _ruby_ | Nie. +| script.conf | Plik konfiguracyjny wtyczki _script_ | Nie. +| tcl.conf | Plik konfiguracyjny wtyczki _tcl_ | Nie. +| trigger.conf | Plik konfiguracyjny wtyczki _trigger_ | Możliwe, zależy od triggerów. +| xfer.conf | Plik konfiguracyjny wtyczki _xfer_ | Nie. +| weechat.log | Plik z logami WeeChat | Nie. |=== [IMPORTANT] @@ -3375,6 +3383,134 @@ Opcje: include::autogen/user/script_options.adoc[] +// TRANSLATION MISSING +[[python_options]] +==== Python options + +Sekcje w pliku _python.conf_: + +[width="100%",cols="3m,6m,16",options="header"] +|=== +| Sekcja | Komenda | Opis +| look | /set python.look.* | Wygląd. +|=== + +Opcje: + +include::autogen/user/python_options.adoc[] + +// TRANSLATION MISSING +[[perl_options]] +==== Perl options + +Sekcje w pliku _perl.conf_: + +[width="100%",cols="3m,6m,16",options="header"] +|=== +| Sekcja | Komenda | Opis +| look | /set perl.look.* | Wygląd. +|=== + +Opcje: + +include::autogen/user/perl_options.adoc[] + +// TRANSLATION MISSING +[[ruby_options]] +==== Ruby options + +Sekcje w pliku _ruby.conf_: + +[width="100%",cols="3m,6m,16",options="header"] +|=== +| Sekcja | Komenda | Opis +| look | /set ruby.look.* | Wygląd. +|=== + +Opcje: + +include::autogen/user/ruby_options.adoc[] + +// TRANSLATION MISSING +[[lua_options]] +==== Lua options + +Sekcje w pliku _lua.conf_: + +[width="100%",cols="3m,6m,16",options="header"] +|=== +| Sekcja | Komenda | Opis +| look | /set lua.look.* | Wygląd. +|=== + +Opcje: + +include::autogen/user/lua_options.adoc[] + +// TRANSLATION MISSING +[[tcl_options]] +==== Tcl options + +Sekcje w pliku _tcl.conf_: + +[width="100%",cols="3m,6m,16",options="header"] +|=== +| Sekcja | Komenda | Opis +| look | /set tcl.look.* | Wygląd. +|=== + +Opcje: + +include::autogen/user/tcl_options.adoc[] + +// TRANSLATION MISSING +[[guile_options]] +==== Guile options + +Sekcje w pliku _guile.conf_: + +[width="100%",cols="3m,6m,16",options="header"] +|=== +| Sekcja | Komenda | Opis +| look | /set guile.look.* | Wygląd. +|=== + +Opcje: + +include::autogen/user/guile_options.adoc[] + +// TRANSLATION MISSING +[[javascript_options]] +==== Javascript options + +Sekcje w pliku _javascript.conf_: + +[width="100%",cols="3m,6m,16",options="header"] +|=== +| Sekcja | Komenda | Opis +| look | /set javascript.look.* | Wygląd. +|=== + +Opcje: + +include::autogen/user/javascript_options.adoc[] + +// TRANSLATION MISSING +[[php_options]] +==== PHP options + +Sekcje w pliku _php.conf_: + +[width="100%",cols="3m,6m,16",options="header"] +|=== +| Sekcja | Komenda | Opis +| look | /set php.look.* | Wygląd. +|=== + +Opcje: + +include::autogen/user/php_options.adoc[] + [[trigger_plugin]] === Trigger diff --git a/doc/ru/weechat.1.ru.adoc b/doc/ru/weechat.1.ru.adoc index 9de4a6f1c..cf8763c0e 100644 --- a/doc/ru/weechat.1.ru.adoc +++ b/doc/ru/weechat.1.ru.adoc @@ -64,9 +64,8 @@ $HOME/.weechat/alias.conf:: $HOME/.weechat/aspell.conf:: файл конфигурации для плагина _aspell_ -// TRANSLATION MISSING $HOME/.weechat/buflist.conf:: - configuration file for _buflist_ plugin + файл конфигурации для плагина _buflist_ $HOME/.weechat/charset.conf:: файл конфигурации для плагина _charset_ @@ -74,26 +73,48 @@ $HOME/.weechat/charset.conf:: $HOME/.weechat/exec.conf:: файл конфигурации для плагина _exec_ -// TRANSLATION MISSING $HOME/.weechat/fifo.conf:: - configuration file for _fifo_ plugin + файл конфигурации для плагина _fifo_ -// TRANSLATION MISSING $HOME/.weechat/fset.conf:: - configuration file for _fset_ plugin + файл конфигурации для плагина _fset_ + +$HOME/.weechat/guile.conf:: + файл конфигурации для плагина _guile_ $HOME/.weechat/irc.conf:: файл конфигурации для плагина _irc_ +$HOME/.weechat/javascript.conf:: + файл конфигурации для плагина _javascript_ + $HOME/.weechat/logger.conf:: файл конфигурации для плагина _logger_ +$HOME/.weechat/lua.conf:: + файл конфигурации для плагина _lua_ + +$HOME/.weechat/perl.conf:: + файл конфигурации для плагина _perl_ + +$HOME/.weechat/php.conf:: + файл конфигурации для плагина _php_ + +$HOME/.weechat/python.conf:: + файл конфигурации для плагина _python_ + $HOME/.weechat/relay.conf:: файл конфигурации для плагина _relay_ +$HOME/.weechat/ruby.conf:: + файл конфигурации для плагина _ruby_ + $HOME/.weechat/script.conf:: файл конфигурации для плагина _script_ +$HOME/.weechat/tcl.conf:: + файл конфигурации для плагина _tcl_ + $HOME/.weechat/trigger.conf:: файл конфигурации для плагина _trigger_ diff --git a/po/POTFILES.in b/po/POTFILES.in index 4d3ace9ad..27665eb1e 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -254,6 +254,8 @@ ./src/plugins/plugin.h ./src/plugins/plugin-script-api.c ./src/plugins/plugin-script-api.h +./src/plugins/plugin-script-config.c +./src/plugins/plugin-script-config.h ./src/plugins/plugin-script.c ./src/plugins/plugin-script.h ./src/plugins/python/weechat-python-api.c diff --git a/po/cs.po b/po/cs.po index d6a438f19..abbcd41d8 100644 --- a/po/cs.po +++ b/po/cs.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2018-01-14 16:50+0100\n" +"POT-Creation-Date: 2018-01-14 21:47+0100\n" "PO-Revision-Date: 2018-01-06 13:50+0100\n" "Last-Translator: Ondřej Súkup \n" "Language-Team: weechat-dev \n" @@ -10245,6 +10245,11 @@ msgstr "Pluginy odebrány" msgid "description of plugin option" msgstr "popis volby pluginu" +msgid "" +"check the license of scripts when they are loaded: if the license is " +"different from the plugin license, a warning is displayed" +msgstr "" + msgid "list/load/unload scripts" msgstr "seznam/načíst/odebrat skirpty" diff --git a/po/de.po b/po/de.po index ec658d2dd..576dfc0c7 100644 --- a/po/de.po +++ b/po/de.po @@ -23,7 +23,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2018-01-14 16:50+0100\n" +"POT-Creation-Date: 2018-01-14 21:47+0100\n" "PO-Revision-Date: 2018-01-14 21:04+0100\n" "Last-Translator: Nils Görs \n" "Language-Team: German \n" @@ -12031,6 +12031,11 @@ msgstr "Erweiterungen wurden beendet" msgid "description of plugin option" msgstr "Beschreibung der Erweiterungsoption" +msgid "" +"check the license of scripts when they are loaded: if the license is " +"different from the plugin license, a warning is displayed" +msgstr "" + msgid "list/load/unload scripts" msgstr "auflisten/installieren/beenden von Skripten" diff --git a/po/es.po b/po/es.po index 7b377a6ee..f27cb4001 100644 --- a/po/es.po +++ b/po/es.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2018-01-14 16:50+0100\n" +"POT-Creation-Date: 2018-01-14 21:47+0100\n" "PO-Revision-Date: 2018-01-06 13:50+0100\n" "Last-Translator: Elián Hanisch \n" "Language-Team: weechat-dev \n" @@ -10583,6 +10583,11 @@ msgstr "Plugins descargados" msgid "description of plugin option" msgstr "descripción de la opción del plugin" +msgid "" +"check the license of scripts when they are loaded: if the license is " +"different from the plugin license, a warning is displayed" +msgstr "" + msgid "list/load/unload scripts" msgstr "listar/cargar/descargar scripts" diff --git a/po/fr.po b/po/fr.po index 025f853e3..96c9a5bf6 100644 --- a/po/fr.po +++ b/po/fr.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2018-01-14 16:50+0100\n" -"PO-Revision-Date: 2018-01-14 16:52+0100\n" +"POT-Creation-Date: 2018-01-14 21:47+0100\n" +"PO-Revision-Date: 2018-01-14 21:51+0100\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" "Language: fr\n" @@ -11761,6 +11761,13 @@ msgstr "Extensions déchargées" msgid "description of plugin option" msgstr "description de l'option d'extension" +msgid "" +"check the license of scripts when they are loaded: if the license is " +"different from the plugin license, a warning is displayed" +msgstr "" +"vérifier la licence des scripts quand ils sont chargés : si la licence est " +"différente de la licence de l'extension, un avertissement est affiché" + msgid "list/load/unload scripts" msgstr "lister/charger/décharger des scripts" diff --git a/po/hu.po b/po/hu.po index aa85463fa..799281ce5 100644 --- a/po/hu.po +++ b/po/hu.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2018-01-14 16:50+0100\n" +"POT-Creation-Date: 2018-01-14 21:47+0100\n" "PO-Revision-Date: 2018-01-06 13:50+0100\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -9615,6 +9615,11 @@ msgstr "Betöltött modulok:\n" msgid "description of plugin option" msgstr "" +msgid "" +"check the license of scripts when they are loaded: if the license is " +"different from the plugin license, a warning is displayed" +msgstr "" + #, fuzzy msgid "list/load/unload scripts" msgstr "modulok listázása/betöltése/eltávolítása" diff --git a/po/it.po b/po/it.po index 5c2af229b..6c861cd64 100644 --- a/po/it.po +++ b/po/it.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2018-01-14 16:50+0100\n" +"POT-Creation-Date: 2018-01-14 21:47+0100\n" "PO-Revision-Date: 2018-01-06 13:50+0100\n" "Last-Translator: Esteban I. Ruiz Moreno \n" "Language-Team: weechat-dev \n" @@ -10774,6 +10774,11 @@ msgstr "Plugin scaricati" msgid "description of plugin option" msgstr "descrizione dell'opzione del plugin" +msgid "" +"check the license of scripts when they are loaded: if the license is " +"different from the plugin license, a warning is displayed" +msgstr "" + msgid "list/load/unload scripts" msgstr "elenca/carica/scarica script" diff --git a/po/ja.po b/po/ja.po index a8cb8e567..678101ab9 100644 --- a/po/ja.po +++ b/po/ja.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2018-01-14 16:50+0100\n" +"POT-Creation-Date: 2018-01-14 21:47+0100\n" "PO-Revision-Date: 2018-01-13 09:00+0900\n" "Last-Translator: AYANOKOUZI, Ryuunosuke \n" "Language-Team: Japanese \n" "Language-Team: weechat-dev \n" @@ -11486,6 +11486,11 @@ msgstr "Wyładowano wtyczki" msgid "description of plugin option" msgstr "opis opcji wtyczki" +msgid "" +"check the license of scripts when they are loaded: if the license is " +"different from the plugin license, a warning is displayed" +msgstr "" + msgid "list/load/unload scripts" msgstr "list/load/unload skrypt" diff --git a/po/pt.po b/po/pt.po index e9c1a4a71..081b98f2e 100644 --- a/po/pt.po +++ b/po/pt.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2018-01-14 16:50+0100\n" +"POT-Creation-Date: 2018-01-14 21:47+0100\n" "PO-Revision-Date: 2018-01-06 13:50+0100\n" "Last-Translator: Vasco Almeida \n" "Language-Team: Portuguese <>\n" @@ -11194,6 +11194,11 @@ msgstr "Plugins descarregados" msgid "description of plugin option" msgstr "descrição das opções do plugin" +msgid "" +"check the license of scripts when they are loaded: if the license is " +"different from the plugin license, a warning is displayed" +msgstr "" + msgid "list/load/unload scripts" msgstr "listar/carregar/descarregar scripts" diff --git a/po/pt_BR.po b/po/pt_BR.po index b83dd1906..baa3653e5 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2018-01-14 16:50+0100\n" +"POT-Creation-Date: 2018-01-14 21:47+0100\n" "PO-Revision-Date: 2018-01-06 13:50+0100\n" "Last-Translator: Eduardo Elias \n" "Language-Team: weechat-dev \n" @@ -10091,6 +10091,11 @@ msgstr "Plugins removidos" msgid "description of plugin option" msgstr "descrição da opção do plugin" +msgid "" +"check the license of scripts when they are loaded: if the license is " +"different from the plugin license, a warning is displayed" +msgstr "" + msgid "list/load/unload scripts" msgstr "listar/carregar/descarregar scripts" diff --git a/po/ru.po b/po/ru.po index 67f4f4690..80af277af 100644 --- a/po/ru.po +++ b/po/ru.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2018-01-14 16:50+0100\n" +"POT-Creation-Date: 2018-01-14 21:47+0100\n" "PO-Revision-Date: 2018-01-06 13:50+0100\n" "Last-Translator: Aleksey V Zapparov AKA ixti \n" "Language-Team: weechat-dev \n" @@ -9651,6 +9651,11 @@ msgstr "Загруженные plugin'ы\n" msgid "description of plugin option" msgstr "" +msgid "" +"check the license of scripts when they are loaded: if the license is " +"different from the plugin license, a warning is displayed" +msgstr "" + #, fuzzy msgid "list/load/unload scripts" msgstr "перечислить/загрузить/выгрузить plugin'ы" diff --git a/po/srcfiles.cmake b/po/srcfiles.cmake index ce217082a..14591cc76 100644 --- a/po/srcfiles.cmake +++ b/po/srcfiles.cmake @@ -255,6 +255,8 @@ SET(WEECHAT_SOURCES ./src/plugins/plugin.h ./src/plugins/plugin-script-api.c ./src/plugins/plugin-script-api.h +./src/plugins/plugin-script-config.c +./src/plugins/plugin-script-config.h ./src/plugins/plugin-script.c ./src/plugins/plugin-script.h ./src/plugins/python/weechat-python-api.c diff --git a/po/tr.po b/po/tr.po index afa3bd254..66708c7fe 100644 --- a/po/tr.po +++ b/po/tr.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2018-01-14 16:50+0100\n" +"POT-Creation-Date: 2018-01-14 21:47+0100\n" "PO-Revision-Date: 2017-06-26 23:33+0200\n" "Last-Translator: Hasan Kiran \n" "Language-Team: weechat-dev \n" @@ -8765,6 +8765,11 @@ msgstr "" msgid "description of plugin option" msgstr "" +msgid "" +"check the license of scripts when they are loaded: if the license is " +"different from the plugin license, a warning is displayed" +msgstr "" + msgid "list/load/unload scripts" msgstr "" diff --git a/po/weechat.pot b/po/weechat.pot index c1b39005f..fdc529d0e 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2018-01-14 16:50+0100\n" +"POT-Creation-Date: 2018-01-14 21:47+0100\n" "PO-Revision-Date: 2014-08-16 10:27+0200\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" @@ -8646,6 +8646,11 @@ msgstr "" msgid "description of plugin option" msgstr "" +msgid "" +"check the license of scripts when they are loaded: if the license is " +"different from the plugin license, a warning is displayed" +msgstr "" + msgid "list/load/unload scripts" msgstr "" diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt index 97f32954c..0abd7e6eb 100644 --- a/src/plugins/CMakeLists.txt +++ b/src/plugins/CMakeLists.txt @@ -26,7 +26,8 @@ plugin-config.h plugin-config.c) set(LIB_PLUGINS_SCRIPTS_SRC plugin-script.c plugin-script.h -plugin-script-api.c plugin-script-api.h) +plugin-script-api.c plugin-script-api.h +plugin-script-config.c plugin-script-config.h) include_directories(${CMAKE_BINARY_DIR}) add_library(weechat_plugins STATIC ${LIB_PLUGINS_SRC}) diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am index cf5e446b7..3d813ba66 100644 --- a/src/plugins/Makefile.am +++ b/src/plugins/Makefile.am @@ -35,7 +35,9 @@ noinst_LTLIBRARIES = lib_weechat_plugins_scripts.la lib_weechat_plugins_scripts_la_SOURCES = plugin-script.c \ plugin-script.h \ plugin-script-api.c \ - plugin-script-api.h + plugin-script-api.h \ + plugin-script-config.c \ + plugin-script-config.h if PLUGIN_ALIAS alias_dir = alias diff --git a/src/plugins/guile/weechat-guile-api.c b/src/plugins/guile/weechat-guile-api.c index 6ad8e3a32..5ab2ff2f4 100644 --- a/src/plugins/guile/weechat-guile-api.c +++ b/src/plugins/guile/weechat-guile-api.c @@ -185,7 +185,7 @@ weechat_guile_api_register (SCM name, SCM author, SCM version, SCM license, /* register script */ guile_current_script = plugin_script_add (weechat_guile_plugin, - &guile_scripts, &last_guile_script, + &guile_data, (guile_current_script_filename) ? guile_current_script_filename : "", API_SCM_TO_STRING(name), diff --git a/src/plugins/guile/weechat-guile.c b/src/plugins/guile/weechat-guile.c index 6f307c196..1c663a02e 100644 --- a/src/plugins/guile/weechat-guile.c +++ b/src/plugins/guile/weechat-guile.c @@ -46,6 +46,11 @@ WEECHAT_PLUGIN_PRIORITY(4000); struct t_weechat_plugin *weechat_guile_plugin = NULL; +struct t_plugin_script_data guile_data; + +struct t_config_file *guile_config_file = NULL; +struct t_config_option *guile_config_look_check_license = NULL; + int guile_quiet = 0; struct t_plugin_script *guile_script_eval = NULL; @@ -1137,7 +1142,6 @@ weechat_guile_port_write (SCM port, const void *data, size_t size) int weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[]) { - struct t_plugin_script_init init; char str_version[128]; weechat_guile_plugin = plugin; @@ -1181,17 +1185,22 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[]) scm_c_use_module ("weechat"); weechat_guile_catch (scm_gc_protect_object, (void *)guile_module_weechat); - init.callback_command = &weechat_guile_command_cb; - init.callback_completion = &weechat_guile_completion_cb; - init.callback_hdata = &weechat_guile_hdata_cb; - init.callback_info_eval = &weechat_guile_info_eval_cb; - init.callback_infolist = &weechat_guile_infolist_cb; - init.callback_signal_debug_dump = &weechat_guile_signal_debug_dump_cb; - init.callback_signal_script_action = &weechat_guile_signal_script_action_cb; - init.callback_load_file = &weechat_guile_load_cb; + guile_data.config_file = &guile_config_file; + guile_data.config_look_check_license = &guile_config_look_check_license; + guile_data.scripts = &guile_scripts; + guile_data.last_script = &last_guile_script; + guile_data.callback_command = &weechat_guile_command_cb; + guile_data.callback_completion = &weechat_guile_completion_cb; + guile_data.callback_hdata = &weechat_guile_hdata_cb; + guile_data.callback_info_eval = &weechat_guile_info_eval_cb; + guile_data.callback_infolist = &weechat_guile_infolist_cb; + guile_data.callback_signal_debug_dump = &weechat_guile_signal_debug_dump_cb; + guile_data.callback_signal_script_action = &weechat_guile_signal_script_action_cb; + guile_data.callback_load_file = &weechat_guile_load_cb; + guile_data.unload_all = &weechat_guile_unload_all; guile_quiet = 1; - plugin_script_init (weechat_guile_plugin, argc, argv, &init); + plugin_script_init (weechat_guile_plugin, argc, argv, &guile_data); guile_quiet = 0; plugin_script_display_short_list (weechat_guile_plugin, @@ -1210,7 +1219,7 @@ weechat_plugin_end (struct t_weechat_plugin *plugin) { /* unload all scripts */ guile_quiet = 1; - plugin_script_end (plugin, &guile_scripts, &weechat_guile_unload_all); + plugin_script_end (plugin, &guile_data); if (guile_script_eval) { weechat_guile_unload (guile_script_eval); diff --git a/src/plugins/guile/weechat-guile.h b/src/plugins/guile/weechat-guile.h index dc62c1c44..d2b7d4028 100644 --- a/src/plugins/guile/weechat-guile.h +++ b/src/plugins/guile/weechat-guile.h @@ -27,6 +27,8 @@ extern struct t_weechat_plugin *weechat_guile_plugin; +extern struct t_plugin_script_data guile_data; + extern int guile_quiet; extern struct t_plugin_script *guile_scripts; extern struct t_plugin_script *last_guile_script; diff --git a/src/plugins/javascript/weechat-js-api.cpp b/src/plugins/javascript/weechat-js-api.cpp index cf4609b24..0fd5c5f3d 100644 --- a/src/plugins/javascript/weechat-js-api.cpp +++ b/src/plugins/javascript/weechat-js-api.cpp @@ -160,7 +160,7 @@ API_FUNC(register) /* register script */ js_current_script = plugin_script_add (weechat_js_plugin, - &js_scripts, &last_js_script, + &js_data, (js_current_script_filename) ? js_current_script_filename : "", *name, *author, *version, diff --git a/src/plugins/javascript/weechat-js.cpp b/src/plugins/javascript/weechat-js.cpp index 0df3248cd..00d5e9890 100644 --- a/src/plugins/javascript/weechat-js.cpp +++ b/src/plugins/javascript/weechat-js.cpp @@ -43,6 +43,11 @@ WEECHAT_PLUGIN_PRIORITY(4000); struct t_weechat_plugin *weechat_js_plugin = NULL; +struct t_plugin_script_data js_data; + +struct t_config_file *js_config_file = NULL; +struct t_config_option *js_config_look_check_license = NULL; + int js_quiet = 0; struct t_plugin_script *js_script_eval = NULL; @@ -899,7 +904,6 @@ weechat_js_signal_script_action_cb (const void *pointer, void *data, EXPORT int weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[]) { - struct t_plugin_script_init init; char str_interpreter[64]; weechat_js_plugin = plugin; @@ -912,17 +916,22 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[]) weechat_hashtable_set (plugin->variables, "interpreter_version", v8::V8::GetVersion()); - init.callback_command = &weechat_js_command_cb; - init.callback_completion = &weechat_js_completion_cb; - init.callback_hdata = &weechat_js_hdata_cb; - init.callback_info_eval = &weechat_js_info_eval_cb; - init.callback_infolist = &weechat_js_infolist_cb; - init.callback_signal_debug_dump = &weechat_js_signal_debug_dump_cb; - init.callback_signal_script_action = &weechat_js_signal_script_action_cb; - init.callback_load_file = &weechat_js_load_cb; + js_data.config_file = &js_config_file; + js_data.config_look_check_license = &js_config_look_check_license; + js_data.scripts = &js_scripts; + js_data.last_script = &last_js_script; + js_data.callback_command = &weechat_js_command_cb; + js_data.callback_completion = &weechat_js_completion_cb; + js_data.callback_hdata = &weechat_js_hdata_cb; + js_data.callback_info_eval = &weechat_js_info_eval_cb; + js_data.callback_infolist = &weechat_js_infolist_cb; + js_data.callback_signal_debug_dump = &weechat_js_signal_debug_dump_cb; + js_data.callback_signal_script_action = &weechat_js_signal_script_action_cb; + js_data.callback_load_file = &weechat_js_load_cb; + js_data.unload_all = &weechat_js_unload_all; js_quiet = 1; - plugin_script_init (plugin, argc, argv, &init); + plugin_script_init (plugin, argc, argv, &js_data); js_quiet = 0; plugin_script_display_short_list (weechat_js_plugin, js_scripts); @@ -938,7 +947,7 @@ EXPORT int weechat_plugin_end (struct t_weechat_plugin *plugin) { js_quiet = 1; - plugin_script_end (plugin, &js_scripts, &weechat_js_unload_all); + plugin_script_end (plugin, &js_data); if (js_script_eval) { weechat_js_unload (js_script_eval); diff --git a/src/plugins/javascript/weechat-js.h b/src/plugins/javascript/weechat-js.h index 36125da44..abeb54b73 100644 --- a/src/plugins/javascript/weechat-js.h +++ b/src/plugins/javascript/weechat-js.h @@ -42,6 +42,8 @@ class WeechatJsV8; extern struct t_weechat_plugin *weechat_js_plugin; +extern struct t_plugin_script_data js_data; + extern int js_quiet; extern struct t_plugin_script *js_scripts; extern struct t_plugin_script *last_js_script; diff --git a/src/plugins/lua/weechat-lua-api.c b/src/plugins/lua/weechat-lua-api.c index 81d7a1589..b1841bfa9 100644 --- a/src/plugins/lua/weechat-lua-api.c +++ b/src/plugins/lua/weechat-lua-api.c @@ -149,7 +149,7 @@ API_FUNC(register) /* register script */ lua_current_script = plugin_script_add (weechat_lua_plugin, - &lua_scripts, &last_lua_script, + &lua_data, (lua_current_script_filename) ? lua_current_script_filename : "", name, diff --git a/src/plugins/lua/weechat-lua.c b/src/plugins/lua/weechat-lua.c index 006ad247c..eca71c60a 100644 --- a/src/plugins/lua/weechat-lua.c +++ b/src/plugins/lua/weechat-lua.c @@ -44,6 +44,11 @@ WEECHAT_PLUGIN_PRIORITY(4000); struct t_weechat_plugin *weechat_lua_plugin = NULL; +struct t_plugin_script_data lua_data; + +struct t_config_file *lua_config_file = NULL; +struct t_config_option *lua_config_look_check_license = NULL; + int lua_quiet = 0; struct t_plugin_script *lua_script_eval = NULL; @@ -1193,8 +1198,6 @@ weechat_lua_signal_script_action_cb (const void *pointer, void *data, int weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[]) { - struct t_plugin_script_init init; - weechat_lua_plugin = plugin; /* set interpreter name and version */ @@ -1213,17 +1216,22 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[]) if (!lua_buffer_output) return WEECHAT_RC_ERROR; - init.callback_command = &weechat_lua_command_cb; - init.callback_completion = &weechat_lua_completion_cb; - init.callback_hdata = &weechat_lua_hdata_cb; - init.callback_info_eval = &weechat_lua_info_eval_cb; - init.callback_infolist = &weechat_lua_infolist_cb; - init.callback_signal_debug_dump = &weechat_lua_signal_debug_dump_cb; - init.callback_signal_script_action = &weechat_lua_signal_script_action_cb; - init.callback_load_file = &weechat_lua_load_cb; + lua_data.config_file = &lua_config_file; + lua_data.config_look_check_license = &lua_config_look_check_license; + lua_data.scripts = &lua_scripts; + lua_data.last_script = &last_lua_script; + lua_data.callback_command = &weechat_lua_command_cb; + lua_data.callback_completion = &weechat_lua_completion_cb; + lua_data.callback_hdata = &weechat_lua_hdata_cb; + lua_data.callback_info_eval = &weechat_lua_info_eval_cb; + lua_data.callback_infolist = &weechat_lua_infolist_cb; + lua_data.callback_signal_debug_dump = &weechat_lua_signal_debug_dump_cb; + lua_data.callback_signal_script_action = &weechat_lua_signal_script_action_cb; + lua_data.callback_load_file = &weechat_lua_load_cb; + lua_data.unload_all = &weechat_lua_unload_all; lua_quiet = 1; - plugin_script_init (weechat_lua_plugin, argc, argv, &init); + plugin_script_init (weechat_lua_plugin, argc, argv, &lua_data); lua_quiet = 0; plugin_script_display_short_list (weechat_lua_plugin, @@ -1242,7 +1250,7 @@ weechat_plugin_end (struct t_weechat_plugin *plugin) { /* unload all scripts */ lua_quiet = 1; - plugin_script_end (plugin, &lua_scripts, &weechat_lua_unload_all); + plugin_script_end (plugin, &lua_data); if (lua_script_eval) { weechat_lua_unload (lua_script_eval); diff --git a/src/plugins/lua/weechat-lua.h b/src/plugins/lua/weechat-lua.h index 7d830787b..ffc004b10 100644 --- a/src/plugins/lua/weechat-lua.h +++ b/src/plugins/lua/weechat-lua.h @@ -35,6 +35,8 @@ struct t_lua_const extern struct t_weechat_plugin *weechat_lua_plugin; +extern struct t_plugin_script_data lua_data; + extern int lua_quiet; extern struct t_plugin_script *lua_scripts; extern struct t_plugin_script *last_lua_script; diff --git a/src/plugins/perl/weechat-perl-api.c b/src/plugins/perl/weechat-perl-api.c index 92e915301..c16d58578 100644 --- a/src/plugins/perl/weechat-perl-api.c +++ b/src/plugins/perl/weechat-perl-api.c @@ -146,7 +146,7 @@ API_FUNC(register) /* register script */ perl_current_script = plugin_script_add (weechat_perl_plugin, - &perl_scripts, &last_perl_script, + &perl_data, (perl_current_script_filename) ? perl_current_script_filename : "", name, author, version, license, diff --git a/src/plugins/perl/weechat-perl.c b/src/plugins/perl/weechat-perl.c index 8099874e2..4381d7cc8 100644 --- a/src/plugins/perl/weechat-perl.c +++ b/src/plugins/perl/weechat-perl.c @@ -41,6 +41,11 @@ WEECHAT_PLUGIN_PRIORITY(4000); struct t_weechat_plugin *weechat_perl_plugin = NULL; +struct t_plugin_script_data perl_data; + +struct t_config_file *perl_config_file = NULL; +struct t_config_option *perl_config_look_check_license = NULL; + int perl_quiet = 0; struct t_plugin_script *perl_script_eval = NULL; @@ -1207,7 +1212,6 @@ weechat_perl_signal_quit_upgrade_cb (const void *pointer, void *data, int weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[]) { - struct t_plugin_script_init init; #ifdef PERL_SYS_INIT3 int a; char **perl_args_local; @@ -1253,17 +1257,22 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[]) perl_args, NULL); #endif /* MULTIPLICITY */ - init.callback_command = &weechat_perl_command_cb; - init.callback_completion = &weechat_perl_completion_cb; - init.callback_hdata = &weechat_perl_hdata_cb; - init.callback_info_eval = &weechat_perl_info_eval_cb; - init.callback_infolist = &weechat_perl_infolist_cb; - init.callback_signal_debug_dump = &weechat_perl_signal_debug_dump_cb; - init.callback_signal_script_action = &weechat_perl_signal_script_action_cb; - init.callback_load_file = &weechat_perl_load_cb; + perl_data.config_file = &perl_config_file; + perl_data.config_look_check_license = &perl_config_look_check_license; + perl_data.scripts = &perl_scripts; + perl_data.last_script = &last_perl_script; + perl_data.callback_command = &weechat_perl_command_cb; + perl_data.callback_completion = &weechat_perl_completion_cb; + perl_data.callback_hdata = &weechat_perl_hdata_cb; + perl_data.callback_info_eval = &weechat_perl_info_eval_cb; + perl_data.callback_infolist = &weechat_perl_infolist_cb; + perl_data.callback_signal_debug_dump = &weechat_perl_signal_debug_dump_cb; + perl_data.callback_signal_script_action = &weechat_perl_signal_script_action_cb; + perl_data.callback_load_file = &weechat_perl_load_cb; + perl_data.unload_all = &weechat_perl_unload_all; perl_quiet = 1; - plugin_script_init (weechat_perl_plugin, argc, argv, &init); + plugin_script_init (weechat_perl_plugin, argc, argv, &perl_data); perl_quiet = 0; plugin_script_display_short_list (weechat_perl_plugin, @@ -1287,7 +1296,7 @@ weechat_plugin_end (struct t_weechat_plugin *plugin) { /* unload all scripts */ perl_quiet = 1; - plugin_script_end (plugin, &perl_scripts, &weechat_perl_unload_all); + plugin_script_end (plugin, &perl_data); if (perl_script_eval) { weechat_perl_unload (perl_script_eval); diff --git a/src/plugins/perl/weechat-perl.h b/src/plugins/perl/weechat-perl.h index 318f28ca5..84914ae72 100644 --- a/src/plugins/perl/weechat-perl.h +++ b/src/plugins/perl/weechat-perl.h @@ -27,6 +27,8 @@ extern struct t_weechat_plugin *weechat_perl_plugin; +extern struct t_plugin_script_data perl_data; + extern int perl_quiet; extern struct t_plugin_script *perl_scripts; extern struct t_plugin_script *last_perl_script; diff --git a/src/plugins/php/weechat-php-api.c b/src/plugins/php/weechat-php-api.c index f272b79a7..ba66cddff 100644 --- a/src/plugins/php/weechat-php-api.c +++ b/src/plugins/php/weechat-php-api.c @@ -130,7 +130,7 @@ API_FUNC(register) /* register script */ php_current_script = plugin_script_add (weechat_php_plugin, - &php_scripts, &last_php_script, + &php_data, (php_current_script_filename) ? php_current_script_filename : "", ZSTR_VAL(name), diff --git a/src/plugins/php/weechat-php.c b/src/plugins/php/weechat-php.c index 1db9f8a0d..379867a2e 100644 --- a/src/plugins/php/weechat-php.c +++ b/src/plugins/php/weechat-php.c @@ -39,6 +39,11 @@ WEECHAT_PLUGIN_PRIORITY(4000); struct t_weechat_plugin *weechat_php_plugin = NULL; +struct t_plugin_script_data php_data; + +struct t_config_file *php_config_file = NULL; +struct t_config_option *php_config_look_check_license = NULL; + int php_quiet = 0; struct t_plugin_script *php_script_eval = NULL; @@ -1234,8 +1239,6 @@ php_weechat_log_message (char *message) int weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[]) { - struct t_plugin_script_init init; - weechat_php_plugin = plugin; /* set interpreter name and version */ @@ -1249,14 +1252,19 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[]) ""); #endif /* PHP_VERSION */ - init.callback_command = &weechat_php_command_cb; - init.callback_completion = &weechat_php_completion_cb; - init.callback_hdata = &weechat_php_hdata_cb; - init.callback_info_eval = &weechat_php_info_eval_cb; - init.callback_infolist = &weechat_php_infolist_cb; - init.callback_signal_debug_dump = &weechat_php_signal_debug_dump_cb; - init.callback_signal_script_action = &weechat_php_signal_script_action_cb; - init.callback_load_file = &weechat_php_load_cb; + php_data.config_file = &php_config_file; + php_data.config_look_check_license = &php_config_look_check_license; + php_data.scripts = &php_scripts; + php_data.last_script = &last_php_script; + php_data.callback_command = &weechat_php_command_cb; + php_data.callback_completion = &weechat_php_completion_cb; + php_data.callback_hdata = &weechat_php_hdata_cb; + php_data.callback_info_eval = &weechat_php_info_eval_cb; + php_data.callback_infolist = &weechat_php_infolist_cb; + php_data.callback_signal_debug_dump = &weechat_php_signal_debug_dump_cb; + php_data.callback_signal_script_action = &weechat_php_signal_script_action_cb; + php_data.callback_load_file = &weechat_php_load_cb; + php_data.unload_all = &weechat_php_unload_all; php_embed_module.startup = php_weechat_startup; php_embed_module.ub_write = php_weechat_ub_write; @@ -1269,7 +1277,7 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[]) PG(report_zend_debug) = 0; /* Turn off --enable-debug output */ php_quiet = 1; - plugin_script_init (weechat_php_plugin, argc, argv, &init); + plugin_script_init (weechat_php_plugin, argc, argv, &php_data); php_quiet = 0; plugin_script_display_short_list (weechat_php_plugin, @@ -1288,7 +1296,7 @@ weechat_plugin_end (struct t_weechat_plugin *plugin) { /* unload all scripts */ php_quiet = 1; - plugin_script_end (plugin, &php_scripts, &weechat_php_unload_all); + plugin_script_end (plugin, &php_data); if (php_script_eval) { weechat_php_unload (php_script_eval); diff --git a/src/plugins/php/weechat-php.h b/src/plugins/php/weechat-php.h index c645f5657..50eb882b5 100644 --- a/src/plugins/php/weechat-php.h +++ b/src/plugins/php/weechat-php.h @@ -34,11 +34,13 @@ struct t_php_const char *str_value; }; -extern int php_quiet; extern struct t_weechat_plugin *weechat_php_plugin; +extern struct t_plugin_script_data php_data; + extern struct t_hashtable *weechat_php_function_map; +extern int php_quiet; extern struct t_plugin_script *php_scripts; extern struct t_plugin_script *last_php_script; extern struct t_plugin_script *php_current_script; diff --git a/src/plugins/plugin-script-config.c b/src/plugins/plugin-script-config.c new file mode 100644 index 000000000..9bbd1bc95 --- /dev/null +++ b/src/plugins/plugin-script-config.c @@ -0,0 +1,72 @@ +/* + * plugin-script-config.c - configuration options, used by script plugins + * + * Copyright (C) 2003-2018 Sébastien Helleu + * + * This file is part of WeeChat, the extensible chat client. + * + * WeeChat 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. + * + * WeeChat 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 WeeChat. If not, see . + */ + +#include + +#include "weechat-plugin.h" +#include "plugin-script.h" + + +/* + * Initializes script configuration. + * + * Returns: + * 1: OK + * 0: error + */ + +int +plugin_script_config_init (struct t_weechat_plugin *weechat_plugin, + struct t_plugin_script_data *plugin_data) +{ + struct t_config_section *ptr_section; + + *(plugin_data->config_file) = weechat_config_new (weechat_plugin->name, + NULL, NULL, NULL); + if (!(*plugin_data->config_file)) + return 0; + + /* look */ + ptr_section = weechat_config_new_section (*(plugin_data->config_file), + "look", + 0, 0, + NULL, NULL, NULL, + NULL, NULL, NULL, + NULL, NULL, NULL, + NULL, NULL, NULL, + NULL, NULL, NULL); + if (!ptr_section) + { + weechat_config_free (*(plugin_data->config_file)); + *(plugin_data->config_file) = NULL; + return 0; + } + + *(plugin_data->config_look_check_license) = weechat_config_new_option ( + *(plugin_data->config_file), ptr_section, + "check_license", "boolean", + N_("check the license of scripts when they are loaded: if the license " + "is different from the plugin license, a warning is displayed"), + NULL, 0, 0, "off", NULL, 0, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + + return 1; +} diff --git a/src/plugins/plugin-script-config.h b/src/plugins/plugin-script-config.h new file mode 100644 index 000000000..59b4672cd --- /dev/null +++ b/src/plugins/plugin-script-config.h @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2003-2018 Sébastien Helleu + * + * This file is part of WeeChat, the extensible chat client. + * + * WeeChat 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. + * + * WeeChat 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 WeeChat. If not, see . + */ + +#ifndef WEECHAT_PLUGIN_PLUGIN_SCRIPT_CONFIG_H +#define WEECHAT_PLUGIN_PLUGIN_SCRIPT_CONFIG_H + +extern int plugin_script_config_init (struct t_weechat_plugin *plugin, + struct t_plugin_script_data *plugin_data); + +#endif /* WEECHAT_PLUGIN_PLUGIN_SCRIPT_CONFIG_H */ diff --git a/src/plugins/plugin-script.c b/src/plugins/plugin-script.c index c4534824d..dca382d07 100644 --- a/src/plugins/plugin-script.c +++ b/src/plugins/plugin-script.c @@ -33,56 +33,9 @@ #include "weechat-plugin.h" #include "plugin-script.h" +#include "plugin-script-config.h" -#define SCRIPT_OPTION_CHECK_LICENSE "check_license" - -int script_option_check_license = 0; - - -/* - * Reads script configuration. - */ - -void -plugin_script_config_read (struct t_weechat_plugin *weechat_plugin) -{ - const char *string; - - string = weechat_config_get_plugin (SCRIPT_OPTION_CHECK_LICENSE); - if (!string) - { - weechat_config_set_plugin (SCRIPT_OPTION_CHECK_LICENSE, "off"); - string = weechat_config_get_plugin (SCRIPT_OPTION_CHECK_LICENSE); - } - if (string && (weechat_config_string_to_boolean (string) > 0)) - script_option_check_license = 1; - else - script_option_check_license = 0; -} - -/* - * Callback for changes on configuration option. - */ - -int -plugin_script_config_cb (const void *pointer, void *data, - const char *option, const char *value) -{ - struct t_weechat_plugin *plugin; - - /* make C compiler happy */ - (void) data; - (void) option; - (void) value; - - plugin = (struct t_weechat_plugin *)pointer; - - plugin_script_config_read (plugin); - - return WEECHAT_RC_OK; -} - /* * Displays name and version of interpreter used. */ @@ -212,22 +165,17 @@ plugin_script_create_dirs (struct t_weechat_plugin *weechat_plugin) void plugin_script_init (struct t_weechat_plugin *weechat_plugin, int argc, char *argv[], - struct t_plugin_script_init *init) + struct t_plugin_script_data *plugin_data) { char string[512], *completion; char *action_signals[] = { "install", "remove", "autoload", NULL }; int i, auto_load_scripts; - /* read script configuration */ - plugin_script_config_read (weechat_plugin); + /* initialize script configuration file (file: ".conf") */ + plugin_script_config_init (weechat_plugin, plugin_data); - /* add hook for configuration option */ - snprintf (string, sizeof (string), - "plugins.var.%s.%s", - weechat_plugin->name, - SCRIPT_OPTION_CHECK_LICENSE); - weechat_hook_config (string, - &plugin_script_config_cb, weechat_plugin, NULL); + /* read configuration file */ + weechat_config_read (*plugin_data->config_file); /* create directories in WeeChat home */ plugin_script_create_dirs (weechat_plugin); @@ -276,29 +224,29 @@ plugin_script_init (struct t_weechat_plugin *weechat_plugin, "\n" "Without argument, this command lists all loaded scripts."), completion, - init->callback_command, NULL, NULL); + plugin_data->callback_command, NULL, NULL); if (completion) free (completion); /* add completion, hdata and infolist */ snprintf (string, sizeof (string), "%s_script", weechat_plugin->name); weechat_hook_completion (string, N_("list of scripts"), - init->callback_completion, NULL, NULL); + plugin_data->callback_completion, NULL, NULL); weechat_hook_hdata (string, N_("list of scripts"), - init->callback_hdata, weechat_plugin, NULL); + plugin_data->callback_hdata, weechat_plugin, NULL); weechat_hook_infolist (string, N_("list of scripts"), N_("script pointer (optional)"), N_("script name (wildcard \"*\" is allowed) " "(optional)"), - init->callback_infolist, NULL, NULL); + plugin_data->callback_infolist, NULL, NULL); snprintf (string, sizeof (string), "%s_eval", weechat_plugin->name); weechat_hook_info (string, N_("evaluation of source code"), N_("source code to execute"), - init->callback_info_eval, NULL, NULL); + plugin_data->callback_info_eval, NULL, NULL); /* add signal for "debug_dump" */ weechat_hook_signal ("debug_dump", - init->callback_signal_debug_dump, NULL, NULL); + plugin_data->callback_signal_debug_dump, NULL, NULL); /* add signal for "debug_libs" */ weechat_hook_signal ("debug_libs", @@ -310,8 +258,9 @@ plugin_script_init (struct t_weechat_plugin *weechat_plugin, { snprintf (string, sizeof (string), "%s_script_%s", weechat_plugin->name, action_signals[i]); - weechat_hook_signal (string, - init->callback_signal_script_action, NULL, NULL); + weechat_hook_signal ( + string, + plugin_data->callback_signal_script_action, NULL, NULL); } /* add infos */ @@ -338,7 +287,8 @@ plugin_script_init (struct t_weechat_plugin *weechat_plugin, /* autoload scripts */ if (auto_load_scripts) { - plugin_script_auto_load (weechat_plugin, init->callback_load_file); + plugin_script_auto_load (weechat_plugin, + plugin_data->callback_load_file); } } @@ -762,8 +712,7 @@ plugin_script_alloc (const char *filename, const char *name, struct t_plugin_script * plugin_script_add (struct t_weechat_plugin *weechat_plugin, - struct t_plugin_script **scripts, - struct t_plugin_script **last_script, + struct t_plugin_script_data *plugin_data, const char *filename, const char *name, const char *author, const char *version, const char *license, const char *description, const char *shutdown_func, @@ -780,7 +729,7 @@ plugin_script_add (struct t_weechat_plugin *weechat_plugin, return NULL; } - if (script_option_check_license + if (weechat_config_boolean (*(plugin_data->config_look_check_license)) && (weechat_strcmp_ignore_chars (weechat_plugin->license, license, "0123456789-.,/\\()[]{}", 0) != 0)) { @@ -805,7 +754,9 @@ plugin_script_add (struct t_weechat_plugin *weechat_plugin, /* add script to the list (except the internal "eval" fake script) */ if (strcmp (new_script->name, WEECHAT_SCRIPT_EVAL_NAME) != 0) { - plugin_script_insert_sorted (weechat_plugin, scripts, last_script, + plugin_script_insert_sorted (weechat_plugin, + plugin_data->scripts, + plugin_data->last_script, new_script); } @@ -1787,20 +1738,22 @@ plugin_script_infolist_list_scripts (struct t_weechat_plugin *weechat_plugin, void plugin_script_end (struct t_weechat_plugin *weechat_plugin, - struct t_plugin_script **scripts, - void (*callback_unload_all)()) + struct t_plugin_script_data *plugin_data) { int scripts_loaded; - scripts_loaded = (*scripts) ? 1 : 0; - - (void)(callback_unload_all) (); - + /* unload all scripts */ + scripts_loaded = (*(plugin_data->scripts)) ? 1 : 0; + (void)(plugin_data->unload_all) (); if (scripts_loaded) { weechat_printf (NULL, _("%s: scripts unloaded"), weechat_plugin->name); } + + /* write config file (file: ".conf") */ + weechat_config_write (*(plugin_data->config_file)); + weechat_config_free (*(plugin_data->config_file)); } /* diff --git a/src/plugins/plugin-script.h b/src/plugins/plugin-script.h index 324b199f8..0d6ad4ac6 100644 --- a/src/plugins/plugin-script.h +++ b/src/plugins/plugin-script.h @@ -69,43 +69,53 @@ struct t_plugin_script struct t_plugin_script *next_script; /* link to next script */ }; -struct t_plugin_script_init +struct t_plugin_script_data { - int (*callback_command)(const void *pointer, void *data, - struct t_gui_buffer *buffer, - int argc, char **argv, char **argv_eol); - int (*callback_completion)(const void *pointer, void *data, - const char *completion_item, - struct t_gui_buffer *buffer, - struct t_gui_completion *completion); - struct t_hdata *(*callback_hdata)(const void *pointer, - void *data, - const char *hdata_name); - const char *(*callback_info_eval)(const void *pointer, - void *data, - const char *info_name, - const char *arguments); - struct t_infolist *(*callback_infolist)(const void *pointer, - void *data, - const char *infolist_name, - void *obj_pointer, - const char *arguments); - int (*callback_signal_debug_dump)(const void *pointer, void *data, - const char *signal, - const char *type_data, - void *signal_data); - int (*callback_signal_script_action)(const void *pointer, void *data, - const char *signal, - const char *type_data, - void *signal_data); - void (*callback_load_file)(void *data, const char *filename); + /* variables */ + struct t_config_file **config_file; + struct t_config_option **config_look_check_license; + struct t_plugin_script **scripts; + struct t_plugin_script **last_script; + + /* callbacks */ + int (*callback_command) (const void *pointer, void *data, + struct t_gui_buffer *buffer, + int argc, char **argv, char **argv_eol); + int (*callback_completion) (const void *pointer, void *data, + const char *completion_item, + struct t_gui_buffer *buffer, + struct t_gui_completion *completion); + struct t_hdata *(*callback_hdata) (const void *pointer, + void *data, + const char *hdata_name); + const char *(*callback_info_eval) (const void *pointer, + void *data, + const char *info_name, + const char *arguments); + struct t_infolist *(*callback_infolist) (const void *pointer, + void *data, + const char *infolist_name, + void *obj_pointer, + const char *arguments); + int (*callback_signal_debug_dump) (const void *pointer, void *data, + const char *signal, + const char *type_data, + void *signal_data); + int (*callback_signal_script_action) (const void *pointer, void *data, + const char *signal, + const char *type_data, + void *signal_data); + void (*callback_load_file) (void *data, const char *filename); + + /* functions */ + void (*unload_all) (); }; extern void plugin_script_display_interpreter (struct t_weechat_plugin *plugin, int indent); extern void plugin_script_init (struct t_weechat_plugin *weechat_plugin, int argc, char *argv[], - struct t_plugin_script_init *init); + struct t_plugin_script_data *plugin_data); extern int plugin_script_valid (struct t_plugin_script *scripts, struct t_plugin_script *script); extern char *plugin_script_ptr2str (void *pointer); @@ -135,8 +145,7 @@ extern struct t_plugin_script *plugin_script_alloc (const char *filename, const char *shutdown_func, const char *charset); extern struct t_plugin_script *plugin_script_add (struct t_weechat_plugin *weechat_plugin, - struct t_plugin_script **scripts, - struct t_plugin_script **last_script, + struct t_plugin_script_data *plugin_data, const char *filename, const char *name, const char *author, @@ -196,8 +205,7 @@ extern struct t_infolist *plugin_script_infolist_list_scripts (struct t_weechat_ void *pointer, const char *arguments); extern void plugin_script_end (struct t_weechat_plugin *weechat_plugin, - struct t_plugin_script **scripts, - void (*callback_unload_all)()); + struct t_plugin_script_data *plugin_data); extern void plugin_script_print_log (struct t_weechat_plugin *weechat_plugin, struct t_plugin_script *scripts); diff --git a/src/plugins/python/weechat-python-api.c b/src/plugins/python/weechat-python-api.c index b9b3ba14c..a6f812a2c 100644 --- a/src/plugins/python/weechat-python-api.c +++ b/src/plugins/python/weechat-python-api.c @@ -128,7 +128,7 @@ API_FUNC(register) /* register script */ python_current_script = plugin_script_add (weechat_python_plugin, - &python_scripts, &last_python_script, + &python_data, (python_current_script_filename) ? python_current_script_filename : "", name, author, version, license, diff --git a/src/plugins/python/weechat-python.c b/src/plugins/python/weechat-python.c index e34485417..4d5f58003 100644 --- a/src/plugins/python/weechat-python.c +++ b/src/plugins/python/weechat-python.c @@ -44,6 +44,11 @@ WEECHAT_PLUGIN_PRIORITY(4000); struct t_weechat_plugin *weechat_python_plugin = NULL; +struct t_plugin_script_data python_data; + +struct t_config_file *python_config_file = NULL; +struct t_config_option *python_config_look_check_license = NULL; + int python_quiet = 0; struct t_plugin_script *python_script_eval = NULL; @@ -1470,8 +1475,6 @@ weechat_python_signal_script_action_cb (const void *pointer, void *data, int weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[]) { - struct t_plugin_script_init init; - weechat_python_plugin = plugin; /* set interpreter name and version */ @@ -1529,17 +1532,22 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[]) return WEECHAT_RC_ERROR; } - init.callback_command = &weechat_python_command_cb; - init.callback_completion = &weechat_python_completion_cb; - init.callback_hdata = &weechat_python_hdata_cb; - init.callback_info_eval = &weechat_python_info_eval_cb; - init.callback_infolist = &weechat_python_infolist_cb; - init.callback_signal_debug_dump = &weechat_python_signal_debug_dump_cb; - init.callback_signal_script_action = &weechat_python_signal_script_action_cb; - init.callback_load_file = &weechat_python_load_cb; + python_data.config_file = &python_config_file; + python_data.config_look_check_license = &python_config_look_check_license; + python_data.scripts = &python_scripts; + python_data.last_script = &last_python_script; + python_data.callback_command = &weechat_python_command_cb; + python_data.callback_completion = &weechat_python_completion_cb; + python_data.callback_hdata = &weechat_python_hdata_cb; + python_data.callback_info_eval = &weechat_python_info_eval_cb; + python_data.callback_infolist = &weechat_python_infolist_cb; + python_data.callback_signal_debug_dump = &weechat_python_signal_debug_dump_cb; + python_data.callback_signal_script_action = &weechat_python_signal_script_action_cb; + python_data.callback_load_file = &weechat_python_load_cb; + python_data.unload_all = &weechat_python_unload_all; python_quiet = 1; - plugin_script_init (weechat_python_plugin, argc, argv, &init); + plugin_script_init (weechat_python_plugin, argc, argv, &python_data); python_quiet = 0; plugin_script_display_short_list (weechat_python_plugin, @@ -1558,7 +1566,7 @@ weechat_plugin_end (struct t_weechat_plugin *plugin) { /* unload all scripts */ python_quiet = 1; - plugin_script_end (plugin, &python_scripts, &weechat_python_unload_all); + plugin_script_end (plugin, &python_data); if (python_script_eval) { weechat_python_unload (python_script_eval); diff --git a/src/plugins/python/weechat-python.h b/src/plugins/python/weechat-python.h index 62de5ca6d..af6a27984 100644 --- a/src/plugins/python/weechat-python.h +++ b/src/plugins/python/weechat-python.h @@ -44,6 +44,8 @@ extern struct t_weechat_plugin *weechat_python_plugin; +extern struct t_plugin_script_data python_data; + extern int python_quiet; extern struct t_plugin_script *python_scripts; extern struct t_plugin_script *last_python_script; diff --git a/src/plugins/ruby/weechat-ruby-api.c b/src/plugins/ruby/weechat-ruby-api.c index 84da52a96..60bc49053 100644 --- a/src/plugins/ruby/weechat-ruby-api.c +++ b/src/plugins/ruby/weechat-ruby-api.c @@ -137,7 +137,7 @@ weechat_ruby_api_register (VALUE class, VALUE name, VALUE author, /* register script */ ruby_current_script = plugin_script_add (weechat_ruby_plugin, - &ruby_scripts, &last_ruby_script, + &ruby_data, (ruby_current_script_filename) ? ruby_current_script_filename : "", c_name, c_author, c_version, c_license, diff --git a/src/plugins/ruby/weechat-ruby.c b/src/plugins/ruby/weechat-ruby.c index 64242e3b8..5386f7759 100644 --- a/src/plugins/ruby/weechat-ruby.c +++ b/src/plugins/ruby/weechat-ruby.c @@ -65,6 +65,11 @@ WEECHAT_PLUGIN_PRIORITY(4000); struct t_weechat_plugin *weechat_ruby_plugin = NULL; +struct t_plugin_script_data ruby_data; + +struct t_config_file *ruby_config_file = NULL; +struct t_config_option *ruby_config_look_check_license = NULL; + int ruby_quiet = 0; int ruby_hide_errors = 0; @@ -1238,7 +1243,6 @@ weechat_ruby_signal_script_action_cb (const void *pointer, void *data, int weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[]) { - struct t_plugin_script_init init; int ruby_error; VALUE err; char *weechat_ruby_code = { @@ -1361,17 +1365,22 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[]) ruby_init_loadpath (); - init.callback_command = &weechat_ruby_command_cb; - init.callback_completion = &weechat_ruby_completion_cb; - init.callback_hdata = &weechat_ruby_hdata_cb; - init.callback_info_eval = &weechat_ruby_info_eval_cb; - init.callback_infolist = &weechat_ruby_infolist_cb; - init.callback_signal_debug_dump = &weechat_ruby_signal_debug_dump_cb; - init.callback_signal_script_action = &weechat_ruby_signal_script_action_cb; - init.callback_load_file = &weechat_ruby_load_cb; + ruby_data.config_file = &ruby_config_file; + ruby_data.config_look_check_license = &ruby_config_look_check_license; + ruby_data.scripts = &ruby_scripts; + ruby_data.last_script = &last_ruby_script; + ruby_data.callback_command = &weechat_ruby_command_cb; + ruby_data.callback_completion = &weechat_ruby_completion_cb; + ruby_data.callback_hdata = &weechat_ruby_hdata_cb; + ruby_data.callback_info_eval = &weechat_ruby_info_eval_cb; + ruby_data.callback_infolist = &weechat_ruby_infolist_cb; + ruby_data.callback_signal_debug_dump = &weechat_ruby_signal_debug_dump_cb; + ruby_data.callback_signal_script_action = &weechat_ruby_signal_script_action_cb; + ruby_data.callback_load_file = &weechat_ruby_load_cb; + ruby_data.unload_all = &weechat_ruby_unload_all; ruby_quiet = 1; - plugin_script_init (weechat_ruby_plugin, argc, argv, &init); + plugin_script_init (weechat_ruby_plugin, argc, argv, &ruby_data); ruby_quiet = 0; plugin_script_display_short_list (weechat_ruby_plugin, @@ -1390,7 +1399,7 @@ weechat_plugin_end (struct t_weechat_plugin *plugin) { /* unload all scripts */ ruby_quiet = 1; - plugin_script_end (plugin, &ruby_scripts, &weechat_ruby_unload_all); + plugin_script_end (plugin, &ruby_data); if (ruby_script_eval) { weechat_ruby_unload (ruby_script_eval); diff --git a/src/plugins/ruby/weechat-ruby.h b/src/plugins/ruby/weechat-ruby.h index 85d91b350..938944759 100644 --- a/src/plugins/ruby/weechat-ruby.h +++ b/src/plugins/ruby/weechat-ruby.h @@ -28,6 +28,8 @@ extern struct t_weechat_plugin *weechat_ruby_plugin; +extern struct t_plugin_script_data ruby_data; + extern int ruby_quiet; extern struct t_plugin_script *ruby_scripts; extern struct t_plugin_script *last_ruby_script; diff --git a/src/plugins/tcl/weechat-tcl-api.c b/src/plugins/tcl/weechat-tcl-api.c index 3d4975a53..1ad4c1151 100644 --- a/src/plugins/tcl/weechat-tcl-api.c +++ b/src/plugins/tcl/weechat-tcl-api.c @@ -259,7 +259,7 @@ API_FUNC(register) /* register script */ tcl_current_script = plugin_script_add (weechat_tcl_plugin, - &tcl_scripts, &last_tcl_script, + &tcl_data, (tcl_current_script_filename) ? tcl_current_script_filename : "", name, author, version, license, diff --git a/src/plugins/tcl/weechat-tcl.c b/src/plugins/tcl/weechat-tcl.c index 11f80ff43..fd228c791 100644 --- a/src/plugins/tcl/weechat-tcl.c +++ b/src/plugins/tcl/weechat-tcl.c @@ -44,6 +44,11 @@ WEECHAT_PLUGIN_PRIORITY(4000); struct t_weechat_plugin *weechat_tcl_plugin = NULL; +struct t_plugin_script_data tcl_data; + +struct t_config_file *tcl_config_file = NULL; +struct t_config_option *tcl_config_look_check_license = NULL; + int tcl_quiet = 0; struct t_plugin_script *tcl_script_eval = NULL; @@ -904,8 +909,6 @@ weechat_tcl_signal_script_action_cb (const void *pointer, void *data, int weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[]) { - struct t_plugin_script_init init; - weechat_tcl_plugin = plugin; /* set interpreter name and version */ @@ -919,17 +922,22 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[]) ""); #endif /* TCL_VERSION */ - init.callback_command = &weechat_tcl_command_cb; - init.callback_completion = &weechat_tcl_completion_cb; - init.callback_hdata = &weechat_tcl_hdata_cb; - init.callback_info_eval = &weechat_tcl_info_eval_cb; - init.callback_infolist = &weechat_tcl_infolist_cb; - init.callback_signal_debug_dump = &weechat_tcl_signal_debug_dump_cb; - init.callback_signal_script_action = &weechat_tcl_signal_script_action_cb; - init.callback_load_file = &weechat_tcl_load_cb; + tcl_data.config_file = &tcl_config_file; + tcl_data.config_look_check_license = &tcl_config_look_check_license; + tcl_data.scripts = &tcl_scripts; + tcl_data.last_script = &last_tcl_script; + tcl_data.callback_command = &weechat_tcl_command_cb; + tcl_data.callback_completion = &weechat_tcl_completion_cb; + tcl_data.callback_hdata = &weechat_tcl_hdata_cb; + tcl_data.callback_info_eval = &weechat_tcl_info_eval_cb; + tcl_data.callback_infolist = &weechat_tcl_infolist_cb; + tcl_data.callback_signal_debug_dump = &weechat_tcl_signal_debug_dump_cb; + tcl_data.callback_signal_script_action = &weechat_tcl_signal_script_action_cb; + tcl_data.callback_load_file = &weechat_tcl_load_cb; + tcl_data.unload_all = &weechat_tcl_unload_all; tcl_quiet = 1; - plugin_script_init (weechat_tcl_plugin, argc, argv, &init); + plugin_script_init (weechat_tcl_plugin, argc, argv, &tcl_data); tcl_quiet = 0; plugin_script_display_short_list (weechat_tcl_plugin, @@ -948,7 +956,7 @@ weechat_plugin_end (struct t_weechat_plugin *plugin) { /* unload all scripts */ tcl_quiet = 1; - plugin_script_end (plugin, &tcl_scripts, &weechat_tcl_unload_all); + plugin_script_end (plugin, &tcl_data); if (tcl_script_eval) { weechat_tcl_unload (tcl_script_eval); diff --git a/src/plugins/tcl/weechat-tcl.h b/src/plugins/tcl/weechat-tcl.h index 63e4d5ab4..c5fa8c359 100644 --- a/src/plugins/tcl/weechat-tcl.h +++ b/src/plugins/tcl/weechat-tcl.h @@ -28,6 +28,8 @@ extern struct t_weechat_plugin *weechat_tcl_plugin; +extern struct t_plugin_script_data tcl_data; + extern int tcl_quiet; extern struct t_plugin_script *tcl_scripts; extern struct t_plugin_script *last_tcl_script;