aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2025-01-03 14:56:47 -05:00
Code

Backspace/delete shouldn't modify cutbuffer.

Browse Source 
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2520 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2002-02-20 12:46:45 +00:00 committed by cras
parent ec0270811e
commit bcc5174e4a
3 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -334,13 +334,14 @@ char *gui_entry_get_cutbuffer(GUI_ENTRY_REC *entry)
return buf; return buf;
} }
void gui_entry_erase(GUI_ENTRY_REC *entry, int size) void gui_entry_erase(GUI_ENTRY_REC *entry, int size, int update_cutbuffer)
{ {
g_return_if_fail(entry != NULL); g_return_if_fail(entry != NULL);
if (entry->pos < size) if (entry->pos < size)
return; return;
if (update_cutbuffer) {
/* put erased text to cutbuffer */ /* put erased text to cutbuffer */
if (entry->cutbuffer == NULL || entry->cutbuffer_len < size) { if (entry->cutbuffer == NULL || entry->cutbuffer_len < size) {
g_free(entry->cutbuffer); g_free(entry->cutbuffer);
@ -351,6 +352,7 @@ void gui_entry_erase(GUI_ENTRY_REC *entry, int size)
entry->cutbuffer[size] = '\0'; entry->cutbuffer[size] = '\0';
memcpy(entry->cutbuffer, entry->text + entry->pos - size, memcpy(entry->cutbuffer, entry->text + entry->pos - size,
size * sizeof(unichar)); size * sizeof(unichar));
}
if (size == 0) { if (size == 0) {
/* we just wanted to clear the cutbuffer */ /* we just wanted to clear the cutbuffer */
@ -391,7 +393,7 @@ 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); gui_entry_erase(entry, entry->pos-to, 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)
@ -417,7 +419,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); gui_entry_erase(entry, size, TRUE);
} }
void gui_entry_transpose_chars(GUI_ENTRY_REC *entry) void gui_entry_transpose_chars(GUI_ENTRY_REC *entry)

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

@ -39,7 +39,7 @@ 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);
void gui_entry_erase(GUI_ENTRY_REC *entry, int size); void gui_entry_erase(GUI_ENTRY_REC *entry, int size, int update_cutbuffer);
void gui_entry_erase_word(GUI_ENTRY_REC *entry, int to_space); void gui_entry_erase_word(GUI_ENTRY_REC *entry, int to_space);
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);

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

@ -280,7 +280,7 @@ static void key_forward_to_space(void)
static void key_erase_line(void) static void key_erase_line(void)
{ {
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); gui_entry_erase(active_entry, active_entry->text_len, TRUE);
} }
static void key_erase_to_beg_of_line(void) static void key_erase_to_beg_of_line(void)
@ -288,7 +288,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); gui_entry_erase(active_entry, pos, TRUE);
} }
static void key_erase_to_end_of_line(void) static void key_erase_to_end_of_line(void)
@ -297,7 +297,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); gui_entry_erase(active_entry, active_entry->text_len - pos, TRUE);
} }
static void key_yank_from_cutbuffer(void) static void key_yank_from_cutbuffer(void)
@ -318,13 +318,13 @@ static void key_delete_character(void)
{ {
if (gui_entry_get_pos(active_entry) < active_entry->text_len) { if (gui_entry_get_pos(active_entry) < active_entry->text_len) {
gui_entry_move_pos(active_entry, 1); gui_entry_move_pos(active_entry, 1);
gui_entry_erase(active_entry, 1); gui_entry_erase(active_entry, 1, FALSE);
} }
} }
static void key_backspace(void) static void key_backspace(void)
{ {
gui_entry_erase(active_entry, 1); gui_entry_erase(active_entry, 1, FALSE);
} }
static void key_delete_previous_word(void) static void key_delete_previous_word(void)