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

Redraw input line correctly in an utf8 locale when deleting a

Browse Source 
nonspacing char by taking in account the cell width, bug #459.


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4414 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Emanuele Giaquinta 2007-02-07 18:20:49 +00:00 committed by exg
parent 7c48fc2fb3
commit 4f49a38402
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -507,8 +507,18 @@ void gui_entry_erase_to(GUI_ENTRY_REC *entry, int pos, int update_cutbuffer)
gui_entry_erase(entry, size, update_cutbuffer); gui_entry_erase(entry, size, update_cutbuffer);
} }
static size_t cell_width(unichar *buf, int len)
{
unichar *str = buf;
while (len-- && utf8_width(*str--) == 0);
return buf - str;
}
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)
{ {
size_t w = 0;
g_return_if_fail(entry != NULL); g_return_if_fail(entry != NULL);
if (entry->pos < size) if (entry->pos < size)
@ -532,13 +542,16 @@ void gui_entry_erase(GUI_ENTRY_REC *entry, int size, int update_cutbuffer)
return; return;
} }
if (entry->utf8)
w = cell_width(entry->text + entry->pos - size, entry->pos - size + 1)-1;
g_memmove(entry->text + entry->pos - size, entry->text + entry->pos, g_memmove(entry->text + entry->pos - size, entry->text + entry->pos,
(entry->text_len-entry->pos+1) * sizeof(unichar)); (entry->text_len-entry->pos+1) * sizeof(unichar));
entry->pos -= size; entry->pos -= size;
entry->text_len -= size; entry->text_len -= size;
gui_entry_redraw_from(entry, entry->pos); gui_entry_redraw_from(entry, entry->pos-w);
gui_entry_fix_cursor(entry); gui_entry_fix_cursor(entry);
gui_entry_draw(entry); gui_entry_draw(entry);
} }