diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/trigger/trigger-command.c | 3 | ||||
| -rw-r--r-- | src/plugins/trigger/trigger.c | 20 |
2 files changed, 18 insertions, 5 deletions
diff --git a/src/plugins/trigger/trigger-command.c b/src/plugins/trigger/trigger-command.c index a97c73a52..f41fe2d2f 100644 --- a/src/plugins/trigger/trigger-command.c +++ b/src/plugins/trigger/trigger-command.c @@ -1193,7 +1193,8 @@ trigger_command_init () " print: buffer, tags, message, strip colors\n" " command: command (required), description, arguments, " "description of arguments, completion (all arguments except command " - "are evaluated, see /help eval)\n" + "are evaluated, \"${tg_trigger_name}\" is replaced by the trigger " + "name, see /help eval)\n" " command_run: command(s) (required)\n" " timer: interval (required), align on second, max calls\n" " config: name(s) of option (required)\n" diff --git a/src/plugins/trigger/trigger.c b/src/plugins/trigger/trigger.c index 7a6efb381..0b9a44f77 100644 --- a/src/plugins/trigger/trigger.c +++ b/src/plugins/trigger/trigger.c @@ -268,6 +268,7 @@ trigger_hook (struct t_trigger *trigger) char *eval_desc, *eval_args, *eval_desc_args, *eval_completion; int i, argc, strip_colors; long interval, align_second, max_calls; + struct t_hashtable *extra_vars; if (!weechat_config_boolean (trigger->options[TRIGGER_OPTION_ENABLED])) return; @@ -400,15 +401,24 @@ trigger_hook (struct t_trigger *trigger) trigger->hooks = malloc (sizeof (trigger->hooks[0])); if (trigger->hooks) { + extra_vars = weechat_hashtable_new (32, + WEECHAT_HASHTABLE_STRING, + WEECHAT_HASHTABLE_STRING, + NULL, NULL); + if (extra_vars) + { + weechat_hashtable_set (extra_vars, "tg_trigger_name", + trigger->name); + } trigger->hooks_count = 1; eval_desc = (argc > 1) ? weechat_string_eval_expression ( - argv[1], NULL, NULL, NULL) : NULL; + argv[1], NULL, extra_vars, NULL) : NULL; eval_args = (argc > 2) ? weechat_string_eval_expression ( - argv[2], NULL, NULL, NULL) : NULL; + argv[2], NULL, extra_vars, NULL) : NULL; eval_desc_args = (argc > 3) ? weechat_string_eval_expression ( - argv[3], NULL, NULL, NULL) : NULL; + argv[3], NULL, extra_vars, NULL) : NULL; eval_completion = (argc > 4) ? weechat_string_eval_expression ( - argv[4], NULL, NULL, NULL) : NULL; + argv[4], NULL, extra_vars, NULL) : NULL; trigger->hooks[0] = weechat_hook_command ( argv[0], /* command */ (eval_desc) ? eval_desc : "", @@ -425,6 +435,8 @@ trigger_hook (struct t_trigger *trigger) free (eval_desc_args); if (eval_completion) free (eval_completion); + if (extra_vars) + weechat_hashtable_free (extra_vars); } } break; |