Benj
/
imgui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CalcTextSize*() tweaks. ImTextCharFromUtf8() return 1 for a zero character now.

Browse Source
docking
ocornut 10 years ago
parent 1da8a52ce7
commit ea94835834
1 changed files with 53 additions and 60 deletions
Show Stats Download Patch File Download Diff File

113
imgui.cpp
Unescape Escape View File

@ -5402,10 +5402,9 @@ bool ImGui::InputText(const char* label, char* buf, size_t buf_size, ImGuiInputT
for (const char* s = clipboard; *s; ) for (const char* s = clipboard; *s; )
{ {
unsigned int c; unsigned int c;
const int bytes_count = ImTextCharFromUtf8(&c, s, NULL); s += ImTextCharFromUtf8(&c, s, NULL);
if (bytes_count <= 0) if (c == 0)
break; break;
s += bytes_count;
if (c >= 0x10000) if (c >= 0x10000)
continue; continue;
if (InputTextFilterCharacter((ImWchar)c, flags)) if (InputTextFilterCharacter((ImWchar)c, flags))
@ -7352,57 +7351,54 @@ const ImFont::Glyph* ImFont::FindGlyph(unsigned short c) const
// Based on stb_from_utf8() from github.com/nothings/stb/ // Based on stb_from_utf8() from github.com/nothings/stb/
static int ImTextCharFromUtf8(unsigned int* out_char, const char* in_text, const char* in_text_end) static int ImTextCharFromUtf8(unsigned int* out_char, const char* in_text, const char* in_text_end)
{ {
if (*in_text != 0) unsigned int c = (unsigned int)-1;
{ const unsigned char* str = (const unsigned char*)in_text;
unsigned int c = (unsigned int)-1; if (!(*str & 0x80))
const unsigned char* str = (const unsigned char*)in_text; {
if (!(*str & 0x80)) c = (unsigned int)(*str++);
{ *out_char = c;
c = (unsigned int)(*str++); return 1;
*out_char = c; }
return 1; if ((*str & 0xe0) == 0xc0)
} {
if ((*str & 0xe0) == 0xc0) if (in_text_end && in_text_end - (const char*)str < 2) return -1;
{ if (*str < 0xc2) return -1;
if (in_text_end && in_text_end - (const char*)str < 2) return -1; c = (unsigned int)((*str++ & 0x1f) << 6);
if (*str < 0xc2) return -1; if ((*str & 0xc0) != 0x80) return -1;
c = (unsigned int)((*str++ & 0x1f) << 6); c += (*str++ & 0x3f);
if ((*str & 0xc0) != 0x80) return -1; *out_char = c;
c += (*str++ & 0x3f); return 2;
*out_char = c; }
return 2; if ((*str & 0xf0) == 0xe0)
} {
if ((*str & 0xf0) == 0xe0) if (in_text_end && in_text_end - (const char*)str < 3) return -1;
{ if (*str == 0xe0 && (str[1] < 0xa0 || str[1] > 0xbf)) return -1;
if (in_text_end && in_text_end - (const char*)str < 3) return -1; if (*str == 0xed && str[1] > 0x9f) return -1; // str[1] < 0x80 is checked below
if (*str == 0xe0 && (str[1] < 0xa0 || str[1] > 0xbf)) return -1; c = (unsigned int)((*str++ & 0x0f) << 12);
if (*str == 0xed && str[1] > 0x9f) return -1; // str[1] < 0x80 is checked below if ((*str & 0xc0) != 0x80) return -1;
c = (unsigned int)((*str++ & 0x0f) << 12); c += (unsigned int)((*str++ & 0x3f) << 6);
if ((*str & 0xc0) != 0x80) return -1; if ((*str & 0xc0) != 0x80) return -1;
c += (unsigned int)((*str++ & 0x3f) << 6); c += (*str++ & 0x3f);
if ((*str & 0xc0) != 0x80) return -1; *out_char = c;
c += (*str++ & 0x3f); return 3;
*out_char = c; }
return 3; if ((*str & 0xf8) == 0xf0)
} {
if ((*str & 0xf8) == 0xf0) if (in_text_end && in_text_end - (const char*)str < 4) return -1;
{ if (*str > 0xf4) return -1;
if (in_text_end && in_text_end - (const char*)str < 4) return -1; if (*str == 0xf0 && (str[1] < 0x90 || str[1] > 0xbf)) return -1;
if (*str > 0xf4) return -1; if (*str == 0xf4 && str[1] > 0x8f) return -1; // str[1] < 0x80 is checked below
if (*str == 0xf0 && (str[1] < 0x90 || str[1] > 0xbf)) return -1; c = (unsigned int)((*str++ & 0x07) << 18);
if (*str == 0xf4 && str[1] > 0x8f) return -1; // str[1] < 0x80 is checked below if ((*str & 0xc0) != 0x80) return -1;
c = (unsigned int)((*str++ & 0x07) << 18); c += (unsigned int)((*str++ & 0x3f) << 12);
if ((*str & 0xc0) != 0x80) return -1; if ((*str & 0xc0) != 0x80) return -1;
c += (unsigned int)((*str++ & 0x3f) << 12); c += (unsigned int)((*str++ & 0x3f) << 6);
if ((*str & 0xc0) != 0x80) return -1; if ((*str & 0xc0) != 0x80) return -1;
c += (unsigned int)((*str++ & 0x3f) << 6); c += (*str++ & 0x3f);
if ((*str & 0xc0) != 0x80) return -1; // utf-8 encodings of values used in surrogate pairs are invalid
c += (*str++ & 0x3f); if ((c & 0xFFFFF800) == 0xD800) return -1;
// utf-8 encodings of values used in surrogate pairs are invalid *out_char = c;
if ((c & 0xFFFFF800) == 0xD800) return -1; return 4;
*out_char = c;
return 4;
}
} }
*out_char = 0; *out_char = 0;
return 0; return 0;
@ -7535,8 +7531,7 @@ const char* ImFont::CalcWordWrapPositionA(float scale, const char* text, const c
while (s < text_end) while (s < text_end)
{ {
unsigned int c; unsigned int c;
const int bytes_count = ImTextCharFromUtf8(&c, s, text_end); const char* next_s = s + ImTextCharFromUtf8(&c, s, text_end);
const char* next_s = s + (bytes_count > 0 ? bytes_count : 1);
if (c == '\n') if (c == '\n')
{ {
@ -7637,8 +7632,7 @@ ImVec2 ImFont::CalcTextSizeA(float size, float max_width, float wrap_width, cons
// Decode and advance source (handle unlikely UTF-8 decoding failure by skipping to the next byte) // Decode and advance source (handle unlikely UTF-8 decoding failure by skipping to the next byte)
unsigned int c; unsigned int c;
const int bytes_count = ImTextCharFromUtf8(&c, s, text_end); s += ImTextCharFromUtf8(&c, s, text_end);
s += bytes_count > 0 ? bytes_count : 1;
if (c == '\n') if (c == '\n')
{ {
@ -7767,8 +7761,7 @@ void ImFont::RenderText(float size, ImVec2 pos, ImU32 col, const ImVec4& clip_re
// Decode and advance source (handle unlikely UTF-8 decoding failure by skipping to the next byte) // Decode and advance source (handle unlikely UTF-8 decoding failure by skipping to the next byte)
unsigned int c; unsigned int c;
const int bytes_count = ImTextCharFromUtf8(&c, s, text_end); s += ImTextCharFromUtf8(&c, s, text_end);
s += bytes_count > 0 ? bytes_count : 1;
if (c == '\n') if (c == '\n')
{ {

Write Preview
Loading…
Cancel
Save