diff options
| -rw-r--r-- | ChangeLog.adoc | 2 | ||||
| -rw-r--r-- | doc/de/includes/autogen_user_commands.de.adoc | 94 | ||||
| -rw-r--r-- | doc/en/includes/autogen_user_commands.en.adoc | 2 | ||||
| -rw-r--r-- | doc/fr/includes/autogen_user_commands.fr.adoc | 2 | ||||
| -rw-r--r-- | doc/it/includes/autogen_user_commands.it.adoc | 2 | ||||
| -rw-r--r-- | doc/ja/includes/autogen_user_commands.ja.adoc | 2 | ||||
| -rw-r--r-- | doc/pl/includes/autogen_user_commands.pl.adoc | 2 | ||||
| -rw-r--r-- | doc/sr/includes/autogen_user_commands.sr.adoc | 2 | ||||
| -rw-r--r-- | po/cs.po | 5 | ||||
| -rw-r--r-- | po/de.po | 75 | ||||
| -rw-r--r-- | po/es.po | 5 | ||||
| -rw-r--r-- | po/fr.po | 11 | ||||
| -rw-r--r-- | po/hu.po | 5 | ||||
| -rw-r--r-- | po/it.po | 5 | ||||
| -rw-r--r-- | po/ja.po | 5 | ||||
| -rw-r--r-- | po/pl.po | 5 | ||||
| -rw-r--r-- | po/pt.po | 5 | ||||
| -rw-r--r-- | po/pt_BR.po | 5 | ||||
| -rw-r--r-- | po/ru.po | 5 | ||||
| -rw-r--r-- | po/sr.po | 5 | ||||
| -rw-r--r-- | po/tr.po | 5 | ||||
| -rw-r--r-- | po/weechat.pot | 5 | ||||
| -rw-r--r-- | src/core/wee-command.c | 33 |
23 files changed, 207 insertions, 80 deletions
diff --git a/ChangeLog.adoc b/ChangeLog.adoc index 99cfa0285..7de0dfadc 100644 --- a/ChangeLog.adoc +++ b/ChangeLog.adoc @@ -20,7 +20,7 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes] New features:: - * core: use human readable key bindings, separate keys with comma in combos, remove modifier "meta2-" (issue #1238, task #10317) + * core: use human readable key bindings, separate keys with comma in combos, remove modifier "meta2-", add option `legacy` in command `/key` (issue #1238, task #10317) * core: make keys normal options, so they are shown and can be updated with `/set` and `/fset` commands (task #12427, task #11783) * core: add key kbd:[Alt+K] (upper case) to grab raw key and its command (issue #1238) * core: add option `key` in command `/debug` (issue #1238) diff --git a/doc/de/includes/autogen_user_commands.de.adoc b/doc/de/includes/autogen_user_commands.de.adoc index 1fb61c936..164a4c290 100644 --- a/doc/de/includes/autogen_user_commands.de.adoc +++ b/doc/de/includes/autogen_user_commands.de.adoc @@ -1778,54 +1778,56 @@ Beispiele: resetctxt <context> <key> resetall -yes [<context>] missing [<context>] - - list: zeigt die aktuelle Tastenbelegungen an (ohne Angabe von Argumente wird diese Liste standardmäßig ausgegeben) -listdefault: zeigt die Standardeinstellung der Tastenbelegung an - listdiff: zeigt die Unterschiede zwischen der aktuell genutzten Tastaturbelegung und der Standardbelegung an (hinzugefügte/verändert/gelöschte Tastenbelegungen) - context: Name des Kontextes ("default" oder "search") - bind: belegt eine Taste mit einem Befehl oder zeigt an welcher Befehl auf eine Taste gelegt wurde (für Kontext "default") - bindctxt: belegt eine Taste mit einem Befehl oder zeigt an welcher Befehl auf eine Taste gelegt wurde, dies trifft für Kontext definierte Tasten zu - command: Befehl (mehrere Befehle werden durch ein Semikolon getrennt) - unbind: hebt eine Tastenbelegung auf (für Kontext "default") - unbindctxt: hebt eine Tastenbelegung für den angegebenen Kontext auf - reset: die Tastenbelegung wird für die ausgewählte Taste auf die Standardeinstellung zurück gesetzt (für Kontext "default") - resetctxt: die Tastenbelegung wird für die ausgewählte Taste auf die Standardeinstellung zurück gesetzt, dies trifft für den ausgewählten Kontext zu - resetall: die Tastenbelegung wird auf die Standardeinstellungen zurück gesetzt. Dies löscht ALLE persönlichen Tastenbelegungen (Vorsicht!) - missing: fügt fehlende Tastenbelegungen hinzu (dazu wird die Standardbelegung genutzt). Dies kann sinnvoll sein wenn man auf eine neue WeeChat Version umgestiegen ist - -Falls ein Befehl einer Taste zugeordnet werden soll ist es ratsam zuerst mit der Tastenkombination alt+k (oder Esc + k) einen Fangmodus zu aktivieren um damit die zu belegende Taste zu ermitteln. Durch diesen Schritt wird der benötigte Tasten-Code in die Befehlszeile übernommen. - -Zulässige Modifikatortasten (in dieser Reihenfolge, wenn mehrere verwendet werden): -meta- (Alt-Taste) -Strg- (Steuertaste) -Shift- (Umschalttaste, kann nur mit Tastennamen unten verwendet werden) - -Zulässige Tastennamen: f0 bis f20, Pos1, Einfügen, Löschen, Ende, Rücktaste, Bild auf, Bild ab, hoch, runter, rechts, links, Tab, Return, Komma, Leerzeichen. - -Tastenkombinationen müssen durch ein Komma getrennt werden. - -Für Kontext "mouse" (Kontext "cursor" ist auch möglich), hat der zu verwendende Schlüssel folgendes Format: "@area:Schlüssel" oder "@area1>area2:Schlüssel". "area" kann folgende Werte habe: - *: jedweder Bereich des Bildschirms - chat: Chatbereich (für jeden Buffer) - chat(xxx): Chatbereich für einen Buffer mit dem Namen "xxx" (vollständiger Name mit Erweiterung. Beispiel: chat(perl.iset):) - bar(*): beliebige Bar - bar(xxx): Bar mit dem Namen "xxx" - item(*): beliebiges Bar-Item - item(xxx): Bar-Item mit Namen "xxx" -Der Platzhalter "*" kann verwendet werden um mehrere unterschiedliche Mausereignisse auszuwählen. -Für den Kontext "mouse" kann ein besonderer Übergabewert für den zu nutzenden Befehl verwendet werden, "hsignal:name". Dieses sendet das hsignal "name" und als Inhalt ein Hashtable als Argument. -Ein weiterer Übergabewert ist "-" und kann genutzt werden um einen Schlüssel zu deaktivieren (der Schlüssel wird bei der Durchführung übersprungen). - -Beispiele: - Mit der Tastenkombination "alt-t" wird die Nicklist-Bar an-und aus geschaltet: - /key bind meta-t /bar toggle nicklist - Mit der Tastenkombination "alt-r" wird direkt zum IRC #weechat Buffer gewechselt: + legacy <key> [<key>...] + + list: list all current keys +listdefault: list default keys + listdiff: list differences between current and default keys (keys added, redefined or deleted) + context: name of context ("default" or "search") + bind: bind a command to a key or display command bound to key (for context "default") + bindctxt: bind a command to a key or display command bound to key, for given context + command: command (many commands can be separated by semicolons) + unbind: remove a key binding (for context "default") + unbindctxt: remove a key binding for given context + reset: reset a key to default binding (for context "default") + resetctxt: reset a key to default binding, for given context + resetall: restore bindings to the default values and delete ALL personal bindings (use carefully!) + missing: add missing keys (using default bindings), useful after installing new WeeChat version + legacy: display new name for legacy keys + +When binding a command to a key, it is recommended to use key alt+k (or Esc then k), and then press the key to bind: this will insert key name in command line. + +Modifiers allowed (in this order when multiple are used): + meta- (alt key) + ctrl- (control key) + shift- (shift key, can only be used with key names below) + +Key names allowed: f0 to f20, home, insert, delete, end, backspace, pgup, pgdn, up, down, right, left, tab, return, comma, space. + +Combo of keys must be separated by a comma. + +For context "mouse" (possible in context "cursor" too), key has format: "@area:key" or "@area1>area2:key" where area can be: + *: any area on screen + chat: chat area (any buffer) + chat(xxx): chat area for buffer with name "xxx" (full name including plugin) + bar(*): any bar + bar(xxx): bar "xxx" + item(*): any bar item + item(xxx): bar item "xxx" +Wildcard "*" is allowed in key to match many mouse events. +A special value for command with format "hsignal:name" can be used for context mouse, this will send the hsignal "name" with the focus hashtable as argument. +Another special value "-" can be used to disable key (it will be ignored when looking for keys). + +Examples: + key alt-r to jump to #weechat IRC channel: /key bind meta-r /buffer #weechat - Die Tastenkombination "alt-r" wird auf die Standardfunktion zurückgesetzt: + restore default binding for key alt-r: /key reset meta-r - "Tab"-Taste nutzen um im Kontext "search" die Suche innerhalb eines Buffers zu beenden: - /key bindctxt search ctrl-i /input search_stop - Auswahl eines Nicknamens mittels mittlerer Maustaste zeigt zusätzliche Informationen zu dem Nick an: + key meta-v then f1 to run /help: + /key bind meta-v,f1 /help + key "tab" to stop search in buffer: + /key bindctxt search tab /input search_stop + middle button of mouse on a nick to retrieve info on nick: /key bindctxt mouse @item(buffer_nicklist):button3 /msg nickserv info ${nick} ---- diff --git a/doc/en/includes/autogen_user_commands.en.adoc b/doc/en/includes/autogen_user_commands.en.adoc index f1ca66e4f..c36957057 100644 --- a/doc/en/includes/autogen_user_commands.en.adoc +++ b/doc/en/includes/autogen_user_commands.en.adoc @@ -1778,6 +1778,7 @@ Examples: resetctxt <context> <key> resetall -yes [<context>] missing [<context>] + legacy <key> [<key>...] list: list all current keys listdefault: list default keys @@ -1792,6 +1793,7 @@ listdefault: list default keys resetctxt: reset a key to default binding, for given context resetall: restore bindings to the default values and delete ALL personal bindings (use carefully!) missing: add missing keys (using default bindings), useful after installing new WeeChat version + legacy: display new name for legacy keys When binding a command to a key, it is recommended to use key alt+k (or Esc then k), and then press the key to bind: this will insert key name in command line. diff --git a/doc/fr/includes/autogen_user_commands.fr.adoc b/doc/fr/includes/autogen_user_commands.fr.adoc index baf59643a..4df8fcd19 100644 --- a/doc/fr/includes/autogen_user_commands.fr.adoc +++ b/doc/fr/includes/autogen_user_commands.fr.adoc @@ -1778,6 +1778,7 @@ Exemples : resetctxt <contexte> <touche> resetall -yes [<contexte>] missing [<contexte>] + legacy <touche> [<touche>...] list : afficher toutes les touches courantes (sans paramètre, cette liste est affichée) listdefault : afficher les touches par défaut @@ -1792,6 +1793,7 @@ listdefault : afficher les touches par défaut resetctxt : réinitialiser une touche à son association par défaut pour le contexte donné resetall : restaurer les touches aux valeurs par défaut et supprimer TOUTES les touches personnelles (utiliser avec précaution !) missing : ajouter les touches manquantes (en utilisant les touches par défaut), pratique après installation d'une nouvelle version de WeeChat + legacy : afficher le nouveau nom pour des anciennes touches Lors de l'association d'une commande à une touche, il est recommandé d'utiliser la touche alt+k (ou Échap puis k), et puis de presser la touche à associer : cela insère le code de la touche dans la ligne de commande. diff --git a/doc/it/includes/autogen_user_commands.it.adoc b/doc/it/includes/autogen_user_commands.it.adoc index 2b8ccba16..a77a4cb36 100644 --- a/doc/it/includes/autogen_user_commands.it.adoc +++ b/doc/it/includes/autogen_user_commands.it.adoc @@ -1778,6 +1778,7 @@ Examples: resetctxt <context> <key> resetall -yes [<context>] missing [<context>] + legacy <key> [<key>...] list: list all current keys listdefault: list default keys @@ -1792,6 +1793,7 @@ listdefault: list default keys resetctxt: reset a key to default binding, for given context resetall: restore bindings to the default values and delete ALL personal bindings (use carefully!) missing: add missing keys (using default bindings), useful after installing new WeeChat version + legacy: display new name for legacy keys When binding a command to a key, it is recommended to use key alt+k (or Esc then k), and then press the key to bind: this will insert key name in command line. diff --git a/doc/ja/includes/autogen_user_commands.ja.adoc b/doc/ja/includes/autogen_user_commands.ja.adoc index d195ca94b..de5d3a07f 100644 --- a/doc/ja/includes/autogen_user_commands.ja.adoc +++ b/doc/ja/includes/autogen_user_commands.ja.adoc @@ -1778,6 +1778,7 @@ Examples: resetctxt <context> <key> resetall -yes [<context>] missing [<context>] + legacy <key> [<key>...] list: list all current keys listdefault: list default keys @@ -1792,6 +1793,7 @@ listdefault: list default keys resetctxt: reset a key to default binding, for given context resetall: restore bindings to the default values and delete ALL personal bindings (use carefully!) missing: add missing keys (using default bindings), useful after installing new WeeChat version + legacy: display new name for legacy keys When binding a command to a key, it is recommended to use key alt+k (or Esc then k), and then press the key to bind: this will insert key name in command line. diff --git a/doc/pl/includes/autogen_user_commands.pl.adoc b/doc/pl/includes/autogen_user_commands.pl.adoc index 7a3517b36..a8cceb750 100644 --- a/doc/pl/includes/autogen_user_commands.pl.adoc +++ b/doc/pl/includes/autogen_user_commands.pl.adoc @@ -1777,6 +1777,7 @@ Przykłady: resetctxt <context> <key> resetall -yes [<context>] missing [<context>] + legacy <key> [<key>...] list: list all current keys listdefault: list default keys @@ -1791,6 +1792,7 @@ listdefault: list default keys resetctxt: reset a key to default binding, for given context resetall: restore bindings to the default values and delete ALL personal bindings (use carefully!) missing: add missing keys (using default bindings), useful after installing new WeeChat version + legacy: display new name for legacy keys When binding a command to a key, it is recommended to use key alt+k (or Esc then k), and then press the key to bind: this will insert key name in command line. diff --git a/doc/sr/includes/autogen_user_commands.sr.adoc b/doc/sr/includes/autogen_user_commands.sr.adoc index e26c66450..e29fe5dcb 100644 --- a/doc/sr/includes/autogen_user_commands.sr.adoc +++ b/doc/sr/includes/autogen_user_commands.sr.adoc @@ -1778,6 +1778,7 @@ addreplace: додаје или мења постојећу прилагођен resetctxt <context> <key> resetall -yes [<context>] missing [<context>] + legacy <key> [<key>...] list: list all current keys listdefault: list default keys @@ -1792,6 +1793,7 @@ listdefault: list default keys resetctxt: reset a key to default binding, for given context resetall: restore bindings to the default values and delete ALL personal bindings (use carefully!) missing: add missing keys (using default bindings), useful after installing new WeeChat version + legacy: display new name for legacy keys When binding a command to a key, it is recommended to use key alt+k (or Esc then k), and then press the key to bind: this will insert key name in command line. @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-03-19 17:43+0100\n" +"POT-Creation-Date: 2023-03-24 23:04+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -2066,7 +2066,7 @@ msgid "" "[list|listdefault|listdiff] [<context>] || bind <key> [<command> [<args>]] " "|| bindctxt <context> <key> [<command> [<args>]] || unbind <key> || " "unbindctxt <context> <key> || reset <key> || resetctxt <context> <key> || " -"resetall -yes [<context>] || missing [<context>]" +"resetall -yes [<context>] || missing [<context>] || legacy <key> [<key>...]" msgstr "" "list|listdefault|listdiff || bind <klávesa> [<příkaz> [<argumenty>]] || " "unbind <klávesa> || reset <klávesa> || resetall -yes || missing" @@ -2091,6 +2091,7 @@ msgid "" "bindings (use carefully!)\n" " missing: add missing keys (using default bindings), useful after " "installing new WeeChat version\n" +" legacy: display new name for legacy keys\n" "\n" "When binding a command to a key, it is recommended to use key alt+k (or Esc " "then k), and then press the key to bind: this will insert key name in " @@ -26,7 +26,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-03-19 17:43+0100\n" +"POT-Creation-Date: 2023-03-24 23:04+0100\n" "PO-Revision-Date: 2023-03-19 19:52+0100\n" "Last-Translator: Nils Görs <weechatter@arcor.de>\n" "Language-Team: German - Germany <weechatter@arcor.de>\n" @@ -2545,17 +2545,87 @@ msgstr "" msgid "bind/unbind keys" msgstr "Einer Taste einen Befehl zuordnen oder entfernen" +#, fuzzy +#| msgid "" +#| "[list|listdefault|listdiff] [<context>] || bind <key> [<command> " +#| "[<args>]] || bindctxt <context> <key> [<command> [<args>]] || unbind " +#| "<key> || unbindctxt <context> <key> || reset <key> || resetctxt <context> " +#| "<key> || resetall -yes [<context>] || missing [<context>]" msgid "" "[list|listdefault|listdiff] [<context>] || bind <key> [<command> [<args>]] " "|| bindctxt <context> <key> [<command> [<args>]] || unbind <key> || " "unbindctxt <context> <key> || reset <key> || resetctxt <context> <key> || " -"resetall -yes [<context>] || missing [<context>]" +"resetall -yes [<context>] || missing [<context>] || legacy <key> [<key>...]" msgstr "" "[list|listdefault|listdiff] [<context>] || bind <key> [<command> [<args>]] " "|| bindctxt <context> <key> [<command> [<args>]] || unbind <key> || " "unbindctxt <context> <key> || reset <key> || resetctxt <context> <key> || " "resetall -yes [<context>] || missing [<context>]" +#, fuzzy +#| msgid "" +#| " list: list all current keys\n" +#| "listdefault: list default keys\n" +#| " listdiff: list differences between current and default keys (keys " +#| "added, redefined or deleted)\n" +#| " context: name of context (\"default\" or \"search\")\n" +#| " bind: bind a command to a key or display command bound to key (for " +#| "context \"default\")\n" +#| " bindctxt: bind a command to a key or display command bound to key, for " +#| "given context\n" +#| " command: command (many commands can be separated by semicolons)\n" +#| " unbind: remove a key binding (for context \"default\")\n" +#| " unbindctxt: remove a key binding for given context\n" +#| " reset: reset a key to default binding (for context \"default\")\n" +#| " resetctxt: reset a key to default binding, for given context\n" +#| " resetall: restore bindings to the default values and delete ALL " +#| "personal bindings (use carefully!)\n" +#| " missing: add missing keys (using default bindings), useful after " +#| "installing new WeeChat version\n" +#| "\n" +#| "When binding a command to a key, it is recommended to use key alt+k (or " +#| "Esc then k), and then press the key to bind: this will insert key name in " +#| "command line.\n" +#| "\n" +#| "Modifiers allowed (in this order when multiple are used):\n" +#| " meta- (alt key)\n" +#| " ctrl- (control key)\n" +#| " shift- (shift key, can only be used with key names below)\n" +#| "\n" +#| "Key names allowed: f0 to f20, home, insert, delete, end, backspace, pgup, " +#| "pgdn, up, down, right, left, tab, return, comma, space.\n" +#| "\n" +#| "Combo of keys must be separated by a comma.\n" +#| "\n" +#| "For context \"mouse\" (possible in context \"cursor\" too), key has " +#| "format: \"@area:key\" or \"@area1>area2:key\" where area can be:\n" +#| " *: any area on screen\n" +#| " chat: chat area (any buffer)\n" +#| " chat(xxx): chat area for buffer with name \"xxx\" (full name including " +#| "plugin)\n" +#| " bar(*): any bar\n" +#| " bar(xxx): bar \"xxx\"\n" +#| " item(*): any bar item\n" +#| " item(xxx): bar item \"xxx\"\n" +#| "Wildcard \"*\" is allowed in key to match many mouse events.\n" +#| "A special value for command with format \"hsignal:name\" can be used for " +#| "context mouse, this will send the hsignal \"name\" with the focus " +#| "hashtable as argument.\n" +#| "Another special value \"-\" can be used to disable key (it will be " +#| "ignored when looking for keys).\n" +#| "\n" +#| "Examples:\n" +#| " key alt-r to jump to #weechat IRC channel:\n" +#| " /key bind meta-r /buffer #weechat\n" +#| " restore default binding for key alt-r:\n" +#| " /key reset meta-r\n" +#| " key meta-v then f1 to run /help:\n" +#| " /key bind meta-v,f1 /help\n" +#| " key \"tab\" to stop search in buffer:\n" +#| " /key bindctxt search tab /input search_stop\n" +#| " middle button of mouse on a nick to retrieve info on nick:\n" +#| " /key bindctxt mouse @item(buffer_nicklist):button3 /msg nickserv info " +#| "${nick}" msgid "" " list: list all current keys\n" "listdefault: list default keys\n" @@ -2575,6 +2645,7 @@ msgid "" "bindings (use carefully!)\n" " missing: add missing keys (using default bindings), useful after " "installing new WeeChat version\n" +" legacy: display new name for legacy keys\n" "\n" "When binding a command to a key, it is recommended to use key alt+k (or Esc " "then k), and then press the key to bind: this will insert key name in " @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-03-19 17:43+0100\n" +"POT-Creation-Date: 2023-03-24 23:04+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: Santiago Forero <santiago@forero.xyz>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -2555,7 +2555,7 @@ msgid "" "[list|listdefault|listdiff] [<context>] || bind <key> [<command> [<args>]] " "|| bindctxt <context> <key> [<command> [<args>]] || unbind <key> || " "unbindctxt <context> <key> || reset <key> || resetctxt <context> <key> || " -"resetall -yes [<context>] || missing [<context>]" +"resetall -yes [<context>] || missing [<context>] || legacy <key> [<key>...]" msgstr "" "list|listdefault|listdiff [<contexto>] || bind <tecla> [<comando> " "[<argumentos>]] || bindctxt <contexto> <tecla> [<comando> [<argumentos>]] || " @@ -2583,6 +2583,7 @@ msgid "" "bindings (use carefully!)\n" " missing: add missing keys (using default bindings), useful after " "installing new WeeChat version\n" +" legacy: display new name for legacy keys\n" "\n" "When binding a command to a key, it is recommended to use key alt+k (or Esc " "then k), and then press the key to bind: this will insert key name in " @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-03-19 17:43+0100\n" -"PO-Revision-Date: 2023-03-19 17:45+0100\n" +"POT-Creation-Date: 2023-03-24 23:04+0100\n" +"PO-Revision-Date: 2023-03-24 23:05+0100\n" "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language: fr\n" @@ -2496,12 +2496,13 @@ msgid "" "[list|listdefault|listdiff] [<context>] || bind <key> [<command> [<args>]] " "|| bindctxt <context> <key> [<command> [<args>]] || unbind <key> || " "unbindctxt <context> <key> || reset <key> || resetctxt <context> <key> || " -"resetall -yes [<context>] || missing [<context>]" +"resetall -yes [<context>] || missing [<context>] || legacy <key> [<key>...]" msgstr "" "[list|listdefault|listdiff] [<contexte>] || bind <touche> [<commande> " "[<args>]] || bindctxt <contexte> <touche> [<commande> [<args>]] || unbind " "<touche> || unbindctxt <contexte> <touche> || reset <touche> || resetctxt " -"<contexte> <touche> || resetall -yes [<contexte>] || missing [<contexte>]" +"<contexte> <touche> || resetall -yes [<contexte>] || missing [<contexte>] || " +"legacy <touche> [<touche>...]" msgid "" " list: list all current keys\n" @@ -2522,6 +2523,7 @@ msgid "" "bindings (use carefully!)\n" " missing: add missing keys (using default bindings), useful after " "installing new WeeChat version\n" +" legacy: display new name for legacy keys\n" "\n" "When binding a command to a key, it is recommended to use key alt+k (or Esc " "then k), and then press the key to bind: this will insert key name in " @@ -2588,6 +2590,7 @@ msgstr "" "TOUTES les touches personnelles (utiliser avec précaution !)\n" " missing : ajouter les touches manquantes (en utilisant les touches par " "défaut), pratique après installation d'une nouvelle version de WeeChat\n" +" legacy : afficher le nouveau nom pour des anciennes touches\n" "\n" "Lors de l'association d'une commande à une touche, il est recommandé " "d'utiliser la touche alt+k (ou Échap puis k), et puis de presser la touche à " @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-03-19 17:43+0100\n" +"POT-Creation-Date: 2023-03-24 23:04+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -1901,7 +1901,7 @@ msgid "" "[list|listdefault|listdiff] [<context>] || bind <key> [<command> [<args>]] " "|| bindctxt <context> <key> [<command> [<args>]] || unbind <key> || " "unbindctxt <context> <key> || reset <key> || resetctxt <context> <key> || " -"resetall -yes [<context>] || missing [<context>]" +"resetall -yes [<context>] || missing [<context>] || legacy <key> [<key>...]" msgstr "" "[billentyű [funkció/parancs]] [unbind billentyű] [funkciók] [call funkció " "[\"paraméterek\"]] [reset -yes]" @@ -1926,6 +1926,7 @@ msgid "" "bindings (use carefully!)\n" " missing: add missing keys (using default bindings), useful after " "installing new WeeChat version\n" +" legacy: display new name for legacy keys\n" "\n" "When binding a command to a key, it is recommended to use key alt+k (or Esc " "then k), and then press the key to bind: this will insert key name in " @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-03-19 17:43+0100\n" +"POT-Creation-Date: 2023-03-24 23:04+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -2151,7 +2151,7 @@ msgid "" "[list|listdefault|listdiff] [<context>] || bind <key> [<command> [<args>]] " "|| bindctxt <context> <key> [<command> [<args>]] || unbind <key> || " "unbindctxt <context> <key> || reset <key> || resetctxt <context> <key> || " -"resetall -yes [<context>] || missing [<context>]" +"resetall -yes [<context>] || missing [<context>] || legacy <key> [<key>...]" msgstr "" "list|listdefault|listdiff [<contesto>] || bind <tasto> [<comando> [<arg>]] " "|| bindctxt <contesto> <tasto> [<comando> <arg>]] || unbind <tasto> || " @@ -2178,6 +2178,7 @@ msgid "" "bindings (use carefully!)\n" " missing: add missing keys (using default bindings), useful after " "installing new WeeChat version\n" +" legacy: display new name for legacy keys\n" "\n" "When binding a command to a key, it is recommended to use key alt+k (or Esc " "then k), and then press the key to bind: this will insert key name in " @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-03-19 17:43+0100\n" +"POT-Creation-Date: 2023-03-24 23:04+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n" "Language-Team: Japanese <https://github.com/l/weechat/tree/master/" @@ -2471,7 +2471,7 @@ msgid "" "[list|listdefault|listdiff] [<context>] || bind <key> [<command> [<args>]] " "|| bindctxt <context> <key> [<command> [<args>]] || unbind <key> || " "unbindctxt <context> <key> || reset <key> || resetctxt <context> <key> || " -"resetall -yes [<context>] || missing [<context>]" +"resetall -yes [<context>] || missing [<context>] || legacy <key> [<key>...]" msgstr "" "list|listdefault|listdiff [<context>] || bind <key> [<command> [<args>]] || " "bindctxt <context> <key> [<command> [<args>]] || unbind <key> || unbindctxt " @@ -2552,6 +2552,7 @@ msgid "" "bindings (use carefully!)\n" " missing: add missing keys (using default bindings), useful after " "installing new WeeChat version\n" +" legacy: display new name for legacy keys\n" "\n" "When binding a command to a key, it is recommended to use key alt+k (or Esc " "then k), and then press the key to bind: this will insert key name in " @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-03-19 17:43+0100\n" +"POT-Creation-Date: 2023-03-24 23:04+0100\n" "PO-Revision-Date: 2022-12-30 14:10+0100\n" "Last-Translator: Krzysztof Korościk <soltys@soltys.info>\n" "Language-Team: Polish <kde-i18n-doc@kde.org>\n" @@ -2776,7 +2776,7 @@ msgid "" "[list|listdefault|listdiff] [<context>] || bind <key> [<command> [<args>]] " "|| bindctxt <context> <key> [<command> [<args>]] || unbind <key> || " "unbindctxt <context> <key> || reset <key> || resetctxt <context> <key> || " -"resetall -yes [<context>] || missing [<context>]" +"resetall -yes [<context>] || missing [<context>] || legacy <key> [<key>...]" msgstr "" "list|listdefault|listdiff [<kontekst>] || bind <klawisz> [<komenda> " "[<argumenty>]] || bindctxt <kontekst> <klawisz> [<komenda> [<argumenty>]] || " @@ -2858,6 +2858,7 @@ msgid "" "bindings (use carefully!)\n" " missing: add missing keys (using default bindings), useful after " "installing new WeeChat version\n" +" legacy: display new name for legacy keys\n" "\n" "When binding a command to a key, it is recommended to use key alt+k (or Esc " "then k), and then press the key to bind: this will insert key name in " @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-03-19 17:43+0100\n" +"POT-Creation-Date: 2023-03-24 23:04+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n" "Language-Team: Portuguese <>\n" @@ -2465,7 +2465,7 @@ msgid "" "[list|listdefault|listdiff] [<context>] || bind <key> [<command> [<args>]] " "|| bindctxt <context> <key> [<command> [<args>]] || unbind <key> || " "unbindctxt <context> <key> || reset <key> || resetctxt <context> <key> || " -"resetall -yes [<context>] || missing [<context>]" +"resetall -yes [<context>] || missing [<context>] || legacy <key> [<key>...]" msgstr "" "list|listdefault|listdiff [<contexto>] || bind <tecla> [<comando> " "[<argumentos>]] || bindctxt <contexto> <tecla> [<comando> [<argumentos>]] || " @@ -2547,6 +2547,7 @@ msgid "" "bindings (use carefully!)\n" " missing: add missing keys (using default bindings), useful after " "installing new WeeChat version\n" +" legacy: display new name for legacy keys\n" "\n" "When binding a command to a key, it is recommended to use key alt+k (or Esc " "then k), and then press the key to bind: this will insert key name in " diff --git a/po/pt_BR.po b/po/pt_BR.po index 281e903da..55f74bfdb 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-03-19 17:43+0100\n" +"POT-Creation-Date: 2023-03-24 23:04+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: Érico Nogueira <ericonr@disroot.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -2220,7 +2220,7 @@ msgid "" "[list|listdefault|listdiff] [<context>] || bind <key> [<command> [<args>]] " "|| bindctxt <context> <key> [<command> [<args>]] || unbind <key> || " "unbindctxt <context> <key> || reset <key> || resetctxt <context> <key> || " -"resetall -yes [<context>] || missing [<context>]" +"resetall -yes [<context>] || missing [<context>] || legacy <key> [<key>...]" msgstr "" "list|listdefault|listdiff [<contexto>] || bind <tecla> [<comando> " "[<argumentos>]] || bindctxt <contexto> <tecla> [<comando> [<argumentos>]] || " @@ -2248,6 +2248,7 @@ msgid "" "bindings (use carefully!)\n" " missing: add missing keys (using default bindings), useful after " "installing new WeeChat version\n" +" legacy: display new name for legacy keys\n" "\n" "When binding a command to a key, it is recommended to use key alt+k (or Esc " "then k), and then press the key to bind: this will insert key name in " @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-03-19 17:43+0100\n" +"POT-Creation-Date: 2023-03-24 23:04+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -1922,7 +1922,7 @@ msgid "" "[list|listdefault|listdiff] [<context>] || bind <key> [<command> [<args>]] " "|| bindctxt <context> <key> [<command> [<args>]] || unbind <key> || " "unbindctxt <context> <key> || reset <key> || resetctxt <context> <key> || " -"resetall -yes [<context>] || missing [<context>]" +"resetall -yes [<context>] || missing [<context>] || legacy <key> [<key>...]" msgstr "" "[клавиша [функция/команда]] [unbind клавиша] [функции] [call функция " "[\"аргументы\"]] [reset -yes]" @@ -1947,6 +1947,7 @@ msgid "" "bindings (use carefully!)\n" " missing: add missing keys (using default bindings), useful after " "installing new WeeChat version\n" +" legacy: display new name for legacy keys\n" "\n" "When binding a command to a key, it is recommended to use key alt+k (or Esc " "then k), and then press the key to bind: this will insert key name in " @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-03-19 17:43+0100\n" +"POT-Creation-Date: 2023-03-24 23:04+0100\n" "PO-Revision-Date: 2023-02-01 14:25+0400\n" "Last-Translator: Ivan Pešić <ivan.pesic@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -2760,7 +2760,7 @@ msgid "" "[list|listdefault|listdiff] [<context>] || bind <key> [<command> [<args>]] " "|| bindctxt <context> <key> [<command> [<args>]] || unbind <key> || " "unbindctxt <context> <key> || reset <key> || resetctxt <context> <key> || " -"resetall -yes [<context>] || missing [<context>]" +"resetall -yes [<context>] || missing [<context>] || legacy <key> [<key>...]" msgstr "" "list|listdefault|listdiff [<контекст>] || bind <тастер> [<команда> [<арг>]] " "|| bindctxt <контекст> <тастер> [<команда> [<арг>]] || unbind <тастер> || " @@ -2841,6 +2841,7 @@ msgid "" "bindings (use carefully!)\n" " missing: add missing keys (using default bindings), useful after " "installing new WeeChat version\n" +" legacy: display new name for legacy keys\n" "\n" "When binding a command to a key, it is recommended to use key alt+k (or Esc " "then k), and then press the key to bind: this will insert key name in " @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-03-19 17:43+0100\n" +"POT-Creation-Date: 2023-03-24 23:04+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: Emir SARI <emir_sari@icloud.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -2815,7 +2815,7 @@ msgid "" "[list|listdefault|listdiff] [<context>] || bind <key> [<command> [<args>]] " "|| bindctxt <context> <key> [<command> [<args>]] || unbind <key> || " "unbindctxt <context> <key> || reset <key> || resetctxt <context> <key> || " -"resetall -yes [<context>] || missing [<context>]" +"resetall -yes [<context>] || missing [<context>] || legacy <key> [<key>...]" msgstr "" "list|listdefault|listdiff [<bağlam>] || bind <düğme> [<komut> " "[<argümanlar>]] || bindctxt <bağlam> <düğme> [<komut> [<argümanlar>]] || " @@ -2896,6 +2896,7 @@ msgid "" "bindings (use carefully!)\n" " missing: add missing keys (using default bindings), useful after " "installing new WeeChat version\n" +" legacy: display new name for legacy keys\n" "\n" "When binding a command to a key, it is recommended to use key alt+k (or Esc " "then k), and then press the key to bind: this will insert key name in " diff --git a/po/weechat.pot b/po/weechat.pot index 62e7f639f..ee99b07e7 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-03-19 17:43+0100\n" +"POT-Creation-Date: 2023-03-24 23:04+0100\n" "PO-Revision-Date: 2014-08-16 10:27+0200\n" "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -1751,7 +1751,7 @@ msgid "" "[list|listdefault|listdiff] [<context>] || bind <key> [<command> [<args>]] " "|| bindctxt <context> <key> [<command> [<args>]] || unbind <key> || " "unbindctxt <context> <key> || reset <key> || resetctxt <context> <key> || " -"resetall -yes [<context>] || missing [<context>]" +"resetall -yes [<context>] || missing [<context>] || legacy <key> [<key>...]" msgstr "" msgid "" @@ -1773,6 +1773,7 @@ msgid "" "bindings (use carefully!)\n" " missing: add missing keys (using default bindings), useful after " "installing new WeeChat version\n" +" legacy: display new name for legacy keys\n" "\n" "When binding a command to a key, it is recommended to use key alt+k (or Esc " "then k), and then press the key to bind: this will insert key name in " diff --git a/src/core/wee-command.c b/src/core/wee-command.c index 5c5b95ac3..6f426c965 100644 --- a/src/core/wee-command.c +++ b/src/core/wee-command.c @@ -4029,7 +4029,8 @@ command_key_reset (int context, const char *key) COMMAND_CALLBACK(key) { struct t_gui_key *ptr_new_key; - int old_keys_count, keys_added, context, rc; + int i, old_keys_count, keys_added, context, rc; + char *key_name; /* make C compiler happy */ (void) pointer; @@ -4305,6 +4306,29 @@ COMMAND_CALLBACK(key) return WEECHAT_RC_OK; } + /* display new name for legacy keys */ + if (string_strcmp (argv[1], "legacy") == 0) + { + for (i = 2; i < argc; i++) + { + key_name = gui_key_legacy_to_alias (argv[i]); + gui_chat_printf (NULL, + "%s\"%s%s%s\"%s => %s\"%s%s%s\"", + GUI_COLOR(GUI_COLOR_CHAT_DELIMITERS), + GUI_COLOR(GUI_COLOR_CHAT), + argv[i], + GUI_COLOR(GUI_COLOR_CHAT_DELIMITERS), + GUI_COLOR(GUI_COLOR_CHAT), + GUI_COLOR(GUI_COLOR_CHAT_DELIMITERS), + GUI_COLOR(GUI_COLOR_CHAT), + key_name, + GUI_COLOR(GUI_COLOR_CHAT_DELIMITERS)); + if (key_name) + free (key_name); + } + return WEECHAT_RC_OK; + } + COMMAND_ERROR; } @@ -8449,7 +8473,8 @@ command_init () " || reset <key>" " || resetctxt <context> <key>" " || resetall -yes [<context>]" - " || missing [<context>]"), + " || missing [<context>]" + " || legacy <key> [<key>...]"), N_(" list: list all current keys\n" "listdefault: list default keys\n" " listdiff: list differences between current and default keys " @@ -8469,6 +8494,7 @@ command_init () "personal bindings (use carefully!)\n" " missing: add missing keys (using default bindings), useful " "after installing new WeeChat version\n" + " legacy: display new name for legacy keys\n" "\n" "When binding a command to a key, it is recommended to use key alt+k " "(or Esc then k), and then press the key to bind: this will insert " @@ -8524,7 +8550,8 @@ command_init () " || reset %(keys_codes_for_reset)" " || resetctxt %(keys_contexts) %(keys_codes_for_reset)" " || resetall %- %(keys_contexts)" - " || missing %(keys_contexts)", + " || missing %(keys_contexts)" + " || legacy", &command_key, NULL, NULL); hook_command ( NULL, "layout", |