aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
Code

fix paste_join_multiline

Browse Source
This commit is contained in:
ailin-nemui 2018-11-09 11:06:13 +01:00
parent 83e98da2ff
commit c1fb9a8402
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/fe-text/gui-readline.c
View File

@ -160,6 +160,7 @@ static void window_next_page(void)
gui_window_scroll(active_win, get_scroll_count()); gui_window_scroll(active_win, get_scroll_count());
} }
#define isnewline(x) ((x) == '\n' || (x) == '\r')
static void paste_buffer_join_lines(GArray *buf) static void paste_buffer_join_lines(GArray *buf)
{ {
unsigned int i, count, indent, line_len; unsigned int i, count, indent, line_len;
@ -199,7 +200,7 @@ static void paste_buffer_join_lines(GArray *buf)
/* find the first beginning of indented line */ /* find the first beginning of indented line */
for (i = 1; i < buf->len; i++) { for (i = 1; i < buf->len; i++) {
if (arr[i-1] == '\n' && isblank(arr[i])) if (isnewline(arr[i-1]) && isblank(arr[i]))
break; break;
} }
if (i == buf->len) if (i == buf->len)
@ -226,7 +227,7 @@ static void paste_buffer_join_lines(GArray *buf)
count = 0; count = 0;
} }
} }
if (arr[i] == '\n') if (isnewline(arr[i]))
last_lf = TRUE; last_lf = TRUE;
} }
@ -236,10 +237,11 @@ static void paste_buffer_join_lines(GArray *buf)
for (i = 0; i < buf->len; i++) { for (i = 0; i < buf->len; i++) {
if (last_lf && isblank(arr[i])) { if (last_lf && isblank(arr[i])) {
/* whitespace, ignore */ /* whitespace, ignore */
} else if (arr[i] == '\n') { } else if (isnewline(arr[i])) {
if (!last_lf && i+1 != buf->len && if (!last_lf && i+1 != buf->len &&
isblank(arr[i+1])) { isblank(arr[i+1])) {
last_lf_pos = dest; last_lf_pos = dest;
if (i != 0 && !isblank(arr[i-1]))
*dest++ = ' '; *dest++ = ' ';
} else { } else {
*dest++ = '\n'; /* double-LF */ *dest++ = '\n'; /* double-LF */
@ -287,7 +289,7 @@ static void paste_send(void)
/* first line has to be kludged kind of to get pasting in the /* first line has to be kludged kind of to get pasting in the
middle of line right.. */ middle of line right.. */
for (i = 0; i < paste_buffer->len; i++) { for (i = 0; i < paste_buffer->len; i++) {
if (arr[i] == '\r' || arr[i] == '\n') { if (isnewline(arr[i])) {
i++; i++;
break; break;
} }
@ -303,7 +305,7 @@ static void paste_send(void)
/* rest of the lines */ /* rest of the lines */
str = g_string_new(NULL); str = g_string_new(NULL);
for (; i < paste_buffer->len; i++) { for (; i < paste_buffer->len; i++) {
if (arr[i] == '\r' || arr[i] == '\n') { if (isnewline(arr[i])) {
paste_send_line(str->str); paste_send_line(str->str);
g_string_truncate(str, 0); g_string_truncate(str, 0);
} else if (active_entry->utf8) { } else if (active_entry->utf8) {
@ -769,7 +771,7 @@ static void paste_bracketed_end(int i, gboolean rest)
last_char = g_array_index(paste_buffer, unichar, i - 1); last_char = g_array_index(paste_buffer, unichar, i - 1);
if (paste_line_count > 0 && last_char != '\n' && last_char != '\r') { if (paste_line_count > 0 && !isnewline(last_char)) {
/* there are newlines, but there's also stuff after the newline /* there are newlines, but there's also stuff after the newline
* adjust line count to reflect this */ * adjust line count to reflect this */
paste_line_count++; paste_line_count++;