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 branch 'master' of github.com:toddpratt/irssi

Browse Source
This commit is contained in:
Todd A. Pratt 2015-11-13 10:59:21 -05:00
commit 0b2b3a0b85
3 changed files with 35 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -555,16 +555,31 @@ void gui_entry_erase(GUI_ENTRY_REC *entry, int size, int update_cutbuffer)
return; return;
if (update_cutbuffer) { if (update_cutbuffer) {
/* put erased text to cutbuffer */ if (entry->cutbuffer_len && update_cutbuffer == CUTBUFFER_PREPEND) {
if (entry->cutbuffer_len < size) { int cutbuffer_new_size = entry->cutbuffer_len + size;
g_free(entry->cutbuffer); unichar *tmpcutbuffer = entry->cutbuffer;
entry->cutbuffer = g_new(unichar, size+1); entry->cutbuffer = g_new(unichar, cutbuffer_new_size+1);
}
entry->cutbuffer_len = size; memcpy(entry->cutbuffer, entry->text + entry->pos - size,
entry->cutbuffer[size] = '\0'; size * sizeof(unichar));
memcpy(entry->cutbuffer, entry->text + entry->pos - size, memcpy(entry->cutbuffer + size, tmpcutbuffer,
size * sizeof(unichar));
entry->cutbuffer_len * sizeof(unichar));
entry->cutbuffer_len = cutbuffer_new_size;
entry->cutbuffer[cutbuffer_new_size] = '\0';
g_free(tmpcutbuffer);
} else if (update_cutbuffer) {
/* put erased text to cutbuffer */
if (entry->cutbuffer_len < size) {
g_free(entry->cutbuffer);
entry->cutbuffer = g_new(unichar, size+1);
}
entry->cutbuffer_len = size;
entry->cutbuffer[size] = '\0';
memcpy(entry->cutbuffer, entry->text + entry->pos - size,
size * sizeof(unichar));
}
} }
if (entry->utf8) if (entry->utf8)
@ -601,7 +616,7 @@ void gui_entry_erase_cell(GUI_ENTRY_REC *entry)
gui_entry_draw(entry); gui_entry_draw(entry);
} }
void gui_entry_erase_word(GUI_ENTRY_REC *entry, int to_space) void gui_entry_erase_word(GUI_ENTRY_REC *entry, int to_space, int repeat)
{ {
int to; int to;
@ -624,7 +639,8 @@ void gui_entry_erase_word(GUI_ENTRY_REC *entry, int to_space)
} }
if (to > 0) to++; if (to > 0) to++;
gui_entry_erase(entry, entry->pos-to, TRUE); gui_entry_erase(entry, entry->pos-to,
repeat ? CUTBUFFER_PREPEND : TRUE);
} }
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)

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

@ -1,6 +1,8 @@
#ifndef __GUI_ENTRY_H #ifndef __GUI_ENTRY_H
#define __GUI_ENTRY_H #define __GUI_ENTRY_H
#define CUTBUFFER_PREPEND 42
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;
@ -43,7 +45,7 @@ char *gui_entry_get_cutbuffer(GUI_ENTRY_REC *entry);
void gui_entry_erase_to(GUI_ENTRY_REC *entry, int pos, int update_cutbuffer); void gui_entry_erase_to(GUI_ENTRY_REC *entry, int pos, int update_cutbuffer);
void gui_entry_erase(GUI_ENTRY_REC *entry, int size, int update_cutbuffer); void gui_entry_erase(GUI_ENTRY_REC *entry, int size, int 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); void gui_entry_erase_word(GUI_ENTRY_REC *entry, int to_space, int repeat);
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);
void gui_entry_transpose_chars(GUI_ENTRY_REC *entry); void gui_entry_transpose_chars(GUI_ENTRY_REC *entry);

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

@ -68,6 +68,8 @@ static int paste_timeout_id;
static void sig_input(void); static void sig_input(void);
static int key_repeated = FALSE;
void input_listen_init(int handle) void input_listen_init(int handle)
{ {
readtag = g_input_add_poll(handle, readtag = g_input_add_poll(handle,
@ -361,6 +363,7 @@ static void sig_gui_key_pressed(gpointer keyp)
int ret; int ret;
key = GPOINTER_TO_INT(keyp); key = GPOINTER_TO_INT(keyp);
key_repeated = key == prev_key;
if (redir != NULL && redir->flags & ENTRY_REDIRECT_FLAG_HOTKEY) { if (redir != NULL && redir->flags & ENTRY_REDIRECT_FLAG_HOTKEY) {
handle_key_redirect(key); handle_key_redirect(key);
@ -596,7 +599,7 @@ 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); gui_entry_erase_word(active_entry, FALSE, key_repeated);
} }
static void key_delete_next_word(void) static void key_delete_next_word(void)
@ -606,7 +609,7 @@ static void key_delete_next_word(void)
static void key_delete_to_previous_space(void) static void key_delete_to_previous_space(void)
{ {
gui_entry_erase_word(active_entry, TRUE); gui_entry_erase_word(active_entry, TRUE, key_repeated);
} }
static void key_delete_to_next_space(void) static void key_delete_to_next_space(void)