pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-07-01 07:16:37 +02:00
Code Activity

core: allow mix of commands and hsignals for keys in context "mouse"

Browse Source
This commit is contained in:
Sebastien Helleu
2011-08-10 12:24:23 +02:00
parent fe9aee25a5
commit f841333609
11 changed files with 205 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
po/cs.po
+17 -1
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.6-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2011-08-09 12:39+0200\n"
"POT-Creation-Date: 2011-08-10 12:16+0200\n"
"PO-Revision-Date: 2011-07-05 15:37+0200\n"
"Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -3234,6 +3234,22 @@ msgstr "Chyba: nemohu napojit kalávesu \"%s\""
msgid "Error: not enough memory for key binding"
msgstr "Chyba: nedostatek paměti pro klávesovou zkratku"
#, fuzzy, c-format
msgid "Hashtable focus: %s"
msgstr "Hash tabulka (výstup)"
#, c-format
msgid "Command for key: \"%s\""
msgstr ""
#, c-format
msgid "Sending hsignal: \"%s\""
msgstr ""
#, fuzzy, c-format
msgid "Executing command: \"%s\""
msgstr "výchozí příkaz:"
msgid "Not enough memory for new line"
msgstr "Nedostatek paměti pro nový řádek"
po/de.po
+17 -1
View File
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.6-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2011-08-09 12:39+0200\n"
"POT-Creation-Date: 2011-08-10 12:16+0200\n"
"PO-Revision-Date: 2011-07-14 20:53+0100\n"
"Last-Translator: Nils Görs\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -3408,6 +3408,22 @@ msgstr "Fehler: kann die Taste \"%s\" nicht zuordnen"
msgid "Error: not enough memory for key binding"
msgstr "Fehler: nicht genügend Speicher für Tastenzuordnung"
#, fuzzy, c-format
msgid "Hashtable focus: %s"
msgstr "Hashtable (Ausgabe)"
#, c-format
msgid "Command for key: \"%s\""
msgstr ""
#, c-format
msgid "Sending hsignal: \"%s\""
msgstr ""
#, fuzzy, c-format
msgid "Executing command: \"%s\""
msgstr "Standardbefehl:"
msgid "Not enough memory for new line"
msgstr "Nicht genügend Speicher für eine neue Zeile"
po/es.po
+17 -1
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.6-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2011-08-09 12:39+0200\n"
"POT-Creation-Date: 2011-08-10 12:16+0200\n"
"PO-Revision-Date: 2011-07-05 15:37+0200\n"
"Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -3295,6 +3295,22 @@ msgstr "Error: no es posible crear el atajo \"%s\""
msgid "Error: not enough memory for key binding"
msgstr "Error: no hay suficiente memoria para crear el atajo"
#, fuzzy, c-format
msgid "Hashtable focus: %s"
msgstr "Tabla hash (salida)"
#, c-format
msgid "Command for key: \"%s\""
msgstr ""
#, c-format
msgid "Sending hsignal: \"%s\""
msgstr ""
#, fuzzy, c-format
msgid "Executing command: \"%s\""
msgstr "comando predeterminado:"
msgid "Not enough memory for new line"
msgstr "No hay suficiente memoria para una línea nueva"
po/fr.po
+18 -2
View File
@@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.6-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2011-08-09 12:39+0200\n"
"PO-Revision-Date: 2011-08-09 12:40+0200\n"
"POT-Creation-Date: 2011-08-10 12:16+0200\n"
"PO-Revision-Date: 2011-08-10 12:17+0200\n"
"Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: French\n"
@@ -3401,6 +3401,22 @@ msgstr "Erreur: impossible de créer la touche \"%s\""
msgid "Error: not enough memory for key binding"
msgstr "Erreur: pas assez de mémoire pour la touche"
#, c-format
msgid "Hashtable focus: %s"
msgstr "Hashtable focus: %s"
#, c-format
msgid "Command for key: \"%s\""
msgstr "Commande pour la touche: \"%s\""
#, c-format
msgid "Sending hsignal: \"%s\""
msgstr "Envoi du hsignal: \"%s\""
#, c-format
msgid "Executing command: \"%s\""
msgstr "Lancement de la commande: \"%s\""
msgid "Not enough memory for new line"
msgstr "Pas assez de mémoire pour une nouvelle ligne"
po/hu.po
+17 -1
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.6-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2011-08-09 12:39+0200\n"
"POT-Creation-Date: 2011-08-10 12:16+0200\n"
"PO-Revision-Date: 2011-05-15 10:51+0200\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2917,6 +2917,22 @@ msgstr "%s nem sikerült a(z) \"%s\" billentyűt hozzárendelni\n"
msgid "Error: not enough memory for key binding"
msgstr "%s nincs elég memória a billentyűhozzárendeléshez\n"
#, c-format
msgid "Hashtable focus: %s"
msgstr ""
#, c-format
msgid "Command for key: \"%s\""
msgstr ""
#, c-format
msgid "Sending hsignal: \"%s\""
msgstr ""
#, fuzzy, c-format
msgid "Executing command: \"%s\""
msgstr "%s belső parancsok:\n"
#, fuzzy
msgid "Not enough memory for new line"
msgstr "Nincs elég memória az új sorhoz\n"
po/it.po
+17 -1
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.6-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2011-08-09 12:39+0200\n"
"POT-Creation-Date: 2011-08-10 12:16+0200\n"
"PO-Revision-Date: 2011-07-16 11:32+0200\n"
"Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -3316,6 +3316,22 @@ msgstr "Errore: impossibile associare il testo \"%s\""
msgid "Error: not enough memory for key binding"
msgstr "Errore: memoria non sufficiente per l'associazione tasti"
#, fuzzy, c-format
msgid "Hashtable focus: %s"
msgstr "Tabella hash (output)"
#, c-format
msgid "Command for key: \"%s\""
msgstr ""
#, c-format
msgid "Sending hsignal: \"%s\""
msgstr ""
#, fuzzy, c-format
msgid "Executing command: \"%s\""
msgstr "comando predefinito:"
msgid "Not enough memory for new line"
msgstr "Memoria non sufficiente per una nuova riga"
po/pl.po
+17 -1
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.6-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2011-08-09 12:39+0200\n"
"POT-Creation-Date: 2011-08-10 12:16+0200\n"
"PO-Revision-Date: 2011-07-05 15:38+0200\n"
"Last-Translator: Krzysztof Koroscik <soltys@szluug.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -3272,6 +3272,22 @@ msgstr "Błąd: nie można przypisać klawisza \"%s\""
msgid "Error: not enough memory for key binding"
msgstr "Błąd: za mało pamięci do przypisania klawisza"
#, fuzzy, c-format
msgid "Hashtable focus: %s"
msgstr "Hashtable (wyjście)"
#, c-format
msgid "Command for key: \"%s\""
msgstr ""
#, c-format
msgid "Sending hsignal: \"%s\""
msgstr ""
#, fuzzy, c-format
msgid "Executing command: \"%s\""
msgstr "domyślna komenda:"
msgid "Not enough memory for new line"
msgstr "Za mało pamięci na nowy wiersz"
po/pt_BR.po
+17 -1
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.6-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2011-08-09 12:39+0200\n"
"POT-Creation-Date: 2011-08-10 12:16+0200\n"
"PO-Revision-Date: 2011-05-15 10:52+0200\n"
"Last-Translator: Ivan Sichmann Freitas <ivansichfreitas@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -3171,6 +3171,22 @@ msgstr ""
msgid "Error: not enough memory for key binding"
msgstr ""
#, c-format
msgid "Hashtable focus: %s"
msgstr ""
#, c-format
msgid "Command for key: \"%s\""
msgstr ""
#, c-format
msgid "Sending hsignal: \"%s\""
msgstr ""
#, fuzzy, c-format
msgid "Executing command: \"%s\""
msgstr "comando padrão:"
msgid "Not enough memory for new line"
msgstr ""
po/ru.po
+17 -1
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.6-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2011-08-09 12:39+0200\n"
"POT-Creation-Date: 2011-08-10 12:16+0200\n"
"PO-Revision-Date: 2011-05-15 10:52+0200\n"
"Last-Translator: Pavel Shevchuk <stlwrt@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2937,6 +2937,22 @@ msgstr "%s не могу установить клавишу \"%s\"\n"
msgid "Error: not enough memory for key binding"
msgstr "%s недостаточно памяти для установки клавиши\n"
#, c-format
msgid "Hashtable focus: %s"
msgstr ""
#, c-format
msgid "Command for key: \"%s\""
msgstr ""
#, c-format
msgid "Sending hsignal: \"%s\""
msgstr ""
#, fuzzy, c-format
msgid "Executing command: \"%s\""
msgstr "Внутренние команды %s:\n"
#, fuzzy
msgid "Not enough memory for new line"
msgstr "Недостаточно памяти для новой строчки\n"
po/weechat.pot
+17 -1
View File
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2011-08-09 12:39+0200\n"
"POT-Creation-Date: 2011-08-10 12:16+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2554,6 +2554,22 @@ msgstr ""
msgid "Error: not enough memory for key binding"
msgstr ""
#, c-format
msgid "Hashtable focus: %s"
msgstr ""
#, c-format
msgid "Command for key: \"%s\""
msgstr ""
#, c-format
msgid "Sending hsignal: \"%s\""
msgstr ""
#, c-format
msgid "Executing command: \"%s\""
msgstr ""
msgid "Not enough memory for new line"
msgstr ""
src/gui/gui-key.c
+34 -39
View File
@@ -771,67 +771,62 @@ gui_key_focus_command (const char *key, int context,
if (!matching)
continue;
if ((context == GUI_KEY_CONTEXT_CURSOR) && gui_cursor_debug)
{
gui_input_delete_line (gui_current_window->buffer);
}
hashtable = hook_focus_get_data (focus_info1,
focus_info2,
key);
if (debug)
{
gui_chat_printf (NULL, "Hashtable focus: %s",
gui_chat_printf (NULL, _("Hashtable focus: %s"),
hashtable_get_string (hashtable,
"keys_values_sorted"));
gui_chat_printf (NULL, _("Command for key: \"%s\""),
ptr_key->command);
}
if (string_strncasecmp (ptr_key->command, "hsignal:", 8) == 0)
commands = string_split_command (ptr_key->command, ';');
if (commands)
{
if (ptr_key->command[8])
for (i = 0; commands[i]; i++)
{
if (debug)
if (string_strncasecmp (commands[i], "hsignal:", 8) == 0)
{
gui_chat_printf (NULL, "Sending hsignal \"%s\"",
ptr_key->command + 8);
}
hook_hsignal_send (ptr_key->command + 8, hashtable);
}
}
else
{
command = string_replace_with_hashtable (ptr_key->command,
hashtable,
&errors);
if (command)
{
if (errors == 0)
{
if (debug)
if (commands[i][8])
{
gui_chat_printf (NULL,
"Executing command: %s (%s)",
command, ptr_key->command);
}
if ((context == GUI_KEY_CONTEXT_CURSOR) && gui_cursor_debug)
{
gui_input_delete_line (gui_current_window->buffer);
}
commands = string_split_command (command, ';');
if (commands)
{
for (i = 0; commands[i]; i++)
if (debug)
{
input_data (gui_current_window->buffer, commands[i]);
gui_chat_printf (NULL,
_("Sending hsignal: \"%s\""),
commands[i] + 8);
}
string_free_split_command (commands);
hook_hsignal_send (commands[i] + 8, hashtable);
}
}
else
{
if (debug)
command = string_replace_with_hashtable (commands[i],
hashtable,
&errors);
if (command)
{
gui_chat_printf (NULL,
"Command NOT executed (%s)",
ptr_key->command);
if (errors == 0)
{
if (debug)
{
gui_chat_printf (NULL,
_("Executing command: \"%s\""),
command);
}
input_data (gui_current_window->buffer, command);
}
free (command);
}
}
free (command);
}
string_free_split_command (commands);
}
if (hashtable)
hashtable_free (hashtable);