pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-07-06 17:53:13 +02:00
Code Activity

api: add support of colors with format "${color:xxx}" in function string_eval_expression and command /eval

Browse Source
This commit is contained in:
Sebastien Helleu
2013-08-04 10:09:53 +02:00
parent dc878c5b69
commit 6ea81f4c8c
20 changed files with 106 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+2
View File
@@ -52,6 +52,8 @@ Version 0.4.2 (under dev!)
"layout_window"
* core: fix line alignment when option weechat.look.buffer_time_format is set
to empty string
* api: add support of colors with format "${color:xxx}" in function
string_eval_expression and command /eval
* api: add argument "options" in function string_eval_expression, add option
"-c" for command /eval (to evaluate a condition)
* api: use pointer for infolist "hook" to return only one hook
doc/de/autogen/user/weechat_commands.txt
+4 -3
View File
@@ -233,9 +233,10 @@ To force a string comparison, add double quotes around each expression, for exam
"50" > "100" ==> 1
Some variables are replaced in expression, using the format ${variable}, variable can be, by order of priority :
1. the name of an option (file.section.option)
2. the name of a local variable in buffer
3. a hdata name/variable (the value is automatically converted to string), by default "window" and "buffer" point to current window/buffer.
1. a color (format: color:xxx)
2. an option (format: file.section.option)
3. a local variable in buffer
4. a hdata name/variable (the value is automatically converted to string), by default "window" and "buffer" point to current window/buffer.
Format for hdata can be one of following:
hdata.var1.var2...: start with a hdata (pointer must be known), and ask variables one after one (other hdata can be followed)
hdata[list].var1.var2...: start with a hdata using a list, for example:
doc/en/autogen/user/weechat_commands.txt
+4 -3
View File
@@ -233,9 +233,10 @@ To force a string comparison, add double quotes around each expression, for exam
"50" > "100" ==> 1
Some variables are replaced in expression, using the format ${variable}, variable can be, by order of priority :
1. the name of an option (file.section.option)
2. the name of a local variable in buffer
3. a hdata name/variable (the value is automatically converted to string), by default "window" and "buffer" point to current window/buffer.
1. a color (format: color:xxx)
2. an option (format: file.section.option)
3. a local variable in buffer
4. a hdata name/variable (the value is automatically converted to string), by default "window" and "buffer" point to current window/buffer.
Format for hdata can be one of following:
hdata.var1.var2...: start with a hdata (pointer must be known), and ask variables one after one (other hdata can be followed)
hdata[list].var1.var2...: start with a hdata using a list, for example:
doc/fr/autogen/user/weechat_commands.txt
+4 -3
View File
@@ -233,9 +233,10 @@ Pour forcer une comparaison de chaînes, ajoutez des guillemets autour de chaque
"50" > "100" ==> 1
Des variables sont remplacées dans l'expression, en utilisant le format ${variable}, la variable pouvant être, par ordre de priorité :
1. le nom d'une option (fichier.section.option)
2. le nom d'une variable locale du tampon
3. le nom d'un hdata/variable (la valeur est automatiquement convertie en chaîne), par défaut "window" et "buffer" pointent vers la fenêtre et le tampon courants.
1. une couleur (format: color:xxx)
2. une option (format: fichier.section.option)
3. une variable locale du tampon
4. un un hdata/variable (la valeur est automatiquement convertie en chaîne), par défaut "window" et "buffer" pointent vers la fenêtre et le tampon courants.
Le format du hdata peut être le suivant :
hdata.var1.var2...: démarrer avec un hdata (le pointeur doit être connu), et demander les variables l'une après l'autre (d'autres hdata peuvent être suivis)
hdata[list].var1.var2...: démarrer avec un hdata en utilisant une liste, par exemple :
doc/it/autogen/user/weechat_commands.txt
+4 -3
View File
@@ -233,9 +233,10 @@ To force a string comparison, add double quotes around each expression, for exam
"50" > "100" ==> 1
Some variables are replaced in expression, using the format ${variable}, variable can be, by order of priority :
1. the name of an option (file.section.option)
2. the name of a local variable in buffer
3. a hdata name/variable (the value is automatically converted to string), by default "window" and "buffer" point to current window/buffer.
1. a color (format: color:xxx)
2. an option (format: file.section.option)
3. a local variable in buffer
4. a hdata name/variable (the value is automatically converted to string), by default "window" and "buffer" point to current window/buffer.
Format for hdata can be one of following:
hdata.var1.var2...: start with a hdata (pointer must be known), and ask variables one after one (other hdata can be followed)
hdata[list].var1.var2...: start with a hdata using a list, for example:
doc/ja/autogen/user/weechat_commands.txt
+4 -3
View File
@@ -233,9 +233,10 @@ To force a string comparison, add double quotes around each expression, for exam
"50" > "100" ==> 1
Some variables are replaced in expression, using the format ${variable}, variable can be, by order of priority :
1. the name of an option (file.section.option)
2. the name of a local variable in buffer
3. a hdata name/variable (the value is automatically converted to string), by default "window" and "buffer" point to current window/buffer.
1. a color (format: color:xxx)
2. an option (format: file.section.option)
3. a local variable in buffer
4. a hdata name/variable (the value is automatically converted to string), by default "window" and "buffer" point to current window/buffer.
Format for hdata can be one of following:
hdata.var1.var2...: start with a hdata (pointer must be known), and ask variables one after one (other hdata can be followed)
hdata[list].var1.var2...: start with a hdata using a list, for example:
po/cs.po
+5 -4
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.2-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2013-08-03 15:05+0200\n"
"POT-Creation-Date: 2013-08-04 09:08+0200\n"
"PO-Revision-Date: 2013-07-31 18:41+0200\n"
"Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1305,9 +1305,10 @@ msgid ""
"\n"
"Some variables are replaced in expression, using the format ${variable}, "
"variable can be, by order of priority :\n"
" 1. the name of an option (file.section.option)\n"
" 2. the name of a local variable in buffer\n"
" 3. a hdata name/variable (the value is automatically converted to string), "
" 1. a color (format: color:xxx)\n"
" 2. an option (format: file.section.option)\n"
" 3. a local variable in buffer\n"
" 4. 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"
" hdata.var1.var2...: start with a hdata (pointer must be known), and ask "
po/de.po
+5 -4
View File
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.2-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2013-08-03 15:05+0200\n"
"POT-Creation-Date: 2013-08-04 09:08+0200\n"
"PO-Revision-Date: 2013-08-01 19:57+0200\n"
"Last-Translator: Nils Görs <weechatter@arcor.de>\n"
"Language-Team: German <weechatter@arcor.de>\n"
@@ -1353,9 +1353,10 @@ msgid ""
"\n"
"Some variables are replaced in expression, using the format ${variable}, "
"variable can be, by order of priority :\n"
" 1. the name of an option (file.section.option)\n"
" 2. the name of a local variable in buffer\n"
" 3. a hdata name/variable (the value is automatically converted to string), "
" 1. a color (format: color:xxx)\n"
" 2. an option (format: file.section.option)\n"
" 3. a local variable in buffer\n"
" 4. 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"
" hdata.var1.var2...: start with a hdata (pointer must be known), and ask "
po/es.po
+5 -4
View File
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.2-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2013-08-03 15:05+0200\n"
"POT-Creation-Date: 2013-08-04 09:08+0200\n"
"PO-Revision-Date: 2013-07-31 18:41+0200\n"
"Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1342,9 +1342,10 @@ msgid ""
"\n"
"Some variables are replaced in expression, using the format ${variable}, "
"variable can be, by order of priority :\n"
" 1. the name of an option (file.section.option)\n"
" 2. the name of a local variable in buffer\n"
" 3. a hdata name/variable (the value is automatically converted to string), "
" 1. a color (format: color:xxx)\n"
" 2. an option (format: file.section.option)\n"
" 3. a local variable in buffer\n"
" 4. 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"
" hdata.var1.var2...: start with a hdata (pointer must be known), and ask "
po/fr.po
+10 -8
View File
@@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.2-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2013-08-03 17:59+0200\n"
"PO-Revision-Date: 2013-08-03 15:06+0200\n"
"POT-Creation-Date: 2013-08-04 09:56+0200\n"
"PO-Revision-Date: 2013-08-04 09:10+0200\n"
"Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: fr\n"
@@ -1335,9 +1335,10 @@ msgid ""
"\n"
"Some variables are replaced in expression, using the format ${variable}, "
"variable can be, by order of priority :\n"
" 1. the name of an option (file.section.option)\n"
" 2. the name of a local variable in buffer\n"
" 3. a hdata name/variable (the value is automatically converted to string), "
" 1. a color (format: color:xxx)\n"
" 2. an option (format: file.section.option)\n"
" 3. a local variable in buffer\n"
" 4. 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"
" hdata.var1.var2...: start with a hdata (pointer must be known), and ask "
@@ -1395,9 +1396,10 @@ msgstr ""
"\n"
"Des variables sont remplacées dans l'expression, en utilisant le format "
"${variable}, la variable pouvant être, par ordre de priorité :\n"
" 1. le nom d'une option (fichier.section.option)\n"
" 2. le nom d'une variable locale du tampon\n"
" 3. le nom d'un hdata/variable (la valeur est automatiquement convertie en "
" 1. une couleur (format: color:xxx)\n"
" 2. une option (format: fichier.section.option)\n"
" 3. une variable locale du tampon\n"
" 4. un un hdata/variable (la valeur est automatiquement convertie en "
"chaîne), par défaut \"window\" et \"buffer\" pointent vers la fenêtre et le "
"tampon courants.\n"
"Le format du hdata peut être le suivant :\n"
po/hu.po
+5 -4
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.2-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2013-08-03 15:05+0200\n"
"POT-Creation-Date: 2013-08-04 09:08+0200\n"
"PO-Revision-Date: 2013-07-31 18:41+0200\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1235,9 +1235,10 @@ msgid ""
"\n"
"Some variables are replaced in expression, using the format ${variable}, "
"variable can be, by order of priority :\n"
" 1. the name of an option (file.section.option)\n"
" 2. the name of a local variable in buffer\n"
" 3. a hdata name/variable (the value is automatically converted to string), "
" 1. a color (format: color:xxx)\n"
" 2. an option (format: file.section.option)\n"
" 3. a local variable in buffer\n"
" 4. 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"
" hdata.var1.var2...: start with a hdata (pointer must be known), and ask "
po/it.po
+5 -4
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.2-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2013-08-03 15:05+0200\n"
"POT-Creation-Date: 2013-08-04 09:08+0200\n"
"PO-Revision-Date: 2013-07-31 18:41+0200\n"
"Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1327,9 +1327,10 @@ msgid ""
"\n"
"Some variables are replaced in expression, using the format ${variable}, "
"variable can be, by order of priority :\n"
" 1. the name of an option (file.section.option)\n"
" 2. the name of a local variable in buffer\n"
" 3. a hdata name/variable (the value is automatically converted to string), "
" 1. a color (format: color:xxx)\n"
" 2. an option (format: file.section.option)\n"
" 3. a local variable in buffer\n"
" 4. 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"
" hdata.var1.var2...: start with a hdata (pointer must be known), and ask "
po/ja.po
+5 -4
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.2-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2013-08-03 15:05+0200\n"
"POT-Creation-Date: 2013-08-04 09:08+0200\n"
"PO-Revision-Date: 2013-08-02 08:50+0200\n"
"Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
"Language-Team: Japanese <https://github.com/l/WeeChat>\n"
@@ -1312,9 +1312,10 @@ msgid ""
"\n"
"Some variables are replaced in expression, using the format ${variable}, "
"variable can be, by order of priority :\n"
" 1. the name of an option (file.section.option)\n"
" 2. the name of a local variable in buffer\n"
" 3. a hdata name/variable (the value is automatically converted to string), "
" 1. a color (format: color:xxx)\n"
" 2. an option (format: file.section.option)\n"
" 3. a local variable in buffer\n"
" 4. 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"
" hdata.var1.var2...: start with a hdata (pointer must be known), and ask "
po/pl.po
+5 -4
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.2-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2013-08-03 15:05+0200\n"
"POT-Creation-Date: 2013-08-04 09:08+0200\n"
"PO-Revision-Date: 2013-08-02 08:50+0200\n"
"Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1342,9 +1342,10 @@ msgid ""
"\n"
"Some variables are replaced in expression, using the format ${variable}, "
"variable can be, by order of priority :\n"
" 1. the name of an option (file.section.option)\n"
" 2. the name of a local variable in buffer\n"
" 3. a hdata name/variable (the value is automatically converted to string), "
" 1. a color (format: color:xxx)\n"
" 2. an option (format: file.section.option)\n"
" 3. a local variable in buffer\n"
" 4. 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"
" hdata.var1.var2...: start with a hdata (pointer must be known), and ask "
po/pt_BR.po
+5 -4
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.2-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2013-08-03 15:05+0200\n"
"POT-Creation-Date: 2013-08-04 09:08+0200\n"
"PO-Revision-Date: 2013-07-31 18:42+0200\n"
"Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1373,9 +1373,10 @@ msgid ""
"\n"
"Some variables are replaced in expression, using the format ${variable}, "
"variable can be, by order of priority :\n"
" 1. the name of an option (file.section.option)\n"
" 2. the name of a local variable in buffer\n"
" 3. a hdata name/variable (the value is automatically converted to string), "
" 1. a color (format: color:xxx)\n"
" 2. an option (format: file.section.option)\n"
" 3. a local variable in buffer\n"
" 4. 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"
" hdata.var1.var2...: start with a hdata (pointer must be known), and ask "
po/ru.po
+5 -4
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.2-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2013-08-03 15:05+0200\n"
"POT-Creation-Date: 2013-08-04 09:08+0200\n"
"PO-Revision-Date: 2013-07-31 18:42+0200\n"
"Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1256,9 +1256,10 @@ msgid ""
"\n"
"Some variables are replaced in expression, using the format ${variable}, "
"variable can be, by order of priority :\n"
" 1. the name of an option (file.section.option)\n"
" 2. the name of a local variable in buffer\n"
" 3. a hdata name/variable (the value is automatically converted to string), "
" 1. a color (format: color:xxx)\n"
" 2. an option (format: file.section.option)\n"
" 3. a local variable in buffer\n"
" 4. 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"
" hdata.var1.var2...: start with a hdata (pointer must be known), and ask "
po/tr.po
+5 -4
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.2-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2013-08-03 15:05+0200\n"
"POT-Creation-Date: 2013-08-04 09:08+0200\n"
"PO-Revision-Date: 2013-07-31 18:42+0200\n"
"Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1101,9 +1101,10 @@ msgid ""
"\n"
"Some variables are replaced in expression, using the format ${variable}, "
"variable can be, by order of priority :\n"
" 1. the name of an option (file.section.option)\n"
" 2. the name of a local variable in buffer\n"
" 3. a hdata name/variable (the value is automatically converted to string), "
" 1. a color (format: color:xxx)\n"
" 2. an option (format: file.section.option)\n"
" 3. a local variable in buffer\n"
" 4. 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"
" hdata.var1.var2...: start with a hdata (pointer must be known), and ask "
po/weechat.pot
+5 -4
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: 2013-08-03 15:05+0200\n"
"POT-Creation-Date: 2013-08-04 09:08+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"
@@ -1107,9 +1107,10 @@ msgid ""
"\n"
"Some variables are replaced in expression, using the format ${variable}, "
"variable can be, by order of priority :\n"
" 1. the name of an option (file.section.option)\n"
" 2. the name of a local variable in buffer\n"
" 3. a hdata name/variable (the value is automatically converted to string), "
" 1. a color (format: color:xxx)\n"
" 2. an option (format: file.section.option)\n"
" 3. a local variable in buffer\n"
" 4. 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"
" hdata.var1.var2...: start with a hdata (pointer must be known), and ask "
src/core/wee-command.c
+4 -3
View File
@@ -6379,9 +6379,10 @@ command_init ()
" \"50\" > \"100\" ==> 1\n\n"
"Some variables are replaced in expression, using the "
"format ${variable}, variable can be, by order of priority :\n"
" 1. the name of an option (file.section.option)\n"
" 2. the name of a local variable in buffer\n"
" 3. a hdata name/variable (the value is automatically "
" 1. a color (format: color:xxx)\n"
" 2. an option (format: file.section.option)\n"
" 3. a local variable in buffer\n"
" 4. 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"
src/core/wee-eval.c
+15 -8
View File
@@ -215,9 +215,10 @@ end:
/*
* Replaces variables, which can be, by order of priority:
* 1. an extra variable (from hashtable "extra_vars")
* 2. an name of option (file.section.option)
* 3. a buffer local variable
* 4. a hdata name/variable
* 2. a color (format: color:xxx)
* 3. an option (format: file.section.option)
* 4. a buffer local variable
* 5. a hdata name/variable
*
* Examples:
* option: ${weechat.look.scroll_amount}
@@ -245,12 +246,18 @@ eval_replace_vars_cb (void *data, const char *text)
if (ptr_value)
return strdup (ptr_value);
/* 2. look for name of option: if found, return this value */
/* 2. look for a color */
if (strncmp (text, "color:", 6) == 0)
{
ptr_value = gui_color_get_custom (text + 6);
return strdup ((ptr_value) ? ptr_value : "");
}
/* 3. look for name of option: if found, return this value */
if (strncmp (text, "sec.data.", 9) == 0)
{
ptr_value = hashtable_get (secure_hashtable_data, text + 9);
if (ptr_value)
return strdup (ptr_value);
return strdup ((ptr_value) ? ptr_value : "");
}
else
{
@@ -277,7 +284,7 @@ eval_replace_vars_cb (void *data, const char *text)
}
}
/* 3. look for local variable in buffer */
/* 4. look for local variable in buffer */
ptr_buffer = hashtable_get (pointers, "buffer");
if (ptr_buffer)
{
@@ -286,7 +293,7 @@ eval_replace_vars_cb (void *data, const char *text)
return strdup (ptr_value);
}
/* 4. look for hdata */
/* 5. look for hdata */
value = NULL;
hdata_name = NULL;
list_name = NULL;