From 51322e79179249f4a84b7c8c5e331572f3c8213a Mon Sep 17 00:00:00 2001 From: Sebastien Helleu Date: Wed, 17 Aug 2005 16:54:05 +0000 Subject: [PATCH] Fixed refresh bug when one line is bigger than screen size --- ChangeLog | 3 ++- src/gui/curses/gui-display.c | 5 ++--- weechat/ChangeLog | 3 ++- weechat/src/gui/curses/gui-display.c | 5 ++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index ae60d9b8b..abc627e1d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,11 @@ WeeChat - Wee Enhanced Environment for Chat =========================================== -ChangeLog - 2005-08-16 +ChangeLog - 2005-08-17 Version 0.1.5 (under dev!): + * fixed refresh bug when one line is bigger than screen size * fixed look_nicklist_min_size and look_nicklist_max_size options * fixed refresh bug when changing channel modes * jump to next server now saves current channel buffer for each server diff --git a/src/gui/curses/gui-display.c b/src/gui/curses/gui-display.c index 12a8cd0a1..636752f90 100644 --- a/src/gui/curses/gui-display.c +++ b/src/gui/curses/gui-display.c @@ -440,7 +440,7 @@ gui_display_word (t_gui_window *window, t_gui_line *line, int end_of_word, chars_to_display, num_displayed; if (!message || !end_msg || - (window->win_chat_cursor_y > window->win_chat_height - 1)) + ((!simulate) && (window->win_chat_cursor_y > window->win_chat_height - 1))) return; snprintf (format_align, 32, "%%-%ds", line->length_align); @@ -493,7 +493,6 @@ gui_display_word (t_gui_window *window, t_gui_line *line, } else { - num_displayed = chars_to_display; if ((!simulate) && ((count == 0) || (*lines_displayed >= num_lines - count))) @@ -832,7 +831,7 @@ gui_draw_buffer_chat (t_gui_buffer *buffer, int erase) ptr_line = (ptr_line) ? ptr_line->next_line : buffer->lines; gui_display_line (ptr_win, ptr_line, gui_display_line (ptr_win, ptr_line, 0, 1) - - (lines_used - (ptr_win->win_chat_height + ptr_win->sub_lines)), 0); + (lines_used - (ptr_win->win_chat_height + ptr_win->sub_lines)), 0);; ptr_line = ptr_line->next_line; ptr_win->first_line_displayed = 0; } diff --git a/weechat/ChangeLog b/weechat/ChangeLog index ae60d9b8b..abc627e1d 100644 --- a/weechat/ChangeLog +++ b/weechat/ChangeLog @@ -1,10 +1,11 @@ WeeChat - Wee Enhanced Environment for Chat =========================================== -ChangeLog - 2005-08-16 +ChangeLog - 2005-08-17 Version 0.1.5 (under dev!): + * fixed refresh bug when one line is bigger than screen size * fixed look_nicklist_min_size and look_nicklist_max_size options * fixed refresh bug when changing channel modes * jump to next server now saves current channel buffer for each server diff --git a/weechat/src/gui/curses/gui-display.c b/weechat/src/gui/curses/gui-display.c index 12a8cd0a1..636752f90 100644 --- a/weechat/src/gui/curses/gui-display.c +++ b/weechat/src/gui/curses/gui-display.c @@ -440,7 +440,7 @@ gui_display_word (t_gui_window *window, t_gui_line *line, int end_of_word, chars_to_display, num_displayed; if (!message || !end_msg || - (window->win_chat_cursor_y > window->win_chat_height - 1)) + ((!simulate) && (window->win_chat_cursor_y > window->win_chat_height - 1))) return; snprintf (format_align, 32, "%%-%ds", line->length_align); @@ -493,7 +493,6 @@ gui_display_word (t_gui_window *window, t_gui_line *line, } else { - num_displayed = chars_to_display; if ((!simulate) && ((count == 0) || (*lines_displayed >= num_lines - count))) @@ -832,7 +831,7 @@ gui_draw_buffer_chat (t_gui_buffer *buffer, int erase) ptr_line = (ptr_line) ? ptr_line->next_line : buffer->lines; gui_display_line (ptr_win, ptr_line, gui_display_line (ptr_win, ptr_line, 0, 1) - - (lines_used - (ptr_win->win_chat_height + ptr_win->sub_lines)), 0); + (lines_used - (ptr_win->win_chat_height + ptr_win->sub_lines)), 0);; ptr_line = ptr_line->next_line; ptr_win->first_line_displayed = 0; }