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

Merge pull request #455 from ailin-nemui/cutbuffer

Browse Source 
improved cutbuffer handling
This commit is contained in:
ailin-nemui 2016-03-31 19:13:53 +02:00
commit 26f875263a
3 changed files with 190 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

137
src/fe-text/gui-entry.c
View File

@ -32,6 +32,8 @@
#undef i_tolower #undef i_tolower
#undef i_isalnum #undef i_isalnum
#define KILL_RING_MAX 10
static unichar i_toupper(unichar c) static unichar i_toupper(unichar c)
{ {
if (term_type == TERM_TYPE_UTF8) if (term_type == TERM_TYPE_UTF8)
@ -82,11 +84,22 @@ GUI_ENTRY_REC *gui_entry_create(int xpos, int ypos, int width, int utf8)
void gui_entry_destroy(GUI_ENTRY_REC *entry) void gui_entry_destroy(GUI_ENTRY_REC *entry)
{ {
GSList *tmp;
g_return_if_fail(entry != NULL); g_return_if_fail(entry != NULL);
if (active_entry == entry) if (active_entry == entry)
gui_entry_set_active(NULL); gui_entry_set_active(NULL);
for (tmp = entry->kill_ring; tmp != NULL; tmp = tmp->next) {
GUI_ENTRY_CUTBUFFER_REC *rec = tmp->data;
if (rec != NULL) {
g_free(rec->cutbuffer);
g_free(rec);
}
}
g_slist_free(entry->kill_ring);
g_free(entry->text); g_free(entry->text);
g_free(entry->prompt); g_free(entry->prompt);
g_free(entry); g_free(entry);
@ -546,22 +559,42 @@ char *gui_entry_get_cutbuffer(GUI_ENTRY_REC *entry)
g_return_val_if_fail(entry != NULL, NULL); g_return_val_if_fail(entry != NULL, NULL);
if (entry->cutbuffer == NULL) if (entry->kill_ring == NULL || entry->kill_ring->data == NULL)
return NULL;
GUI_ENTRY_CUTBUFFER_REC *tmp = entry->kill_ring->data;
if (tmp->cutbuffer == NULL)
return NULL; return NULL;
if (entry->utf8) if (entry->utf8)
buf = g_ucs4_to_utf8(entry->cutbuffer, -1, NULL, NULL, NULL); buf = g_ucs4_to_utf8(tmp->cutbuffer, -1, NULL, NULL, NULL);
else { else {
buf = g_malloc(entry->cutbuffer_len*6 + 1); buf = g_malloc(tmp->cutbuffer_len*6 + 1);
if (term_type == TERM_TYPE_BIG5) if (term_type == TERM_TYPE_BIG5)
unichars_to_big5(entry->cutbuffer, buf); unichars_to_big5(tmp->cutbuffer, buf);
else else
for (i = 0; i <= entry->cutbuffer_len; i++) for (i = 0; i <= tmp->cutbuffer_len; i++)
buf[i] = entry->cutbuffer[i]; buf[i] = tmp->cutbuffer[i];
} }
return buf; return buf;
} }
char *gui_entry_get_next_cutbuffer(GUI_ENTRY_REC *entry)
{
g_return_val_if_fail(entry != NULL, NULL);
if (entry->kill_ring == NULL)
return NULL;
GUI_ENTRY_CUTBUFFER_REC *tmp = entry->kill_ring->data;
entry->kill_ring = g_slist_remove(entry->kill_ring, tmp);
entry->kill_ring = g_slist_append(entry->kill_ring, tmp);
return gui_entry_get_cutbuffer(entry);
}
void gui_entry_erase_to(GUI_ENTRY_REC *entry, int pos, CUTBUFFER_UPDATE_OP update_cutbuffer) void gui_entry_erase_to(GUI_ENTRY_REC *entry, int pos, CUTBUFFER_UPDATE_OP update_cutbuffer)
{ {
int newpos, size = 0; int newpos, size = 0;
@ -573,6 +606,40 @@ void gui_entry_erase_to(GUI_ENTRY_REC *entry, int pos, CUTBUFFER_UPDATE_OP updat
gui_entry_erase(entry, size, update_cutbuffer); gui_entry_erase(entry, size, update_cutbuffer);
} }
static GUI_ENTRY_CUTBUFFER_REC *get_cutbuffer_rec(GUI_ENTRY_REC *entry, CUTBUFFER_UPDATE_OP update_cutbuffer)
{
GUI_ENTRY_CUTBUFFER_REC *tmp = NULL;
g_return_val_if_fail(entry != NULL, NULL);
if (entry->kill_ring == NULL) {
/* no kill ring exists */
entry->kill_ring = g_slist_prepend(entry->kill_ring, (void *)NULL);
} else {
tmp = entry->kill_ring->data;
if (tmp != NULL && tmp->cutbuffer_len > 0
&& (!entry->previous_append_next_kill
|| update_cutbuffer == CUTBUFFER_UPDATE_REPLACE)) {
/* a cutbuffer exists and should be replaced */
entry->kill_ring = g_slist_prepend(entry->kill_ring, (void *)NULL);
}
}
if (g_slist_length(entry->kill_ring) > KILL_RING_MAX) {
GUI_ENTRY_CUTBUFFER_REC *rec = g_slist_last(entry->kill_ring)->data;
entry->kill_ring = g_slist_remove(entry->kill_ring, rec);
if (rec != NULL) g_free(rec->cutbuffer);
g_free(rec);
}
if (entry->kill_ring->data == NULL) {
entry->kill_ring->data = g_new0(GUI_ENTRY_CUTBUFFER_REC, 1);
}
return entry->kill_ring->data;
}
void gui_entry_erase(GUI_ENTRY_REC *entry, int size, CUTBUFFER_UPDATE_OP update_cutbuffer) void gui_entry_erase(GUI_ENTRY_REC *entry, int size, CUTBUFFER_UPDATE_OP update_cutbuffer)
{ {
size_t w = 0; size_t w = 0;
@ -582,52 +649,60 @@ void gui_entry_erase(GUI_ENTRY_REC *entry, int size, CUTBUFFER_UPDATE_OP update_
if (size == 0 || entry->pos < size) if (size == 0 || entry->pos < size)
return; return;
if (update_cutbuffer != CUTBUFFER_UPDATE_NOOP if (update_cutbuffer != CUTBUFFER_UPDATE_NOOP) {
&& entry->cutbuffer_len == 0) { int cutbuffer_new_size;
unichar *tmpcutbuffer;
GUI_ENTRY_CUTBUFFER_REC *tmp = get_cutbuffer_rec(entry, update_cutbuffer);
if (tmp->cutbuffer_len == 0) {
update_cutbuffer = CUTBUFFER_UPDATE_REPLACE; update_cutbuffer = CUTBUFFER_UPDATE_REPLACE;
} }
int cutbuffer_new_size = entry->cutbuffer_len + size;
unichar *tmpcutbuffer = entry->cutbuffer; cutbuffer_new_size = tmp->cutbuffer_len + size;
tmpcutbuffer = tmp->cutbuffer;
entry->append_next_kill = TRUE;
switch (update_cutbuffer) { switch (update_cutbuffer) {
case CUTBUFFER_UPDATE_APPEND: case CUTBUFFER_UPDATE_APPEND:
entry->cutbuffer = g_new(unichar, cutbuffer_new_size+1); tmp->cutbuffer = g_new(unichar, cutbuffer_new_size+1);
memcpy(entry->cutbuffer, tmpcutbuffer, memcpy(tmp->cutbuffer, tmpcutbuffer,
entry->cutbuffer_len * sizeof(unichar)); tmp->cutbuffer_len * sizeof(unichar));
memcpy(entry->cutbuffer + entry->cutbuffer_len * sizeof(unichar), memcpy(tmp->cutbuffer + tmp->cutbuffer_len * sizeof(unichar),
entry->text + entry->pos - size, size * sizeof(unichar)); entry->text + entry->pos - size, size * sizeof(unichar));
entry->cutbuffer_len = cutbuffer_new_size; tmp->cutbuffer_len = cutbuffer_new_size;
entry->cutbuffer[cutbuffer_new_size] = '\0'; tmp->cutbuffer[cutbuffer_new_size] = '\0';
g_free(tmpcutbuffer); g_free(tmpcutbuffer);
break; break;
case CUTBUFFER_UPDATE_PREPEND: case CUTBUFFER_UPDATE_PREPEND:
entry->cutbuffer = g_new(unichar, cutbuffer_new_size+1); tmp->cutbuffer = g_new(unichar, cutbuffer_new_size+1);
memcpy(entry->cutbuffer, entry->text + entry->pos - size, memcpy(tmp->cutbuffer, entry->text + entry->pos - size,
size * sizeof(unichar)); size * sizeof(unichar));
memcpy(entry->cutbuffer + size, tmpcutbuffer, memcpy(tmp->cutbuffer + size, tmpcutbuffer,
entry->cutbuffer_len * sizeof(unichar)); tmp->cutbuffer_len * sizeof(unichar));
entry->cutbuffer_len = cutbuffer_new_size; tmp->cutbuffer_len = cutbuffer_new_size;
entry->cutbuffer[cutbuffer_new_size] = '\0'; tmp->cutbuffer[cutbuffer_new_size] = '\0';
g_free(tmpcutbuffer); g_free(tmpcutbuffer);
break; break;
case CUTBUFFER_UPDATE_REPLACE: case CUTBUFFER_UPDATE_REPLACE:
/* put erased text to cutbuffer */ /* put erased text to cutbuffer */
if (entry->cutbuffer_len < size) { if (tmp->cutbuffer_len < size) {
g_free(entry->cutbuffer); g_free(tmp->cutbuffer);
entry->cutbuffer = g_new(unichar, size+1); tmp->cutbuffer = g_new(unichar, size+1);
} }
entry->cutbuffer_len = size; tmp->cutbuffer_len = size;
entry->cutbuffer[size] = '\0'; tmp->cutbuffer[size] = '\0';
memcpy(entry->cutbuffer, entry->text + entry->pos - size, size * sizeof(unichar)); memcpy(tmp->cutbuffer, entry->text + entry->pos - size, size * sizeof(unichar));
break; break;
case CUTBUFFER_UPDATE_NOOP: case CUTBUFFER_UPDATE_NOOP:
/* cannot happen, handled in "if" */
break; break;
} }
}
if (entry->utf8) if (entry->utf8)
while (entry->pos-size-w > 0 && while (entry->pos-size-w > 0 &&
@ -686,10 +761,10 @@ void gui_entry_erase_word(GUI_ENTRY_REC *entry, int to_space, CUTBUFFER_UPDATE_O
} }
if (to > 0) to++; if (to > 0) to++;
gui_entry_erase(entry, entry->pos-to, CUTBUFFER_UPDATE_REPLACE); gui_entry_erase(entry, entry->pos-to, cutbuffer_op);
} }
void gui_entry_erase_next_word(GUI_ENTRY_REC *entry, int to_space) void gui_entry_erase_next_word(GUI_ENTRY_REC *entry, int to_space, CUTBUFFER_UPDATE_OP cutbuffer_op)
{ {
int to, size; int to, size;
@ -712,7 +787,7 @@ void gui_entry_erase_next_word(GUI_ENTRY_REC *entry, int to_space)
size = to-entry->pos; size = to-entry->pos;
entry->pos = to; entry->pos = to;
gui_entry_erase(entry, size, CUTBUFFER_UPDATE_REPLACE); gui_entry_erase(entry, size, cutbuffer_op);
} }
void gui_entry_transpose_chars(GUI_ENTRY_REC *entry) void gui_entry_transpose_chars(GUI_ENTRY_REC *entry)

15
src/fe-text/gui-entry.h
View File

@ -1,12 +1,16 @@
#ifndef __GUI_ENTRY_H #ifndef __GUI_ENTRY_H
#define __GUI_ENTRY_H #define __GUI_ENTRY_H
typedef struct {
int cutbuffer_len;
unichar *cutbuffer;
} GUI_ENTRY_CUTBUFFER_REC;
typedef struct { typedef struct {
int text_len, text_alloc; /* as shorts, not chars */ int text_len, text_alloc; /* as shorts, not chars */
unichar *text; unichar *text;
int cutbuffer_len; GSList *kill_ring;
unichar *cutbuffer;
/* all as shorts, not chars */ /* all as shorts, not chars */
int xpos, ypos, width; /* entry position in screen */ int xpos, ypos, width; /* entry position in screen */
@ -18,6 +22,10 @@ typedef struct {
int redraw_needed_from; int redraw_needed_from;
unsigned int utf8:1; unsigned int utf8:1;
unsigned int previous_append_next_kill:1;
unsigned int append_next_kill:1;
unsigned int yank_preceded:1;
} GUI_ENTRY_REC; } GUI_ENTRY_REC;
typedef enum { typedef enum {
@ -47,11 +55,12 @@ void gui_entry_insert_text(GUI_ENTRY_REC *entry, const char *str);
void gui_entry_insert_char(GUI_ENTRY_REC *entry, unichar chr); void gui_entry_insert_char(GUI_ENTRY_REC *entry, unichar chr);
char *gui_entry_get_cutbuffer(GUI_ENTRY_REC *entry); char *gui_entry_get_cutbuffer(GUI_ENTRY_REC *entry);
char *gui_entry_get_next_cutbuffer(GUI_ENTRY_REC *entry);
void gui_entry_erase_to(GUI_ENTRY_REC *entry, int pos, CUTBUFFER_UPDATE_OP update_cutbuffer); void gui_entry_erase_to(GUI_ENTRY_REC *entry, int pos, CUTBUFFER_UPDATE_OP update_cutbuffer);
void gui_entry_erase(GUI_ENTRY_REC *entry, int size, CUTBUFFER_UPDATE_OP update_cutbuffer); void gui_entry_erase(GUI_ENTRY_REC *entry, int size, CUTBUFFER_UPDATE_OP update_cutbuffer);
void gui_entry_erase_cell(GUI_ENTRY_REC *entry); void gui_entry_erase_cell(GUI_ENTRY_REC *entry);
void gui_entry_erase_word(GUI_ENTRY_REC *entry, int to_space, CUTBUFFER_UPDATE_OP cutbuffer_op); void gui_entry_erase_word(GUI_ENTRY_REC *entry, int to_space, CUTBUFFER_UPDATE_OP cutbuffer_op);
void gui_entry_erase_next_word(GUI_ENTRY_REC *entry, int to_space); void gui_entry_erase_next_word(GUI_ENTRY_REC *entry, int to_space, CUTBUFFER_UPDATE_OP cutbuffer_op);
void gui_entry_transpose_chars(GUI_ENTRY_REC *entry); void gui_entry_transpose_chars(GUI_ENTRY_REC *entry);
void gui_entry_transpose_words(GUI_ENTRY_REC *entry); void gui_entry_transpose_words(GUI_ENTRY_REC *entry);

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

@ -73,6 +73,7 @@ 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; static int paste_was_bracketed_mode;
static int previous_yank_preceded;
/* 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
@ -440,11 +441,20 @@ static void sig_gui_key_pressed(gpointer keyp)
gui_entry_insert_char(active_entry, key); gui_entry_insert_char(active_entry, key);
ret = 1; ret = 1;
} else { } else {
previous_yank_preceded = active_entry->yank_preceded;
active_entry->yank_preceded = FALSE;
active_entry->previous_append_next_kill = active_entry->append_next_kill;
active_entry->append_next_kill = FALSE;
ret = key_pressed(keyboard, str); ret = key_pressed(keyboard, str);
if (ret < 0) { if (ret < 0) {
/* key wasn't used for anything, print it */ /* key wasn't used for anything, print it */
gui_entry_insert_char(active_entry, key); gui_entry_insert_char(active_entry, key);
} }
if (ret == 0) {
/* combo not complete, ignore append_next_kill and yank_preceded */
active_entry->append_next_kill = active_entry->previous_append_next_kill;
active_entry->yank_preceded = previous_yank_preceded;
}
} }
/* ret = 0 : some key create multiple characters - we're in the middle /* ret = 0 : some key create multiple characters - we're in the middle
@ -571,7 +581,7 @@ static void key_erase_to_beg_of_line(void)
int pos; int pos;
pos = gui_entry_get_pos(active_entry); pos = gui_entry_get_pos(active_entry);
gui_entry_erase(active_entry, pos, CUTBUFFER_UPDATE_REPLACE); gui_entry_erase(active_entry, pos, CUTBUFFER_UPDATE_PREPEND);
} }
static void key_erase_to_end_of_line(void) static void key_erase_to_end_of_line(void)
@ -580,7 +590,7 @@ static void key_erase_to_end_of_line(void)
pos = gui_entry_get_pos(active_entry); pos = gui_entry_get_pos(active_entry);
gui_entry_set_pos(active_entry, active_entry->text_len); gui_entry_set_pos(active_entry, active_entry->text_len);
gui_entry_erase(active_entry, active_entry->text_len - pos, CUTBUFFER_UPDATE_REPLACE); gui_entry_erase(active_entry, active_entry->text_len - pos, CUTBUFFER_UPDATE_APPEND);
} }
static void key_yank_from_cutbuffer(void) static void key_yank_from_cutbuffer(void)
@ -590,6 +600,35 @@ static void key_yank_from_cutbuffer(void)
cutbuffer = gui_entry_get_cutbuffer(active_entry); cutbuffer = gui_entry_get_cutbuffer(active_entry);
if (cutbuffer != NULL) { if (cutbuffer != NULL) {
gui_entry_insert_text(active_entry, cutbuffer); gui_entry_insert_text(active_entry, cutbuffer);
active_entry->yank_preceded = TRUE;
g_free(cutbuffer);
}
}
static void key_yank_next_cutbuffer(void)
{
GUI_ENTRY_CUTBUFFER_REC *rec;
guint length = 0;
char *cutbuffer;
if (!previous_yank_preceded) {
if (settings_get_bool("bell_beeps")) {
signal_emit("beep", 0);
}
return;
}
if (active_entry->kill_ring == NULL)
return;
rec = active_entry->kill_ring->data;
if (rec != NULL) length = rec->cutbuffer_len;
cutbuffer = gui_entry_get_next_cutbuffer(active_entry);
if (cutbuffer != NULL) {
gui_entry_erase(active_entry, length, CUTBUFFER_UPDATE_NOOP);
gui_entry_insert_text(active_entry, cutbuffer);
active_entry->yank_preceded = TRUE;
g_free(cutbuffer); g_free(cutbuffer);
} }
} }
@ -632,22 +671,27 @@ static void key_backspace(void)
static void key_delete_previous_word(void) static void key_delete_previous_word(void)
{ {
gui_entry_erase_word(active_entry, FALSE, CUTBUFFER_UPDATE_REPLACE); gui_entry_erase_word(active_entry, FALSE, CUTBUFFER_UPDATE_PREPEND);
} }
static void key_delete_next_word(void) static void key_delete_next_word(void)
{ {
gui_entry_erase_next_word(active_entry, FALSE); gui_entry_erase_next_word(active_entry, FALSE, CUTBUFFER_UPDATE_APPEND);
} }
static void key_delete_to_previous_space(void) static void key_delete_to_previous_space(void)
{ {
gui_entry_erase_word(active_entry, TRUE, CUTBUFFER_UPDATE_REPLACE); gui_entry_erase_word(active_entry, TRUE, CUTBUFFER_UPDATE_PREPEND);
} }
static void key_delete_to_next_space(void) static void key_delete_to_next_space(void)
{ {
gui_entry_erase_next_word(active_entry, TRUE); gui_entry_erase_next_word(active_entry, TRUE, CUTBUFFER_UPDATE_APPEND);
}
static void key_append_next_kill(void)
{
active_entry->append_next_kill = TRUE;
} }
static gboolean paste_timeout(gpointer data) static gboolean paste_timeout(gpointer data)
@ -1191,6 +1235,8 @@ void gui_readline_init(void)
key_bind("erase_to_beg_of_line", "Erase everything before the cursor", NULL, NULL, (SIGNAL_FUNC) key_erase_to_beg_of_line); key_bind("erase_to_beg_of_line", "Erase everything before the cursor", NULL, NULL, (SIGNAL_FUNC) key_erase_to_beg_of_line);
key_bind("erase_to_end_of_line", "Erase everything after the cursor", "^K", NULL, (SIGNAL_FUNC) key_erase_to_end_of_line); key_bind("erase_to_end_of_line", "Erase everything after the cursor", "^K", NULL, (SIGNAL_FUNC) key_erase_to_end_of_line);
key_bind("yank_from_cutbuffer", "\"Undelete\", paste the last deleted text", "^Y", NULL, (SIGNAL_FUNC) key_yank_from_cutbuffer); key_bind("yank_from_cutbuffer", "\"Undelete\", paste the last deleted text", "^Y", NULL, (SIGNAL_FUNC) key_yank_from_cutbuffer);
key_bind("yank_next_cutbuffer", "Revert to the previous last deleted text", NULL, NULL, (SIGNAL_FUNC) key_yank_next_cutbuffer);
key_bind("append_next_kill", "Append next deletion", NULL, NULL, (SIGNAL_FUNC) key_append_next_kill);
key_bind("transpose_characters", "Swap current and previous character", "^T", NULL, (SIGNAL_FUNC) key_transpose_characters); key_bind("transpose_characters", "Swap current and previous character", "^T", NULL, (SIGNAL_FUNC) key_transpose_characters);
key_bind("transpose_words", "Swap current and previous word", NULL, NULL, (SIGNAL_FUNC) key_transpose_words); key_bind("transpose_words", "Swap current and previous word", NULL, NULL, (SIGNAL_FUNC) key_transpose_words);
key_bind("capitalize_word", "Capitalize the current word", NULL, NULL, (SIGNAL_FUNC) key_capitalize_word); key_bind("capitalize_word", "Capitalize the current word", NULL, NULL, (SIGNAL_FUNC) key_capitalize_word);
@ -1280,6 +1326,8 @@ void gui_readline_deinit(void)
key_unbind("erase_to_beg_of_line", (SIGNAL_FUNC) key_erase_to_beg_of_line); key_unbind("erase_to_beg_of_line", (SIGNAL_FUNC) key_erase_to_beg_of_line);
key_unbind("erase_to_end_of_line", (SIGNAL_FUNC) key_erase_to_end_of_line); key_unbind("erase_to_end_of_line", (SIGNAL_FUNC) key_erase_to_end_of_line);
key_unbind("yank_from_cutbuffer", (SIGNAL_FUNC) key_yank_from_cutbuffer); key_unbind("yank_from_cutbuffer", (SIGNAL_FUNC) key_yank_from_cutbuffer);
key_unbind("yank_next_cutbuffer", (SIGNAL_FUNC) key_yank_next_cutbuffer);
key_unbind("append_next_kill", (SIGNAL_FUNC) key_append_next_kill);
key_unbind("transpose_characters", (SIGNAL_FUNC) key_transpose_characters); key_unbind("transpose_characters", (SIGNAL_FUNC) key_transpose_characters);
key_unbind("transpose_words", (SIGNAL_FUNC) key_transpose_words); key_unbind("transpose_words", (SIGNAL_FUNC) key_transpose_words);