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 #12 from ailin-nemui/no-split-utf8

Browse Source 
no split utf8 from the bug tracker
This commit is contained in:
Alexander Færøy 2014-06-18 22:53:01 +02:00
commit 8c08eef87a
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/fe-common/core/utf8.h
View File

@ -12,5 +12,6 @@
int mk_wcwidth(unichar c);
#define unichar_isprint(c) (((c) & ~0x80) >= 32)
#define is_utf8_leading(c) (((c) & 0xc0) != 0x80)
#endif

12
src/fe-text/textbuffer.c
View File

@ -23,6 +23,7 @@
#include "module.h"
#include "misc.h"
#include "formats.h"
#include "utf8.h"
#include "textbuffer.h"
@ -154,6 +155,17 @@ static void text_chunk_append(TEXT_BUFFER_REC *buffer,
chunk = buffer->cur_text;
while (chunk->pos + len >= TEXT_CHUNK_USABLE_SIZE) {
left = TEXT_CHUNK_USABLE_SIZE - chunk->pos;
/* don't split utf-8 character. (assume we can split non-utf8 anywhere.) */
if (left < len && !is_utf8_leading(data[left])) {
int i;
for (i = 1; i < 4 && left >= i; i++)
if (is_utf8_leading(data[left - i])) {
left -= i;
break;
}
}
if (left > 0 && data[left-1] == 0)
left--; /* don't split the commands */