jrd/irssi
1
0
Fork 0
forked from PsychoticNinja/irssi
Code Issues Pull Requests Projects Releases Wiki Activity

Send last line of bracketed paste together with the rest

Browse Source
This commit is contained in:
dequis 2015-09-25 02:21:27 -03:00
parent 3b01198f03
commit 79987d87f3
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,6 +69,7 @@ static int paste_join_multiline;
static int paste_timeout_id; static int paste_timeout_id;
static int paste_use_bracketed_mode; static int paste_use_bracketed_mode;
static int paste_bracketed_mode; static int paste_bracketed_mode;
static int paste_was_bracketed_mode;
/* Terminal sequences that surround the input when the terminal has the /* Terminal sequences that surround the input when the terminal has the
* bracketed paste mode active. Fror more details see * bracketed paste mode active. Fror more details see
@ -258,9 +259,16 @@ static void paste_buffer_join_lines(GArray *buf)
g_array_set_size(buf, dest - arr); g_array_set_size(buf, dest - arr);
} }
static void paste_send_line(char *text)
{
/* we need to get the current history every time because it might change between calls */
command_history_add(command_history_current(active_win), text);
signal_emit("send command", 3, text, active_win->active_server, active_win->active);
}
static void paste_send(void) static void paste_send(void)
{ {
HISTORY_REC *history;
unichar *arr; unichar *arr;
GString *str; GString *str;
char out[10], *text; char out[10], *text;
@ -285,11 +293,7 @@ static void paste_send(void)
} }
text = gui_entry_get_text(active_entry); text = gui_entry_get_text(active_entry);
history = command_history_current(active_win); paste_send_line(text);
command_history_add(history, text);
signal_emit("send command", 3, text,
active_win->active_server, active_win->active);
g_free(text); g_free(text);
} }
@ -297,12 +301,7 @@ static void paste_send(void)
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 (arr[i] == '\r' || arr[i] == '\n') {
history = command_history_current(active_win); paste_send_line(str->str);
command_history_add(history, str->str);
signal_emit("send command", 3, str->str,
active_win->active_server,
active_win->active);
g_string_truncate(str, 0); g_string_truncate(str, 0);
} else if (active_entry->utf8) { } else if (active_entry->utf8) {
out[g_unichar_to_utf8(arr[i], out)] = '\0'; out[g_unichar_to_utf8(arr[i], out)] = '\0';
@ -316,7 +315,14 @@ static void paste_send(void)
} }
} }
if (paste_was_bracketed_mode) {
/* the text before the bracket end should be sent along with the rest */
paste_send_line(str->str);
gui_entry_set_text(active_entry, "");
} else {
gui_entry_set_text(active_entry, str->str); gui_entry_set_text(active_entry, str->str);
}
g_string_free(str, TRUE); g_string_free(str, TRUE);
} }
@ -632,6 +638,8 @@ static void key_delete_to_next_space(void)
static gboolean paste_timeout(gpointer data) static gboolean paste_timeout(gpointer data)
{ {
paste_was_bracketed_mode = paste_bracketed_mode;
if (paste_line_count == 0) { if (paste_line_count == 0) {
int i; int i;