edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 09:34:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix str_utf8_forward to use the same logic as str_utf8_decode

Browse source
This commit is contained in:
heinrich5991 2021-12-20 02:17:10 +01:00
parent ae9944550c
commit 27f18824d6
2 changed files with 21 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
src/base/system.cpp
View file

@ -2556,12 +2556,15 @@ void str_copy(char *dst, const char *src, int dst_size)
void str_utf8_truncate(char *dst, int dst_size, const char *src, int truncation_len) void str_utf8_truncate(char *dst, int dst_size, const char *src, int truncation_len)
{ {
int size = -1; int size = -1;
int cursor = 0; const char *cursor = src;
int pos = 0; int pos = 0;
while(pos <= truncation_len && cursor < dst_size && size != cursor) while(pos <= truncation_len && cursor < dst_size && size != cursor)
{ {
size = cursor; size = cursor - src;
cursor = str_utf8_forward(src, cursor); if(str_utf8_decode(&cursor) == 0)
{
break;
}
pos++; pos++;
} }
str_copy(dst, src, size + 1); str_copy(dst, src, size + 1);
@ -3295,39 +3298,12 @@ int str_utf8_fix_truncation(char *str)
int str_utf8_forward(const char *str, int cursor) int str_utf8_forward(const char *str, int cursor)
{ {
const char *buf = str + cursor; const char *ptr = str + cursor;
if(!buf[0]) if(str_utf8_decode(&ptr) == 0)
{
return cursor; return cursor;
if((*buf & 0x80) == 0x0) /* 0xxxxxxx */
return cursor + 1;
else if((*buf & 0xE0) == 0xC0) /* 110xxxxx */
{
if(!buf[1])
return cursor + 1;
return cursor + 2;
} }
else if((*buf & 0xF0) == 0xE0) /* 1110xxxx */ return ptr - str;
{
if(!buf[1])
return cursor + 1;
if(!buf[2])
return cursor + 2;
return cursor + 3;
}
else if((*buf & 0xF8) == 0xF0) /* 11110xxx */
{
if(!buf[1])
return cursor + 1;
if(!buf[2])
return cursor + 2;
if(!buf[3])
return cursor + 3;
return cursor + 4;
}
/* invalid */
return cursor + 1;
} }
int str_utf8_encode(char *ptr, int chr) int str_utf8_encode(char *ptr, int chr)
@ -3488,14 +3464,20 @@ void str_utf8_copy(char *dst, const char *src, int dst_size)
void str_utf8_stats(const char *str, int max_size, int max_count, int *size, int *count) void str_utf8_stats(const char *str, int max_size, int max_count, int *size, int *count)
{ {
const char *cursor = str;
*size = 0; *size = 0;
*count = 0; *count = 0;
while(*size < max_size && *count < max_count) while(*size < max_size && *count < max_count)
{ {
int new_size = str_utf8_forward(str, *size); if(str_utf8_decode(&cursor) == 0)
if(new_size == *size || new_size >= max_size) {
break; break;
*size = new_size; }
if(cursor - str >= max_size)
{
break;
}
*size = cursor - str;
++(*count); ++(*count);
} }
} }

5
src/engine/client/text.cpp
View file

@ -263,15 +263,14 @@ class CTextRender : public IEngineTextRender
int WordLength(const char *pText) int WordLength(const char *pText)
{ {
int Length = 0; const char *pCursor = pText;
while(1) while(1)
{ {
const char *pCursor = (pText + Length);
if(*pCursor == 0) if(*pCursor == 0)
return Length; return Length;
if(*pCursor == '\n' || *pCursor == '\t' || *pCursor == ' ') if(*pCursor == '\n' || *pCursor == '\t' || *pCursor == ' ')
return Length + 1; return Length + 1;
Length = str_utf8_forward(pText, Length); str_utf8_decode(&pCursor);
} }
} }