diff --git a/ChangeLog.adoc b/ChangeLog.adoc index 399d3093d..b15ca055b 100644 --- a/ChangeLog.adoc +++ b/ChangeLog.adoc @@ -22,7 +22,7 @@ New features:: * core: add command `/allbuf` * core: add command `/hotlist` - * core: move some `/input` actions to commands `/allbuf`, `/buffer set`, `/buffer jump` and `/hotlist` + * core: move some `/input` actions to commands `/allbuf`, `/buffer` and `/hotlist` * core: improve case convert and insensitive char comparisons (issue #258) * core: add color attributes "blink" and "dim" (half bright) (issue #1855) * core: allow command `/toggle` to create option before setting the value, if allowed in the section (issue #1837) diff --git a/ReleaseNotes.adoc b/ReleaseNotes.adoc index 8bab36ea7..cfe71c16b 100644 --- a/ReleaseNotes.adoc +++ b/ReleaseNotes.adoc @@ -40,6 +40,9 @@ removed): | /input hotlist_restore_all | /hotlist restore -all | kbd:[Alt+h], kbd:[Alt+Shift+R] | /input set_unread | /allbuf /buffer set unread | kbd:[Ctrl+s], kbd:[Ctrl+u] | /input set_unread_current_buffer | /buffer set unread | (none) +| /input switch_active_buffer | /buffer switch | kbd:[Ctrl+x] +| /input switch_active_buffer_previous | /buffer switch -previous | (none) +| /input zoom_merged_buffer | /buffer zoom | kbd:[Alt+x] |=== The following default keys can be reset to use the new command: @@ -54,6 +57,8 @@ The following default keys can be reset to use the new command: /key reset meta-hmeta-r /key reset meta-hmeta-R /key reset ctrl-Sctrl-U +/key reset ctrl-X +/key reset meta-x ---- [[v3.8_return_code_string_comparison_functions]] diff --git a/doc/de/includes/autogen_user_commands.de.adoc b/doc/de/includes/autogen_user_commands.de.adoc index dce0e4f77..d46162109 100644 --- a/doc/de/includes/autogen_user_commands.de.adoc +++ b/doc/de/includes/autogen_user_commands.de.adoc @@ -1193,6 +1193,8 @@ Beispiele: unmerge [|-all] hide [||-all [|...]] unhide [||-all [|...]] + switch [-previous] + zoom renumber [ [ []]] close [[-]|...] notify [] @@ -1215,6 +1217,8 @@ Beispiele: unmerge: unmerge buffer from other buffers which have same number hide: hide the buffer unhide: unhide the buffer + switch: switch to next merged buffer (or to previous buffer with "-previous") + zoom: zoom on merged buffer renumber: renumber buffers (works only if option weechat.look.buffer_auto_renumber is off) close: close buffer (number/range or name is optional) notify: display or set notify level for current buffer: this level determines whether buffer will be added to hotlist or not: @@ -1683,9 +1687,6 @@ list of actions: grab_key_command: grab a key with its associated command (optional argument: delay for end of grab, default is 500 milliseconds) grab_mouse: grab mouse event code grab_mouse_area: grab mouse event code with area - switch_active_buffer: switch to next merged buffer - switch_active_buffer_previous: switch to previous merged buffer - zoom_merged_buffer: zoom on merged buffer insert: insert text in command line (escaped chars are allowed, see /help print) send: send text to the buffer paste_start: start paste (bracketed paste mode) diff --git a/doc/de/weechat_faq.de.adoc b/doc/de/weechat_faq.de.adoc index eda858b3c..b7c8fdc65 100644 --- a/doc/de/weechat_faq.de.adoc +++ b/doc/de/weechat_faq.de.adoc @@ -1050,7 +1050,7 @@ Für weitere Beispiele, siehe `+/help buffer_autoset+`. === Wie kann ich bei zusammengefügten Buffern den Zielbuffer ändern (z.B. bei einem Server-Buffer)? Die Standardtastenkombination ist kbd:[Ctrl+x]. Der entsprechende Befehl lautet: -`+/input switch_active_buffer+`. +`+/buffer switch+`. [[plugins_scripts]] == Erweiterungen / Skripten diff --git a/doc/de/weechat_user.de.adoc b/doc/de/weechat_user.de.adoc index 056fa35d8..955c07988 100644 --- a/doc/de/weechat_user.de.adoc +++ b/doc/de/weechat_user.de.adoc @@ -1587,8 +1587,8 @@ Sie können mit dem Befehl <> geändert und neue hinzu | Taste | Beschreibung | Befehl | kbd:[Ctrl+r] | Textsuche im Verlaufsspeicher des Buffers (siehe <>). | `+/input search_text_here+` | kbd:[Ctrl+s], kbd:[Ctrl+u] | setzt für alle Buffer die Markierung für ungelesene Nachrichten. | `+/allbuf /buffer set unread+` -| kbd:[Ctrl+x] | Wechseln Sie den aktuellen Buffer, wenn diese zusammengefügt worden sind, z.B. zwischen IRC-Serverbuffer wechseln. | `+/input switch_active_buffer+` -| kbd:[Alt+x] | Zoom eines zusammengefügten Buffers (kbd:[Alt+x] ein zweites mal: alle zusammengefügten Buffer werden angezeigt). | `+/input zoom_merged_buffer+` +| kbd:[Ctrl+x] | Wechseln Sie den aktuellen Buffer, wenn diese zusammengefügt worden sind, z.B. zwischen IRC-Serverbuffer wechseln. | `+/buffer switch+` +| kbd:[Alt+x] | Zoom eines zusammengefügten Buffers (kbd:[Alt+x] ein zweites mal: alle zusammengefügten Buffer werden angezeigt). | `+/buffer zoom+` | kbd:[PgUp] | eine Seite im Verlaufsspeicher des Buffers nach oben blättern. | `+/window page_up+` | kbd:[PgDn] | eine Seite im Verlaufsspeicher des Buffer nach unten blättern. | `+/window page_down+` | kbd:[Alt+PgUp] | einige Zeilen im Verlaufsspeicher des Buffer nach oben blättern. | `+/window scroll_up+` diff --git a/doc/en/includes/autogen_user_commands.en.adoc b/doc/en/includes/autogen_user_commands.en.adoc index 4ccf9b7fd..8a1432f85 100644 --- a/doc/en/includes/autogen_user_commands.en.adoc +++ b/doc/en/includes/autogen_user_commands.en.adoc @@ -1193,6 +1193,8 @@ Examples: unmerge [|-all] hide [||-all [|...]] unhide [||-all [|...]] + switch [-previous] + zoom renumber [ [ []]] close [[-]|...] notify [] @@ -1215,6 +1217,8 @@ Examples: unmerge: unmerge buffer from other buffers which have same number hide: hide the buffer unhide: unhide the buffer + switch: switch to next merged buffer (or to previous buffer with "-previous") + zoom: zoom on merged buffer renumber: renumber buffers (works only if option weechat.look.buffer_auto_renumber is off) close: close buffer (number/range or name is optional) notify: display or set notify level for current buffer: this level determines whether buffer will be added to hotlist or not: @@ -1683,9 +1687,6 @@ list of actions: grab_key_command: grab a key with its associated command (optional argument: delay for end of grab, default is 500 milliseconds) grab_mouse: grab mouse event code grab_mouse_area: grab mouse event code with area - switch_active_buffer: switch to next merged buffer - switch_active_buffer_previous: switch to previous merged buffer - zoom_merged_buffer: zoom on merged buffer insert: insert text in command line (escaped chars are allowed, see /help print) send: send text to the buffer paste_start: start paste (bracketed paste mode) diff --git a/doc/en/weechat_faq.en.adoc b/doc/en/weechat_faq.en.adoc index cedf832ab..fdcdf6328 100644 --- a/doc/en/weechat_faq.en.adoc +++ b/doc/en/weechat_faq.en.adoc @@ -976,7 +976,7 @@ For more examples, see `+/help buffer_autoset+`. [[irc_target_buffer]] === How can I change target buffer for commands on merged buffers (like buffer with servers)? -The default key is kbd:[Ctrl+x] (command is: `+/input switch_active_buffer+`). +The default key is kbd:[Ctrl+x] (command is: `+/buffer switch+`). [[plugins_scripts]] == Plugins / scripts diff --git a/doc/en/weechat_user.en.adoc b/doc/en/weechat_user.en.adoc index 9dd3878c9..5c0858e59 100644 --- a/doc/en/weechat_user.en.adoc +++ b/doc/en/weechat_user.en.adoc @@ -1570,8 +1570,8 @@ They can be changed and new ones can be added with the <>). | `+/input search_text_here+` | kbd:[Ctrl+s], kbd:[Ctrl+u] | Set unread marker on all buffers. | `+/allbuf /buffer set unread+` -| kbd:[Ctrl+x] | Switch current buffer if buffers are merged with same number, for example switch to another IRC server buffer. | `+/input switch_active_buffer+` -| kbd:[Alt+x] | Zoom on merged buffer (kbd:[Alt+x] again: display all merged buffers). | `+/input zoom_merged_buffer+` +| kbd:[Ctrl+x] | Switch current buffer if buffers are merged with same number, for example switch to another IRC server buffer. | `+/buffer switch+` +| kbd:[Alt+x] | Zoom on merged buffer (kbd:[Alt+x] again: display all merged buffers). | `+/buffer zoom+` | kbd:[PgUp] | Scroll up one page in buffer history. | `+/window page_up+` | kbd:[PgDn] | Scroll down one page in buffer history. | `+/window page_down+` | kbd:[Alt+PgUp] | Scroll up a few lines in buffer history. | `+/window scroll_up+` diff --git a/doc/es/weechat_faq.es.adoc b/doc/es/weechat_faq.es.adoc index ce13660f7..c48c23eb9 100644 --- a/doc/es/weechat_faq.es.adoc +++ b/doc/es/weechat_faq.es.adoc @@ -997,7 +997,7 @@ Para más ejemplos, vea `+/help buffer_autoset+`. [[irc_target_buffer]] === ¿Cómo puedo cambiar el objetivo del buffer para comandos en buffers unidos (como en un buffer con servidores)? -La tecla predeterminada es kbd:[Ctrl+x] (el comando es: `+/input switch_active_buffer+`). +La tecla predeterminada es kbd:[Ctrl+x] (el comando es: `+/buffer switch+`). [[plugins_scripts]] == Complementos / scripts diff --git a/doc/fr/includes/autogen_user_commands.fr.adoc b/doc/fr/includes/autogen_user_commands.fr.adoc index a56767ae3..b11a1cb38 100644 --- a/doc/fr/includes/autogen_user_commands.fr.adoc +++ b/doc/fr/includes/autogen_user_commands.fr.adoc @@ -1193,6 +1193,8 @@ Exemples : unmerge [|-all] hide [||-all [|...]] unhide [||-all [|...]] + switch [-previous] + zoom renumber [ []] close [[-]|...] notify [] @@ -1215,6 +1217,8 @@ Exemples : unmerge : détacher le tampon courant des autres tampons portant le même numéro hide : masquer le tampon unhide : démasquer le tampon + switch : basculer vers le tampon mélangé suivant (ou vers le tampon précédent avec -previous) + zoom : zoom sur le tampon mélangé renumber : renuméroter des tampons (fonctionne seulement si l'option weechat.look.buffer_auto_renumber est désactivée) close : fermer le tampon (nombre/intervalle ou nom optionnel) notify : afficher ou définir le niveau de notification pour le tampon courant : ce niveau détermine si le tampon doit être ajouté à la hotlist ou pas : @@ -1683,9 +1687,6 @@ liste des actions : grab_key_command : capturer une touche avec sa commande associée (paramètre facultatif : délai pour la fin de la capture, par défaut 500 millisecondes) grab_mouse : capturer un évènement de la souris grab_mouse_area : capturer un évènement de la souris avec la zone - switch_active_buffer : basculer vers le tampon mélangé suivant - switch_active_buffer_previous : basculer vers le tampon mélangé précédent - zoom_merged_buffer : zoom sur le tampon mélangé insert : insérer du texte dans la ligne de commande (les caractères échappés sont autorisés, voir /help print) send : envoyer du texte au tampon paste_start : début de collage (mode "bracketed paste") diff --git a/doc/fr/weechat_faq.fr.adoc b/doc/fr/weechat_faq.fr.adoc index a3a2c5ffa..c0c434b39 100644 --- a/doc/fr/weechat_faq.fr.adoc +++ b/doc/fr/weechat_faq.fr.adoc @@ -1009,7 +1009,7 @@ Pour plus d'exemples, voir `+/help buffer_autoset+`. === Comment puis-je changer le serveur cible pour les commandes avec des tampons mélangés (comme le tampon avec les serveurs) ? La touche par défaut est kbd:[Ctrl+x] (la commande est : -`+/input switch_active_buffer+`). +`+/buffer switch+`). [[plugins_scripts]] == Extensions / scripts diff --git a/doc/fr/weechat_user.fr.adoc b/doc/fr/weechat_user.fr.adoc index d465bcd27..5222655b3 100644 --- a/doc/fr/weechat_user.fr.adoc +++ b/doc/fr/weechat_user.fr.adoc @@ -1609,8 +1609,8 @@ Ils peuvent être modifiés et de nouveaux peuvent être ajoutés avec la comman | Touche | Description | Commande | kbd:[Ctrl+r] | Chercher du texte dans l'historique du tampon (voir <>). | `+/input search_text_here+` | kbd:[Ctrl+s], kbd:[Ctrl+u] | Positionner le marqueur de données non lues sur tous les tampons. | `+/allbuf /buffer set unread+` -| kbd:[Ctrl+x] | Changer de tampon courant si plusieurs tampons sont mélangés avec le même numéro, par exemple basculer vers un autre tampon serveur IRC. | `+/input switch_active_buffer+` -| kbd:[Alt+x] | Zoomer sur le tampon mélangé (kbd:[Alt+x] de nouveau : afficher tous les tampons mélangés). | `+/input zoom_merged_buffer+` +| kbd:[Ctrl+x] | Changer de tampon courant si plusieurs tampons sont mélangés avec le même numéro, par exemple basculer vers un autre tampon serveur IRC. | `+/buffer switch+` +| kbd:[Alt+x] | Zoomer sur le tampon mélangé (kbd:[Alt+x] de nouveau : afficher tous les tampons mélangés). | `+/buffer zoom+` | kbd:[PgUp] | Monter d'une page dans l'historique du tampon. | `+/window page_up+` | kbd:[PgDn] | Descendre d'une page dans l'historique du tampon. | `+/window page_down+` | kbd:[Alt+PgUp] | Monter de quelques lignes dans l'historique du tampon. | `+/window scroll_up+` diff --git a/doc/it/includes/autogen_user_commands.it.adoc b/doc/it/includes/autogen_user_commands.it.adoc index fff8f9412..4299fd24b 100644 --- a/doc/it/includes/autogen_user_commands.it.adoc +++ b/doc/it/includes/autogen_user_commands.it.adoc @@ -1193,6 +1193,8 @@ Examples: unmerge [|-all] hide [||-all [|...]] unhide [||-all [|...]] + switch [-previous] + zoom renumber [ [ []]] close [[-]|...] notify [] @@ -1215,6 +1217,8 @@ Examples: unmerge: unmerge buffer from other buffers which have same number hide: hide the buffer unhide: unhide the buffer + switch: switch to next merged buffer (or to previous buffer with "-previous") + zoom: zoom on merged buffer renumber: renumber buffers (works only if option weechat.look.buffer_auto_renumber is off) close: close buffer (number/range or name is optional) notify: display or set notify level for current buffer: this level determines whether buffer will be added to hotlist or not: @@ -1683,9 +1687,6 @@ list of actions: grab_key_command: grab a key with its associated command (optional argument: delay for end of grab, default is 500 milliseconds) grab_mouse: grab mouse event code grab_mouse_area: grab mouse event code with area - switch_active_buffer: switch to next merged buffer - switch_active_buffer_previous: switch to previous merged buffer - zoom_merged_buffer: zoom on merged buffer insert: insert text in command line (escaped chars are allowed, see /help print) send: send text to the buffer paste_start: start paste (bracketed paste mode) diff --git a/doc/it/weechat_faq.it.adoc b/doc/it/weechat_faq.it.adoc index 86c491054..54d8f67be 100644 --- a/doc/it/weechat_faq.it.adoc +++ b/doc/it/weechat_faq.it.adoc @@ -1065,7 +1065,7 @@ For more examples, see `+/help buffer_autoset+`. [[irc_target_buffer]] === Come si può modificare il buffer destinazione per i comandi sui buffer uniti (come i buffer con i server)? -Il tasto predefinito è kbd:[Ctrl+x] (il comando è: `+/input switch_active_buffer+`). +Il tasto predefinito è kbd:[Ctrl+x] (il comando è: `+/buffer switch+`). [[plugins_scripts]] == Plugin / script diff --git a/doc/it/weechat_user.it.adoc b/doc/it/weechat_user.it.adoc index 99526841f..4ef373fcc 100644 --- a/doc/it/weechat_user.it.adoc +++ b/doc/it/weechat_user.it.adoc @@ -1709,9 +1709,9 @@ They can be changed and new ones can be added with the <>). | `+/input search_text_here+` | kbd:[Ctrl+s], kbd:[Ctrl+u] | Imposta l'evidenziatore dei messaggi non letti su tutti i buffer. | `+/allbuf /buffer set unread+` // TRANSLATION MISSING -| kbd:[Ctrl+x] | Switch current buffer if buffers are merged with same number, for example switch to another IRC server buffer. | `+/input switch_active_buffer+` +| kbd:[Ctrl+x] | Switch current buffer if buffers are merged with same number, for example switch to another IRC server buffer. | `+/buffer switch+` // TRANSLATION MISSING -| kbd:[Alt+x] | Zoom on merged buffer (kbd:[Alt+x] again: display all merged buffers). | `+/input zoom_merged_buffer+` +| kbd:[Alt+x] | Zoom on merged buffer (kbd:[Alt+x] again: display all merged buffers). | `+/buffer zoom+` | kbd:[PgUp] | Scorre in alto di una pagina nella cronologia del buffer. | `+/window page_up+` | kbd:[PgDn] | Scorre di una pagina in basso nella cronologia del buffer. | `+/window page_down+` | kbd:[Alt+PgUp] | Scorre di qualche riga in alto nella cronologia del buffer. | `+/window scroll_up+` diff --git a/doc/ja/includes/autogen_user_commands.ja.adoc b/doc/ja/includes/autogen_user_commands.ja.adoc index 543ddca87..7fb25702e 100644 --- a/doc/ja/includes/autogen_user_commands.ja.adoc +++ b/doc/ja/includes/autogen_user_commands.ja.adoc @@ -1193,6 +1193,8 @@ message: 離席メッセージ (メッセージが無い場合は、離席状態 unmerge [|-all] hide [||-all [|...]] unhide [||-all [|...]] + switch [-previous] + zoom renumber [ [ []]] close [[-]|...] notify [] @@ -1215,6 +1217,8 @@ message: 離席メッセージ (メッセージが無い場合は、離席状態 unmerge: unmerge buffer from other buffers which have same number hide: hide the buffer unhide: unhide the buffer + switch: switch to next merged buffer (or to previous buffer with "-previous") + zoom: zoom on merged buffer renumber: renumber buffers (works only if option weechat.look.buffer_auto_renumber is off) close: close buffer (number/range or name is optional) notify: display or set notify level for current buffer: this level determines whether buffer will be added to hotlist or not: @@ -1683,9 +1687,6 @@ list of actions: grab_key_command: grab a key with its associated command (optional argument: delay for end of grab, default is 500 milliseconds) grab_mouse: grab mouse event code grab_mouse_area: grab mouse event code with area - switch_active_buffer: switch to next merged buffer - switch_active_buffer_previous: switch to previous merged buffer - zoom_merged_buffer: zoom on merged buffer insert: insert text in command line (escaped chars are allowed, see /help print) send: send text to the buffer paste_start: start paste (bracketed paste mode) diff --git a/doc/ja/weechat_faq.ja.adoc b/doc/ja/weechat_faq.ja.adoc index 7298f2d8d..7ef0f81b6 100644 --- a/doc/ja/weechat_faq.ja.adoc +++ b/doc/ja/weechat_faq.ja.adoc @@ -996,7 +996,7 @@ or per group of buffers (like IRC servers). [[irc_target_buffer]] === どうすればマージされたバッファ内であるコマンドを発行するターゲットバッファを変更できますか。 -デフォルトのキーは kbd:[Ctrl+x] です (コマンドは: `+/input switch_active_buffer+`)。 +デフォルトのキーは kbd:[Ctrl+x] です (コマンドは: `+/buffer switch+`)。 [[plugins_scripts]] == プラグイン / スクリプト diff --git a/doc/ja/weechat_user.ja.adoc b/doc/ja/weechat_user.ja.adoc index bd4044995..d432ecd53 100644 --- a/doc/ja/weechat_user.ja.adoc +++ b/doc/ja/weechat_user.ja.adoc @@ -1657,8 +1657,8 @@ They can be changed and new ones can be added with the <>を参照) | `+/input search_text_here+` | kbd:[Ctrl+s], kbd:[Ctrl+u] | すべてのバッファに未読マークをセット | `+/allbuf /buffer set unread+` // TRANSLATION MISSING -| kbd:[Ctrl+x] | Switch current buffer if buffers are merged with same number, for example switch to another IRC server buffer. | `+/input switch_active_buffer+` -| kbd:[Alt+x] | マージされたバッファに再ズーム (kbd:[Alt+x]: 全てのマージされたバッファを表示) | `+/input zoom_merged_buffer+` +| kbd:[Ctrl+x] | Switch current buffer if buffers are merged with same number, for example switch to another IRC server buffer. | `+/buffer switch+` +| kbd:[Alt+x] | マージされたバッファに再ズーム (kbd:[Alt+x]: 全てのマージされたバッファを表示) | `+/buffer zoom+` | kbd:[PgUp] | バッファ履歴を 1 ページ分上方向にスクロール | `+/window page_up+` | kbd:[PgDn] | バッファ履歴を 1 ページ分下方向にスクロール | `+/window page_down+` | kbd:[Alt+PgUp] | バッファ履歴を数行分上方向にスクロール | `+/window scroll_up+` diff --git a/doc/pl/includes/autogen_user_commands.pl.adoc b/doc/pl/includes/autogen_user_commands.pl.adoc index a072b94ad..311ad6502 100644 --- a/doc/pl/includes/autogen_user_commands.pl.adoc +++ b/doc/pl/includes/autogen_user_commands.pl.adoc @@ -1192,6 +1192,8 @@ Przykłady: unmerge [|-all] hide [||-all [|...]] unhide [||-all [|...]] + switch [-previous] + zoom renumber [ [ []]] close [[-]|...] notify [] @@ -1214,6 +1216,8 @@ Przykłady: unmerge: unmerge buffer from other buffers which have same number hide: hide the buffer unhide: unhide the buffer + switch: switch to next merged buffer (or to previous buffer with "-previous") + zoom: zoom on merged buffer renumber: renumber buffers (works only if option weechat.look.buffer_auto_renumber is off) close: close buffer (number/range or name is optional) notify: display or set notify level for current buffer: this level determines whether buffer will be added to hotlist or not: @@ -1682,9 +1686,6 @@ list of actions: grab_key_command: grab a key with its associated command (optional argument: delay for end of grab, default is 500 milliseconds) grab_mouse: grab mouse event code grab_mouse_area: grab mouse event code with area - switch_active_buffer: switch to next merged buffer - switch_active_buffer_previous: switch to previous merged buffer - zoom_merged_buffer: zoom on merged buffer insert: insert text in command line (escaped chars are allowed, see /help print) send: send text to the buffer paste_start: start paste (bracketed paste mode) diff --git a/doc/pl/weechat_faq.pl.adoc b/doc/pl/weechat_faq.pl.adoc index c93c3a42d..fdaf21560 100644 --- a/doc/pl/weechat_faq.pl.adoc +++ b/doc/pl/weechat_faq.pl.adoc @@ -995,7 +995,7 @@ Więcej przykładów można znaleźć wykonując komende `+/help buffer_autoset+ [[irc_target_buffer]] === Jak mogę zmienić docelowy bufor dla komendy w połączonym buforze (jak bufor z serwerami)? -Domyślna kombinacja to kbd:[Ctrl+x] (komenda: `+/input switch_active_buffer+`). +Domyślna kombinacja to kbd:[Ctrl+x] (komenda: `+/buffer switch+`). [[plugins_scripts]] == Pluginy / skrypty diff --git a/doc/pl/weechat_user.pl.adoc b/doc/pl/weechat_user.pl.adoc index 4677189df..62d535c45 100644 --- a/doc/pl/weechat_user.pl.adoc +++ b/doc/pl/weechat_user.pl.adoc @@ -1598,8 +1598,8 @@ Można je zmienić oraz dodać nowe za pomocą komendy <>). | `+/input search_text_here+` | kbd:[Ctrl+s], kbd:[Ctrl+u] | Ustaw znacznik nieprzeczytania we wszystkich buforach. | `+/allbuf /buffer set unread+` // TRANSLATION MISSING -| kbd:[Ctrl+x] | Switch current buffer if buffers are merged with same number, for example switch to another IRC server buffer. | `+/input switch_active_buffer+` -| kbd:[Alt+x] | Pokaż wybrany z połączonych buforów (naciśnij kbd:[Alt+x] ponownie: wyświetl wszystkie połączone bufory). | `+/input zoom_merged_buffer+` +| kbd:[Ctrl+x] | Switch current buffer if buffers are merged with same number, for example switch to another IRC server buffer. | `+/buffer switch+` +| kbd:[Alt+x] | Pokaż wybrany z połączonych buforów (naciśnij kbd:[Alt+x] ponownie: wyświetl wszystkie połączone bufory). | `+/buffer zoom+` | kbd:[PgUp] | Przewiń jedną stronę w górę w historii bufora. | `+/window page_up+` | kbd:[PgDn] | Przewiń jedną stronę w dół w historii bufora. | `+/window page_down+` | kbd:[Alt+PgUp] | Przewiń w górę kilka linii w historii bufora. | `+/window scroll_up+` diff --git a/doc/sr/includes/autogen_user_commands.sr.adoc b/doc/sr/includes/autogen_user_commands.sr.adoc index 94c248846..0c93d9d52 100644 --- a/doc/sr/includes/autogen_user_commands.sr.adoc +++ b/doc/sr/includes/autogen_user_commands.sr.adoc @@ -1193,6 +1193,8 @@ Examples: unmerge [|-all] hide [||-all [|...]] unhide [||-all [|...]] + switch [-previous] + zoom renumber [ [ []]] close [[-]|...] notify [] @@ -1215,6 +1217,8 @@ Examples: unmerge: unmerge buffer from other buffers which have same number hide: hide the buffer unhide: unhide the buffer + switch: switch to next merged buffer (or to previous buffer with "-previous") + zoom: zoom on merged buffer renumber: renumber buffers (works only if option weechat.look.buffer_auto_renumber is off) close: close buffer (number/range or name is optional) notify: display or set notify level for current buffer: this level determines whether buffer will be added to hotlist or not: @@ -1683,9 +1687,6 @@ list of actions: grab_key_command: grab a key with its associated command (optional argument: delay for end of grab, default is 500 milliseconds) grab_mouse: grab mouse event code grab_mouse_area: grab mouse event code with area - switch_active_buffer: switch to next merged buffer - switch_active_buffer_previous: switch to previous merged buffer - zoom_merged_buffer: zoom on merged buffer insert: insert text in command line (escaped chars are allowed, see /help print) send: send text to the buffer paste_start: start paste (bracketed paste mode) diff --git a/doc/sr/weechat_faq.sr.adoc b/doc/sr/weechat_faq.sr.adoc index a5b44e129..d7798ab37 100644 --- a/doc/sr/weechat_faq.sr.adoc +++ b/doc/sr/weechat_faq.sr.adoc @@ -862,7 +862,7 @@ link:weechat_user.sr.html#max_hotlist_level_nicks[hotlist_max_level_nicks_add ^ [[irc_target_buffer]] === Како могу да променим циљни бафер за команде над спојеним баферима (као што је бафер са серверима)? -Подразумевани тастер је kbd:[Ctrl+x] (команда је: `+/input switch_active_buffer+`). +Подразумевани тастер је kbd:[Ctrl+x] (команда је: `+/buffer switch+`). [[plugins_scripts]] == Додаци / скрипте diff --git a/doc/sr/weechat_user.sr.adoc b/doc/sr/weechat_user.sr.adoc index 026c2135e..fc65aba12 100644 --- a/doc/sr/weechat_user.sr.adoc +++ b/doc/sr/weechat_user.sr.adoc @@ -1480,8 +1480,8 @@ WeeChat нуди доста подразумеваних тастерских п | Тастер | Опис | Команда | kbd:[Ctrl+r] | Претрага на текст у историји бафера (погледајте <>). | `+/input search_text_here+` | kbd:[Ctrl+s], kbd:[Ctrl+u] | Поставља маркер непрочитано за све бафере. | `+/allbuf /buffer set unread+` -| kbd:[Ctrl+x] | Мења текући бафер ако су бафери спојени са истим бројем, на пример, прелазак на други IRC сервер бафер. | `+/input switch_active_buffer+` -| kbd:[Alt+x] | Зум на спојени бафер (kbd:[Alt+x] поново: приказује све спојене бафере). | `+/input zoom_merged_buffer+` +| kbd:[Ctrl+x] | Мења текући бафер ако су бафери спојени са истим бројем, на пример, прелазак на други IRC сервер бафер. | `+/buffer switch+` +| kbd:[Alt+x] | Зум на спојени бафер (kbd:[Alt+x] поново: приказује све спојене бафере). | `+/buffer zoom+` | kbd:[PgUp] | Скролује навише једну страну у историји бафера. | `+/window page_up+` | kbd:[PgDn] | Скролује наниже једну страну у историји бафера. | `+/window page_down+` | kbd:[Alt+PgUp] | Скролује навише неколико линија у историји бафера. | `+/window scroll_up+` diff --git a/po/cs.po b/po/cs.po index fceb0446b..90f00825a 100644 --- a/po/cs.po +++ b/po/cs.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2022-12-25 21:30+0100\n" +"POT-Creation-Date: 2022-12-25 22:34+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: Ondřej Súkup \n" "Language-Team: weechat-dev \n" @@ -1248,10 +1248,11 @@ msgid "" "[|] || cycle | [|...] || merge " "| || unmerge [|-all] || hide [||-all " "[|...]] || unhide [||-all [|...]] " -"|| renumber [ [ []]] || close [[-]|" -"...] || notify [] || listvar [|] || setvar " -"[] || delvar || set [] || get || " -"jump smart|last_displayed|prev_visited|next_visited || |-|+|" +"|| switch [-previous] || zoom || renumber [ [ []]] " +"|| close [[-]|...] || notify [] || listvar [|" +"] || setvar [] || delvar || set " +"[] || get || jump smart|last_displayed|prev_visited|" +"next_visited || |-|+|" msgstr "" "list || clear [<číslo>|-merged|-all] || move|merge <číslo> || unmerge " "[<číslo>] || close [[-]] || notify <úroveň> || localvar || set " @@ -1275,6 +1276,9 @@ msgid "" " unmerge: unmerge buffer from other buffers which have same number\n" " hide: hide the buffer\n" " unhide: unhide the buffer\n" +" switch: switch to next merged buffer (or to previous buffer with \"-" +"previous\")\n" +" zoom: zoom on merged buffer\n" "renumber: renumber buffers (works only if option weechat.look." "buffer_auto_renumber is off)\n" " close: close buffer (number/range or name is optional)\n" @@ -1911,9 +1915,6 @@ msgid "" "argument: delay for end of grab, default is 500 milliseconds)\n" " grab_mouse: grab mouse event code\n" " grab_mouse_area: grab mouse event code with area\n" -" switch_active_buffer: switch to next merged buffer\n" -" switch_active_buffer_previous: switch to previous merged buffer\n" -" zoom_merged_buffer: zoom on merged buffer\n" " insert: insert text in command line (escaped chars are allowed, see /help " "print)\n" " send: send text to the buffer\n" diff --git a/po/de.po b/po/de.po index d43005b73..26dc43887 100644 --- a/po/de.po +++ b/po/de.po @@ -26,7 +26,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2022-12-25 21:30+0100\n" +"POT-Creation-Date: 2022-12-25 22:34+0100\n" "PO-Revision-Date: 2022-12-14 22:37+0100\n" "Last-Translator: Nils Görs \n" "Language-Team: German - Germany \n" @@ -1291,10 +1291,11 @@ msgid "" "[|] || cycle | [|...] || merge " "| || unmerge [|-all] || hide [||-all " "[|...]] || unhide [||-all [|...]] " -"|| renumber [ [ []]] || close [[-]|" -"...] || notify [] || listvar [|] || setvar " -"[] || delvar || set [] || get || " -"jump smart|last_displayed|prev_visited|next_visited || |-|+|" +"|| switch [-previous] || zoom || renumber [ [ []]] " +"|| close [[-]|...] || notify [] || listvar [|" +"] || setvar [] || delvar || set " +"[] || get || jump smart|last_displayed|prev_visited|" +"next_visited || |-|+|" msgstr "" "list || add [-free] [-switch] || clear [||-merged|-all " "[|...]] || move |-|+ || swap | " @@ -1392,6 +1393,9 @@ msgid "" " unmerge: unmerge buffer from other buffers which have same number\n" " hide: hide the buffer\n" " unhide: unhide the buffer\n" +" switch: switch to next merged buffer (or to previous buffer with \"-" +"previous\")\n" +" zoom: zoom on merged buffer\n" "renumber: renumber buffers (works only if option weechat.look." "buffer_auto_renumber is off)\n" " close: close buffer (number/range or name is optional)\n" @@ -2481,9 +2485,6 @@ msgid "" "argument: delay for end of grab, default is 500 milliseconds)\n" " grab_mouse: grab mouse event code\n" " grab_mouse_area: grab mouse event code with area\n" -" switch_active_buffer: switch to next merged buffer\n" -" switch_active_buffer_previous: switch to previous merged buffer\n" -" zoom_merged_buffer: zoom on merged buffer\n" " insert: insert text in command line (escaped chars are allowed, see /help " "print)\n" " send: send text to the buffer\n" diff --git a/po/es.po b/po/es.po index 38f19cb34..b1b78cc4b 100644 --- a/po/es.po +++ b/po/es.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2022-12-25 21:30+0100\n" +"POT-Creation-Date: 2022-12-25 22:34+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: Santiago Forero \n" "Language-Team: weechat-dev \n" @@ -1297,10 +1297,11 @@ msgid "" "[|] || cycle | [|...] || merge " "| || unmerge [|-all] || hide [||-all " "[|...]] || unhide [||-all [|...]] " -"|| renumber [ [ []]] || close [[-]|" -"...] || notify [] || listvar [|] || setvar " -"[] || delvar || set [] || get || " -"jump smart|last_displayed|prev_visited|next_visited || |-|+|" +"|| switch [-previous] || zoom || renumber [ [ []]] " +"|| close [[-]|...] || notify [] || listvar [|" +"] || setvar [] || delvar || set " +"[] || get || jump smart|last_displayed|prev_visited|" +"next_visited || |-|+|" msgstr "" "list || add [-free] [-switch] || clear [||-merged|-" "all [|...]] || move |-|+ || swap | " @@ -1330,6 +1331,9 @@ msgid "" " unmerge: unmerge buffer from other buffers which have same number\n" " hide: hide the buffer\n" " unhide: unhide the buffer\n" +" switch: switch to next merged buffer (or to previous buffer with \"-" +"previous\")\n" +" zoom: zoom on merged buffer\n" "renumber: renumber buffers (works only if option weechat.look." "buffer_auto_renumber is off)\n" " close: close buffer (number/range or name is optional)\n" @@ -2316,9 +2320,6 @@ msgid "" "argument: delay for end of grab, default is 500 milliseconds)\n" " grab_mouse: grab mouse event code\n" " grab_mouse_area: grab mouse event code with area\n" -" switch_active_buffer: switch to next merged buffer\n" -" switch_active_buffer_previous: switch to previous merged buffer\n" -" zoom_merged_buffer: zoom on merged buffer\n" " insert: insert text in command line (escaped chars are allowed, see /help " "print)\n" " send: send text to the buffer\n" diff --git a/po/fr.po b/po/fr.po index 43207c2ad..2b3b21ad0 100644 --- a/po/fr.po +++ b/po/fr.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2022-12-25 21:30+0100\n" -"PO-Revision-Date: 2022-12-25 21:41+0100\n" +"POT-Creation-Date: 2022-12-25 22:34+0100\n" +"PO-Revision-Date: 2022-12-25 22:36+0100\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" "Language: fr\n" @@ -1258,20 +1258,22 @@ msgid "" "[|] || cycle | [|...] || merge " "| || unmerge [|-all] || hide [||-all " "[|...]] || unhide [||-all [|...]] " -"|| renumber [ [ []]] || close [[-]|" -"...] || notify [] || listvar [|] || setvar " -"[] || delvar || set [] || get || " -"jump smart|last_displayed|prev_visited|next_visited || |-|+|" +"|| switch [-previous] || zoom || renumber [ [ []]] " +"|| close [[-]|...] || notify [] || listvar [|" +"] || setvar [] || delvar || set " +"[] || get || jump smart|last_displayed|prev_visited|" +"next_visited || |-|+|" msgstr "" "list || add [-free] [-switch] || clear [||-merged|-all " "[|...]] || move |-|+ || swap | " "[|] || cycle | [|...] || merge " "| || unmerge [|-all] || hide [||-all " "[|...]] || unhide [||-all [|...]] || " -"renumber [ []] || close [[-]|...] || " -"notify [] || listvar [|] || setvar [] || " -"delvar || set [] || get || jump smart|" -"last_displayed|prev_visited|next_visited || |-|+|" +"switch [-previous] || zoom || renumber [ []] || " +"close [[-]|...] || notify [] || listvar [|" +"] || setvar [] || delvar || set " +"[] || get || jump smart|last_displayed|prev_visited|" +"next_visited || |-|+|" msgid "" " list: list buffers (without argument, this list is displayed)\n" @@ -1290,6 +1292,9 @@ msgid "" " unmerge: unmerge buffer from other buffers which have same number\n" " hide: hide the buffer\n" " unhide: unhide the buffer\n" +" switch: switch to next merged buffer (or to previous buffer with \"-" +"previous\")\n" +" zoom: zoom on merged buffer\n" "renumber: renumber buffers (works only if option weechat.look." "buffer_auto_renumber is off)\n" " close: close buffer (number/range or name is optional)\n" @@ -1368,6 +1373,9 @@ msgstr "" "numéro\n" " hide : masquer le tampon\n" " unhide : démasquer le tampon\n" +" switch : basculer vers le tampon mélangé suivant (ou vers le tampon " +"précédent avec -previous)\n" +" zoom : zoom sur le tampon mélangé\n" "renumber : renuméroter des tampons (fonctionne seulement si l'option weechat." "look.buffer_auto_renumber est désactivée)\n" " close : fermer le tampon (nombre/intervalle ou nom optionnel)\n" @@ -2271,9 +2279,6 @@ msgid "" "argument: delay for end of grab, default is 500 milliseconds)\n" " grab_mouse: grab mouse event code\n" " grab_mouse_area: grab mouse event code with area\n" -" switch_active_buffer: switch to next merged buffer\n" -" switch_active_buffer_previous: switch to previous merged buffer\n" -" zoom_merged_buffer: zoom on merged buffer\n" " insert: insert text in command line (escaped chars are allowed, see /help " "print)\n" " send: send text to the buffer\n" @@ -2331,9 +2336,6 @@ msgstr "" "millisecondes)\n" " grab_mouse : capturer un évènement de la souris\n" " grab_mouse_area : capturer un évènement de la souris avec la zone\n" -" switch_active_buffer : basculer vers le tampon mélangé suivant\n" -" switch_active_buffer_previous : basculer vers le tampon mélangé précédent\n" -" zoom_merged_buffer : zoom sur le tampon mélangé\n" " insert : insérer du texte dans la ligne de commande (les caractères " "échappés sont autorisés, voir /help print)\n" " send : envoyer du texte au tampon\n" diff --git a/po/hu.po b/po/hu.po index 527da364e..592b9923b 100644 --- a/po/hu.po +++ b/po/hu.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2022-12-25 21:30+0100\n" +"POT-Creation-Date: 2022-12-25 22:34+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -1182,10 +1182,11 @@ msgid "" "[|] || cycle | [|...] || merge " "| || unmerge [|-all] || hide [||-all " "[|...]] || unhide [||-all [|...]] " -"|| renumber [ [ []]] || close [[-]|" -"...] || notify [] || listvar [|] || setvar " -"[] || delvar || set [] || get || " -"jump smart|last_displayed|prev_visited|next_visited || |-|+|" +"|| switch [-previous] || zoom || renumber [ [ []]] " +"|| close [[-]|...] || notify [] || listvar [|" +"] || setvar [] || delvar || set " +"[] || get || jump smart|last_displayed|prev_visited|" +"next_visited || |-|+|" msgstr "" #, fuzzy @@ -1206,6 +1207,9 @@ msgid "" " unmerge: unmerge buffer from other buffers which have same number\n" " hide: hide the buffer\n" " unhide: unhide the buffer\n" +" switch: switch to next merged buffer (or to previous buffer with \"-" +"previous\")\n" +" zoom: zoom on merged buffer\n" "renumber: renumber buffers (works only if option weechat.look." "buffer_auto_renumber is off)\n" " close: close buffer (number/range or name is optional)\n" @@ -1786,9 +1790,6 @@ msgid "" "argument: delay for end of grab, default is 500 milliseconds)\n" " grab_mouse: grab mouse event code\n" " grab_mouse_area: grab mouse event code with area\n" -" switch_active_buffer: switch to next merged buffer\n" -" switch_active_buffer_previous: switch to previous merged buffer\n" -" zoom_merged_buffer: zoom on merged buffer\n" " insert: insert text in command line (escaped chars are allowed, see /help " "print)\n" " send: send text to the buffer\n" diff --git a/po/it.po b/po/it.po index a3b51f61b..4679d9ec1 100644 --- a/po/it.po +++ b/po/it.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2022-12-25 21:30+0100\n" +"POT-Creation-Date: 2022-12-25 22:34+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: Esteban I. Ruiz Moreno \n" "Language-Team: weechat-dev \n" @@ -1214,10 +1214,11 @@ msgid "" "[|] || cycle | [|...] || merge " "| || unmerge [|-all] || hide [||-all " "[|...]] || unhide [||-all [|...]] " -"|| renumber [ [ []]] || close [[-]|" -"...] || notify [] || listvar [|] || setvar " -"[] || delvar || set [] || get || " -"jump smart|last_displayed|prev_visited|next_visited || |-|+|" +"|| switch [-previous] || zoom || renumber [ [ []]] " +"|| close [[-]|...] || notify [] || listvar [|" +"] || setvar [] || delvar || set " +"[] || get || jump smart|last_displayed|prev_visited|" +"next_visited || |-|+|" msgstr "" "list || clear [||-merged|-all] || move|merge || swap " "| [|] || unmerge [|-all] || close " @@ -1242,6 +1243,9 @@ msgid "" " unmerge: unmerge buffer from other buffers which have same number\n" " hide: hide the buffer\n" " unhide: unhide the buffer\n" +" switch: switch to next merged buffer (or to previous buffer with \"-" +"previous\")\n" +" zoom: zoom on merged buffer\n" "renumber: renumber buffers (works only if option weechat.look." "buffer_auto_renumber is off)\n" " close: close buffer (number/range or name is optional)\n" @@ -1974,9 +1978,6 @@ msgid "" "argument: delay for end of grab, default is 500 milliseconds)\n" " grab_mouse: grab mouse event code\n" " grab_mouse_area: grab mouse event code with area\n" -" switch_active_buffer: switch to next merged buffer\n" -" switch_active_buffer_previous: switch to previous merged buffer\n" -" zoom_merged_buffer: zoom on merged buffer\n" " insert: insert text in command line (escaped chars are allowed, see /help " "print)\n" " send: send text to the buffer\n" diff --git a/po/ja.po b/po/ja.po index 605359b36..db491620f 100644 --- a/po/ja.po +++ b/po/ja.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2022-12-25 21:30+0100\n" +"POT-Creation-Date: 2022-12-25 22:34+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: AYANOKOUZI, Ryuunosuke \n" "Language-Team: Japanese |] || cycle | [|...] || merge " "| || unmerge [|-all] || hide [||-all " "[|...]] || unhide [||-all [|...]] " -"|| renumber [ [ []]] || close [[-]|" -"...] || notify [] || listvar [|] || setvar " -"[] || delvar || set [] || get || " -"jump smart|last_displayed|prev_visited|next_visited || |-|+|" +"|| switch [-previous] || zoom || renumber [ [ []]] " +"|| close [[-]|...] || notify [] || listvar [|" +"] || setvar [] || delvar || set " +"[] || get || jump smart|last_displayed|prev_visited|" +"next_visited || |-|+|" msgstr "" "list || add [-free] [-switch] || clear [||-merged|-all " "[|...]] || move |-|+ || swap | " @@ -1281,6 +1282,9 @@ msgid "" " unmerge: unmerge buffer from other buffers which have same number\n" " hide: hide the buffer\n" " unhide: unhide the buffer\n" +" switch: switch to next merged buffer (or to previous buffer with \"-" +"previous\")\n" +" zoom: zoom on merged buffer\n" "renumber: renumber buffers (works only if option weechat.look." "buffer_auto_renumber is off)\n" " close: close buffer (number/range or name is optional)\n" @@ -2234,9 +2238,6 @@ msgid "" "argument: delay for end of grab, default is 500 milliseconds)\n" " grab_mouse: grab mouse event code\n" " grab_mouse_area: grab mouse event code with area\n" -" switch_active_buffer: switch to next merged buffer\n" -" switch_active_buffer_previous: switch to previous merged buffer\n" -" zoom_merged_buffer: zoom on merged buffer\n" " insert: insert text in command line (escaped chars are allowed, see /help " "print)\n" " send: send text to the buffer\n" diff --git a/po/pl.po b/po/pl.po index b138fb048..c2de3c3c8 100644 --- a/po/pl.po +++ b/po/pl.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2022-12-25 21:30+0100\n" +"POT-Creation-Date: 2022-12-25 22:34+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: Krzysztof Korościk \n" "Language-Team: Polish \n" @@ -1290,10 +1290,11 @@ msgid "" "[|] || cycle | [|...] || merge " "| || unmerge [|-all] || hide [||-all " "[|...]] || unhide [||-all [|...]] " -"|| renumber [ [ []]] || close [[-]|" -"...] || notify [] || listvar [|] || setvar " -"[] || delvar || set [] || get || " -"jump smart|last_displayed|prev_visited|next_visited || |-|+|" +"|| switch [-previous] || zoom || renumber [ [ []]] " +"|| close [[-]|...] || notify [] || listvar [|" +"] || setvar [] || delvar || set " +"[] || get || jump smart|last_displayed|prev_visited|" +"next_visited || |-|+|" msgstr "" "list || add [-free] [-switch] || clear [||-merged|-all " "[|...]] || move |-|+ || swap | " @@ -1391,6 +1392,9 @@ msgid "" " unmerge: unmerge buffer from other buffers which have same number\n" " hide: hide the buffer\n" " unhide: unhide the buffer\n" +" switch: switch to next merged buffer (or to previous buffer with \"-" +"previous\")\n" +" zoom: zoom on merged buffer\n" "renumber: renumber buffers (works only if option weechat.look." "buffer_auto_renumber is off)\n" " close: close buffer (number/range or name is optional)\n" @@ -2549,9 +2553,6 @@ msgid "" "argument: delay for end of grab, default is 500 milliseconds)\n" " grab_mouse: grab mouse event code\n" " grab_mouse_area: grab mouse event code with area\n" -" switch_active_buffer: switch to next merged buffer\n" -" switch_active_buffer_previous: switch to previous merged buffer\n" -" zoom_merged_buffer: zoom on merged buffer\n" " insert: insert text in command line (escaped chars are allowed, see /help " "print)\n" " send: send text to the buffer\n" diff --git a/po/pt.po b/po/pt.po index 50a75725a..797d70a53 100644 --- a/po/pt.po +++ b/po/pt.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2022-12-25 21:30+0100\n" +"POT-Creation-Date: 2022-12-25 22:34+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: Vasco Almeida \n" "Language-Team: Portuguese <>\n" @@ -1247,10 +1247,11 @@ msgid "" "[|] || cycle | [|...] || merge " "| || unmerge [|-all] || hide [||-all " "[|...]] || unhide [||-all [|...]] " -"|| renumber [ [ []]] || close [[-]|" -"...] || notify [] || listvar [|] || setvar " -"[] || delvar || set [] || get || " -"jump smart|last_displayed|prev_visited|next_visited || |-|+|" +"|| switch [-previous] || zoom || renumber [ [ []]] " +"|| close [[-]|...] || notify [] || listvar [|" +"] || setvar [] || delvar || set " +"[] || get || jump smart|last_displayed|prev_visited|" +"next_visited || |-|+|" msgstr "" "list || clear [||-merged|-all [|...]] || move " "|-|+ || swap | [|] || cycle |" @@ -1278,6 +1279,9 @@ msgid "" " unmerge: unmerge buffer from other buffers which have same number\n" " hide: hide the buffer\n" " unhide: unhide the buffer\n" +" switch: switch to next merged buffer (or to previous buffer with \"-" +"previous\")\n" +" zoom: zoom on merged buffer\n" "renumber: renumber buffers (works only if option weechat.look." "buffer_auto_renumber is off)\n" " close: close buffer (number/range or name is optional)\n" @@ -2225,9 +2229,6 @@ msgid "" "argument: delay for end of grab, default is 500 milliseconds)\n" " grab_mouse: grab mouse event code\n" " grab_mouse_area: grab mouse event code with area\n" -" switch_active_buffer: switch to next merged buffer\n" -" switch_active_buffer_previous: switch to previous merged buffer\n" -" zoom_merged_buffer: zoom on merged buffer\n" " insert: insert text in command line (escaped chars are allowed, see /help " "print)\n" " send: send text to the buffer\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index dbd7c8af9..6432001d2 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: 2022-12-25 21:30+0100\n" +"POT-Creation-Date: 2022-12-25 22:34+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: Érico Nogueira \n" "Language-Team: weechat-dev \n" @@ -1256,10 +1256,11 @@ msgid "" "[|] || cycle | [|...] || merge " "| || unmerge [|-all] || hide [||-all " "[|...]] || unhide [||-all [|...]] " -"|| renumber [ [ []]] || close [[-]|" -"...] || notify [] || listvar [|] || setvar " -"[] || delvar || set [] || get || " -"jump smart|last_displayed|prev_visited|next_visited || |-|+|" +"|| switch [-previous] || zoom || renumber [ [ []]] " +"|| close [[-]|...] || notify [] || listvar [|" +"] || setvar [] || delvar || set " +"[] || get || jump smart|last_displayed|prev_visited|" +"next_visited || |-|+|" msgstr "" "list || clear [||-merged|-all] || move|merge || swap " "| [|] || unmerge [|-all] || close " @@ -1285,6 +1286,9 @@ msgid "" " unmerge: unmerge buffer from other buffers which have same number\n" " hide: hide the buffer\n" " unhide: unhide the buffer\n" +" switch: switch to next merged buffer (or to previous buffer with \"-" +"previous\")\n" +" zoom: zoom on merged buffer\n" "renumber: renumber buffers (works only if option weechat.look." "buffer_auto_renumber is off)\n" " close: close buffer (number/range or name is optional)\n" @@ -2041,9 +2045,6 @@ msgid "" "argument: delay for end of grab, default is 500 milliseconds)\n" " grab_mouse: grab mouse event code\n" " grab_mouse_area: grab mouse event code with area\n" -" switch_active_buffer: switch to next merged buffer\n" -" switch_active_buffer_previous: switch to previous merged buffer\n" -" zoom_merged_buffer: zoom on merged buffer\n" " insert: insert text in command line (escaped chars are allowed, see /help " "print)\n" " send: send text to the buffer\n" diff --git a/po/ru.po b/po/ru.po index 728b5d5c6..263ea1777 100644 --- a/po/ru.po +++ b/po/ru.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2022-12-25 21:30+0100\n" +"POT-Creation-Date: 2022-12-25 22:34+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: Aleksey V Zapparov AKA ixti \n" "Language-Team: weechat-dev \n" @@ -1202,10 +1202,11 @@ msgid "" "[|] || cycle | [|...] || merge " "| || unmerge [|-all] || hide [||-all " "[|...]] || unhide [||-all [|...]] " -"|| renumber [ [ []]] || close [[-]|" -"...] || notify [] || listvar [|] || setvar " -"[] || delvar || set [] || get || " -"jump smart|last_displayed|prev_visited|next_visited || |-|+|" +"|| switch [-previous] || zoom || renumber [ [ []]] " +"|| close [[-]|...] || notify [] || listvar [|" +"] || setvar [] || delvar || set " +"[] || get || jump smart|last_displayed|prev_visited|" +"next_visited || |-|+|" msgstr "" #, fuzzy @@ -1226,6 +1227,9 @@ msgid "" " unmerge: unmerge buffer from other buffers which have same number\n" " hide: hide the buffer\n" " unhide: unhide the buffer\n" +" switch: switch to next merged buffer (or to previous buffer with \"-" +"previous\")\n" +" zoom: zoom on merged buffer\n" "renumber: renumber buffers (works only if option weechat.look." "buffer_auto_renumber is off)\n" " close: close buffer (number/range or name is optional)\n" @@ -1807,9 +1811,6 @@ msgid "" "argument: delay for end of grab, default is 500 milliseconds)\n" " grab_mouse: grab mouse event code\n" " grab_mouse_area: grab mouse event code with area\n" -" switch_active_buffer: switch to next merged buffer\n" -" switch_active_buffer_previous: switch to previous merged buffer\n" -" zoom_merged_buffer: zoom on merged buffer\n" " insert: insert text in command line (escaped chars are allowed, see /help " "print)\n" " send: send text to the buffer\n" diff --git a/po/sr.po b/po/sr.po index 949620747..32e472d26 100644 --- a/po/sr.po +++ b/po/sr.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2022-12-25 21:30+0100\n" +"POT-Creation-Date: 2022-12-25 22:34+0100\n" "PO-Revision-Date: 2022-12-05 09:44+0400\n" "Last-Translator: Ivan Pešić \n" "Language-Team: weechat-dev \n" @@ -1264,10 +1264,11 @@ msgid "" "[|] || cycle | [|...] || merge " "| || unmerge [|-all] || hide [||-all " "[|...]] || unhide [||-all [|...]] " -"|| renumber [ [ []]] || close [[-]|" -"...] || notify [] || listvar [|] || setvar " -"[] || delvar || set [] || get || " -"jump smart|last_displayed|prev_visited|next_visited || |-|+|" +"|| switch [-previous] || zoom || renumber [ [ []]] " +"|| close [[-]|...] || notify [] || listvar [|" +"] || setvar [] || delvar || set " +"[] || get || jump smart|last_displayed|prev_visited|" +"next_visited || |-|+|" msgstr "" "list || add [-free] [-switch] <име> || clear [<број>|<име>|-merged|-all " "[<број>|<име>...]] || move <број>|-|+ || swap <број1>|<име1> [<број2>|" @@ -1364,6 +1365,9 @@ msgid "" " unmerge: unmerge buffer from other buffers which have same number\n" " hide: hide the buffer\n" " unhide: unhide the buffer\n" +" switch: switch to next merged buffer (or to previous buffer with \"-" +"previous\")\n" +" zoom: zoom on merged buffer\n" "renumber: renumber buffers (works only if option weechat.look." "buffer_auto_renumber is off)\n" " close: close buffer (number/range or name is optional)\n" @@ -2408,9 +2412,6 @@ msgid "" "argument: delay for end of grab, default is 500 milliseconds)\n" " grab_mouse: grab mouse event code\n" " grab_mouse_area: grab mouse event code with area\n" -" switch_active_buffer: switch to next merged buffer\n" -" switch_active_buffer_previous: switch to previous merged buffer\n" -" zoom_merged_buffer: zoom on merged buffer\n" " insert: insert text in command line (escaped chars are allowed, see /help " "print)\n" " send: send text to the buffer\n" diff --git a/po/tr.po b/po/tr.po index 9fda33552..f1e715496 100644 --- a/po/tr.po +++ b/po/tr.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2022-12-25 21:30+0100\n" +"POT-Creation-Date: 2022-12-25 22:34+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: Emir SARI \n" "Language-Team: weechat-dev \n" @@ -1252,10 +1252,11 @@ msgid "" "[|] || cycle | [|...] || merge " "| || unmerge [|-all] || hide [||-all " "[|...]] || unhide [||-all [|...]] " -"|| renumber [ [ []]] || close [[-]|" -"...] || notify [] || listvar [|] || setvar " -"[] || delvar || set [] || get || " -"jump smart|last_displayed|prev_visited|next_visited || |-|+|" +"|| switch [-previous] || zoom || renumber [ [ []]] " +"|| close [[-]|...] || notify [] || listvar [|" +"] || setvar [] || delvar || set " +"[] || get || jump smart|last_displayed|prev_visited|" +"next_visited || |-|+|" msgstr "" "list || add [-free] [-switch] || clear [||-merged|-all " "[|...]] || move |-|+ || swap | [|" @@ -1352,6 +1353,9 @@ msgid "" " unmerge: unmerge buffer from other buffers which have same number\n" " hide: hide the buffer\n" " unhide: unhide the buffer\n" +" switch: switch to next merged buffer (or to previous buffer with \"-" +"previous\")\n" +" zoom: zoom on merged buffer\n" "renumber: renumber buffers (works only if option weechat.look." "buffer_auto_renumber is off)\n" " close: close buffer (number/range or name is optional)\n" @@ -2528,9 +2532,6 @@ msgid "" "argument: delay for end of grab, default is 500 milliseconds)\n" " grab_mouse: grab mouse event code\n" " grab_mouse_area: grab mouse event code with area\n" -" switch_active_buffer: switch to next merged buffer\n" -" switch_active_buffer_previous: switch to previous merged buffer\n" -" zoom_merged_buffer: zoom on merged buffer\n" " insert: insert text in command line (escaped chars are allowed, see /help " "print)\n" " send: send text to the buffer\n" diff --git a/po/weechat.pot b/po/weechat.pot index df8b1db1b..34fd027c2 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: 2022-12-25 21:30+0100\n" +"POT-Creation-Date: 2022-12-25 22:34+0100\n" "PO-Revision-Date: 2014-08-16 10:27+0200\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" @@ -1084,10 +1084,11 @@ msgid "" "[|] || cycle | [|...] || merge " "| || unmerge [|-all] || hide [||-all " "[|...]] || unhide [||-all [|...]] " -"|| renumber [ [ []]] || close [[-]|" -"...] || notify [] || listvar [|] || setvar " -"[] || delvar || set [] || get || " -"jump smart|last_displayed|prev_visited|next_visited || |-|+|" +"|| switch [-previous] || zoom || renumber [ [ []]] " +"|| close [[-]|...] || notify [] || listvar [|" +"] || setvar [] || delvar || set " +"[] || get || jump smart|last_displayed|prev_visited|" +"next_visited || |-|+|" msgstr "" msgid "" @@ -1107,6 +1108,9 @@ msgid "" " unmerge: unmerge buffer from other buffers which have same number\n" " hide: hide the buffer\n" " unhide: unhide the buffer\n" +" switch: switch to next merged buffer (or to previous buffer with \"-" +"previous\")\n" +" zoom: zoom on merged buffer\n" "renumber: renumber buffers (works only if option weechat.look." "buffer_auto_renumber is off)\n" " close: close buffer (number/range or name is optional)\n" @@ -1643,9 +1647,6 @@ msgid "" "argument: delay for end of grab, default is 500 milliseconds)\n" " grab_mouse: grab mouse event code\n" " grab_mouse_area: grab mouse event code with area\n" -" switch_active_buffer: switch to next merged buffer\n" -" switch_active_buffer_previous: switch to previous merged buffer\n" -" zoom_merged_buffer: zoom on merged buffer\n" " insert: insert text in command line (escaped chars are allowed, see /help " "print)\n" " send: send text to the buffer\n" diff --git a/src/core/wee-command.c b/src/core/wee-command.c index d0d1dfd3c..1cebd130b 100644 --- a/src/core/wee-command.c +++ b/src/core/wee-command.c @@ -976,6 +976,23 @@ COMMAND_CALLBACK(buffer) return WEECHAT_RC_OK; } + /* switch to next/previous active buffer */ + if (string_strcasecmp (argv[1], "switch") == 0) + { + if ((argc > 2) && (string_strcasecmp (argv[2], "-previous") == 0)) + gui_buffer_switch_active_buffer_previous (buffer); + else + gui_buffer_switch_active_buffer (buffer); + return WEECHAT_RC_OK; + } + + /* zoom on merged buffer */ + if (string_strcasecmp (argv[1], "zoom") == 0) + { + gui_buffer_zoom (buffer); + return WEECHAT_RC_OK; + } + /* renumber buffers */ if (string_strcasecmp (argv[1], "renumber") == 0) { @@ -3433,12 +3450,6 @@ COMMAND_CALLBACK(input) gui_input_grab_mouse (buffer, 0); else if (string_strcasecmp (argv[1], "grab_mouse_area") == 0) gui_input_grab_mouse (buffer, 1); - else if (string_strcasecmp (argv[1], "switch_active_buffer") == 0) - gui_input_switch_active_buffer (buffer); - else if (string_strcasecmp (argv[1], "zoom_merged_buffer") == 0) - gui_input_zoom_merged_buffer (buffer); - else if (string_strcasecmp (argv[1], "switch_active_buffer_previous") == 0) - gui_input_switch_active_buffer_previous (buffer); else if (string_strcasecmp (argv[1], "insert") == 0) { if (argc > 2) @@ -3498,6 +3509,15 @@ COMMAND_CALLBACK(input) /* since WeeChat 3.8: "/allbuf /buffer set unread" */ else if (string_strcasecmp (argv[1], "set_unread") == 0) (void) input_data (buffer, "/allbuf /buffer set unread", NULL); + /* since WeeChat 3.8: "/buffer switch" */ + else if (string_strcasecmp (argv[1], "switch_active_buffer") == 0) + gui_buffer_switch_active_buffer (buffer); + /* since WeeChat 3.8: "/buffer switch previous" */ + else if (string_strcasecmp (argv[1], "switch_active_buffer_previous") == 0) + gui_buffer_switch_active_buffer_previous (buffer); + /* since WeeChat 3.8: "/buffer zoom" */ + else if (string_strcasecmp (argv[1], "zoom_merged_buffer") == 0) + gui_buffer_zoom (buffer); else COMMAND_ERROR; } @@ -7566,6 +7586,8 @@ command_init () " || unmerge [|-all]" " || hide [||-all [|...]]" " || unhide [||-all [|...]]" + " || switch [-previous]" + " || zoom" " || renumber [ [ []]]" " || close [[-]|...]" " || notify []" @@ -7593,6 +7615,9 @@ command_init () " unmerge: unmerge buffer from other buffers which have same number\n" " hide: hide the buffer\n" " unhide: unhide the buffer\n" + " switch: switch to next merged buffer (or to previous buffer " + "with \"-previous\")\n" + " zoom: zoom on merged buffer\n" "renumber: renumber buffers (works only if option weechat.look." "buffer_auto_renumber is off)\n" " close: close buffer (number/range or name is optional)\n" @@ -7662,6 +7687,8 @@ command_init () " || hide %(buffers_numbers)|%(buffers_plugins_names)|-all " "%(buffers_numbers)|%(buffers_plugins_names)|%*" " || unhide %(buffers_numbers)|%(buffers_plugins_names)|-all " + " || switch -previous" + " || zoom" "%(buffers_numbers)|%(buffers_plugins_names)|%*" " || renumber %(buffers_numbers) %(buffers_numbers) %(buffers_numbers)" " || close %(buffers_plugins_names)|%*" @@ -8195,9 +8222,6 @@ command_init () "argument: delay for end of grab, default is 500 milliseconds)\n" " grab_mouse: grab mouse event code\n" " grab_mouse_area: grab mouse event code with area\n" - " switch_active_buffer: switch to next merged buffer\n" - " switch_active_buffer_previous: switch to previous merged buffer\n" - " zoom_merged_buffer: zoom on merged buffer\n" " insert: insert text in command line (escaped chars are allowed, " "see /help print)\n" " send: send text to the buffer\n" @@ -8221,8 +8245,6 @@ command_init () "history_previous || history_next || history_global_previous || " "history_global_next || " "grab_key || grab_key_command || grab_mouse || grab_mouse_area || " - "switch_active_buffer || switch_active_buffer_previous || " - "zoom_merged_buffer || " "insert || send || " "paste_start || paste_stop", &command_input, NULL, NULL); diff --git a/src/gui/curses/gui-curses-key.c b/src/gui/curses/gui-curses-key.c index c1ff9c1c7..ca50bfb6c 100644 --- a/src/gui/curses/gui-curses-key.c +++ b/src/gui/curses/gui-curses-key.c @@ -95,8 +95,8 @@ gui_key_default_bindings (int context) BIND(/* ^D */ "ctrl-D", "/input delete_next_char"); BIND(/* ^W */ "ctrl-W", "/input delete_previous_word_whitespace"); BIND(/* m- */ "meta-ctrl-?", "/input delete_previous_word"); - BIND(/* ^X */ "ctrl-X", "/input switch_active_buffer"); - BIND(/* m-x */ "meta-x", "/input zoom_merged_buffer"); + BIND(/* ^X */ "ctrl-X", "/buffer switch"); + BIND(/* m-x */ "meta-x", "/buffer zoom"); BIND(/* m-d */ "meta-d", "/input delete_next_word"); BIND(/* ^K */ "ctrl-K", "/input delete_end_of_line"); BIND(/* m-r */ "meta-r", "/input delete_line"); diff --git a/src/gui/gui-buffer.c b/src/gui/gui-buffer.c index 62442f5ea..cbf5c616b 100644 --- a/src/gui/gui-buffer.c +++ b/src/gui/gui-buffer.c @@ -3354,6 +3354,120 @@ gui_buffer_get_previous_active_buffer (struct t_gui_buffer *buffer, return NULL; } +/* + * Switches active buffer to next buffer (when many buffers are merged). + */ + +void +gui_buffer_switch_active_buffer (struct t_gui_buffer *buffer) +{ + struct t_gui_buffer *ptr_buffer; + struct t_gui_window *window; + + ptr_buffer = gui_buffer_get_next_active_buffer (buffer, 0); + if (ptr_buffer) + { + gui_buffer_set_active_buffer (ptr_buffer); + window = gui_window_search_with_buffer (buffer); + if (window) + gui_window_switch_to_buffer (window, ptr_buffer, 1); + } +} + +/* + * Switches active buffer to previous buffer (when many buffers are merged). + */ + +void +gui_buffer_switch_active_buffer_previous (struct t_gui_buffer *buffer) +{ + struct t_gui_buffer *ptr_buffer; + struct t_gui_window *window; + + ptr_buffer = gui_buffer_get_previous_active_buffer (buffer, 0); + if (ptr_buffer) + { + gui_buffer_set_active_buffer (ptr_buffer); + window = gui_window_search_with_buffer (buffer); + if (window) + gui_window_switch_to_buffer (window, ptr_buffer, 1); + } +} + +/* + * Zooms on current active merged buffer, or display all merged buffers if zoom + * was active. + */ + +void +gui_buffer_zoom (struct t_gui_buffer *buffer) +{ + struct t_gui_window *ptr_window; + struct t_gui_buffer *ptr_buffer; + int buffer_was_zoomed; + + /* do nothing if current buffer is not merged with another buffer */ + if (gui_buffer_count_merged_buffers (buffer->number) < 2) + return; + + buffer_was_zoomed = (buffer->active == 2); + + /* reset scroll in all windows displaying this buffer number */ + for (ptr_window = gui_windows; ptr_window; + ptr_window = ptr_window->next_window) + { + if ((ptr_window->buffer->number == buffer->number) + && ptr_window->scroll && ptr_window->scroll->start_line) + { + gui_window_scroll_bottom (ptr_window); + } + } + + /* first make buffer active if it is not */ + if (!buffer->active) + { + gui_buffer_set_active_buffer (buffer); + ptr_window = gui_window_search_with_buffer (buffer); + if (ptr_window) + gui_window_switch_to_buffer (ptr_window, buffer, 1); + } + + /* + * toggle active flag between 1 and 2 + * (1 = active with other merged buffers displayed, 2 = the only active) + */ + if (buffer->active == 1) + { + buffer->active = 2; + buffer->lines = buffer->own_lines; + } + else if (buffer->active == 2) + { + buffer->active = 1; + buffer->lines = buffer->mixed_lines; + } + + /* set "zoomed" in merged buffers */ + for (ptr_buffer = gui_buffers; ptr_buffer; + ptr_buffer = ptr_buffer->next_buffer) + { + if (ptr_buffer->number > buffer->number) + break; + if (ptr_buffer->number == buffer->number) + { + ptr_buffer->zoomed = (buffer->active == 2) ? 1 : 0; + } + } + + gui_buffer_compute_num_displayed (); + + gui_buffer_ask_chat_refresh (buffer, 2); + + (void) hook_signal_send ((buffer_was_zoomed) ? + "buffer_unzoomed" : "buffer_zoomed", + WEECHAT_HOOK_SIGNAL_POINTER, buffer); +} + /* * Renumbers buffers with consecutive numbers between the range * number1 -> number2, sarting with new number "start_number". diff --git a/src/gui/gui-buffer.h b/src/gui/gui-buffer.h index 0dc1c3b6b..5fc4da2ca 100644 --- a/src/gui/gui-buffer.h +++ b/src/gui/gui-buffer.h @@ -361,6 +361,9 @@ extern struct t_gui_buffer *gui_buffer_get_next_active_buffer (struct t_gui_buff int allow_hidden_buffer); extern struct t_gui_buffer *gui_buffer_get_previous_active_buffer (struct t_gui_buffer *buffer, int allow_hidden_buffer); +extern void gui_buffer_switch_active_buffer (struct t_gui_buffer *buffer); +extern void gui_buffer_switch_active_buffer_previous (struct t_gui_buffer *buffer); +extern void gui_buffer_zoom (struct t_gui_buffer *buffer); extern void gui_buffer_renumber (int number1, int number2, int start_number); extern void gui_buffer_move_to_number (struct t_gui_buffer *buffer, int number); extern void gui_buffer_swap (int number1, int number2); diff --git a/src/gui/gui-input.c b/src/gui/gui-input.c index 6a98e798a..11e11ccd7 100644 --- a/src/gui/gui-input.c +++ b/src/gui/gui-input.c @@ -1484,121 +1484,6 @@ gui_input_grab_mouse (struct t_gui_buffer *buffer, int area) gui_mouse_grab_init (area); } -/* - * Switches active buffer to next buffer (when many buffers are merged) (default - * key: ctrl-X). - */ - -void -gui_input_switch_active_buffer (struct t_gui_buffer *buffer) -{ - struct t_gui_buffer *ptr_buffer; - struct t_gui_window *window; - - ptr_buffer = gui_buffer_get_next_active_buffer (buffer, 0); - if (ptr_buffer) - { - gui_buffer_set_active_buffer (ptr_buffer); - window = gui_window_search_with_buffer (buffer); - if (window) - gui_window_switch_to_buffer (window, ptr_buffer, 1); - } -} - -/* - * Switches active buffer to previous buffer (when many buffers are merged). - */ - -void -gui_input_switch_active_buffer_previous (struct t_gui_buffer *buffer) -{ - struct t_gui_buffer *ptr_buffer; - struct t_gui_window *window; - - ptr_buffer = gui_buffer_get_previous_active_buffer (buffer, 0); - if (ptr_buffer) - { - gui_buffer_set_active_buffer (ptr_buffer); - window = gui_window_search_with_buffer (buffer); - if (window) - gui_window_switch_to_buffer (window, ptr_buffer, 1); - } -} - -/* - * Zooms on current active merged buffer, or display all merged buffers if zoom - * was active (default key: alt-x). - */ - -void -gui_input_zoom_merged_buffer (struct t_gui_buffer *buffer) -{ - struct t_gui_window *ptr_window; - struct t_gui_buffer *ptr_buffer; - int buffer_was_zoomed; - - /* do nothing if current buffer is not merged with another buffer */ - if (gui_buffer_count_merged_buffers (buffer->number) < 2) - return; - - buffer_was_zoomed = (buffer->active == 2); - - /* reset scroll in all windows displaying this buffer number */ - for (ptr_window = gui_windows; ptr_window; - ptr_window = ptr_window->next_window) - { - if ((ptr_window->buffer->number == buffer->number) - && ptr_window->scroll && ptr_window->scroll->start_line) - { - gui_window_scroll_bottom (ptr_window); - } - } - - /* first make buffer active if it is not */ - if (!buffer->active) - { - gui_buffer_set_active_buffer (buffer); - ptr_window = gui_window_search_with_buffer (buffer); - if (ptr_window) - gui_window_switch_to_buffer (ptr_window, buffer, 1); - } - - /* - * toggle active flag between 1 and 2 - * (1 = active with other merged buffers displayed, 2 = the only active) - */ - if (buffer->active == 1) - { - buffer->active = 2; - buffer->lines = buffer->own_lines; - } - else if (buffer->active == 2) - { - buffer->active = 1; - buffer->lines = buffer->mixed_lines; - } - - /* set "zoomed" in merged buffers */ - for (ptr_buffer = gui_buffers; ptr_buffer; - ptr_buffer = ptr_buffer->next_buffer) - { - if (ptr_buffer->number > buffer->number) - break; - if (ptr_buffer->number == buffer->number) - { - ptr_buffer->zoomed = (buffer->active == 2) ? 1 : 0; - } - } - - gui_buffer_compute_num_displayed (); - - gui_buffer_ask_chat_refresh (buffer, 2); - - (void) hook_signal_send ((buffer_was_zoomed) ? - "buffer_unzoomed" : "buffer_zoomed", - WEECHAT_HOOK_SIGNAL_POINTER, buffer); -} - /* * Inserts a string in command line. */ diff --git a/src/gui/gui-input.h b/src/gui/gui-input.h index b6732d061..2e401a6c5 100644 --- a/src/gui/gui-input.h +++ b/src/gui/gui-input.h @@ -75,9 +75,6 @@ extern void gui_input_history_global_next (struct t_gui_buffer *buffer); extern void gui_input_grab_key (struct t_gui_buffer *buffer, int command, const char *delay); extern void gui_input_grab_mouse (struct t_gui_buffer *buffer, int area); -extern void gui_input_switch_active_buffer (struct t_gui_buffer *buffer); -extern void gui_input_switch_active_buffer_previous (struct t_gui_buffer *buffer); -extern void gui_input_zoom_merged_buffer (struct t_gui_buffer *buffer); extern void gui_input_insert (struct t_gui_buffer *buffer, const char *args); extern void gui_input_undo (struct t_gui_buffer *buffer); extern void gui_input_redo (struct t_gui_buffer *buffer); diff --git a/tests/unit/gui/test-gui-buffer.cpp b/tests/unit/gui/test-gui-buffer.cpp index 7f86c33c8..9440ada1d 100644 --- a/tests/unit/gui/test-gui-buffer.cpp +++ b/tests/unit/gui/test-gui-buffer.cpp @@ -1147,6 +1147,36 @@ TEST(GuiBuffer, GetPreviousActiveBuffer) /* TODO: write tests */ } +/* + * Tests functions: + * gui_buffer_switch_active_buffer + */ + +TEST(GuiBuffer, SwitchActiveBuffer) +{ + /* TODO: write tests */ +} + +/* + * Tests functions: + * gui_buffer_switch_active_buffer_previous + */ + +TEST(GuiBuffer, SwitchActiveBufferPrevious) +{ + /* TODO: write tests */ +} + +/* + * Tests functions: + * gui_buffer_zoom + */ + +TEST(GuiBuffer, Zoom) +{ + /* TODO: write tests */ +} + /* * Tests functions: * gui_buffer_renumber diff --git a/tests/unit/gui/test-gui-input.cpp b/tests/unit/gui/test-gui-input.cpp index 31356edad..ecfae84e8 100644 --- a/tests/unit/gui/test-gui-input.cpp +++ b/tests/unit/gui/test-gui-input.cpp @@ -802,36 +802,6 @@ TEST(GuiInput, GrabMouse) /* TODO: write tests */ } -/* - * Tests functions: - * gui_input_switch_active_buffer - */ - -TEST(GuiInput, SwitchActiveBuffer) -{ - /* TODO: write tests */ -} - -/* - * Tests functions: - * gui_input_switch_active_buffer_previous - */ - -TEST(GuiInput, SwitchActiveBufferPrevious) -{ - /* TODO: write tests */ -} - -/* - * Tests functions: - * gui_input_zoom_merged_buffer - */ - -TEST(GuiInput, ZoomMergedBuffer) -{ - /* TODO: write tests */ -} - /* * Tests functions: * gui_input_insert