diff options
| author | Sebastien Helleu <flashcode@flashtux.org> | 2012-11-02 15:40:15 +0100 |
|---|---|---|
| committer | Sebastien Helleu <flashcode@flashtux.org> | 2012-11-02 15:40:15 +0100 |
| commit | 4d436e3ac653b9face748afbe4d3c96b797469b4 (patch) | |
| tree | c7ab3ec6cb60375036e943ad6f86e70e4ed31eb6 /src | |
| parent | f7b53fe6aa07d69928fbb0dc9311e7904a8c7673 (diff) | |
| download | weechat-4d436e3ac653b9face748afbe4d3c96b797469b4.zip | |
core: expand buffer local variables in evaluation of expressions (command /eval and function "string_eval_expression" in plugin API)
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/wee-command.c | 3 | ||||
| -rw-r--r-- | src/core/wee-eval.c | 20 |
2 files changed, 18 insertions, 5 deletions
diff --git a/src/core/wee-command.c b/src/core/wee-command.c index 5ab73624a..830b40bae 100644 --- a/src/core/wee-command.c +++ b/src/core/wee-command.c @@ -5796,7 +5796,8 @@ command_init () "Some variables are replaced in expression, using the " "format ${variable}, variable can be, by order of prioity :\n" " 1. the name of an option (file.section.option)\n" - " 2. a hdata name/variable (the value is automatically " + " 2. the name of a local variable in buffer\n" + " 3. a hdata name/variable (the value is automatically " "converted to string), by default \"window\" and \"buffer\" " "point to current window/buffer.\n" "Format for hdata can be one of following:\n" diff --git a/src/core/wee-eval.c b/src/core/wee-eval.c index 45b2e1f01..f52e359e4 100644 --- a/src/core/wee-eval.c +++ b/src/core/wee-eval.c @@ -36,6 +36,7 @@ #include "wee-hdata.h" #include "wee-hook.h" #include "wee-string.h" +#include "../gui/gui-buffer.h" #include "../gui/gui-color.h" #include "../gui/gui-window.h" #include "../plugins/plugin.h" @@ -212,7 +213,8 @@ end: * by order of priority: * 1. an extra variable (from hashtable "extra_vars") * 2. an name of option (file.section.option) - * 3. a hdata name/variable + * 3. a buffer local variable + * 4. a hdata name/variable * Examples: * option: ${weechat.look.scroll_amount} * hdata : ${window.buffer.full_name} @@ -224,6 +226,7 @@ eval_replace_vars_cb (void *data, const char *text) { struct t_hashtable *pointers, *extra_vars; struct t_config_option *ptr_option; + struct t_gui_buffer *ptr_buffer; char str_value[64], *value, *pos, *pos1, *pos2, *hdata_name, *list_name; char *tmp; const char *ptr_value; @@ -233,12 +236,12 @@ eval_replace_vars_cb (void *data, const char *text) pointers = (struct t_hashtable *)(((void **)data)[0]); extra_vars = (struct t_hashtable *)(((void **)data)[1]); - /* first look for var in hashtable "extra_vars" */ + /* 1. look for var in hashtable "extra_vars" */ ptr_value = hashtable_get (extra_vars, text); if (ptr_value) return strdup (ptr_value); - /* look for name of option: if found, return this value */ + /* 2. look for name of option: if found, return this value */ config_file_search_with_string (text, NULL, NULL, &ptr_option, NULL); if (ptr_option) { @@ -261,7 +264,16 @@ eval_replace_vars_cb (void *data, const char *text) } } - /* look for hdata */ + /* 3. look for local variable in buffer */ + ptr_buffer = hashtable_get (pointers, "buffer"); + if (ptr_buffer) + { + ptr_value = hashtable_get (ptr_buffer->local_variables, text); + if (ptr_value) + return strdup (ptr_value); + } + + /* 4. look for hdata */ value = NULL; hdata_name = NULL; list_name = NULL; |