summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog1
-rw-r--r--NEWS6
-rw-r--r--doc/de/autogen/user/weechat_commands.txt168
-rw-r--r--doc/de/weechat_user.de.txt2
-rw-r--r--doc/en/autogen/user/weechat_commands.txt4
-rw-r--r--doc/en/weechat_user.en.txt2
-rw-r--r--doc/fr/autogen/user/weechat_commands.txt4
-rw-r--r--doc/fr/weechat_user.fr.txt2
-rw-r--r--doc/it/autogen/user/weechat_commands.txt192
-rw-r--r--doc/it/weechat_user.it.txt2
-rw-r--r--po/cs.po10
-rw-r--r--po/de.po13
-rw-r--r--po/es.po12
-rw-r--r--po/fr.po20
-rw-r--r--po/hu.po10
-rw-r--r--po/it.po13
-rw-r--r--po/pl.po12
-rw-r--r--po/pt_BR.po12
-rw-r--r--po/ru.po10
-rw-r--r--po/weechat.pot10
-rw-r--r--src/core/wee-command.c14
-rw-r--r--src/gui/curses/gui-curses-key.c2
-rw-r--r--src/gui/gui-input.c38
-rw-r--r--src/gui/gui-input.h1
-rw-r--r--src/gui/gui-window.c33
-rw-r--r--src/gui/gui-window.h1
26 files changed, 306 insertions, 288 deletions
diff --git a/ChangeLog b/ChangeLog
index 4a8f0028f..b31c3c656 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@ v0.3.7-dev, 2012-01-24
Version 0.3.7 (under dev!)
--------------------------
+* core: move option "scroll_unread" from command /input to /window
* core: add support of flags in regular expressions and highlight options
* core: add library "pthread" in cmake file for link on OpenBSD
* core: use extended regex in filters (patch #7616)
diff --git a/NEWS b/NEWS
index c937b2bfc..8ff57e193 100644
--- a/NEWS
+++ b/NEWS
@@ -1,12 +1,16 @@
WeeChat News
============
Sébastien Helleu <flashcode@flashtux.org>
-v0.3.7-dev, 2012-01-22
+v0.3.7-dev, 2012-01-24
Version 0.3.7 (under dev!)
--------------------------
+* option `scroll_unread` has been moved from command `/input` to `/window`,
+ therefore default command of key alt-u has been updated. To bind key with new
+ default value:
+** `/key bind meta-u /window scroll_unread`
* extented regex is used in filters and irc ignore, so some chars that
needed escape in past do not need any more (for example `[0-9]\+` becomes
`[0-9]+`), filters and ignore have to be manually fixed
diff --git a/doc/de/autogen/user/weechat_commands.txt b/doc/de/autogen/user/weechat_commands.txt
index bf99531a7..c9f8cbe1c 100644
--- a/doc/de/autogen/user/weechat_commands.txt
+++ b/doc/de/autogen/user/weechat_commands.txt
@@ -275,54 +275,53 @@ value: Anzahl der gewünschten Einträgen im Befehlsverlauf anzeigen
........................................
/input <action> [<arguments>]
-Auflistung der Aktionen:
- return: simuliert die "enter" Taste
- complete_next: vervollständigt Wort mit nächster Komplettierung
- complete_previous: vervollständigt Word mit vorheriger Komplettierung
- search_text: sucht nach Text im Buffer
- search_switch_case: schaltet Groß-/Kleinschreibung ein und aus
- search_previous: sucht vorheriger Zeile
- search_next: sucht nächste Zeile
- search_stop: suche stoppen
- delete_previous_char: entfernt vorheriges Zeichen
- delete_next_char: entfernt nächstes Zeichen
- delete_previous_word: entfernt vorheriges Wort
- delete_next_word: entfernt nächstes Wort
- delete_beginning_of_line: entfernt alle Zeichen ab Zeilenanfang bis zum Cursor
- delete_end_of_line: entfernt alle Zeichen ab Cursor bis zum Ende der Zeile
- delete_line: löscht die komplette Eingabezeile
- clipboard_paste: fügt Zeichenkette aus der Zwischenablage ein
- transpose_chars: Zeichen austauschen
- undo: letzten Befehl in der Eingabezeile rückgängig machen
- redo: letzten Befehl in der Eingabezeile wiederherstellen
- move_beginning_of_line: springt an den Anfang der Eingabezeile
- move_end_of_line: springt ans Ende der Eingabezeile
- move_previous_char: setzt den Cursor eine Position nach links
- move_next_char: setzt den Cursor eine Position nach rechts
- move_previous_word: springt zum Anfang des vorherigen Wortes, in der Eingabezeile
- move_next_word: springt zum Anfang des nächsten Wortes, in der Eingabezeile
- history_previous: ruft vorherigen Befehl oder Nachricht aus dem Befehlsspeicher auf (im Such-Modus: rückwärts suchen)
- history_next: ruft nächsten Befehl oder Nachricht aus dem Befehlsspeicher auf (im Such-Modus: vorwärts suchen)
- history_global_previous: ruft vorherigen Befehl/Nachricht aus dem globalen Befehlsspeicher auf (für alle Buffer)
- history_global_next: ruft nächsten Befehl/Nachricht aus dem globalen Befehlsspeicher auf (für alle Buffer)
- jump_smart: wechselt zum nächsten Buffer mit Aktivität (nach Priorität: highlight, Nachricht, …)
- jump_last_buffer: springt zum letzten Buffer, in der Bufferliste
- jump_last_buffer_displayed: wechselt zum jeweils zuletzt angezeigten Buffer
- jump_previously_visited_buffer: springt zum letzten besuchten Buffer
- jump_next_visited_buffer: springt zum nächsten besuchten Buffer
- hotlist_clear: löscht Hotliste (Aktivitätsanzeige für die Buffer)
- grab_key: fängt eine Taste (optionales Argument: Verzögerung um eine Taste einzufangen. Standard sind 500 Millisekunden)
- grab_key_command: zeigt den Tastencode (inklusive des eingebundenen Befehls) einer Tastenkombination an und fügt ihn in die Befehlszeile ein (optionales Argument: Verzögerung um eine Taste einzufangen. Standard sind 500 Millisekunden)
- grab_mouse: fängt den Code einer Maus Aktivität
- grab_mouse_area: fängt den Code einer Maus Aktivität mit Bereich
- scroll_unread: springe zur ersten ungelesenen Zeile im Buffer
- set_unread: setzt für alle Buffer die Markierung der ungelesen Nachrichten
- set_unread_current_buffer: setzt nur für den aktuellen Buffer eine Markierung der ungelesen Nachrichten
- switch_active_buffer: springt zum nächsten zusammengefügten Buffer
- switch_active_buffer_previous: springt zum vorherigen zusammengefügten Buffer
- insert: fügt einen Text in die Eingabezeile ein
-
-Dieser Befehl wird durch Tastenbelegungen oder Erweiterungen genutzt.
+list of actions:
+ return: simulate key "enter"
+ complete_next: complete word with next completion
+ complete_previous: complete word with previous completion
+ search_text: search text in buffer
+ search_switch_case: switch exact case for search
+ search_previous: search previous line
+ search_next: search next line
+ search_stop: stop search
+ delete_previous_char: delete previous char
+ delete_next_char: delete next char
+ delete_previous_word: delete previous word
+ delete_next_word: delete next word
+ delete_beginning_of_line: delete from beginning of line until cursor
+ delete_end_of_line: delete from cursor until end of line
+ delete_line: delete entire line
+ clipboard_paste: paste from clipboard
+ transpose_chars: transpose two chars
+ undo: undo last command line action
+ redo: redo last command line action
+ move_beginning_of_line: move cursor to beginning of line
+ move_end_of_line: move cursor to end of line
+ move_previous_char: move cursor to previous char
+ move_next_char: move cursor to next char
+ move_previous_word: move cursor to previous word
+ move_next_word: move cursor to next word
+ history_previous: recall previous command in current buffer history
+ history_next: recall next command in current buffer history
+ history_global_previous: recall previous command in global history
+ history_global_next: recall next command in global history
+ jump_smart: jump to next buffer with activity
+ jump_last_buffer: jump to last buffer
+ jump_last_buffer_displayed: jump to last buffer displayed (before last jump to a buffer)
+ jump_previously_visited_buffer: jump to previously visited buffer
+ jump_next_visited_buffer: jump to next visited buffer
+ hotlist_clear: clear hotlist
+ grab_key: grab a key (optional argument: delay for end of grab, default is 500 milliseconds)
+ 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
+ set_unread: set unread marker for all buffers
+ set_unread_current_buffer: set unread marker for current buffer
+ switch_active_buffer: switch to next merged buffer
+ switch_active_buffer_previous: switch to previous merged buffer
+ insert: insert text in command line
+
+This command is used by key bindings or plugins.
........................................
[[command_weechat_key]]
@@ -649,50 +648,51 @@ Beispiele:
refresh
scroll [-window <number>] [+/-]<value>[s|m|h|d|M|y]
scroll_horiz [-window <number>] [+/-]<value>[%]
- scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight [-window <number>]
+ scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight|scroll_unread [-window <number>]
swap [-window <number>] [up|down|left|right]
zoom[-window <number>]
- list: listet die geöffneten Fenster (ohne Angabe von Parametern wird diese Funktion aufgerufen)
- -1: springt zum vorherigen Fenster
- +1: springt zum nächsten Fenster
- b#: springt zum nächsten Fenster, welches die Buffer Nummer # besitzt
- up: wechselt zum Fenster über dem aktuellen
- down: wechselt zum Fenster unter dem aktuellen
- left: wechselt zum linken Fenster
- right: wechselt zum rechten Fenster
- number: Nummer des Fensters (siehe /window list)
- splith: teilt das aktuelle Fenster horizontal
- splitv: teilt das aktuelle Fenster vertikal
- resize: verändert die Größe des aktuellen Fensters. Die neue Größe des Fensters ist prozentual <pct> zum Stammfensters groß
- balance: passt die Größe aller Fenster an
- merge: vereinigt Fenster miteinander (all = alle Fenster vereinigen)
- page_up: scrollt eine Seite nach oben
- page_down: scrollt eine Seite nach unten
- refresh: Seite wird neu aufgebaut
- scroll: scrollt eine Anzahl an Zeilen (+/-N) oder zu einer gewissen Zeit: s=Sekunden, m=Minuten, h=Stunden, d=Tage, M=Monate, y=Jahre
- scroll_horiz: scrollt horizontal eine Anzahl an Spalten (+/-N) oder prozentual von der Fenstergröße ausgehend (dieses scrolling ist nur in Buffern möglich die über einen freien Inhalt verfügen)
- scroll_up: scrollt ein paar Zeilen nach oben
- scroll_down: scrollt ein paar Zeilen nach unten
- scroll_top: scrollt zum Anfang des Buffers
-scroll_bottom: scrollt zum Ende des Buffers
-scroll_previous_highlight: scrollt zum vorherigen Hightlight
-scroll_next_highlight: scrollt zum nächsten Highlight
- swap: tauscht die Buffer von zwei Fenstern (mit optionaler Angabe für das Zielfenster)
- zoom: vergrößert ein Fenster auf 100%
-
-Bei splith und splitv gibt "pct" die neue Größe des Fensters im Verhältnis zur aktuellen Größe an. Zum Beispiel würde ein Wert von 25 bedeuten, dass das neue Fenster nur noch ein Viertel der Größe des alten Fensters hat.
+ list: list opened windows (without argument, this list is displayed)
+ -1: jump to previous window
+ +1: jump to next window
+ b#: jump to next window displaying buffer number #
+ up: switch to window above current one
+ down: switch to window below current one
+ left: switch to window on the left
+ right: switch to window on the right
+ number: window number (see /window list)
+ splith: split current window horizontally
+ splitv: split current window vertically
+ resize: resize window size, new size is <pct> percentage of parent window
+ balance: balance the sizes of all windows
+ merge: merge window with another (all = keep only one window)
+ page_up: scroll one page up
+ page_down: scroll one page down
+ refresh: refresh screen
+ scroll: scroll a number of lines (+/-N) or with time: s=seconds, m=minutes, h=hours, d=days, M=months, y=years
+ scroll_horiz: scroll horizontally a number of columns (+/-N) or percentage of window size (this scrolling is possible only on buffers with free content)
+ scroll_up: scroll a few lines up
+ scroll_down: scroll a few lines down
+ scroll_top: scroll to top of buffer
+scroll_bottom: scroll to bottom of buffer
+scroll_previous_highlight: scroll to previous highlight
+scroll_next_highlight: scroll to next highlight
+scroll_unread: scroll to unread marker
+ swap: swap buffers of two windows (with optional direction for target window)
+ zoom: zoom on window
+
+For splith and splitv, pct is a percentage which represents size of new window, computed with current window as size reference. For example 25 means create a new window with size = current_size / 4
-Beispiele:
- springt zum Fenster mit dem Buffer #1:
+Examples:
+ jump to window displaying buffer #1:
/window b1
- scrollt zwei Zeilen hoch:
+ scroll 2 lines up:
/window scroll -2
- scrollt zwei Tage hoch: /window scroll -2d
+ scroll 2 days up:
/window scroll -2d
- scrollt zum Beginn des aktuellen Tages:
+ scroll to beginning of current day:
/window scroll -d
- Fenster #2 wird vergrößert:
+ zoom on window #2:
/window zoom -window 2
........................................
diff --git a/doc/de/weechat_user.de.txt b/doc/de/weechat_user.de.txt
index fe942b594..a29ceebb3 100644
--- a/doc/de/weechat_user.de.txt
+++ b/doc/de/weechat_user.de.txt
@@ -522,7 +522,7 @@ Tastenbefehle für Buffer / Fenster
| @k(A-)@k(m) | schaltet Mausfunktion ein/aus | /mouse toggle
| @k(A-)@k(n) | springt zur nächsten Highlight Nachricht | /window scroll_next_highlight
| @k(A-)@k(p) | springt zur vorherigen Highlight Nachricht | /window scroll_previous_highlight
-| @k(A-)@k(u) | springt zur ersten ungelesenen Zeile im Buffer | /input scroll_unread
+| @k(A-)@k(u) | springt zur ersten ungelesenen Zeile im Buffer | /window scroll_unread
| @k(A-)@k(w) , @k(A-)@k(↑) | wechselt zum oberen Fenster | /window up
| @k(A-)@k(w) , @k(A-)@k(↓) | wechselt zum unteren Fenster | /window down
| @k(A-)@k(w) , @k(A-)@k(←) | wechselt zum linken Fenster | /window left
diff --git a/doc/en/autogen/user/weechat_commands.txt b/doc/en/autogen/user/weechat_commands.txt
index f04f5bdc0..a264ba8e6 100644
--- a/doc/en/autogen/user/weechat_commands.txt
+++ b/doc/en/autogen/user/weechat_commands.txt
@@ -315,7 +315,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
- scroll_unread: scroll to unread marker
set_unread: set unread marker for all buffers
set_unread_current_buffer: set unread marker for current buffer
switch_active_buffer: switch to next merged buffer
@@ -649,7 +648,7 @@ Examples:
refresh
scroll [-window <number>] [+/-]<value>[s|m|h|d|M|y]
scroll_horiz [-window <number>] [+/-]<value>[%]
- scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight [-window <number>]
+ scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight|scroll_unread [-window <number>]
swap [-window <number>] [up|down|left|right]
zoom[-window <number>]
@@ -678,6 +677,7 @@ Examples:
scroll_bottom: scroll to bottom of buffer
scroll_previous_highlight: scroll to previous highlight
scroll_next_highlight: scroll to next highlight
+scroll_unread: scroll to unread marker
swap: swap buffers of two windows (with optional direction for target window)
zoom: zoom on window
diff --git a/doc/en/weechat_user.en.txt b/doc/en/weechat_user.en.txt
index 65c2ac38d..1cd984dc0 100644
--- a/doc/en/weechat_user.en.txt
+++ b/doc/en/weechat_user.en.txt
@@ -522,7 +522,7 @@ Keys for buffers / windows
| @k(A-)@k(m) | Toggle mouse | /mouse toggle
| @k(A-)@k(n) | Scroll to next highlight | /window scroll_next_highlight
| @k(A-)@k(p) | Scroll to previous highlight | /window scroll_previous_highlight
-| @k(A-)@k(u) | Scroll to first unread line in buffer | /input scroll_unread
+| @k(A-)@k(u) | Scroll to first unread line in buffer | /window scroll_unread
| @k(A-)@k(w) , @k(A-)@k(↑) | Switch to window above | /window up
| @k(A-)@k(w) , @k(A-)@k(↓) | Switch to window below | /window down
| @k(A-)@k(w) , @k(A-)@k(←) | Switch to window on the left | /window left
diff --git a/doc/fr/autogen/user/weechat_commands.txt b/doc/fr/autogen/user/weechat_commands.txt
index d69178263..1ac5781a4 100644
--- a/doc/fr/autogen/user/weechat_commands.txt
+++ b/doc/fr/autogen/user/weechat_commands.txt
@@ -315,7 +315,6 @@ list 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
- scroll_unread: faire défiler jusqu'au marqueur de données non lues
set_unread: définir le marqueur de données non lues pour tous les tampons
set_unread_current_buffer: définir le marqueur de données non lues pour le tampon courant
switch_active_buffer: basculer vers le tampon mélangé suivant
@@ -647,7 +646,7 @@ Exemples:
refresh
scroll [-window <numéro>] [+/-]<valeur>[s|m|h|d|M|y]
scroll_horiz [-window <numéro>] [+/-]<valeur>[%]
- scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight [-window <numéro>]
+ scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight|scroll_unread [-window <numéro>]
swap [-window <numéro>] [up|down|left|right]
zoom [-window <numéro>]
@@ -676,6 +675,7 @@ Exemples:
scroll_bottom: faire défiler jusqu'en bas du tampon
scroll_previous_highlight: faire défiler jusqu'au highlight précédent
scroll_next_highlight: faire défiler jusqu'au highlight suivant
+scroll_unread: faire défiler jusqu'au marqueur de données non lues
swap: échanger les tampons de deux fenêtres (avec une direction facultative pour la fenêtre cible)
zoom: zoomer sur la fenêtre
diff --git a/doc/fr/weechat_user.fr.txt b/doc/fr/weechat_user.fr.txt
index 53708ccd6..1262aaa8d 100644
--- a/doc/fr/weechat_user.fr.txt
+++ b/doc/fr/weechat_user.fr.txt
@@ -532,7 +532,7 @@ Touches pour les tampons / fenêtres
| @k(A-)@k(m) | Activer/désactiver la souris | /mouse toggle
| @k(A-)@k(n) | Se positionner sur le highlight suivant | /window scroll_next_highlight
| @k(A-)@k(p) | Se positionner sur le highlight précédent | /window scroll_previous_highlight
-| @k(A-)@k(u) | Se positionner sur la première ligne non lue du tampon | /input scroll_unread
+| @k(A-)@k(u) | Se positionner sur la première ligne non lue du tampon | /window scroll_unread
| @k(A-)@k(w) , @k(A-)@k(↑) | Sauter à la fenêtre au dessus | /window up
| @k(A-)@k(w) , @k(A-)@k(↓) | Sauter à la fenêtre en dessous | /window down
| @k(A-)@k(w) , @k(A-)@k(←) | Sauter à la fenêtre de gauche | /window left
diff --git a/doc/it/autogen/user/weechat_commands.txt b/doc/it/autogen/user/weechat_commands.txt
index 98f6229d2..98b602105 100644
--- a/doc/it/autogen/user/weechat_commands.txt
+++ b/doc/it/autogen/user/weechat_commands.txt
@@ -275,54 +275,53 @@ valore: numero delle voci nella cronologia da mostrare
........................................
/input <azioni> [<argomenti>]
-elenco di azioni:
- return: simula il tasto "invio"
- complete_next: completa la parola con il completamento successivo
- complete_previous: completa la parola con il completamento precedente
- search_text: cerca testo nel buffer
- search_switch_case: passa alla ricerca esatta
- search_previous: cerca la riga precedente
- search_next: cerca la riga successiva
- search_stop: ferma la ricerca
- delete_previous_char: elimina carattere precedente
- delete_next_char: elimina carattere successivo
- delete_previous_word: elimina parola precedente
- delete_next_word: elimina parola successiva
- delete_beginning_of_line: elimina da inizio riga fino al cursore
- delete_end_of_line: elimina dal cursore fino a fine riga
- delete_line: elimina intera riga
- clipboard_paste: incolla dagli appunti
- transpose_chars: inverti l'ordine di due caratteri
- undo: annulla l'ultima azione nella riga di comando
- redo: rifai l'ultima azione nella riga di comando
- move_beginning_of_line: sposta il cursore ad inizio riga
- move_end_of_line: sposta il cursore a fine riga
- move_previous_char: sposta cursore al carattere precedente
- move_next_char: sposta cursore al carattere successivo
- move_previous_word: sposta cursore alla parola precedente
- move_next_word: sposta cursore alla parola successiva
- history_previous: richiama il comando precedente nella cronologia del buffer corrente
- history_next: richiama il comando successivo nella cronologia del buffer corrente
- history_global_previous: richiama il comando precedente nella cronologia globale
- history_global_next: richiama il comando successivo nella cronologia globale
- jump_smart: passa al buffer successivo con attività
- jump_last_buffer: passa all'ultimo buffer
- jump_last_buffer_displayed: passa all'ultimo buffer mostrato (primadell'ultimo passaggio ad un buffer)
- jump_previously_visited_buffer: passa al precedente buffer visualizzato
- jump_next_visited_buffer: passa al successivo buffer visualizzato
- hotlist_clear: elimina hotlist
- grab_key: ottiene un tasto
- grab_key_command: ottiene un tasto con il suo comando associato
- grab_mouse: cattura il codice dell'evento del mouse
- grab_mouse_area: cattura il codice dell'evento del mouse con l'area
- scroll_unread: scorri fino al segnalibro non letto
- set_unread: imposta il segnalibro non letto per tutti i buffer
- set_unread_current_buffer: imposta il segnalibro non letto per il buffer corrente
- switch_active_buffer: passa al successivo buffer incollato
- switch_active_buffer_previous: passa al precedente buffer incollato
- insert: inserisci testo nella riga di comando
-
-Questo comando viene usato dalla combinazioni tasti o dai plugin.
+list of actions:
+ return: simulate key "enter"
+ complete_next: complete word with next completion
+ complete_previous: complete word with previous completion
+ search_text: search text in buffer
+ search_switch_case: switch exact case for search
+ search_previous: search previous line
+ search_next: search next line
+ search_stop: stop search
+ delete_previous_char: delete previous char
+ delete_next_char: delete next char
+ delete_previous_word: delete previous word
+ delete_next_word: delete next word
+ delete_beginning_of_line: delete from beginning of line until cursor
+ delete_end_of_line: delete from cursor until end of line
+ delete_line: delete entire line
+ clipboard_paste: paste from clipboard
+ transpose_chars: transpose two chars
+ undo: undo last command line action
+ redo: redo last command line action
+ move_beginning_of_line: move cursor to beginning of line
+ move_end_of_line: move cursor to end of line
+ move_previous_char: move cursor to previous char
+ move_next_char: move cursor to next char
+ move_previous_word: move cursor to previous word
+ move_next_word: move cursor to next word
+ history_previous: recall previous command in current buffer history
+ history_next: recall next command in current buffer history
+ history_global_previous: recall previous command in global history
+ history_global_next: recall next command in global history
+ jump_smart: jump to next buffer with activity
+ jump_last_buffer: jump to last buffer
+ jump_last_buffer_displayed: jump to last buffer displayed (before last jump to a buffer)
+ jump_previously_visited_buffer: jump to previously visited buffer
+ jump_next_visited_buffer: jump to next visited buffer
+ hotlist_clear: clear hotlist
+ grab_key: grab a key (optional argument: delay for end of grab, default is 500 milliseconds)
+ 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
+ set_unread: set unread marker for all buffers
+ set_unread_current_buffer: set unread marker for current buffer
+ switch_active_buffer: switch to next merged buffer
+ switch_active_buffer_previous: switch to previous merged buffer
+ insert: insert text in command line
+
+This command is used by key bindings or plugins.
........................................
[[command_weechat_key]]
@@ -639,60 +638,61 @@ Esempi:
[command]*`window`* gestione finestre::
........................................
/window list
- -1|+1|b#|up|down|left|right [-window <numero>]
- <numero>
- splith|splitv [-window <numero>] [<pct>]
- resize [-window <numero>] [+/-]<pct>
+ -1|+1|b#|up|down|left|right [-window <number>]
+ <number>
+ splith|splitv [-window <number>] [<pct>]
+ resize [-window <number>] [+/-]<pct>
balance
- merge [-window <numero>] [all]
- page_up|page_down [-window <numero>]
+ merge [-window <number>] [all]
+ page_up|page_down [-window <number>]
refresh
- scroll [-window <numero>] [+/-]<value>[s|m|h|d|M|y]
- scroll_horiz [-window <numero>] [+/-]<value>[%]
- scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight [-window <numero>]
- swap [-window <numero>] [up|down|left|right]
- zoom[-window <numero>]
-
- list: elenca le finestre aperte (senza argomento, questa lista viene visualizzata)
- -1: salta alla finestra precedente
- +1: salta alla finestra successiva
- b#: salta alla finestra successiva che visualizza il buffer numero #
- up: passa alla finestra superiore a quella corrente
- down: passa alla finestra inferiore a quella attiva
- left: passa alla finestra a sinistra
- right: passa alla finestra a destra
- numero: numero della finestra (consultare /window list)
- splith: divide la finestra attiva orizzontalmente
- splitv: divide la finestra attiva verticalmente
- resize: ridimensiona finestra, la nuova dimensione è <pct> percentuale della finestra genitore
- balance: bilancia le dimensioni tutte le finestre
- merge: unisce la finestra con un'altra (all = mantiente una sola finestra)
- page_up: scorre di una pagina in alto
- page_down: scorre di una pagina in basso
- refresh: aggiorna lo schermo
- scroll: scorre di un numero di righe (+/-N) o in base al tempo: s=secondi, m=minuti, h=ore, d=giorni, M=mesi, y=anni
- scroll_horiz: scorre orizzontalmente un numero di colonne (+/-N) una percentuale della dimensione della finestra (questo scorrimento è possibile solo sui buffer con contenuto libero)
- scroll_up: scorre di alcune righe in alto
- scroll_down: scorre di alcune righe in basso
- scroll_top: scorre fino all'inizio del buffer
-scroll_bottom: scorre fino alla fine del buffer buffer
-scroll_previous_highlight: passa all'evento precedente
- scroll_next_highlight: passa all'evento successivo
- swap: scambia i buffer di due finestra (con direzione opzionale per la finestra di destinazione)
- zoom: ingrandimento sulla finestra
-
-Per splith e splitv, pct è una percentuale che rappresenta la dimensione della nuova finestra, calcolata con la finestra attiva come riferimento per la dimensione. Per esempio 25 vuol dire creare una finestra di dimensione = dimensione_attuale / 4
+ scroll [-window <number>] [+/-]<value>[s|m|h|d|M|y]
+ scroll_horiz [-window <number>] [+/-]<value>[%]
+ scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight|scroll_unread [-window <number>]
+ swap [-window <number>] [up|down|left|right]
+ zoom[-window <number>]
+
+ list: list opened windows (without argument, this list is displayed)
+ -1: jump to previous window
+ +1: jump to next window
+ b#: jump to next window displaying buffer number #
+ up: switch to window above current one
+ down: switch to window below current one
+ left: switch to window on the left
+ right: switch to window on the right
+ number: window number (see /window list)
+ splith: split current window horizontally
+ splitv: split current window vertically
+ resize: resize window size, new size is <pct> percentage of parent window
+ balance: balance the sizes of all windows
+ merge: merge window with another (all = keep only one window)
+ page_up: scroll one page up
+ page_down: scroll one page down
+ refresh: refresh screen
+ scroll: scroll a number of lines (+/-N) or with time: s=seconds, m=minutes, h=hours, d=days, M=months, y=years
+ scroll_horiz: scroll horizontally a number of columns (+/-N) or percentage of window size (this scrolling is possible only on buffers with free content)
+ scroll_up: scroll a few lines up
+ scroll_down: scroll a few lines down
+ scroll_top: scroll to top of buffer
+scroll_bottom: scroll to bottom of buffer
+scroll_previous_highlight: scroll to previous highlight
+scroll_next_highlight: scroll to next highlight
+scroll_unread: scroll to unread marker
+ swap: swap buffers of two windows (with optional direction for target window)
+ zoom: zoom on window
+
+For splith and splitv, pct is a percentage which represents size of new window, computed with current window as size reference. For example 25 means create a new window with size = current_size / 4
-Esempi:
- salta alla finestra che visualizza il buffer #1:
+Examples:
+ jump to window displaying buffer #1:
/window b1
- scorre di due righe in alto:
+ scroll 2 lines up:
/window scroll -2
- scorre all'indietro di due giorni:
+ scroll 2 days up:
/window scroll -2d
- scorre all'inizio del giorno attuale:
- /window scroll -d
- zoom sulla finestra #2:
+ scroll to beginning of current day:
+ /window scroll -d
+ zoom on window #2:
/window zoom -window 2
........................................
diff --git a/doc/it/weechat_user.it.txt b/doc/it/weechat_user.it.txt
index b87bc262a..3c73c3b66 100644
--- a/doc/it/weechat_user.it.txt
+++ b/doc/it/weechat_user.it.txt
@@ -532,7 +532,7 @@ Tasti per buffer / finestre
| @k(A-)@k(m) | Abilita/disabilita | /mouse toggle
| @k(A-)@k(n) | Scorre fino all'evento successivo | /window scroll_next_highlight
| @k(A-)@k(p) | Scorre fino all'evento precedente | /window scroll_previous_highlight
-| @k(A-)@k(u) | Scorre fino alla prima riga non letta nel buffer | /input scroll_unread
+| @k(A-)@k(u) | Scorre fino alla prima riga non letta nel buffer | /window scroll_unread
| @k(A-)@k(w) , @k(A-)@k(↑) | Passa alla finestra in alto | /window up
| @k(A-)@k(w) , @k(A-)@k(↓) | Passa alla finestra in basso | /window down
| @k(A-)@k(w) , @k(A-)@k(←) | Passa alla finestra sulla sinistra | /window left
diff --git a/po/cs.po b/po/cs.po
index 2f57df0ff..37dc5c4ac 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.7-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-01-23 12:18+0100\n"
+"POT-Creation-Date: 2012-01-24 21:20+0100\n"
"PO-Revision-Date: 2011-12-25 22:56+0100\n"
"Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1378,7 +1378,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"
-" scroll_unread: scroll to unread marker\n"
" set_unread: set unread marker for all buffers\n"
" set_unread_current_buffer: set unread marker for current buffer\n"
" switch_active_buffer: switch to next merged buffer\n"
@@ -1973,9 +1972,9 @@ msgid ""
"balance || merge [-window <number>] [all] || page_up|page_down [-window "
"<number>] || refresh || scroll [-window <number>] [+/-]<value>[s|m|h|d|M|y] "
"|| scroll_horiz [-window <number>] [+/-]<value>[%] || scroll_up|scroll_down|"
-"scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight [-"
-"window <number>] || swap [-window <number>] [up|down|left|right] || zoom[-"
-"window <number>]"
+"scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight|"
+"scroll_unread [-window <number>] || swap [-window <number>] [up|down|left|"
+"right] || zoom[-window <number>]"
msgstr ""
"list || -1|+1|b#|up|down|left|right || splith|splitv [<pct>] || resize [+/-]"
"<pct> || balance || merge [all] || page_up|page_down || refresh || scroll|"
@@ -2014,6 +2013,7 @@ msgid ""
"scroll_bottom: scroll to bottom of buffer\n"
"scroll_previous_highlight: scroll to previous highlight\n"
"scroll_next_highlight: scroll to next highlight\n"
+"scroll_unread: scroll to unread marker\n"
" swap: swap buffers of two windows (with optional direction for "
"target window)\n"
" zoom: zoom on window\n"
diff --git a/po/de.po b/po/de.po
index e09c784e0..7b693baff 100644
--- a/po/de.po
+++ b/po/de.po
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.7-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-01-23 12:18+0100\n"
+"POT-Creation-Date: 2012-01-24 21:20+0100\n"
"PO-Revision-Date: 2012-01-16 22:33+0100\n"
"Last-Translator: Nils Görs <weechatter@arcor.de>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1379,6 +1379,7 @@ msgstr "Funktionen für die Befehlszeile"
msgid "<action> [<arguments>]"
msgstr "<action> [<arguments>]"
+#, fuzzy
msgid ""
"list of actions:\n"
" return: simulate key \"enter\"\n"
@@ -1423,7 +1424,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"
-" scroll_unread: scroll to unread marker\n"
" set_unread: set unread marker for all buffers\n"
" set_unread_current_buffer: set unread marker for current buffer\n"
" switch_active_buffer: switch to next merged buffer\n"
@@ -2123,15 +2123,16 @@ msgstr ""
msgid "manage windows"
msgstr "Fenster verwalten"
+#, fuzzy
msgid ""
"list || -1|+1|b#|up|down|left|right [-window <number>] || <number> || splith|"
"splitv [-window <number>] [<pct>] || resize [-window <number>] [+/-]<pct> || "
"balance || merge [-window <number>] [all] || page_up|page_down [-window "
"<number>] || refresh || scroll [-window <number>] [+/-]<value>[s|m|h|d|M|y] "
"|| scroll_horiz [-window <number>] [+/-]<value>[%] || scroll_up|scroll_down|"
-"scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight [-"
-"window <number>] || swap [-window <number>] [up|down|left|right] || zoom[-"
-"window <number>]"
+"scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight|"
+"scroll_unread [-window <number>] || swap [-window <number>] [up|down|left|"
+"right] || zoom[-window <number>]"
msgstr ""
"list || -1|+1|b#|up|down|left|right [-window <number>] || <number> || splith|"
"splitv [-window <number>] [<pct>] || resize [-window <number>] [+/-]<pct> || "
@@ -2142,6 +2143,7 @@ msgstr ""
"window <number>] || swap [-window <number>] [up|down|left|right] || zoom[-"
"window <number>]"
+#, fuzzy
msgid ""
" list: list opened windows (without argument, this list is "
"displayed)\n"
@@ -2173,6 +2175,7 @@ msgid ""
"scroll_bottom: scroll to bottom of buffer\n"
"scroll_previous_highlight: scroll to previous highlight\n"
"scroll_next_highlight: scroll to next highlight\n"
+"scroll_unread: scroll to unread marker\n"
" swap: swap buffers of two windows (with optional direction for "
"target window)\n"
" zoom: zoom on window\n"
diff --git a/po/es.po b/po/es.po
index 6b727d283..793a16c23 100644
--- a/po/es.po
+++ b/po/es.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.7-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-01-23 12:18+0100\n"
+"POT-Creation-Date: 2012-01-24 21:20+0100\n"
"PO-Revision-Date: 2011-12-25 22:56+0100\n"
"Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1404,7 +1404,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"
-" scroll_unread: scroll to unread marker\n"
" set_unread: set unread marker for all buffers\n"
" set_unread_current_buffer: set unread marker for current buffer\n"
" switch_active_buffer: switch to next merged buffer\n"
@@ -2066,15 +2065,16 @@ msgstr ""
msgid "manage windows"
msgstr "gestión de ventanas"
+#, fuzzy
msgid ""
"list || -1|+1|b#|up|down|left|right [-window <number>] || <number> || splith|"
"splitv [-window <number>] [<pct>] || resize [-window <number>] [+/-]<pct> || "
"balance || merge [-window <number>] [all] || page_up|page_down [-window "
"<number>] || refresh || scroll [-window <number>] [+/-]<value>[s|m|h|d|M|y] "
"|| scroll_horiz [-window <number>] [+/-]<value>[%] || scroll_up|scroll_down|"
-"scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight [-"
-"window <number>] || swap [-window <number>] [up|down|left|right] || zoom[-"
-"window <number>]"
+"scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight|"
+"scroll_unread [-window <number>] || swap [-window <number>] [up|down|left|"
+"right] || zoom[-window <number>]"
msgstr ""
"list || -1|+1|b#|up|down|left|right [-window <número>] || <número> || splith|"
"splitv [-window <número>] [<pct>] || resize [-window <número>] [+/-]<pct> || "
@@ -2085,6 +2085,7 @@ msgstr ""
"window <número>] || swap [-window <número>] [up|down|left|right] || zoom[-"
"window <número>]"
+#, fuzzy
msgid ""
" list: list opened windows (without argument, this list is "
"displayed)\n"
@@ -2116,6 +2117,7 @@ msgid ""
"scroll_bottom: scroll to bottom of buffer\n"
"scroll_previous_highlight: scroll to previous highlight\n"
"scroll_next_highlight: scroll to next highlight\n"
+"scroll_unread: scroll to unread marker\n"
" swap: swap buffers of two windows (with optional direction for "
"target window)\n"
" zoom: zoom on window\n"
diff --git a/po/fr.po b/po/fr.po
index cb66addd0..dd0db7452 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.7-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-01-23 12:18+0100\n"
-"PO-Revision-Date: 2012-01-23 12:18+0100\n"
+"POT-Creation-Date: 2012-01-24 21:20+0100\n"
+"PO-Revision-Date: 2012-01-24 20:33+0100\n"
"Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: French\n"
@@ -1402,7 +1402,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"
-" scroll_unread: scroll to unread marker\n"
" set_unread: set unread marker for all buffers\n"
" set_unread_current_buffer: set unread marker for current buffer\n"
" switch_active_buffer: switch to next merged buffer\n"
@@ -1458,7 +1457,6 @@ msgstr ""
"facultatif: délai pour la fin de la capture, par défaut 500 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"
-" scroll_unread: faire défiler jusqu'au marqueur de données non lues\n"
" set_unread: définir le marqueur de données non lues pour tous les tampons\n"
" set_unread_current_buffer: définir le marqueur de données non lues pour le "
"tampon courant\n"
@@ -2070,18 +2068,18 @@ msgid ""
"balance || merge [-window <number>] [all] || page_up|page_down [-window "
"<number>] || refresh || scroll [-window <number>] [+/-]<value>[s|m|h|d|M|y] "
"|| scroll_horiz [-window <number>] [+/-]<value>[%] || scroll_up|scroll_down|"
-"scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight [-"
-"window <number>] || swap [-window <number>] [up|down|left|right] || zoom[-"
-"window <number>]"
+"scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight|"
+"scroll_unread [-window <number>] || swap [-window <number>] [up|down|left|"
+"right] || zoom[-window <number>]"
msgstr ""
"list || -1|+1|b#|up|down|left|right [-window <numéro>] || <numéro> || splith|"
"splitv [-window <numéro>] [<pct>] || resize [-window <numéro>] [+/-]<pct> || "
"balance || merge [-window <numéro>] [all] || page_up|page_down [-window "
"<numéro>] || refresh || scroll [-window <numéro>] [+/-]<valeur>[s|m|h|d|M|y] "
"|| scroll_horiz [-window <numéro>] [+/-]<valeur>[%] || scroll_up|scroll_down|"
-"scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight [-"
-"window <numéro>] || swap [-window <numéro>] [up|down|left|right] || zoom [-"
-"window <numéro>]"
+"scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight|"
+"scroll_unread [-window <numéro>] || swap [-window <numéro>] [up|down|left|"
+"right] || zoom [-window <numéro>]"
msgid ""
" list: list opened windows (without argument, this list is "
@@ -2114,6 +2112,7 @@ msgid ""
"scroll_bottom: scroll to bottom of buffer\n"
"scroll_previous_highlight: scroll to previous highlight\n"
"scroll_next_highlight: scroll to next highlight\n"
+"scroll_unread: scroll to unread marker\n"
" swap: swap buffers of two windows (with optional direction for "
"target window)\n"
" zoom: zoom on window\n"
@@ -2164,6 +2163,7 @@ msgstr ""
"scroll_bottom: faire défiler jusqu'en bas du tampon\n"
"scroll_previous_highlight: faire défiler jusqu'au highlight précédent\n"
"scroll_next_highlight: faire défiler jusqu'au highlight suivant\n"
+"scroll_unread: faire défiler jusqu'au marqueur de données non lues\n"
" swap: échanger les tampons de deux fenêtres (avec une direction "
"facultative pour la fenêtre cible)\n"
" zoom: zoomer sur la fenêtre\n"
diff --git a/po/hu.po b/po/hu.po
index 507e61268..fe344a584 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.7-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-01-23 12:18+0100\n"
+"POT-Creation-Date: 2012-01-24 21:20+0100\n"
"PO-Revision-Date: 2011-12-25 22:56+0100\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1256,7 +1256,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"
-" scroll_unread: scroll to unread marker\n"
" set_unread: set unread marker for all buffers\n"
" set_unread_current_buffer: set unread marker for current buffer\n"
" switch_active_buffer: switch to next merged buffer\n"
@@ -1677,9 +1676,9 @@ msgid ""
"balance || merge [-window <number>] [all] || page_up|page_down [-window "
"<number>] || refresh || scroll [-window <number>] [+/-]<value>[s|m|h|d|M|y] "
"|| scroll_horiz [-window <number>] [+/-]<value>[%] || scroll_up|scroll_down|"
-"scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight [-"
-"window <number>] || swap [-window <number>] [up|down|left|right] || zoom[-"
-"window <number>]"
+"scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight|"
+"scroll_unread [-window <number>] || swap [-window <number>] [up|down|left|"
+"right] || zoom[-window <number>]"
msgstr ""
"[list | -1 | +1 | b# | up | down | left | right | splith [pct] | splitv "
"[pct] | resize pct | merge [all]]"
@@ -1716,6 +1715,7 @@ msgid ""
"scroll_bottom: scroll to bottom of buffer\n"
"scroll_previous_highlight: scroll to previous highlight\n"
"scroll_next_highlight: scroll to next highlight\n"
+"scroll_unread: scroll to unread marker\n"
" swap: swap buffers of two windows (with optional direction for "
"target window)\n"
" zoom: zoom on window\n"
diff --git a/po/it.po b/po/it.po
index 5befe1240..b1d4e67b7 100644
--- a/po/it.po
+++ b/po/it.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.7-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-01-23 12:18+0100\n"
+"POT-Creation-Date: 2012-01-24 21:20+0100\n"
"PO-Revision-Date: 2012-01-16 22:07+0100\n"
"Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1347,6 +1347,7 @@ msgstr "funzioni per la riga di comando"
msgid "<action> [<arguments>]"
msgstr "<azioni> [<argomenti>]"
+#, fuzzy
msgid ""
"list of actions:\n"
" return: simulate key \"enter\"\n"
@@ -1391,7 +1392,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"
-" scroll_unread: scroll to unread marker\n"
" set_unread: set unread marker for all buffers\n"
" set_unread_current_buffer: set unread marker for current buffer\n"
" switch_active_buffer: switch to next merged buffer\n"
@@ -2050,15 +2050,16 @@ msgstr ""
msgid "manage windows"
msgstr "gestione finestre"
+#, fuzzy
msgid ""
"list || -1|+1|b#|up|down|left|right [-window <number>] || <number> || splith|"
"splitv [-window <number>] [<pct>] || resize [-window <number>] [+/-]<pct> || "
"balance || merge [-window <number>] [all] || page_up|page_down [-window "
"<number>] || refresh || scroll [-window <number>] [+/-]<value>[s|m|h|d|M|y] "
"|| scroll_horiz [-window <number>] [+/-]<value>[%] || scroll_up|scroll_down|"
-"scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight [-"
-"window <number>] || swap [-window <number>] [up|down|left|right] || zoom[-"
-"window <number>]"
+"scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight|"
+"scroll_unread [-window <number>] || swap [-window <number>] [up|down|left|"
+"right] || zoom[-window <number>]"
msgstr ""
"list || -1|+1|b#|up|down|left|right [-window <numero>] || <numero> || splith|"
"splitv [-window <numero>] [<pct>] || resize [-window <numero>] [+/-]<pct> || "
@@ -2069,6 +2070,7 @@ msgstr ""
"window <numero>] || swap [-window <numero>] [up|down|left|right] || zoom[-"
"window <numero>]"
+#, fuzzy
msgid ""
" list: list opened windows (without argument, this list is "
"displayed)\n"
@@ -2100,6 +2102,7 @@ msgid ""
"scroll_bottom: scroll to bottom of buffer\n"
"scroll_previous_highlight: scroll to previous highlight\n"
"scroll_next_highlight: scroll to next highlight\n"
+"scroll_unread: scroll to unread marker\n"
" swap: swap buffers of two windows (with optional direction for "
"target window)\n"
" zoom: zoom on window\n"
diff --git a/po/pl.po b/po/pl.po
index 274cec3be..482dad400 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.7-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-01-23 12:18+0100\n"
+"POT-Creation-Date: 2012-01-24 21:20+0100\n"
"PO-Revision-Date: 2011-12-25 22:56+0100\n"
"Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1410,7 +1410,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"
-" scroll_unread: scroll to unread marker\n"
" set_unread: set unread marker for all buffers\n"
" set_unread_current_buffer: set unread marker for current buffer\n"
" switch_active_buffer: switch to next merged buffer\n"
@@ -2070,15 +2069,16 @@ msgstr ""
msgid "manage windows"
msgstr "zarządza oknami"
+#, fuzzy
msgid ""
"list || -1|+1|b#|up|down|left|right [-window <number>] || <number> || splith|"
"splitv [-window <number>] [<pct>] || resize [-window <number>] [+/-]<pct> || "
"balance || merge [-window <number>] [all] || page_up|page_down [-window "
"<number>] || refresh || scroll [-window <number>] [+/-]<value>[s|m|h|d|M|y] "
"|| scroll_horiz [-window <number>] [+/-]<value>[%] || scroll_up|scroll_down|"
-"scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight [-"
-"window <number>] || swap [-window <number>] [up|down|left|right] || zoom[-"
-"window <number>]"
+"scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight|"
+"scroll_unread [-window <number>] || swap [-window <number>] [up|down|left|"
+"right] || zoom[-window <number>]"
msgstr ""
"list || -1|+1|b#|up|down|left|right [-window <numer>] || <numer> || splith|"
"splitv[-window <numer>] [<pct>] || resize[-window <numer>] [+/-]<pct> || "
@@ -2089,6 +2089,7 @@ msgstr ""
"window <numer>] || swap [-window <numer>] [up|down|left|right] || zoom[-"
"window <numer>]"
+#, fuzzy
msgid ""
" list: list opened windows (without argument, this list is "
"displayed)\n"
@@ -2120,6 +2121,7 @@ msgid ""
"scroll_bottom: scroll to bottom of buffer\n"
"scroll_previous_highlight: scroll to previous highlight\n"
"scroll_next_highlight: scroll to next highlight\n"
+"scroll_unread: scroll to unread marker\n"
" swap: swap buffers of two windows (with optional direction for "
"target window)\n"
" zoom: zoom on window\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 57020dbfe..8059c78bc 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.7-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-01-23 12:18+0100\n"
+"POT-Creation-Date: 2012-01-24 21:20+0100\n"
"PO-Revision-Date: 2011-12-25 22:56+0100\n"
"Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1395,6 +1395,7 @@ msgid "<action> [<arguments>]"
msgstr "<ação> [<argumentos>]"
# TODO
+#, fuzzy
msgid ""
"list of actions:\n"
" return: simulate key \"enter\"\n"
@@ -1439,7 +1440,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"
-" scroll_unread: scroll to unread marker\n"
" set_unread: set unread marker for all buffers\n"
" set_unread_current_buffer: set unread marker for current buffer\n"
" switch_active_buffer: switch to next merged buffer\n"
@@ -2034,15 +2034,16 @@ msgstr ""
msgid "manage windows"
msgstr "gerencia janelas"
+#, fuzzy
msgid ""
"list || -1|+1|b#|up|down|left|right [-window <number>] || <number> || splith|"
"splitv [-window <number>] [<pct>] || resize [-window <number>] [+/-]<pct> || "
"balance || merge [-window <number>] [all] || page_up|page_down [-window "
"<number>] || refresh || scroll [-window <number>] [+/-]<value>[s|m|h|d|M|y] "
"|| scroll_horiz [-window <number>] [+/-]<value>[%] || scroll_up|scroll_down|"
-"scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight [-"
-"window <number>] || swap [-window <number>] [up|down|left|right] || zoom[-"
-"window <number>]"
+"scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight|"
+"scroll_unread [-window <number>] || swap [-window <number>] [up|down|left|"
+"right] || zoom[-window <number>]"
msgstr ""
"list || -1|+1|b#|up|down|left|right || splith|splitv [<pct>] || resize [+/-]"
"<pct> || balance || merge [all] || page_up|page_down || refresh || scroll "
@@ -2082,6 +2083,7 @@ msgid ""
"scroll_bottom: scroll to bottom of buffer\n"
"scroll_previous_highlight: scroll to previous highlight\n"
"scroll_next_highlight: scroll to next highlight\n"
+"scroll_unread: scroll to unread marker\n"
" swap: swap buffers of two windows (with optional direction for "
"target window)\n"
" zoom: zoom on window\n"
diff --git a/po/ru.po b/po/ru.po
index d74234a3b..7c7baccb0 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.7-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-01-23 12:18+0100\n"
+"POT-Creation-Date: 2012-01-24 21:20+0100\n"
"PO-Revision-Date: 2012-01-07 09:24+0100\n"
"Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1274,7 +1274,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"
-" scroll_unread: scroll to unread marker\n"
" set_unread: set unread marker for all buffers\n"
" set_unread_current_buffer: set unread marker for current buffer\n"
" switch_active_buffer: switch to next merged buffer\n"
@@ -1696,9 +1695,9 @@ msgid ""
"balance || merge [-window <number>] [all] || page_up|page_down [-window "
"<number>] || refresh || scroll [-window <number>] [+/-]<value>[s|m|h|d|M|y] "
"|| scroll_horiz [-window <number>] [+/-]<value>[%] || scroll_up|scroll_down|"
-"scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight [-"
-"window <number>] || swap [-window <number>] [up|down|left|right] || zoom[-"
-"window <number>]"
+"scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight|"
+"scroll_unread [-window <number>] || swap [-window <number>] [up|down|left|"
+"right] || zoom[-window <number>]"
msgstr ""
"[list | -1 | +1 | b# | up | down | left | right | splith [pct] | splitv "
"[pct] | resize pct | merge [all]]"
@@ -1735,6 +1734,7 @@ msgid ""
"scroll_bottom: scroll to bottom of buffer\n"
"scroll_previous_highlight: scroll to previous highlight\n"
"scroll_next_highlight: scroll to next highlight\n"
+"scroll_unread: scroll to unread marker\n"
" swap: swap buffers of two windows (with optional direction for "
"target window)\n"
" zoom: zoom on window\n"
diff --git a/po/weechat.pot b/po/weechat.pot
index 37caeb10a..aba9fdd94 100644
--- a/po/weechat.pot
+++ b/po/weechat.pot
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-01-23 12:18+0100\n"
+"POT-Creation-Date: 2012-01-24 21:20+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1110,7 +1110,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"
-" scroll_unread: scroll to unread marker\n"
" set_unread: set unread marker for all buffers\n"
" set_unread_current_buffer: set unread marker for current buffer\n"
" switch_active_buffer: switch to next merged buffer\n"
@@ -1486,9 +1485,9 @@ msgid ""
"balance || merge [-window <number>] [all] || page_up|page_down [-window "
"<number>] || refresh || scroll [-window <number>] [+/-]<value>[s|m|h|d|M|y] "
"|| scroll_horiz [-window <number>] [+/-]<value>[%] || scroll_up|scroll_down|"
-"scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight [-"
-"window <number>] || swap [-window <number>] [up|down|left|right] || zoom[-"
-"window <number>]"
+"scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight|"
+"scroll_unread [-window <number>] || swap [-window <number>] [up|down|left|"
+"right] || zoom[-window <number>]"
msgstr ""
msgid ""
@@ -1522,6 +1521,7 @@ msgid ""
"scroll_bottom: scroll to bottom of buffer\n"
"scroll_previous_highlight: scroll to previous highlight\n"
"scroll_next_highlight: scroll to next highlight\n"
+"scroll_unread: scroll to unread marker\n"
" swap: swap buffers of two windows (with optional direction for "
"target window)\n"
" zoom: zoom on window\n"
diff --git a/src/core/wee-command.c b/src/core/wee-command.c
index 7515f0b9f..a96b46216 100644
--- a/src/core/wee-command.c
+++ b/src/core/wee-command.c
@@ -2376,8 +2376,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], "scroll_unread") == 0)
- gui_input_scroll_unread (buffer);
else if (string_strcasecmp (argv[1], "set_unread") == 0)
gui_input_set_unread ();
else if (string_strcasecmp (argv[1], "set_unread_current_buffer") == 0)
@@ -5143,6 +5141,13 @@ COMMAND_CALLBACK(window)
return WEECHAT_RC_OK;
}
+ /* scroll to unread marker */
+ if (string_strcasecmp (argv[1], "scroll_unread") == 0)
+ {
+ gui_window_scroll_unread (ptr_win);
+ return WEECHAT_RC_OK;
+ }
+
/* split window horizontally */
if (string_strcasecmp (argv[1], "splith") == 0)
{
@@ -5751,7 +5756,6 @@ command_init ()
"default is 500 milliseconds)\n"
" grab_mouse: grab mouse event code\n"
" grab_mouse_area: grab mouse event code with area\n"
- " scroll_unread: scroll to unread marker\n"
" set_unread: set unread marker for all buffers\n"
" set_unread_current_buffer: set unread marker for "
"current buffer\n"
@@ -6127,7 +6131,7 @@ command_init ()
" || scroll_horiz [-window <number>] [+/-]<value>[%]"
" || scroll_up|scroll_down|scroll_top|"
"scroll_bottom|scroll_previous_highlight|"
- "scroll_next_highlight [-window <number>]"
+ "scroll_next_highlight|scroll_unread [-window <number>]"
" || swap [-window <number>] [up|down|left|right]"
" || zoom[-window <number>]"),
N_(" list: list opened windows (without argument, "
@@ -6161,6 +6165,7 @@ command_init ()
"scroll_bottom: scroll to bottom of buffer\n"
"scroll_previous_highlight: scroll to previous highlight\n"
"scroll_next_highlight: scroll to next highlight\n"
+ "scroll_unread: scroll to unread marker\n"
" swap: swap buffers of two windows (with optional "
"direction for target window)\n"
" zoom: zoom on window\n\n"
@@ -6201,6 +6206,7 @@ command_init ()
" || scroll_bottom -window %(windows_numbers)"
" || scroll_previous_highlight -window %(windows_numbers)"
" || scroll_next_highlight -window %(windows_numbers)"
+ " || scroll_unread -window %(windows_numbers)"
" || swap up|down|left|right|-window %(windows_numbers)"
" || zoom -window %(windows_numbers)"
" || merge all|-window %(windows_numbers)",
diff --git a/src/gui/curses/gui-curses-key.c b/src/gui/curses/gui-curses-key.c
index 37d9a10b9..2efde9084 100644
--- a/src/gui/curses/gui-curses-key.c
+++ b/src/gui/curses/gui-curses-key.c
@@ -138,7 +138,7 @@ gui_key_default_bindings (int context)
BIND(/* m-j,m-s */ "meta-jmeta-s", "/server jump");
BIND(/* m-h */ "meta-h", "/input hotlist_clear");
BIND(/* m-k */ "meta-k", "/input grab_key_command");
- BIND(/* m-u */ "meta-u", "/input scroll_unread");
+ BIND(/* m-u */ "meta-u", "/window scroll_unread");
BIND(/* ^S^U */ "ctrl-Sctrl-U", "/input set_unread");
BIND(/* ^Cb */ "ctrl-Cb", "/input insert \\x02");
BIND(/* ^Cc */ "ctrl-Cc", "/input insert \\x03");
diff --git a/src/gui/gui-input.c b/src/gui/gui-input.c
index dc3f1574a..7c3d205c6 100644
--- a/src/gui/gui-input.c
+++ b/src/gui/gui-input.c
@@ -1419,44 +1419,6 @@ gui_input_grab_mouse (struct t_gui_buffer *buffer, int area)
}
/*
- * gui_input_scroll_unread: scroll to first unread line of buffer
- * (default key: meta-u)
- */
-
-void
-gui_input_scroll_unread (struct t_gui_buffer *buffer)
-{
- struct t_gui_window *window;
-
- window = gui_window_search_with_buffer (buffer);
- if (window
- && (window->buffer->text_search == GUI_TEXT_SEARCH_DISABLED))
- {
- if (CONFIG_STRING(config_look_read_marker) &&
- CONFIG_STRING(config_look_read_marker)[0] &&
- (window->buffer->type == GUI_BUFFER_TYPE_FORMATTED) &&
- (window->buffer->lines->first_line_not_read ||
- (window->buffer->lines->last_read_line &&
- window->buffer->lines->last_read_line != window->buffer->lines->last_line)))
- {
- if (window->buffer->lines->first_line_not_read)
- window->scroll->start_line = window->buffer->lines->first_line;
- else
- window->scroll->start_line = window->buffer->lines->last_read_line->next_line;
- if (window->scroll->start_line)
- {
- if (!gui_line_is_displayed (window->scroll->start_line))
- window->scroll->start_line = gui_line_get_next_displayed (window->scroll->start_line);
- }
- window->scroll->start_line_pos = 0;
- window->scroll->first_line_displayed =
- (window->scroll->start_line == gui_line_get_first_displayed (window->buffer));
- gui_buffer_ask_chat_refresh (window->buffer, 2);
- }
- }
-}
-
-/*
* gui_input_set_unread: set unread marker for all buffers
* (default key: ctrl-s, ctrl-u)
*/
diff --git a/src/gui/gui-input.h b/src/gui/gui-input.h
index f19409591..456b39fb1 100644
--- a/src/gui/gui-input.h
+++ b/src/gui/gui-input.h
@@ -74,7 +74,6 @@ extern void gui_input_hotlist_clear (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_scroll_unread (struct t_gui_buffer *buffer);
extern void gui_input_set_unread ();
extern void gui_input_set_unread_current (struct t_gui_buffer *buffer);
extern void gui_input_switch_active_buffer (struct t_gui_buffer *buffer);
diff --git a/src/gui/gui-window.c b/src/gui/gui-window.c
index 938a3eea8..d7bfdd0dc 100644
--- a/src/gui/gui-window.c
+++ b/src/gui/gui-window.c
@@ -1386,6 +1386,39 @@ gui_window_scroll_next_highlight (struct t_gui_window *window)
}
/*
+ * gui_window_scroll_unread: scroll to first unread line of buffer
+ */
+
+void
+gui_window_scroll_unread (struct t_gui_window *window)
+{
+ if (window->buffer->text_search == GUI_TEXT_SEARCH_DISABLED)
+ {
+ if (CONFIG_STRING(config_look_read_marker) &&
+ CONFIG_STRING(config_look_read_marker)[0] &&
+ (window->buffer->type == GUI_BUFFER_TYPE_FORMATTED) &&
+ (window->buffer->lines->first_line_not_read ||
+ (window->buffer->lines->last_read_line &&
+ window->buffer->lines->last_read_line != window->buffer->lines->last_line)))
+ {
+ if (window->buffer->lines->first_line_not_read)
+ window->scroll->start_line = window->buffer->lines->first_line;
+ else
+ window->scroll->start_line = window->buffer->lines->last_read_line->next_line;
+ if (window->scroll->start_line)
+ {
+ if (!gui_line_is_displayed (window->scroll->start_line))
+ window->scroll->start_line = gui_line_get_next_displayed (window->scroll->start_line);
+ }
+ window->scroll->start_line_pos = 0;
+ window->scroll->first_line_displayed =
+ (window->scroll->start_line == gui_line_get_first_displayed (window->buffer));
+ gui_buffer_ask_chat_refresh (window->buffer, 2);
+ }
+ }
+}
+
+/*
* gui_window_search_text: search text in a buffer
* return 1 if line has been found with text, otherwise 0
*/
diff --git a/src/gui/gui-window.h b/src/gui/gui-window.h
index 640b27ec7..3df5dd97a 100644
--- a/src/gui/gui-window.h
+++ b/src/gui/gui-window.h
@@ -185,6 +185,7 @@ extern void gui_window_scroll (struct t_gui_window *window, char *scroll);
extern void gui_window_scroll_horiz (struct t_gui_window *window, char *scroll);
extern void gui_window_scroll_previous_highlight (struct t_gui_window *window);
extern void gui_window_scroll_next_highlight (struct t_gui_window *window);
+extern void gui_window_scroll_unread (struct t_gui_window *window);
extern void gui_window_search_start (struct t_gui_window *window);
extern void gui_window_search_restart (struct t_gui_window *window);
extern void gui_window_search_stop (struct t_gui_window *window);
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-31 13:30:25 +0000