mirrors
/
Nuklear
mirror of https://github.com/Immediate-Mode-UI/Nuklear
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix copied string corrupt when contain CJK glyphs

This commit is contained in:
Windmill_City 2023-02-01 11:27:16 +08:00
parent 25b84d101d
commit 4d554ffae0
3 changed files with 55 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
demo/glfw_opengl2/nuklear_glfw_gl2.h
View File

@ -240,15 +240,26 @@ nk_glfw3_clipboard_paste(nk_handle usr, struct nk_text_edit *edit)
}
NK_INTERN void
nk_glfw3_clipboard_copy(nk_handle usr, const char *text, int len)
nk_glfw3_clipboard_copy(nk_handle usr, const char *text, int glyphs)
{
char *str = 0;
(void)usr;
if (!len) return;
str = (char*)malloc((size_t)len+1);
NK_UNUSED(usr);
if (!glyphs) return;
int bytes = 0;
for (int i = 0; i < glyphs; i++)
{
int glyph_bytes;
// Find out how many bytes in a glyph
for (glyph_bytes = 1; (nk_byte)text[bytes] >= nk_utfmask[glyph_bytes]; glyph_bytes++)
;
bytes += glyph_bytes;
}
char* str = (char*)malloc(bytes + 1);
if (!str) return;
memcpy(str, text, (size_t)len);
str[len] = '\0';
memcpy(str, text, bytes);
str[bytes] = '\0';
glfwSetClipboardString(glfw.win, str);
free(str);
}

27
demo/glfw_opengl3/nuklear_glfw_gl3.h
View File

@ -353,16 +353,27 @@ nk_glfw3_clipboard_paste(nk_handle usr, struct nk_text_edit *edit)
}
NK_INTERN void
nk_glfw3_clipboard_copy(nk_handle usr, const char *text, int len)
nk_glfw3_clipboard_copy(nk_handle usr, const char *text, int glyphs)
{
struct nk_glfw* glfw = (struct nk_glfw*)usr.ptr;
char *str = 0;
if (!len) return;
str = (char*)malloc((size_t)len+1);
NK_UNUSED(usr);
if (!glyphs) return;
int bytes = 0;
for (int i = 0; i < glyphs; i++)
{
int glyph_bytes;
// Find out how many bytes in a glyph
for (glyph_bytes = 1; (nk_byte)text[bytes] >= nk_utfmask[glyph_bytes]; glyph_bytes++)
;
bytes += glyph_bytes;
}
char* str = (char*)malloc(bytes + 1);
if (!str) return;
memcpy(str, text, (size_t)len);
str[len] = '\0';
glfwSetClipboardString(glfw->win, str);
memcpy(str, text, bytes);
str[bytes] = '\0';
glfwSetClipboardString(glfw.win, str);
free(str);
}

25
demo/glfw_opengl4/nuklear_glfw_gl4.h
View File

@ -499,15 +499,26 @@ nk_glfw3_clipboard_paste(nk_handle usr, struct nk_text_edit *edit)
}
NK_INTERN void
nk_glfw3_clipboard_copy(nk_handle usr, const char *text, int len)
nk_glfw3_clipboard_copy(nk_handle usr, const char *text, int glyphs)
{
char *str = 0;
(void)usr;
if (!len) return;
str = (char*)malloc((size_t)len+1);
NK_UNUSED(usr);
if (!glyphs) return;
int bytes = 0;
for (int i = 0; i < glyphs; i++)
{
int glyph_bytes;
// Find out how many bytes in a glyph
for (glyph_bytes = 1; (nk_byte)text[bytes] >= nk_utfmask[glyph_bytes]; glyph_bytes++)
;
bytes += glyph_bytes;
}
char* str = (char*)malloc(bytes + 1);
if (!str) return;
memcpy(str, text, (size_t)len);
str[len] = '\0';
memcpy(str, text, bytes);
str[bytes] = '\0';
glfwSetClipboardString(glfw.win, str);
free(str);
}