pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-07-09 23:05:41 +02:00
Code Activity

trigger: add filter in trigger monitor buffer

Browse Source 
The filter can be set with /trigger monitor <filter> or by entering data
in the trigger monitor input.
This commit is contained in:
Sébastien Helleu
2014-04-01 14:26:02 +02:00
parent e96639123b
commit 3b32d62fa6
30 changed files with 623 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/de/autogen/plugin_api/completions.txt
+2
View File
@@ -82,6 +82,8 @@
| trigger | trigger_hooks | Hooks für Trigger
| trigger | trigger_hooks_filter | hooks for triggers (for filter in monitor buffer)
| trigger | trigger_names | trigger
| trigger | trigger_option_value | Werte für Trigger-Option
doc/de/autogen/user/trigger_commands.txt
+52 -49
View File
File diff suppressed because it is too large Load Diff
doc/en/autogen/plugin_api/completions.txt
+2
View File
@@ -82,6 +82,8 @@
| trigger | trigger_hooks | hooks for triggers
| trigger | trigger_hooks_filter | hooks for triggers (for filter in monitor buffer)
| trigger | trigger_names | triggers
| trigger | trigger_option_value | value of a trigger option
doc/en/autogen/user/trigger_commands.txt
+5 -2
View File
@@ -13,7 +13,7 @@
show <name>
del <name>|-all [<name>...]
default -yes
monitor
monitor [<filter>]
list: list triggers (without argument, this list is displayed)
listfull: list triggers with detailed info for each trigger
@@ -55,7 +55,8 @@ return_code: return code in callback (ok (default), ok_eat, error)
del: delete a trigger
-all: do action on all triggers
default: restore default triggers
monitor: open the trigger monitor buffer
monitor: open the trigger monitor buffer, with optional filter:
filter: filter hooks/triggers to display (a hook must start with "@", for example "@signal"), many filters can be separated by commas; each trigger name can start or end with "*"
When a trigger callback is called, following actions are performed, in this order:
1. check conditions; if false, exit
@@ -71,5 +72,7 @@ Examples (you can also look at default triggers with /trigger listdefault):
/trigger add resize_big signal signal_sigwinch "${info:term_width} >= 100" "" "/bar show nicklist"
silently save config each hour:
/trigger add cfgsave timer 3600000;0;0 "" "" "/mute /save"
open trigger monitor and show only modifiers and triggers whose name starts with "resize":
/trigger monitor @modifier,resize*
----
doc/fr/autogen/plugin_api/completions.txt
+2
View File
@@ -82,6 +82,8 @@
| trigger | trigger_hooks | hooks pour les triggers
| trigger | trigger_hooks_filter | hooks pour les triggers (pour filtrer dans le tampon moniteur)
| trigger | trigger_names | triggers
| trigger | trigger_option_value | valeur d'une option de trigger
doc/fr/autogen/user/trigger_commands.txt
+4 -1
View File
@@ -13,7 +13,7 @@
show <nom>
del <nom>|-all [<nom>...]
default -yes
monitor
monitor [<filtre>]
list: lister les triggers (sans paramètre, cette liste est affichée)
listfull: lister les triggers avec des informations détaillées pour chaque trigger
@@ -56,6 +56,7 @@ code_retour: code retour dans le callback (ok (par défaut), ok_eat, error)
-all: effectuer l'action sur tous les triggers
default: restaurer les triggers par défaut
monitor: ouvrir le tampon moniteur des triggers
filtre: filtrer les hooks/triggers à afficher (un hook doit commencer par "@", par exemple "@signal"), plusieurs filtres peuvent être séparés par des virgules; chaque nom de trigger peut commencer ou se terminer par "*"
Lorsqu'un callback de trigger est appelé, les actions suivantes sont exécutées, dans cet ordre :
1. vérifier les conditions; si faux, sortir
@@ -71,5 +72,7 @@ Exemples (vous pouvez aussi regarder les triggers par défaut avec /trigger list
/trigger add resize_big signal signal_sigwinch "${info:term_width} >= 100" "" "/bar show nicklist"
sauver la configuration chaque heure (de manière silencieuse):
/trigger add cfgsave timer 3600000;0;0 "" "" "/mute /save"
ouvrir le tampon moniteur des triggers et afficher seulement les modificateurs et les triggers dont le nom commence par "resize":
/trigger monitor @modifier,resize*
----
doc/it/autogen/plugin_api/completions.txt
+2
View File
@@ -82,6 +82,8 @@
| trigger | trigger_hooks | hooks for triggers
| trigger | trigger_hooks_filter | hooks for triggers (for filter in monitor buffer)
| trigger | trigger_names | triggers
| trigger | trigger_option_value | value of a trigger option
doc/it/autogen/user/trigger_commands.txt
+5 -2
View File
@@ -13,7 +13,7 @@
show <name>
del <name>|-all [<name>...]
default -yes
monitor
monitor [<filter>]
list: list triggers (without argument, this list is displayed)
listfull: list triggers with detailed info for each trigger
@@ -55,7 +55,8 @@ return_code: return code in callback (ok (default), ok_eat, error)
del: delete a trigger
-all: do action on all triggers
default: restore default triggers
monitor: open the trigger monitor buffer
monitor: open the trigger monitor buffer, with optional filter:
filter: filter hooks/triggers to display (a hook must start with "@", for example "@signal"), many filters can be separated by commas; each trigger name can start or end with "*"
When a trigger callback is called, following actions are performed, in this order:
1. check conditions; if false, exit
@@ -71,5 +72,7 @@ Examples (you can also look at default triggers with /trigger listdefault):
/trigger add resize_big signal signal_sigwinch "${info:term_width} >= 100" "" "/bar show nicklist"
silently save config each hour:
/trigger add cfgsave timer 3600000;0;0 "" "" "/mute /save"
open trigger monitor and show only modifiers and triggers whose name starts with "resize":
/trigger monitor @modifier,resize*
----
doc/ja/autogen/plugin_api/completions.txt
+2
View File
@@ -82,6 +82,8 @@
| trigger | trigger_hooks | トリガに対するフック
| trigger | trigger_hooks_filter | hooks for triggers (for filter in monitor buffer)
| trigger | trigger_names | トリガ
| trigger | trigger_option_value | トリガオプションの値
doc/ja/autogen/user/trigger_commands.txt
+54 -51
View File
File diff suppressed because it is too large Load Diff
doc/pl/autogen/plugin_api/completions.txt
+2
View File
@@ -82,6 +82,8 @@
| trigger | trigger_hooks | hooks for triggers
| trigger | trigger_hooks_filter | hooks for triggers (for filter in monitor buffer)
| trigger | trigger_names | triggers
| trigger | trigger_option_value | value of a trigger option
doc/pl/autogen/user/trigger_commands.txt
+5 -2
View File
@@ -13,7 +13,7 @@
show <name>
del <name>|-all [<name>...]
default -yes
monitor
monitor [<filter>]
list: list triggers (without argument, this list is displayed)
listfull: list triggers with detailed info for each trigger
@@ -55,7 +55,8 @@ return_code: return code in callback (ok (default), ok_eat, error)
del: delete a trigger
-all: do action on all triggers
default: restore default triggers
monitor: open the trigger monitor buffer
monitor: open the trigger monitor buffer, with optional filter:
filter: filter hooks/triggers to display (a hook must start with "@", for example "@signal"), many filters can be separated by commas; each trigger name can start or end with "*"
When a trigger callback is called, following actions are performed, in this order:
1. check conditions; if false, exit
@@ -71,5 +72,7 @@ Examples (you can also look at default triggers with /trigger listdefault):
/trigger add resize_big signal signal_sigwinch "${info:term_width} >= 100" "" "/bar show nicklist"
silently save config each hour:
/trigger add cfgsave timer 3600000;0;0 "" "" "/mute /save"
open trigger monitor and show only modifiers and triggers whose name starts with "resize":
/trigger monitor @modifier,resize*
----
po/cs.po
+15 -5
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-03-30 22:25+0200\n"
"POT-Creation-Date: 2014-04-01 14:23+0200\n"
"PO-Revision-Date: 2014-03-24 14:23+0100\n"
"Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -9818,7 +9818,8 @@ msgstr "%sChyba: nemohu přejmenovat filter \"%s\" na \"%s\""
msgid "%s%s: invalid regular expression in trigger \"%s\""
msgstr "%s%s: chyba při zpracování regulárního výrazu \"%s\""
msgid "Trigger monitor"
#, c-format
msgid "Trigger monitor (filter: %s) | Input: q=close words=filter"
msgstr ""
#, fuzzy
@@ -9972,7 +9973,7 @@ msgid ""
"<name> || set <name> <option> <value> || rename|copy <name> <new_name> || "
"enable|disable|toggle [<name>|-all [<name>...]] || restart <name>|-all "
"[<name>...] || show <name> || del <name>|-all [<name>...] || default -yes || "
"monitor"
"monitor [<filter>]"
msgstr ""
msgid ""
@@ -10026,7 +10027,10 @@ msgid ""
" del: delete a trigger\n"
" -all: do action on all triggers\n"
" default: restore default triggers\n"
" monitor: open the trigger monitor buffer\n"
" monitor: open the trigger monitor buffer, with optional filter:\n"
" filter: filter hooks/triggers to display (a hook must start with \"@\", "
"for example \"@signal\"), many filters can be separated by commas; each "
"trigger name can start or end with \"*\"\n"
"\n"
"When a trigger callback is called, following actions are performed, in this "
"order:\n"
@@ -10049,7 +10053,10 @@ msgid ""
" /trigger add resize_big signal signal_sigwinch \"${info:term_width} >= "
"100\" \"\" \"/bar show nicklist\"\n"
" silently save config each hour:\n"
" /trigger add cfgsave timer 3600000;0;0 \"\" \"\" \"/mute /save\""
" /trigger add cfgsave timer 3600000;0;0 \"\" \"\" \"/mute /save\"\n"
" open trigger monitor and show only modifiers and triggers whose name "
"starts with \"resize\":\n"
" /trigger monitor @modifier,resize*"
msgstr ""
msgid "triggers"
@@ -10067,6 +10074,9 @@ msgstr "hodnoty pro konfigurační nastavení"
msgid "hooks for triggers"
msgstr "volby pro proxy"
msgid "hooks for triggers (for filter in monitor buffer)"
msgstr ""
#, fuzzy
msgid "default arguments for a hook"
msgstr "výchozí odchozí zpráva pro IRC kanál"
po/de.po
+22 -6
View File
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-03-30 22:25+0200\n"
"POT-Creation-Date: 2014-04-01 14:23+0200\n"
"PO-Revision-Date: 2014-03-27 19:25+0100\n"
"Last-Translator: Nils Görs <weechatter@arcor.de>\n"
"Language-Team: German <weechatter@arcor.de>\n"
@@ -11079,8 +11079,9 @@ msgstr ""
msgid "%s%s: invalid regular expression in trigger \"%s\""
msgstr "%s%s: ungültiger regulärer Ausdruck in Trigger \"%s\""
msgid "Trigger monitor"
msgstr "Trigger-Monitor"
#, c-format
msgid "Trigger monitor (filter: %s) | Input: q=close words=filter"
msgstr ""
msgid "no variable"
msgstr "keine Variable"
@@ -11220,6 +11221,7 @@ msgstr ""
msgid "manage triggers, the Swiss Army knife for WeeChat"
msgstr "verwaltet Trigger, das Schweizer Armeemesser für WeeChat"
#, fuzzy
msgid ""
"list|listfull|listdefault || add|addoff|addreplace <name> <hook> "
"[\"<arguments>\" [\"<conditions>\" [\"<regex>\" [\"<command>"
@@ -11227,7 +11229,7 @@ msgid ""
"<name> || set <name> <option> <value> || rename|copy <name> <new_name> || "
"enable|disable|toggle [<name>|-all [<name>...]] || restart <name>|-all "
"[<name>...] || show <name> || del <name>|-all [<name>...] || default -yes || "
"monitor"
"monitor [<filter>]"
msgstr ""
"list|listfull|listdefault || add|addoff|addreplace <name> <hook> "
"[\"<arguments>\" [\"<conditions>\" [\"<regex>\" [\"<command>"
@@ -11237,6 +11239,7 @@ msgstr ""
"[<name>...] || show <name> || del <name>|-all [<name>...] || default -yes || "
"monitor"
#, fuzzy
msgid ""
" list: list triggers (without argument, this list is displayed)\n"
" listfull: list triggers with detailed info for each trigger\n"
@@ -11288,7 +11291,10 @@ msgid ""
" del: delete a trigger\n"
" -all: do action on all triggers\n"
" default: restore default triggers\n"
" monitor: open the trigger monitor buffer\n"
" monitor: open the trigger monitor buffer, with optional filter:\n"
" filter: filter hooks/triggers to display (a hook must start with \"@\", "
"for example \"@signal\"), many filters can be separated by commas; each "
"trigger name can start or end with \"*\"\n"
"\n"
"When a trigger callback is called, following actions are performed, in this "
"order:\n"
@@ -11311,7 +11317,10 @@ msgid ""
" /trigger add resize_big signal signal_sigwinch \"${info:term_width} >= "
"100\" \"\" \"/bar show nicklist\"\n"
" silently save config each hour:\n"
" /trigger add cfgsave timer 3600000;0;0 \"\" \"\" \"/mute /save\""
" /trigger add cfgsave timer 3600000;0;0 \"\" \"\" \"/mute /save\"\n"
" open trigger monitor and show only modifiers and triggers whose name "
"starts with \"resize\":\n"
" /trigger monitor @modifier,resize*"
msgstr ""
" list: zeigt eine Liste aller Trigger (ohne Angabe von Argumente wird "
"diese Liste standardmäßig ausgegeben)\n"
@@ -11409,6 +11418,9 @@ msgstr "Werte für Trigger-Option"
msgid "hooks for triggers"
msgstr "Hooks für Trigger"
msgid "hooks for triggers (for filter in monitor buffer)"
msgstr ""
msgid "default arguments for a hook"
msgstr "Standardargumente für einen Hook"
@@ -11970,5 +11982,9 @@ msgstr ""
msgid "%s%s: timeout for \"%s\" with %s"
msgstr "%s%s: Zeitüberschreitung für \"%s\" mit %s"
#, fuzzy
#~ msgid "Trigger monitor | Filter: %s"
#~ msgstr "Trigger-Monitor"
#~ msgid "Signal SIGHUP received, reloading configuration files"
#~ msgstr "Signal SIGHUP empfangen, lese Konfigurationsdateien neu"
po/es.po
+15 -5
View File
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-03-30 22:25+0200\n"
"POT-Creation-Date: 2014-04-01 14:23+0200\n"
"PO-Revision-Date: 2014-03-24 14:23+0100\n"
"Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -10084,7 +10084,8 @@ msgstr "%sError: no se pudo renombrar el filtro \"%s\" a \"%s\""
msgid "%s%s: invalid regular expression in trigger \"%s\""
msgstr "%s%s: error al compilar la expresión regular \"%s\""
msgid "Trigger monitor"
#, c-format
msgid "Trigger monitor (filter: %s) | Input: q=close words=filter"
msgstr ""
#, fuzzy
@@ -10238,7 +10239,7 @@ msgid ""
"<name> || set <name> <option> <value> || rename|copy <name> <new_name> || "
"enable|disable|toggle [<name>|-all [<name>...]] || restart <name>|-all "
"[<name>...] || show <name> || del <name>|-all [<name>...] || default -yes || "
"monitor"
"monitor [<filter>]"
msgstr ""
msgid ""
@@ -10292,7 +10293,10 @@ msgid ""
" del: delete a trigger\n"
" -all: do action on all triggers\n"
" default: restore default triggers\n"
" monitor: open the trigger monitor buffer\n"
" monitor: open the trigger monitor buffer, with optional filter:\n"
" filter: filter hooks/triggers to display (a hook must start with \"@\", "
"for example \"@signal\"), many filters can be separated by commas; each "
"trigger name can start or end with \"*\"\n"
"\n"
"When a trigger callback is called, following actions are performed, in this "
"order:\n"
@@ -10315,7 +10319,10 @@ msgid ""
" /trigger add resize_big signal signal_sigwinch \"${info:term_width} >= "
"100\" \"\" \"/bar show nicklist\"\n"
" silently save config each hour:\n"
" /trigger add cfgsave timer 3600000;0;0 \"\" \"\" \"/mute /save\""
" /trigger add cfgsave timer 3600000;0;0 \"\" \"\" \"/mute /save\"\n"
" open trigger monitor and show only modifiers and triggers whose name "
"starts with \"resize\":\n"
" /trigger monitor @modifier,resize*"
msgstr ""
msgid "triggers"
@@ -10333,6 +10340,9 @@ msgstr "valores de una opción de configuración"
msgid "hooks for triggers"
msgstr "opciones para proxies"
msgid "hooks for triggers (for filter in monitor buffer)"
msgstr ""
#, fuzzy
msgid "default arguments for a hook"
msgstr "mensaje de abandono por defecto"
po/fr.po
+29 -9
View File
@@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-03-30 22:25+0200\n"
"PO-Revision-Date: 2014-03-30 22:25+0200\n"
"POT-Creation-Date: 2014-04-01 14:23+0200\n"
"PO-Revision-Date: 2014-04-01 14:24+0200\n"
"Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: fr\n"
@@ -10805,8 +10805,9 @@ msgstr ""
msgid "%s%s: invalid regular expression in trigger \"%s\""
msgstr "%s%s: expression régulière invalide dans le trigger \"%s\""
msgid "Trigger monitor"
msgstr "Moniteur de trigger"
#, c-format
msgid "Trigger monitor (filter: %s) | Input: q=close words=filter"
msgstr "Moniteur de trigger (filtre: %s) | Entrée: q=fermer mots=filtrer"
msgid "no variable"
msgstr "pas de variable"
@@ -10953,7 +10954,7 @@ msgid ""
"<name> || set <name> <option> <value> || rename|copy <name> <new_name> || "
"enable|disable|toggle [<name>|-all [<name>...]] || restart <name>|-all "
"[<name>...] || show <name> || del <name>|-all [<name>...] || default -yes || "
"monitor"
"monitor [<filter>]"
msgstr ""
"list|listfull|listdefault || add|addoff|addreplace <nom> <hook> "
"[\"<paramètres>\" [\"<conditions>\" [\"<regex>\" [\"<commande>"
@@ -10961,7 +10962,7 @@ msgstr ""
"<nom> || set <nom> <option> <valeur> || rename|copy <nom> <nouveau_nom> || "
"enable|disable|toggle [<nom>|-all [<nom>...]] || restart <nom>|-all "
"[<nom>...] || show <nom> || del <nom>|-all [<nom>...] || default -yes || "
"monitor"
"monitor [<filtre>]"
msgid ""
" list: list triggers (without argument, this list is displayed)\n"
@@ -11014,7 +11015,10 @@ msgid ""
" del: delete a trigger\n"
" -all: do action on all triggers\n"
" default: restore default triggers\n"
" monitor: open the trigger monitor buffer\n"
" monitor: open the trigger monitor buffer, with optional filter:\n"
" filter: filter hooks/triggers to display (a hook must start with \"@\", "
"for example \"@signal\"), many filters can be separated by commas; each "
"trigger name can start or end with \"*\"\n"
"\n"
"When a trigger callback is called, following actions are performed, in this "
"order:\n"
@@ -11037,7 +11041,10 @@ msgid ""
" /trigger add resize_big signal signal_sigwinch \"${info:term_width} >= "
"100\" \"\" \"/bar show nicklist\"\n"
" silently save config each hour:\n"
" /trigger add cfgsave timer 3600000;0;0 \"\" \"\" \"/mute /save\""
" /trigger add cfgsave timer 3600000;0;0 \"\" \"\" \"/mute /save\"\n"
" open trigger monitor and show only modifiers and triggers whose name "
"starts with \"resize\":\n"
" /trigger monitor @modifier,resize*"
msgstr ""
" list: lister les triggers (sans paramètre, cette liste est affichée)\n"
" listfull: lister les triggers avec des informations détaillées pour "
@@ -11096,6 +11103,10 @@ msgstr ""
" -all: effectuer l'action sur tous les triggers\n"
" default: restaurer les triggers par défaut\n"
" monitor: ouvrir le tampon moniteur des triggers\n"
" filtre: filtrer les hooks/triggers à afficher (un hook doit commencer "
"par \"@\", par exemple \"@signal\"), plusieurs filtres peuvent être séparés "
"par des virgules; chaque nom de trigger peut commencer ou se terminer par \"*"
"\"\n"
"\n"
"Lorsqu'un callback de trigger est appelé, les actions suivantes sont "
"exécutées, dans cet ordre :\n"
@@ -11119,7 +11130,10 @@ msgstr ""
" /trigger add resize_big signal signal_sigwinch \"${info:term_width} >= "
"100\" \"\" \"/bar show nicklist\"\n"
" sauver la configuration chaque heure (de manière silencieuse):\n"
" /trigger add cfgsave timer 3600000;0;0 \"\" \"\" \"/mute /save\""
" /trigger add cfgsave timer 3600000;0;0 \"\" \"\" \"/mute /save\"\n"
" ouvrir le tampon moniteur des triggers et afficher seulement les "
"modificateurs et les triggers dont le nom commence par \"resize\":\n"
" /trigger monitor @modifier,resize*"
msgid "triggers"
msgstr "triggers"
@@ -11133,6 +11147,9 @@ msgstr "valeur d'une option de trigger"
msgid "hooks for triggers"
msgstr "hooks pour les triggers"
msgid "hooks for triggers (for filter in monitor buffer)"
msgstr "hooks pour les triggers (pour filtrer dans le tampon moniteur)"
msgid "default arguments for a hook"
msgstr "paramètres par défaut pour un hook"
@@ -11693,5 +11710,8 @@ msgstr ""
msgid "%s%s: timeout for \"%s\" with %s"
msgstr "%s%s: délai d'attente dépassé pour \"%s\" avec %s"
#~ msgid "Trigger monitor | Filter: %s"
#~ msgstr "Moniteur de trigger | Filtre: %s"
#~ msgid "Signal SIGHUP received, reloading configuration files"
#~ msgstr "Signal SIGHUP reçu, rechargement des fichiers de configuration"
po/hu.po
+15 -5
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-03-30 22:25+0200\n"
"POT-Creation-Date: 2014-04-01 14:23+0200\n"
"PO-Revision-Date: 2014-03-24 14:23+0100\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -9214,7 +9214,8 @@ msgstr "%s ismeretlen opció a \"%s\" parancsnak\n"
msgid "%s%s: invalid regular expression in trigger \"%s\""
msgstr "%s nincs elég memória az információs pult üzenethez\n"
msgid "Trigger monitor"
#, c-format
msgid "Trigger monitor (filter: %s) | Input: q=close words=filter"
msgstr ""
#, fuzzy
@@ -9368,7 +9369,7 @@ msgid ""
"<name> || set <name> <option> <value> || rename|copy <name> <new_name> || "
"enable|disable|toggle [<name>|-all [<name>...]] || restart <name>|-all "
"[<name>...] || show <name> || del <name>|-all [<name>...] || default -yes || "
"monitor"
"monitor [<filter>]"
msgstr ""
msgid ""
@@ -9422,7 +9423,10 @@ msgid ""
" del: delete a trigger\n"
" -all: do action on all triggers\n"
" default: restore default triggers\n"
" monitor: open the trigger monitor buffer\n"
" monitor: open the trigger monitor buffer, with optional filter:\n"
" filter: filter hooks/triggers to display (a hook must start with \"@\", "
"for example \"@signal\"), many filters can be separated by commas; each "
"trigger name can start or end with \"*\"\n"
"\n"
"When a trigger callback is called, following actions are performed, in this "
"order:\n"
@@ -9445,7 +9449,10 @@ msgid ""
" /trigger add resize_big signal signal_sigwinch \"${info:term_width} >= "
"100\" \"\" \"/bar show nicklist\"\n"
" silently save config each hour:\n"
" /trigger add cfgsave timer 3600000;0;0 \"\" \"\" \"/mute /save\""
" /trigger add cfgsave timer 3600000;0;0 \"\" \"\" \"/mute /save\"\n"
" open trigger monitor and show only modifiers and triggers whose name "
"starts with \"resize\":\n"
" /trigger monitor @modifier,resize*"
msgstr ""
msgid "triggers"
@@ -9463,6 +9470,9 @@ msgstr "Nem található az opció\n"
msgid "hooks for triggers"
msgstr "Aliaszok listája:\n"
msgid "hooks for triggers (for filter in monitor buffer)"
msgstr ""
#, fuzzy
msgid "default arguments for a hook"
msgstr "felhasználók listája a szobában"
po/it.po
+15 -5
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-03-30 22:25+0200\n"
"POT-Creation-Date: 2014-04-01 14:23+0200\n"
"PO-Revision-Date: 2014-03-24 14:23+0100\n"
"Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -10254,7 +10254,8 @@ msgstr "%sErrore: impossibile rinominare il filtro da \"%s\" a \"%s\""
msgid "%s%s: invalid regular expression in trigger \"%s\""
msgstr "%s%s: errore nella compilazione dell'espressione regolare \"%s\""
msgid "Trigger monitor"
#, c-format
msgid "Trigger monitor (filter: %s) | Input: q=close words=filter"
msgstr ""
#, fuzzy
@@ -10408,7 +10409,7 @@ msgid ""
"<name> || set <name> <option> <value> || rename|copy <name> <new_name> || "
"enable|disable|toggle [<name>|-all [<name>...]] || restart <name>|-all "
"[<name>...] || show <name> || del <name>|-all [<name>...] || default -yes || "
"monitor"
"monitor [<filter>]"
msgstr ""
msgid ""
@@ -10462,7 +10463,10 @@ msgid ""
" del: delete a trigger\n"
" -all: do action on all triggers\n"
" default: restore default triggers\n"
" monitor: open the trigger monitor buffer\n"
" monitor: open the trigger monitor buffer, with optional filter:\n"
" filter: filter hooks/triggers to display (a hook must start with \"@\", "
"for example \"@signal\"), many filters can be separated by commas; each "
"trigger name can start or end with \"*\"\n"
"\n"
"When a trigger callback is called, following actions are performed, in this "
"order:\n"
@@ -10485,7 +10489,10 @@ msgid ""
" /trigger add resize_big signal signal_sigwinch \"${info:term_width} >= "
"100\" \"\" \"/bar show nicklist\"\n"
" silently save config each hour:\n"
" /trigger add cfgsave timer 3600000;0;0 \"\" \"\" \"/mute /save\""
" /trigger add cfgsave timer 3600000;0;0 \"\" \"\" \"/mute /save\"\n"
" open trigger monitor and show only modifiers and triggers whose name "
"starts with \"resize\":\n"
" /trigger monitor @modifier,resize*"
msgstr ""
msgid "triggers"
@@ -10503,6 +10510,9 @@ msgstr "valori per una opzione di configurazione"
msgid "hooks for triggers"
msgstr "opzioni per i proxy"
msgid "hooks for triggers (for filter in monitor buffer)"
msgstr ""
#, fuzzy
msgid "default arguments for a hook"
msgstr "messaggio di uscita predefinito per il canale IRC"
po/ja.po
+22 -6
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-03-30 22:25+0200\n"
"POT-Creation-Date: 2014-04-01 14:23+0200\n"
"PO-Revision-Date: 2014-03-29 20:07+0900\n"
"Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
"Language-Team: Japanese <https://github.com/l/weechat/tree/translation_ja>\n"
@@ -10416,8 +10416,9 @@ msgstr "%s%s: トリガ \"%s\" のフックを作成できません (無効な
msgid "%s%s: invalid regular expression in trigger \"%s\""
msgstr "%s%s: トリガ \"%s\" の正規表現が間違っています"
msgid "Trigger monitor"
msgstr "トリガモニタ"
#, c-format
msgid "Trigger monitor (filter: %s) | Input: q=close words=filter"
msgstr ""
msgid "no variable"
msgstr "変数がありません"
@@ -10558,6 +10559,7 @@ msgstr ""
msgid "manage triggers, the Swiss Army knife for WeeChat"
msgstr "トリガ (WeeChat 用のスイスアーミーナイフ) の管理"
#, fuzzy
msgid ""
"list|listfull|listdefault || add|addoff|addreplace <name> <hook> "
"[\"<arguments>\" [\"<conditions>\" [\"<regex>\" [\"<command>"
@@ -10565,7 +10567,7 @@ msgid ""
"<name> || set <name> <option> <value> || rename|copy <name> <new_name> || "
"enable|disable|toggle [<name>|-all [<name>...]] || restart <name>|-all "
"[<name>...] || show <name> || del <name>|-all [<name>...] || default -yes || "
"monitor"
"monitor [<filter>]"
msgstr ""
"list|listfull|listdefault || add|addoff|addreplace <name> <hook> "
"[\"<arguments>\" [\"<conditions>\" [\"<regex>\" [\"<command>"
@@ -10575,6 +10577,7 @@ msgstr ""
"[<name>...] || show <name> || del <name>|-all [<name>...] || default -yes || "
"monitor"
#, fuzzy
msgid ""
" list: list triggers (without argument, this list is displayed)\n"
" listfull: list triggers with detailed info for each trigger\n"
@@ -10626,7 +10629,10 @@ msgid ""
" del: delete a trigger\n"
" -all: do action on all triggers\n"
" default: restore default triggers\n"
" monitor: open the trigger monitor buffer\n"
" monitor: open the trigger monitor buffer, with optional filter:\n"
" filter: filter hooks/triggers to display (a hook must start with \"@\", "
"for example \"@signal\"), many filters can be separated by commas; each "
"trigger name can start or end with \"*\"\n"
"\n"
"When a trigger callback is called, following actions are performed, in this "
"order:\n"
@@ -10649,7 +10655,10 @@ msgid ""
" /trigger add resize_big signal signal_sigwinch \"${info:term_width} >= "
"100\" \"\" \"/bar show nicklist\"\n"
" silently save config each hour:\n"
" /trigger add cfgsave timer 3600000;0;0 \"\" \"\" \"/mute /save\""
" /trigger add cfgsave timer 3600000;0;0 \"\" \"\" \"/mute /save\"\n"
" open trigger monitor and show only modifiers and triggers whose name "
"starts with \"resize\":\n"
" /trigger monitor @modifier,resize*"
msgstr ""
" list: トリガをリストアップ (引数なしの場合、このリストを表示します)\n"
" listfull: 各トリガに関する詳細な情報を付けてトリガをリストアップ\n"
@@ -10731,6 +10740,9 @@ msgstr "トリガオプションの値"
msgid "hooks for triggers"
msgstr "トリガに対するフック"
msgid "hooks for triggers (for filter in monitor buffer)"
msgstr ""
msgid "default arguments for a hook"
msgstr "フックに対するデフォルト引数"
@@ -11265,5 +11277,9 @@ msgstr "%s%s: ソケットにオプション \"nonblock\" を設定できませ
msgid "%s%s: timeout for \"%s\" with %s"
msgstr "%s%s: \"%s\" のタイムアウト %s"
#, fuzzy
#~ msgid "Trigger monitor | Filter: %s"
#~ msgstr "トリガモニタ"
#~ msgid "Signal SIGHUP received, reloading configuration files"
#~ msgstr "シグナル SIGHUP を受け取りました、設定ファイルを再読み込み中"
po/pl.po
+15 -5
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-03-30 22:25+0200\n"
"POT-Creation-Date: 2014-04-01 14:23+0200\n"
"PO-Revision-Date: 2014-03-24 14:23+0100\n"
"Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -10521,7 +10521,8 @@ msgstr "%sBłąd: nie można zmienić nazwy filtru z \"%s\" na \"%s\""
msgid "%s%s: invalid regular expression in trigger \"%s\""
msgstr "%s%s: błąd podczas kompilowania wyrażenia regularnego \"%s\""
msgid "Trigger monitor"
#, c-format
msgid "Trigger monitor (filter: %s) | Input: q=close words=filter"
msgstr ""
#, fuzzy
@@ -10675,7 +10676,7 @@ msgid ""
"<name> || set <name> <option> <value> || rename|copy <name> <new_name> || "
"enable|disable|toggle [<name>|-all [<name>...]] || restart <name>|-all "
"[<name>...] || show <name> || del <name>|-all [<name>...] || default -yes || "
"monitor"
"monitor [<filter>]"
msgstr ""
msgid ""
@@ -10729,7 +10730,10 @@ msgid ""
" del: delete a trigger\n"
" -all: do action on all triggers\n"
" default: restore default triggers\n"
" monitor: open the trigger monitor buffer\n"
" monitor: open the trigger monitor buffer, with optional filter:\n"
" filter: filter hooks/triggers to display (a hook must start with \"@\", "
"for example \"@signal\"), many filters can be separated by commas; each "
"trigger name can start or end with \"*\"\n"
"\n"
"When a trigger callback is called, following actions are performed, in this "
"order:\n"
@@ -10752,7 +10756,10 @@ msgid ""
" /trigger add resize_big signal signal_sigwinch \"${info:term_width} >= "
"100\" \"\" \"/bar show nicklist\"\n"
" silently save config each hour:\n"
" /trigger add cfgsave timer 3600000;0;0 \"\" \"\" \"/mute /save\""
" /trigger add cfgsave timer 3600000;0;0 \"\" \"\" \"/mute /save\"\n"
" open trigger monitor and show only modifiers and triggers whose name "
"starts with \"resize\":\n"
" /trigger monitor @modifier,resize*"
msgstr ""
msgid "triggers"
@@ -10770,6 +10777,9 @@ msgstr "wartości opcji konfiguracyjnych"
msgid "hooks for triggers"
msgstr "opcje proxy"
msgid "hooks for triggers (for filter in monitor buffer)"
msgstr ""
#, fuzzy
msgid "default arguments for a hook"
msgstr "domyślna wiadomość opuszczenia kanału IRC"
po/pt_BR.po
+15 -5
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-03-30 22:25+0200\n"
"POT-Creation-Date: 2014-04-01 14:23+0200\n"
"PO-Revision-Date: 2014-03-24 14:23+0100\n"
"Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -9451,7 +9451,8 @@ msgstr "%sErro: não foi possível renomear filtro \"%s\" para \"%s\""
msgid "%s%s: invalid regular expression in trigger \"%s\""
msgstr "%s%s: erro ao compilar expressão regular \"%s\""
msgid "Trigger monitor"
#, c-format
msgid "Trigger monitor (filter: %s) | Input: q=close words=filter"
msgstr ""
#, fuzzy
@@ -9605,7 +9606,7 @@ msgid ""
"<name> || set <name> <option> <value> || rename|copy <name> <new_name> || "
"enable|disable|toggle [<name>|-all [<name>...]] || restart <name>|-all "
"[<name>...] || show <name> || del <name>|-all [<name>...] || default -yes || "
"monitor"
"monitor [<filter>]"
msgstr ""
msgid ""
@@ -9659,7 +9660,10 @@ msgid ""
" del: delete a trigger\n"
" -all: do action on all triggers\n"
" default: restore default triggers\n"
" monitor: open the trigger monitor buffer\n"
" monitor: open the trigger monitor buffer, with optional filter:\n"
" filter: filter hooks/triggers to display (a hook must start with \"@\", "
"for example \"@signal\"), many filters can be separated by commas; each "
"trigger name can start or end with \"*\"\n"
"\n"
"When a trigger callback is called, following actions are performed, in this "
"order:\n"
@@ -9682,7 +9686,10 @@ msgid ""
" /trigger add resize_big signal signal_sigwinch \"${info:term_width} >= "
"100\" \"\" \"/bar show nicklist\"\n"
" silently save config each hour:\n"
" /trigger add cfgsave timer 3600000;0;0 \"\" \"\" \"/mute /save\""
" /trigger add cfgsave timer 3600000;0;0 \"\" \"\" \"/mute /save\"\n"
" open trigger monitor and show only modifiers and triggers whose name "
"starts with \"resize\":\n"
" /trigger monitor @modifier,resize*"
msgstr ""
msgid "triggers"
@@ -9700,6 +9707,9 @@ msgstr "valores para uma opção de configuração"
msgid "hooks for triggers"
msgstr "opções para proxys"
msgid "hooks for triggers (for filter in monitor buffer)"
msgstr ""
#, fuzzy
msgid "default arguments for a hook"
msgstr "cor padrão do fundo para a barra"
po/ru.po
+15 -5
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-03-30 22:25+0200\n"
"POT-Creation-Date: 2014-04-01 14:23+0200\n"
"PO-Revision-Date: 2014-03-24 14:23+0100\n"
"Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -9239,7 +9239,8 @@ msgstr "%s неизвестный параметр для команды \"%s\"\
msgid "%s%s: invalid regular expression in trigger \"%s\""
msgstr "%s недостаточно памяти для сообщения в строке информации\n"
msgid "Trigger monitor"
#, c-format
msgid "Trigger monitor (filter: %s) | Input: q=close words=filter"
msgstr ""
#, fuzzy
@@ -9392,7 +9393,7 @@ msgid ""
"<name> || set <name> <option> <value> || rename|copy <name> <new_name> || "
"enable|disable|toggle [<name>|-all [<name>...]] || restart <name>|-all "
"[<name>...] || show <name> || del <name>|-all [<name>...] || default -yes || "
"monitor"
"monitor [<filter>]"
msgstr ""
msgid ""
@@ -9446,7 +9447,10 @@ msgid ""
" del: delete a trigger\n"
" -all: do action on all triggers\n"
" default: restore default triggers\n"
" monitor: open the trigger monitor buffer\n"
" monitor: open the trigger monitor buffer, with optional filter:\n"
" filter: filter hooks/triggers to display (a hook must start with \"@\", "
"for example \"@signal\"), many filters can be separated by commas; each "
"trigger name can start or end with \"*\"\n"
"\n"
"When a trigger callback is called, following actions are performed, in this "
"order:\n"
@@ -9469,7 +9473,10 @@ msgid ""
" /trigger add resize_big signal signal_sigwinch \"${info:term_width} >= "
"100\" \"\" \"/bar show nicklist\"\n"
" silently save config each hour:\n"
" /trigger add cfgsave timer 3600000;0;0 \"\" \"\" \"/mute /save\""
" /trigger add cfgsave timer 3600000;0;0 \"\" \"\" \"/mute /save\"\n"
" open trigger monitor and show only modifiers and triggers whose name "
"starts with \"resize\":\n"
" /trigger monitor @modifier,resize*"
msgstr ""
msgid "triggers"
@@ -9487,6 +9494,9 @@ msgstr "Не найден параметр\n"
msgid "hooks for triggers"
msgstr "Список сокращений:\n"
msgid "hooks for triggers (for filter in monitor buffer)"
msgstr ""
#, fuzzy
msgid "default arguments for a hook"
msgstr "список ников на канале"
po/tr.po
+15 -5
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-03-30 22:25+0200\n"
"POT-Creation-Date: 2014-04-01 14:23+0200\n"
"PO-Revision-Date: 2014-03-24 14:23+0100\n"
"Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -8307,7 +8307,8 @@ msgstr "%sHata: dosya \"%s\" oluşturulamaz"
msgid "%s%s: invalid regular expression in trigger \"%s\""
msgstr "%sHata: dosya \"%s\" oluşturulamaz"
msgid "Trigger monitor"
#, c-format
msgid "Trigger monitor (filter: %s) | Input: q=close words=filter"
msgstr ""
msgid "no variable"
@@ -8455,7 +8456,7 @@ msgid ""
"<name> || set <name> <option> <value> || rename|copy <name> <new_name> || "
"enable|disable|toggle [<name>|-all [<name>...]] || restart <name>|-all "
"[<name>...] || show <name> || del <name>|-all [<name>...] || default -yes || "
"monitor"
"monitor [<filter>]"
msgstr ""
msgid ""
@@ -8509,7 +8510,10 @@ msgid ""
" del: delete a trigger\n"
" -all: do action on all triggers\n"
" default: restore default triggers\n"
" monitor: open the trigger monitor buffer\n"
" monitor: open the trigger monitor buffer, with optional filter:\n"
" filter: filter hooks/triggers to display (a hook must start with \"@\", "
"for example \"@signal\"), many filters can be separated by commas; each "
"trigger name can start or end with \"*\"\n"
"\n"
"When a trigger callback is called, following actions are performed, in this "
"order:\n"
@@ -8532,7 +8536,10 @@ msgid ""
" /trigger add resize_big signal signal_sigwinch \"${info:term_width} >= "
"100\" \"\" \"/bar show nicklist\"\n"
" silently save config each hour:\n"
" /trigger add cfgsave timer 3600000;0;0 \"\" \"\" \"/mute /save\""
" /trigger add cfgsave timer 3600000;0;0 \"\" \"\" \"/mute /save\"\n"
" open trigger monitor and show only modifiers and triggers whose name "
"starts with \"resize\":\n"
" /trigger monitor @modifier,resize*"
msgstr ""
msgid "triggers"
@@ -8549,6 +8556,9 @@ msgstr "yapılandırma seçenekleri ayarı"
msgid "hooks for triggers"
msgstr ""
msgid "hooks for triggers (for filter in monitor buffer)"
msgstr ""
#, fuzzy
msgid "default arguments for a hook"
msgstr "İRC kanalı için varsayılan ayrılma iletisi"
po/weechat.pot
+15 -5
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-03-30 22:25+0200\n"
"POT-Creation-Date: 2014-04-01 14:23+0200\n"
"PO-Revision-Date: 2013-02-14 18:20+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -8251,7 +8251,8 @@ msgstr ""
msgid "%s%s: invalid regular expression in trigger \"%s\""
msgstr ""
msgid "Trigger monitor"
#, c-format
msgid "Trigger monitor (filter: %s) | Input: q=close words=filter"
msgstr ""
msgid "no variable"
@@ -8395,7 +8396,7 @@ msgid ""
"<name> || set <name> <option> <value> || rename|copy <name> <new_name> || "
"enable|disable|toggle [<name>|-all [<name>...]] || restart <name>|-all "
"[<name>...] || show <name> || del <name>|-all [<name>...] || default -yes || "
"monitor"
"monitor [<filter>]"
msgstr ""
msgid ""
@@ -8449,7 +8450,10 @@ msgid ""
" del: delete a trigger\n"
" -all: do action on all triggers\n"
" default: restore default triggers\n"
" monitor: open the trigger monitor buffer\n"
" monitor: open the trigger monitor buffer, with optional filter:\n"
" filter: filter hooks/triggers to display (a hook must start with \"@\", "
"for example \"@signal\"), many filters can be separated by commas; each "
"trigger name can start or end with \"*\"\n"
"\n"
"When a trigger callback is called, following actions are performed, in this "
"order:\n"
@@ -8472,7 +8476,10 @@ msgid ""
" /trigger add resize_big signal signal_sigwinch \"${info:term_width} >= "
"100\" \"\" \"/bar show nicklist\"\n"
" silently save config each hour:\n"
" /trigger add cfgsave timer 3600000;0;0 \"\" \"\" \"/mute /save\""
" /trigger add cfgsave timer 3600000;0;0 \"\" \"\" \"/mute /save\"\n"
" open trigger monitor and show only modifiers and triggers whose name "
"starts with \"resize\":\n"
" /trigger monitor @modifier,resize*"
msgstr ""
msgid "triggers"
@@ -8487,6 +8494,9 @@ msgstr ""
msgid "hooks for triggers"
msgstr ""
msgid "hooks for triggers (for filter in monitor buffer)"
msgstr ""
msgid "default arguments for a hook"
msgstr ""
src/plugins/trigger/trigger-buffer.c
+210 -86
View File
File diff suppressed because it is too large Load Diff
src/plugins/trigger/trigger-buffer.h
+6 -5
View File
@@ -24,11 +24,12 @@
struct t_gui_buffer *trigger_buffer;
extern void trigger_buffer_display_trigger (struct t_trigger *trigger,
struct t_gui_buffer *buffer,
struct t_hashtable *pointers,
struct t_hashtable *extra_vars);
extern void trigger_buffer_set_callbacks ();
extern void trigger_buffer_open (int switch_to_buffer);
extern void trigger_buffer_open (const char *filter, int switch_to_buffer);
extern int trigger_buffer_display_trigger (struct t_trigger *trigger,
struct t_gui_buffer *buffer,
struct t_hashtable *pointers,
struct t_hashtable *extra_vars);
extern void trigger_buffer_end ();
#endif /* WEECHAT_TRIGGER_BUFFER_H */
src/plugins/trigger/trigger-callback.c
+19 -10
View File
@@ -162,7 +162,8 @@ trigger_callback_check_conditions (struct t_trigger *trigger,
void
trigger_callback_replace_regex (struct t_trigger *trigger,
struct t_hashtable *pointers,
struct t_hashtable *extra_vars)
struct t_hashtable *extra_vars,
int display_monitor)
{
char *value, *replace_eval;
const char *ptr_key, *ptr_value;
@@ -182,7 +183,7 @@ trigger_callback_replace_regex (struct t_trigger *trigger,
trigger_hook_regex_default_var[weechat_config_integer (trigger->options[TRIGGER_OPTION_HOOK])];
if (!ptr_key || !ptr_key[0])
{
if (trigger_buffer)
if (trigger_buffer && display_monitor)
{
weechat_printf_tags (trigger_buffer, "no_trigger",
"\t regex %d: %s",
@@ -194,7 +195,7 @@ trigger_callback_replace_regex (struct t_trigger *trigger,
ptr_value = weechat_hashtable_get (extra_vars, ptr_key);
if (!ptr_value)
{
if (trigger_buffer)
if (trigger_buffer && display_monitor)
{
weechat_printf_tags (trigger_buffer, "no_trigger",
"\t regex %d (%s): %s",
@@ -218,7 +219,7 @@ trigger_callback_replace_regex (struct t_trigger *trigger,
if (value)
{
/* display debug info on trigger buffer */
if (trigger_buffer)
if (trigger_buffer && display_monitor)
{
weechat_printf_tags (trigger_buffer, "no_trigger",
"\t regex %d %s(%s%s%s)%s: "
@@ -250,7 +251,8 @@ void
trigger_callback_run_command (struct t_trigger *trigger,
struct t_gui_buffer *buffer,
struct t_hashtable *pointers,
struct t_hashtable *extra_vars)
struct t_hashtable *extra_vars,
int display_monitor)
{
char *command_eval;
int i;
@@ -273,7 +275,7 @@ trigger_callback_run_command (struct t_trigger *trigger,
if (command_eval)
{
/* display debug info on trigger buffer */
if (trigger_buffer)
if (trigger_buffer && display_monitor)
{
weechat_printf_tags (trigger_buffer, "no_trigger",
_("%s running command %s\"%s%s%s\"%s "
@@ -312,19 +314,26 @@ trigger_callback_execute (struct t_trigger *trigger,
struct t_hashtable *pointers,
struct t_hashtable *extra_vars)
{
int display_monitor;
/* display debug info on trigger buffer */
if (!trigger_buffer && (weechat_trigger_plugin->debug >= 1))
trigger_buffer_open (0);
trigger_buffer_display_trigger (trigger, buffer, pointers, extra_vars);
trigger_buffer_open (NULL, 0);
display_monitor = trigger_buffer_display_trigger (trigger,
buffer,
pointers,
extra_vars);
/* check conditions */
if (trigger_callback_check_conditions (trigger, pointers, extra_vars))
{
/* replace text with regex */
trigger_callback_replace_regex (trigger, pointers, extra_vars);
trigger_callback_replace_regex (trigger, pointers, extra_vars,
display_monitor);
/* execute command(s) */
trigger_callback_run_command (trigger, buffer, pointers, extra_vars);
trigger_callback_run_command (trigger, buffer, pointers, extra_vars,
display_monitor);
}
}
src/plugins/trigger/trigger-command.c
+11 -5
View File
@@ -912,7 +912,7 @@ trigger_command_trigger (void *data, struct t_gui_buffer *buffer, int argc,
/* open the trigger monitor buffer */
if (weechat_strcasecmp (argv[1], "monitor") == 0)
{
trigger_buffer_open (1);
trigger_buffer_open ((argc > 2) ? argv_eol[2] : NULL, 1);
goto end;
}
@@ -949,7 +949,7 @@ trigger_command_init ()
" || show <name>"
" || del <name>|-all [<name>...]"
" || default -yes"
" || monitor"),
" || monitor [<filter>]"),
N_(" list: list triggers (without argument, this list is displayed)\n"
" listfull: list triggers with detailed info for each trigger\n"
"listdefault: list default triggers\n"
@@ -1001,7 +1001,10 @@ trigger_command_init ()
" del: delete a trigger\n"
" -all: do action on all triggers\n"
" default: restore default triggers\n"
" monitor: open the trigger monitor buffer\n"
" monitor: open the trigger monitor buffer, with optional filter:\n"
" filter: filter hooks/triggers to display (a hook must start "
"with \"@\", for example \"@signal\"), many filters can be separated "
"by commas; each trigger name can start or end with \"*\"\n"
"\n"
"When a trigger callback is called, following actions are performed, "
"in this order:\n"
@@ -1025,7 +1028,10 @@ trigger_command_init ()
" /trigger add resize_big signal signal_sigwinch "
"\"${info:term_width} >= 100\" \"\" \"/bar show nicklist\"\n"
" silently save config each hour:\n"
" /trigger add cfgsave timer 3600000;0;0 \"\" \"\" \"/mute /save\""),
" /trigger add cfgsave timer 3600000;0;0 \"\" \"\" \"/mute /save\"\n"
" open trigger monitor and show only modifiers and triggers whose "
"name starts with \"resize\":\n"
" /trigger monitor @modifier,resize*"),
"list|listfull|listdefault"
" || add|addoff|addreplace %(trigger_names) %(trigger_hooks) "
"%(trigger_hook_arguments) %(trigger_hook_conditions) "
@@ -1038,6 +1044,6 @@ trigger_command_init ()
"%(trigger_names)|%*"
" || show %(trigger_names)"
" || default"
" || monitor",
" || monitor %(trigger_names)|%(trigger_hooks_filter)",
&trigger_command_trigger, NULL);
}
src/plugins/trigger/trigger-completion.c
+31
View File
@@ -163,6 +163,34 @@ trigger_completion_hooks_cb (void *data, const char *completion_item,
return WEECHAT_RC_OK;
}
/*
* Adds hooks for filtering triggers to completion list.
*/
int
trigger_completion_hooks_filter_cb (void *data, const char *completion_item,
struct t_gui_buffer *buffer,
struct t_gui_completion *completion)
{
int i;
char str_hook[128];
/* make C compiler happy */
(void) data;
(void) completion_item;
(void) buffer;
for (i = 0; i < TRIGGER_NUM_HOOK_TYPES; i++)
{
snprintf (str_hook, sizeof (str_hook),
"@%s", trigger_hook_type_string[i]);
weechat_hook_completion_list_add (completion, str_hook,
0, WEECHAT_LIST_POS_END);
}
return WEECHAT_RC_OK;
}
/*
* Adds a word with quotes around to completion list.
*/
@@ -374,6 +402,9 @@ trigger_completion_init ()
weechat_hook_completion ("trigger_hooks",
N_("hooks for triggers"),
&trigger_completion_hooks_cb, NULL);
weechat_hook_completion ("trigger_hooks_filter",
N_("hooks for triggers (for filter in monitor buffer)"),
&trigger_completion_hooks_filter_cb, NULL);
weechat_hook_completion ("trigger_hook_arguments",
N_("default arguments for a hook"),
&trigger_completion_hook_arguments_cb, NULL);
src/plugins/trigger/trigger.c
+1
View File
@@ -1218,6 +1218,7 @@ weechat_plugin_end (struct t_weechat_plugin *plugin)
/* make C compiler happy */
(void) plugin;
trigger_buffer_end ();
trigger_config_write ();
trigger_free_all ();
trigger_config_free ();