diff --git a/ChangeLog b/ChangeLog index f04c12914..4f0c0e7d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ WeeChat ChangeLog ================= FlashCode -v0.3.2-dev, 2010-03-02 +v0.3.2-dev, 2010-03-03 Version 0.3.2 (under dev!) @@ -19,6 +19,7 @@ Version 0.3.2 (under dev!) weechat_util_get_time_string in plugin API (patch #6914) * core: add new option weechat.look.command_chars, add functions string_is_command_char and string_input_for_buffer in plugin and script API +* core: add new option weechat.look.read_marker_always_show * core: use arguments for infolist "nicklist" to return only one nick or group * gui: fix bug with global history, reset pointer to last entry after each user input (bug #28754) diff --git a/po/cs.po b/po/cs.po index 0b0db5377..87fdb3bca 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-03-02 16:35+0100\n" +"POT-Creation-Date: 2010-03-03 22:13+0100\n" "PO-Revision-Date: 2010-02-23 10:43+0100\n" "Last-Translator: Jiri Golembiovsky \n" "Language-Team: weechat-dev \n" @@ -1680,6 +1680,9 @@ msgstr "" "použít značku (řádek nebo znak) v bufferech pro zobrazení první nepřečtené " "řádky" +msgid "always show read marker, even if it is after last buffer line" +msgstr "" + msgid "save configuration file on exit" msgstr "uložit soubor s nastavením při ukončení" diff --git a/po/de.po b/po/de.po index 9f7423f7a..75e8d7ef1 100644 --- a/po/de.po +++ b/po/de.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-03-02 16:35+0100\n" +"POT-Creation-Date: 2010-03-03 22:13+0100\n" "PO-Revision-Date: 2010-02-23 10:43+0100\n" "Last-Translator: Nils G \n" "Language-Team: weechat-dev \n" @@ -1767,6 +1767,9 @@ msgstr "Nach dem Präfix anzufügende Zeichenfolge" msgid "use a marker (line or char) on buffers to show first unread line" msgstr "Markiere die erste, ungelesene Zeile bei Server- und Channel-Buffern" +msgid "always show read marker, even if it is after last buffer line" +msgstr "" + msgid "save configuration file on exit" msgstr "Konfiguration beim Beenden abspeichern" diff --git a/po/es.po b/po/es.po index fc3831cba..c92f7849f 100644 --- a/po/es.po +++ b/po/es.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-03-02 16:35+0100\n" +"POT-Creation-Date: 2010-03-03 22:13+0100\n" "PO-Revision-Date: 2010-02-23 10:43+0100\n" "Last-Translator: Elián Hanisch \n" "Language-Team: weechat-dev \n" @@ -1707,6 +1707,9 @@ msgstr "" "usa un marcador (línea o carácter) para indicar la primera línea sin leer en " "el buffer" +msgid "always show read marker, even if it is after last buffer line" +msgstr "" + msgid "save configuration file on exit" msgstr "guardar archivo de configuración al salir" diff --git a/po/fr.po b/po/fr.po index 722a11890..884489c80 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-03-02 16:35+0100\n" -"PO-Revision-Date: 2010-02-28 21:07+0100\n" +"POT-Creation-Date: 2010-03-03 22:13+0100\n" +"PO-Revision-Date: 2010-03-03 22:15+0100\n" "Last-Translator: FlashCode \n" "Language-Team: weechat-dev \n" "MIME-Version: 1.0\n" @@ -1731,6 +1731,11 @@ msgstr "" "utiliser un marqueur (ligne ou caractère) sur les tampons pour montrer la " "première ligne non lue" +msgid "always show read marker, even if it is after last buffer line" +msgstr "" +"toujours afficher le marqueur de lecture, même s'il est après la dernière " +"ligne du tampon" + msgid "save configuration file on exit" msgstr "sauvegarder la configuration en quittant" diff --git a/po/hu.po b/po/hu.po index 3ce2c7bec..275b5ac46 100644 --- a/po/hu.po +++ b/po/hu.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-03-02 16:35+0100\n" +"POT-Creation-Date: 2010-03-03 22:13+0100\n" "PO-Revision-Date: 2010-02-23 10:43+0100\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -1545,6 +1545,9 @@ msgstr "névkiegészítés után beszúrt szöveg" msgid "use a marker (line or char) on buffers to show first unread line" msgstr "jelölje a szerveren/szobában utoljára olvasott sort" +msgid "always show read marker, even if it is after last buffer line" +msgstr "" + #, fuzzy msgid "save configuration file on exit" msgstr "beállítások mentése kilépéskor" diff --git a/po/it.po b/po/it.po index 8f0cfe9b5..821fd6248 100644 --- a/po/it.po +++ b/po/it.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Weechat 0.3.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-03-02 16:35+0100\n" +"POT-Creation-Date: 2010-03-03 22:13+0100\n" "PO-Revision-Date: 2010-02-23 10:43+0100\n" "Last-Translator: Marco Paolone \n" "Language-Team: weechat-dev \n" @@ -1705,6 +1705,9 @@ msgstr "" "usa un evidenziatore (riga o carattere) sui buffer per mostrare la prima " "riga non letta" +msgid "always show read marker, even if it is after last buffer line" +msgstr "" + msgid "save configuration file on exit" msgstr "salva file di configurazione all'uscita" diff --git a/po/pl.po b/po/pl.po index fd96a2b32..758693950 100644 --- a/po/pl.po +++ b/po/pl.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.0-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-03-02 16:35+0100\n" +"POT-Creation-Date: 2010-03-03 22:13+0100\n" "PO-Revision-Date: 2010-02-23 10:43+0100\n" "Last-Translator: Krzysztof Koroscik \n" "Language-Team: Polish\n" @@ -1730,6 +1730,9 @@ msgstr "" "używaj znacznika (lini albo znaku) do zaznaczania pierwszej nieprzeczytanej " "lini w buforze" +msgid "always show read marker, even if it is after last buffer line" +msgstr "" + msgid "save configuration file on exit" msgstr "zapisz plik konfiguracyjny przy wyjściu" diff --git a/po/ru.po b/po/ru.po index 843d647a9..49e42df1d 100644 --- a/po/ru.po +++ b/po/ru.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-03-02 16:35+0100\n" +"POT-Creation-Date: 2010-03-03 22:13+0100\n" "PO-Revision-Date: 2010-02-23 10:43+0100\n" "Last-Translator: Pavel Shevchuk \n" "Language-Team: weechat-dev \n" @@ -1556,6 +1556,9 @@ msgstr "строка, вставляемая после автодополнен msgid "use a marker (line or char) on buffers to show first unread line" msgstr "использовать маркер непрочитанных сообщений в окнах серверов и каналов" +msgid "always show read marker, even if it is after last buffer line" +msgstr "" + #, fuzzy msgid "save configuration file on exit" msgstr "сохранять конфигурационный файл при выходе" diff --git a/po/weechat.pot b/po/weechat.pot index fd124dfc9..29dcadce4 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: 2010-03-02 16:35+0100\n" +"POT-Creation-Date: 2010-03-03 22:13+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1332,6 +1332,9 @@ msgstr "" msgid "use a marker (line or char) on buffers to show first unread line" msgstr "" +msgid "always show read marker, even if it is after last buffer line" +msgstr "" + msgid "save configuration file on exit" msgstr "" diff --git a/src/core/wee-config.c b/src/core/wee-config.c index 3a96c5f23..eeb603dcf 100644 --- a/src/core/wee-config.c +++ b/src/core/wee-config.c @@ -100,6 +100,7 @@ struct t_config_option *config_look_prefix_buffer_align_max; struct t_config_option *config_look_prefix_buffer_align_more; struct t_config_option *config_look_prefix_suffix; struct t_config_option *config_look_read_marker; +struct t_config_option *config_look_read_marker_always_show; struct t_config_option *config_look_save_config_on_exit; struct t_config_option *config_look_save_layout_on_exit; struct t_config_option *config_look_scroll_amount; @@ -1406,6 +1407,11 @@ config_weechat_init_options () N_("use a marker (line or char) on buffers to show first unread line"), "none|line|dotted-line|char", 0, 0, "dotted-line", NULL, 0, NULL, NULL, &config_change_read_marker, NULL, NULL, NULL); + config_look_read_marker_always_show = config_file_new_option ( + weechat_config_file, ptr_section, + "read_marker_always_show", "boolean", + N_("always show read marker, even if it is after last buffer line"), + NULL, 0, 0, "on", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); config_look_save_config_on_exit = config_file_new_option ( weechat_config_file, ptr_section, "save_config_on_exit", "boolean", diff --git a/src/core/wee-config.h b/src/core/wee-config.h index 0c3e4fb5a..398de7c77 100644 --- a/src/core/wee-config.h +++ b/src/core/wee-config.h @@ -115,6 +115,7 @@ extern struct t_config_option *config_look_prefix_buffer_align_max; extern struct t_config_option *config_look_prefix_buffer_align_more; extern struct t_config_option *config_look_prefix_suffix; extern struct t_config_option *config_look_read_marker; +extern struct t_config_option *config_look_read_marker_always_show; extern struct t_config_option *config_look_save_config_on_exit; extern struct t_config_option *config_look_save_layout_on_exit; extern struct t_config_option *config_look_scroll_amount; diff --git a/src/gui/curses/gui-curses-chat.c b/src/gui/curses/gui-curses-chat.c index 3a907656f..9fe17aab7 100644 --- a/src/gui/curses/gui-curses-chat.c +++ b/src/gui/curses/gui-curses-chat.c @@ -926,7 +926,7 @@ gui_chat_display_line (struct t_gui_window *window, struct t_gui_line *line, } } - if (marker_line && gui_line_get_next_displayed (line)) + if (marker_line) { gui_chat_display_horizontal_line (window, simulate); gui_chat_display_new_line (window, num_lines, count, diff --git a/src/gui/curses/gui-curses-window.c b/src/gui/curses/gui-curses-window.c index 94ccb8276..b5030362e 100644 --- a/src/gui/curses/gui-curses-window.c +++ b/src/gui/curses/gui-curses-window.c @@ -586,6 +586,12 @@ gui_window_switch_to_buffer (struct t_gui_window *window, ptr_bar_window->bar->bar_refresh_needed = 1; } + if (CONFIG_BOOLEAN(config_look_read_marker_always_show) + && set_last_read && !window->buffer->lines->last_read_line) + { + window->buffer->lines->last_read_line = window->buffer->lines->last_line; + } + hook_signal_send ("buffer_switch", WEECHAT_HOOK_SIGNAL_POINTER, buffer); }