aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-09-29 04:45:57 -04:00
Code

Merge pull request #414 from toddpratt/master

Browse Source 
add an append operation to cut buffer handling
This commit is contained in:
ailin-nemui 2016-02-18 00:18:24 +01:00
commit 4650665ee4
2 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -582,13 +582,26 @@ void gui_entry_erase(GUI_ENTRY_REC *entry, int size, CUTBUFFER_UPDATE_OP update_
if (size == 0 || entry->pos < size)
return;
switch (update_cutbuffer) {
case CUTBUFFER_UPDATE_PREPEND:
if (entry->cutbuffer_len) {
if (entry->cutbuffer_len == 0) {
update_cutbuffer = CUTBUFFER_UPDATE_REPLACE;
}
int cutbuffer_new_size = entry->cutbuffer_len + size;
unichar *tmpcutbuffer = entry->cutbuffer;
switch (update_cutbuffer) {
case CUTBUFFER_UPDATE_APPEND:
entry->cutbuffer = g_new(unichar, cutbuffer_new_size+1);
memcpy(entry->cutbuffer, tmpcutbuffer,
entry->cutbuffer_len * sizeof(unichar));
memcpy(entry->cutbuffer + entry->cutbuffer_len * sizeof(unichar),
entry->text + entry->pos - size, size * sizeof(unichar));
entry->cutbuffer_len = cutbuffer_new_size;
entry->cutbuffer[cutbuffer_new_size] = '\0';
g_free(tmpcutbuffer);
break;
case CUTBUFFER_UPDATE_PREPEND:
entry->cutbuffer = g_new(unichar, cutbuffer_new_size+1);
memcpy(entry->cutbuffer, entry->text + entry->pos - size,
size * sizeof(unichar));
memcpy(entry->cutbuffer + size, tmpcutbuffer,
@ -596,11 +609,9 @@ void gui_entry_erase(GUI_ENTRY_REC *entry, int size, CUTBUFFER_UPDATE_OP update_
entry->cutbuffer_len = cutbuffer_new_size;
entry->cutbuffer[cutbuffer_new_size] = '\0';
g_free(tmpcutbuffer);
break;
}
/* fall through to REPLACE if cutbuffer_len was 0 */
case CUTBUFFER_UPDATE_REPLACE:
/* put erased text to cutbuffer */
if (entry->cutbuffer_len < size) {
@ -610,9 +621,9 @@ void gui_entry_erase(GUI_ENTRY_REC *entry, int size, CUTBUFFER_UPDATE_OP update_
entry->cutbuffer_len = size;
entry->cutbuffer[size] = '\0';
memcpy(entry->cutbuffer, entry->text + entry->pos - size,
size * sizeof(unichar));
memcpy(entry->cutbuffer, entry->text + entry->pos - size, size * sizeof(unichar));
break;
case CUTBUFFER_UPDATE_NOOP:
break;
}

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

@ -23,6 +23,7 @@ typedef struct {
typedef enum {
CUTBUFFER_UPDATE_NOOP,
CUTBUFFER_UPDATE_REPLACE,
CUTBUFFER_UPDATE_APPEND,
CUTBUFFER_UPDATE_PREPEND
} CUTBUFFER_UPDATE_OP;