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

Display number of lines remaining after last line displayed screen in "-MORE-" indicator

Browse Source
This commit is contained in:
Sebastien Helleu
2008-07-06 11:36:05 +02:00
parent 28088484df
commit 9d911f6c11
11 changed files with 73 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
po/cs.po
+5 -1
View File
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.2.7-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2008-07-03 12:38+0200\n"
"POT-Creation-Date: 2008-07-06 11:26+0200\n"
"PO-Revision-Date: 2007-09-06 12:44+0200\n"
"Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1757,6 +1757,10 @@ msgstr "Alias \"%s\" => \"%s\" vytvořen\n"
msgid "filtered"
msgstr "uživatel byl zablokován"
#, fuzzy, c-format
msgid "%s-MORE(%d)-"
msgstr "-VÍCE-"
#, fuzzy, c-format
msgid "%sError: a buffer with same name already exists (%s / %s)"
msgstr ""
po/de.po
+5 -1
View File
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.2.7-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2008-07-03 12:38+0200\n"
"POT-Creation-Date: 2008-07-06 11:26+0200\n"
"PO-Revision-Date: 2007-09-06 12:44+0200\n"
"Last-Translator: Thomas Schuetz <i18n@internet-villa.de>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1758,6 +1758,10 @@ msgstr "Alias \"%s\" => \"%s\" angelegt\n"
msgid "filtered"
msgstr "/users wurde deaktiviert"
#, fuzzy, c-format
msgid "%s-MORE(%d)-"
msgstr "-MEHR-"
#, fuzzy, c-format
msgid "%sError: a buffer with same name already exists (%s / %s)"
msgstr ""
po/es.po
+15 -10
View File
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.2.7-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2008-07-03 12:38+0200\n"
"POT-Creation-Date: 2008-07-06 11:26+0200\n"
"PO-Revision-Date: 2007-09-19 12:09+0200\n"
"Last-Translator: Roberto González Cardenete <robert.glez@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1103,8 +1103,8 @@ msgstr "la cadena mostrada tras la finalización de los nombres de usuario"
#, fuzzy
msgid "use a marker (line or char) on buffers to show first unread line"
msgstr ""
"usar un marcador en los servidores/canales para mostrar la primera línea sin "
"leer"
"usar un marcador en los servidores/canales para mostrar la primera línea "
"sin leer"
#, fuzzy
msgid "save configuration file on exit"
@@ -1618,8 +1618,8 @@ msgid ""
"support.\n"
"Be careful, private info may be in these files.\n"
msgstr ""
"Por favor, envía %s/%s, %s/%s y los mensajes de arriba a los desarrolladores "
"de Weechat para el soporte.\n"
"Por favor, envía %s/%s, %s/%s y los mensajes de arriba a los "
"desarrolladores de Weechat para el soporte.\n"
"Sé cuidadoso, puede que haya información privada en estos ficheros.\n"
#, c-format
@@ -1740,6 +1740,10 @@ msgstr "Alias \"%s\" => \"%s\" creado\n"
msgid "filtered"
msgstr "los usuarios han sido desactivados"
#, fuzzy, c-format
msgid "%s-MORE(%d)-"
msgstr "-MÁS-"
#, fuzzy, c-format
msgid "%sError: a buffer with same name already exists (%s / %s)"
msgstr ""
@@ -5499,8 +5503,8 @@ msgstr "%s falta un argumento para la opción --dir\n"
#~ "maximum number of lines in history for one server/channel/private window "
#~ "(0 = unlimited)"
#~ msgstr ""
#~ "número máximo de líneas en el histórico para un servidor/canal/privado "
#~ "(0 = ilimitado)"
#~ "número máximo de líneas en el histórico para un servidor/canal/"
#~ "privado (0 = ilimitado)"
#, fuzzy
#~ msgid "log messages from plugins"
@@ -5694,8 +5698,8 @@ msgstr "%s falta un argumento para la opción --dir\n"
#~ "max size for aligning nick and other messages (should be >= to "
#~ "look_align_size)"
#~ msgstr ""
#~ "tamaño máximo para la alineación de nick y otros mensajes (debería ser "
#~ ">= a look_align_size)"
#~ "tamaño máximo para la alineación de nick y otros mensajes (debería "
#~ "ser >= a look_align_size)"
#~ msgid "server name not found"
#~ msgstr "nombre de servidor no encontrado"
@@ -6482,7 +6486,8 @@ msgstr "%s falta un argumento para la opción --dir\n"
#~ msgid "color for chan owner symbol (specific to unrealircd)"
#~ msgstr ""
#~ "color para el símbolo de propietario de canal (especificado en unrealircd)"
#~ "color para el símbolo de propietario de canal (especificado en "
#~ "unrealircd)"
#~ msgid "color for chan admin symbol"
#~ msgstr "color para el símbolo de administrador de canal"
po/fr.po
+6 -2
View File
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.2.7-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2008-07-03 12:38+0200\n"
"PO-Revision-Date: 2008-07-03 12:39+0200\n"
"POT-Creation-Date: 2008-07-06 11:26+0200\n"
"PO-Revision-Date: 2008-07-06 11:27+0200\n"
"Last-Translator: FlashCode <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"MIME-Version: 1.0\n"
@@ -1740,6 +1740,10 @@ msgstr "Barre \"%s\" mise à jour"
msgid "filtered"
msgstr "filtré"
#, c-format
msgid "%s-MORE(%d)-"
msgstr "%s-PLUS(%d)-"
#, c-format
msgid "%sError: a buffer with same name already exists (%s / %s)"
msgstr "%sErreur: un tampon avec le même nom existe déjà (%s / %s)"
po/hu.po
+5 -1
View File
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.2.7-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2008-07-03 12:38+0200\n"
"POT-Creation-Date: 2008-07-06 11:26+0200\n"
"PO-Revision-Date: 2007-10-10 18:07+0200\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1762,6 +1762,10 @@ msgstr "A \"%s\" => \"%s\" aliasz elkészült\n"
msgid "filtered"
msgstr "a felhasználók le lettek tiltva"
#, fuzzy, c-format
msgid "%s-MORE(%d)-"
msgstr "-TOVÁBB-"
#, fuzzy, c-format
msgid "%sError: a buffer with same name already exists (%s / %s)"
msgstr "%s nem sikerült a \"%s\" modult betölteni: már van ilyen nevű modul\n"
po/ru.po
+5 -1
View File
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.2.7-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2008-07-03 12:38+0200\n"
"POT-Creation-Date: 2008-07-06 11:26+0200\n"
"PO-Revision-Date: 2007-09-06 12:44+0200\n"
"Last-Translator: Pavel Shevchuk <stlwrt@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1766,6 +1766,10 @@ msgstr "Сокращение \"%s\" => \"%s\" создано\n"
msgid "filtered"
msgstr "команда users отключена"
#, fuzzy, c-format
msgid "%s-MORE(%d)-"
msgstr "-ДАЛЬШЕ-"
#, fuzzy, c-format
msgid "%sError: a buffer with same name already exists (%s / %s)"
msgstr ""
po/weechat.pot
+5 -1
View File
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2008-07-03 12:38+0200\n"
"POT-Creation-Date: 2008-07-06 11:26+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1467,6 +1467,10 @@ msgstr ""
msgid "filtered"
msgstr ""
#, c-format
msgid "%s-MORE(%d)-"
msgstr ""
#, c-format
msgid "%sError: a buffer with same name already exists (%s / %s)"
msgstr ""
src/gui/curses/gui-curses-chat.c
+22 -7
View File
@@ -1077,7 +1077,7 @@ gui_chat_draw (struct t_gui_buffer *buffer, int erase)
struct t_gui_window *ptr_win;
struct t_gui_line *ptr_line;
char format_empty[32];
int i, line_pos, count, old_scroll, y_start, y_end;
int i, line_pos, count, old_scroll, old_scroll_lines_after, y_start, y_end;
if (!gui_ok)
return;
@@ -1147,6 +1147,7 @@ gui_chat_draw (struct t_gui_buffer *buffer, int erase)
}
old_scroll = ptr_win->scroll;
old_scroll_lines_after = ptr_win->scroll_lines_after;
ptr_win->scroll = (ptr_win->win_chat_cursor_y > ptr_win->win_chat_height - 1);
@@ -1158,12 +1159,6 @@ gui_chat_draw (struct t_gui_buffer *buffer, int erase)
ptr_win->scroll = 0;
}
if (ptr_win->scroll != old_scroll)
{
hook_signal_send ("window_scrolled",
WEECHAT_HOOK_SIGNAL_POINTER, ptr_win);
}
if (!ptr_win->scroll
&& (ptr_win->start_line == gui_chat_get_first_line_displayed (ptr_win->buffer)))
{
@@ -1171,6 +1166,26 @@ gui_chat_draw (struct t_gui_buffer *buffer, int erase)
ptr_win->start_line_pos = 0;
}
ptr_win->scroll_lines_after = 0;
if (ptr_win->scroll && ptr_line)
{
/* count number of lines after last line displayed */
while (ptr_line)
{
ptr_line = gui_chat_get_next_line_displayed (ptr_line);
if (ptr_line)
ptr_win->scroll_lines_after++;
}
ptr_win->scroll_lines_after++;
}
if ((ptr_win->scroll != old_scroll)
|| (ptr_win->scroll_lines_after != old_scroll_lines_after))
{
hook_signal_send ("window_scrolled",
WEECHAT_HOOK_SIGNAL_POINTER, ptr_win);
}
/* cursor is below end line of chat window? */
if (ptr_win->win_chat_cursor_y > ptr_win->win_chat_height - 1)
{
src/gui/gui-bar-item.c
+2 -2
View File
@@ -851,9 +851,9 @@ gui_bar_item_default_scroll (void *data, struct t_gui_bar_item *item,
if (!window->scroll)
return NULL;
snprintf (buf, sizeof (buf), "%s%s",
snprintf (buf, sizeof (buf), _("%s-MORE(%d)-"),
gui_color_get_custom (gui_color_get_name (CONFIG_COLOR(config_color_status_more))),
_("-MORE-"));
window->scroll_lines_after);
return strdup (buf);
}
src/gui/gui-window.c
+1
View File
@@ -250,6 +250,7 @@ gui_window_new (struct t_gui_window *parent, int x, int y, int width, int height
new_window->start_line = NULL;
new_window->start_line_pos = 0;
new_window->scroll = 0;
new_window->scroll_lines_after = 0;
new_window->ptr_tree = ptr_leaf;
ptr_leaf->window = new_window;
src/gui/gui-window.h
+2
View File
@@ -83,6 +83,8 @@ struct t_gui_window
struct t_gui_line *start_line; /* pointer to line if scrolling */
int start_line_pos; /* position in first line displayed */
int scroll; /* = 1 if "MORE" should be displayed */
int scroll_lines_after; /* number of lines after last line */
/* displayed (with scrolling) */
struct t_gui_window_tree *ptr_tree;/* pointer to leaf in windows tree */
struct t_gui_window *prev_window; /* link to previous window */