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

Improve bracketed paste start/end detection

Browse Source 
- Use a keybinding to detect the start of a bracketed paste
- Iterate over the paste buffer looking for the end marker
This commit is contained in:
dequis 2015-09-17 00:52:55 -03:00
parent 6888fc5fc7
commit 9a6b2dedcc
1 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -665,37 +665,44 @@ static void sig_input(void)
/* use the bracketed paste mode to detect when the user pastes /* use the bracketed paste mode to detect when the user pastes
* some text into the entry */ * some text into the entry */
if (paste_use_bracketed_mode != FALSE && paste_buffer->len > 12) { if (paste_bracketed_mode) {
/* try to find the start/end sequence, we know that we int i;
* either find those at the start/end of the buffer or int len = paste_buffer->len - G_N_ELEMENTS(bp_end);
* we don't find those at all. */ unichar *ptr = (unichar *) paste_buffer->data;
int seq_start = !memcmp(paste_buffer->data, bp_start, sizeof(bp_start)),
seq_end = !memcmp(paste_buffer->data + paste_buffer->len * g_array_get_element_size(paste_buffer) - sizeof(bp_end), bp_end, sizeof(bp_end));
if (seq_start) { if (len <= 0) {
paste_bracketed_mode = TRUE; return;
/* remove the leading sequence chars */
g_array_remove_range(paste_buffer, 0, 6);
} }
if (seq_end) { for (i = 0; i <= len; i++, ptr++) {
paste_bracketed_mode = FALSE; if (ptr[0] == bp_end[0] && !memcmp(ptr, bp_end, sizeof(bp_end))) {
/* remove the trailing sequence chars */ /* remove the trailing sequence chars */
g_array_set_size(paste_buffer, paste_buffer->len - 6); g_array_set_size(paste_buffer, i);
/* decide what to do with the buffer */
paste_timeout(NULL); /* decide what to do with the buffer */
paste_timeout(NULL);
paste_bracketed_mode = FALSE;
break;
}
} }
} }
else if (paste_detect_time > 0 && paste_buffer->len >= 3) { else if (paste_detect_time > 0 && paste_buffer->len >= 3) {
if (paste_timeout_id != -1) if (paste_timeout_id != -1)
g_source_remove(paste_timeout_id); g_source_remove(paste_timeout_id);
paste_timeout_id = g_timeout_add(paste_detect_time, paste_timeout, NULL); paste_timeout_id = g_timeout_add(paste_detect_time, paste_timeout, NULL);
} else { } else if (!paste_bracketed_mode) {
int i; int i;
for (i = 0; i < paste_buffer->len; i++) { for (i = 0; i < paste_buffer->len; i++) {
unichar key = g_array_index(paste_buffer, unichar, i); unichar key = g_array_index(paste_buffer, unichar, i);
signal_emit("gui key pressed", 1, GINT_TO_POINTER(key)); signal_emit("gui key pressed", 1, GINT_TO_POINTER(key));
if (paste_bracketed_mode) {
/* just enabled by the signal, remove what was processed so far */
g_array_remove_range(paste_buffer, 0, i + 1);
return;
}
} }
g_array_set_size(paste_buffer, 0); g_array_set_size(paste_buffer, 0);
paste_line_count = 0; paste_line_count = 0;
@ -703,6 +710,11 @@ static void sig_input(void)
} }
} }
static void key_paste_start(void)
{
paste_bracketed_mode = TRUE;
}
time_t get_idle_time(void) time_t get_idle_time(void)
{ {
return last_keypress.tv_sec; return last_keypress.tv_sec;
@ -1060,6 +1072,8 @@ void gui_readline_init(void)
key_bind("key", NULL, "meta2-5F", "cend", (SIGNAL_FUNC) key_combo); key_bind("key", NULL, "meta2-5F", "cend", (SIGNAL_FUNC) key_combo);
key_bind("key", NULL, "meta2-1;5F", "cend", (SIGNAL_FUNC) key_combo); key_bind("key", NULL, "meta2-1;5F", "cend", (SIGNAL_FUNC) key_combo);
key_bind("paste_start", "Bracketed paste start", "meta2-200~", "paste_start", (SIGNAL_FUNC) key_paste_start);
/* cursor movement */ /* cursor movement */
key_bind("backward_character", "Move the cursor a character backward", "left", NULL, (SIGNAL_FUNC) key_backward_character); key_bind("backward_character", "Move the cursor a character backward", "left", NULL, (SIGNAL_FUNC) key_backward_character);
key_bind("forward_character", "Move the cursor a character forward", "right", NULL, (SIGNAL_FUNC) key_forward_character); key_bind("forward_character", "Move the cursor a character forward", "right", NULL, (SIGNAL_FUNC) key_forward_character);
@ -1155,6 +1169,8 @@ void gui_readline_deinit(void)
key_configure_freeze(); key_configure_freeze();
key_unbind("paste_start", (SIGNAL_FUNC) key_paste_start);
key_unbind("backward_character", (SIGNAL_FUNC) key_backward_character); key_unbind("backward_character", (SIGNAL_FUNC) key_backward_character);
key_unbind("forward_character", (SIGNAL_FUNC) key_forward_character); key_unbind("forward_character", (SIGNAL_FUNC) key_forward_character);
key_unbind("backward_word", (SIGNAL_FUNC) key_backward_word); key_unbind("backward_word", (SIGNAL_FUNC) key_backward_word);