blackbeard420/weechat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed infinite loop when scrolling back and displaying long lines

Browse Source
This commit is contained in:
Sebastien Helleu 2005-09-14 08:39:14 +00:00
parent dfbea2850a
commit 8f3455d0a9
4 changed files with 36 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,10 +1,11 @@
WeeChat - Wee Enhanced Environment for Chat WeeChat - Wee Enhanced Environment for Chat
=========================================== ===========================================
ChangeLog - 2005-09-13 ChangeLog - 2005-09-14
Version 0.1.5 (under dev!): Version 0.1.5 (under dev!):
* fixed infinite loop when scrolling back and displaying long lines
* fixed crash when closing a buffer used by more than one window * fixed crash when closing a buffer used by more than one window
* added some missing IRC commands * added some missing IRC commands
* fixed DCC display bug (now decodes string according to charset) * fixed DCC display bug (now decodes string according to charset)

26
src/gui/curses/gui-display.c
View File

@ -525,7 +525,8 @@ gui_display_word (t_gui_window *window, t_gui_line *line,
/* end of word? */ /* end of word? */
if (!message || (message->prev_message == end_msg) || if (!message || (message->prev_message == end_msg) ||
((message == end_msg) && (offset > end_offset))) ((message == end_msg) && (offset > end_offset)) ||
(window->win_chat_cursor_y >= window->win_chat_height))
end_of_word = 1; end_of_word = 1;
} }
@ -646,16 +647,21 @@ gui_display_line (t_gui_window *window, t_gui_line *line, int count, int simulat
word_end_msg, word_end_offset, word_end_msg, word_end_offset,
num_lines, count, &lines_displayed, simulate); num_lines, count, &lines_displayed, simulate);
/* move pointer after end of word */ if (window->win_chat_cursor_y >= window->win_chat_height)
ptr_message = word_end_msg; ptr_message = NULL;
offset = word_end_offset; else
gui_message_get_next_char (&ptr_message, &offset);
/* skip leading spaces? */
if (skip_spaces)
{ {
while (ptr_message && (ptr_message->message[offset] == ' ')) /* move pointer after end of word */
gui_message_get_next_char (&ptr_message, &offset); ptr_message = word_end_msg;
offset = word_end_offset;
gui_message_get_next_char (&ptr_message, &offset);
/* skip leading spaces? */
if (skip_spaces)
{
while (ptr_message && (ptr_message->message[offset] == ' '))
gui_message_get_next_char (&ptr_message, &offset);
}
} }
} }
else else

3
weechat/ChangeLog
View File

@ -1,10 +1,11 @@
WeeChat - Wee Enhanced Environment for Chat WeeChat - Wee Enhanced Environment for Chat
=========================================== ===========================================
ChangeLog - 2005-09-13 ChangeLog - 2005-09-14
Version 0.1.5 (under dev!): Version 0.1.5 (under dev!):
* fixed infinite loop when scrolling back and displaying long lines
* fixed crash when closing a buffer used by more than one window * fixed crash when closing a buffer used by more than one window
* added some missing IRC commands * added some missing IRC commands
* fixed DCC display bug (now decodes string according to charset) * fixed DCC display bug (now decodes string according to charset)

26
weechat/src/gui/curses/gui-display.c
View File

@ -525,7 +525,8 @@ gui_display_word (t_gui_window *window, t_gui_line *line,
/* end of word? */ /* end of word? */
if (!message || (message->prev_message == end_msg) || if (!message || (message->prev_message == end_msg) ||
((message == end_msg) && (offset > end_offset))) ((message == end_msg) && (offset > end_offset)) ||
(window->win_chat_cursor_y >= window->win_chat_height))
end_of_word = 1; end_of_word = 1;
} }
@ -646,16 +647,21 @@ gui_display_line (t_gui_window *window, t_gui_line *line, int count, int simulat
word_end_msg, word_end_offset, word_end_msg, word_end_offset,
num_lines, count, &lines_displayed, simulate); num_lines, count, &lines_displayed, simulate);
/* move pointer after end of word */ if (window->win_chat_cursor_y >= window->win_chat_height)
ptr_message = word_end_msg; ptr_message = NULL;
offset = word_end_offset; else
gui_message_get_next_char (&ptr_message, &offset);
/* skip leading spaces? */
if (skip_spaces)
{ {
while (ptr_message && (ptr_message->message[offset] == ' ')) /* move pointer after end of word */
gui_message_get_next_char (&ptr_message, &offset); ptr_message = word_end_msg;
offset = word_end_offset;
gui_message_get_next_char (&ptr_message, &offset);
/* skip leading spaces? */
if (skip_spaces)
{
while (ptr_message && (ptr_message->message[offset] == ' '))
gui_message_get_next_char (&ptr_message, &offset);
}
} }
} }
else else