1
0
mirror of https://github.com/weechat/weechat.git synced 2026-07-09 03:03:12 +02:00

core: fix paste detection (problem with end of lines)

This commit is contained in:
Sebastien Helleu
2011-09-27 21:35:13 +02:00
parent a8c22c11fc
commit d0f41efeb7
3 changed files with 18 additions and 5 deletions
+9 -3
View File
@@ -1386,10 +1386,13 @@ gui_key_buffer_add (unsigned char key)
if (gui_key_buffer)
{
gui_key_buffer[gui_key_buffer_size - 1] = key;
if ((key == 13)
if (((key == '\r') || (key == '\n'))
&& (gui_key_buffer_size > 1)
&& (gui_key_buffer[gui_key_buffer_size - 2] != 13))
&& (gui_key_buffer[gui_key_buffer_size - 2] != '\r')
&& (gui_key_buffer[gui_key_buffer_size - 2] != '\n'))
{
gui_key_paste_lines++;
}
}
else
{
@@ -1409,8 +1412,11 @@ int
gui_key_get_paste_lines ()
{
if ((gui_key_buffer_size > 0)
&& (gui_key_buffer[gui_key_buffer_size - 1] != 13))
&& (gui_key_buffer[gui_key_buffer_size - 1] != '\r')
&& (gui_key_buffer[gui_key_buffer_size - 1] != '\n'))
{
return gui_key_paste_lines + 1;
}
return gui_key_paste_lines;
}