replace own unicode functions with versions from glib which support more unicode characters.

added BLI_str_utf8_as_unicode(), BLI_str_utf8_from_unicode()

1 files changed, 17 insertions, 10 deletions

diff --git a/source/blender/blenlib/BLI_string_utf8.h b/source/blender/blenlib/BLI_string_utf8.h
index c3bb81dd03f..b53d9d3203b 100644
--- a/source/blender/blenlib/BLI_string_utf8.h
+++ b/source/blender/blenlib/BLI_string_utf8.h
@@ -33,20 +33,27 @@
 extern "C" {
 #endif
 
-char       *BLI_strncpy_utf8(char *dst, const char *src, size_t maxncpy);
-int         BLI_utf8_invalid_byte(const char *str, int length);
-int         BLI_utf8_invalid_strip(char *str, int length);
+char        *BLI_strncpy_utf8(char *dst, const char *src, size_t maxncpy);
+int          BLI_utf8_invalid_byte(const char *str, int length);
+int          BLI_utf8_invalid_strip(char *str, int length);
 
     /* copied from glib */
-char       *BLI_str_find_prev_char_utf8(const char *str, const char *p);
-char       *BLI_str_find_next_char_utf8(const char *p, const char *end);
-char       *BLI_str_prev_char_utf8(const char *p);
+unsigned int BLI_str_utf8_as_unicode(const char *p);
+unsigned int BLI_str_utf8_as_unicode_and_size(const char *p, size_t *index);
+unsigned int BLI_str_utf8_as_unicode_step(const char *p, size_t *index);
+size_t		 BLI_str_utf8_from_unicode(unsigned int c, char *outbuf);
+
+char        *BLI_str_find_prev_char_utf8(const char *str, const char *p);
+char        *BLI_str_find_next_char_utf8(const char *p, const char *end);
+char        *BLI_str_prev_char_utf8(const char *p);
 
     /* wchar_t functions, copied from blenders own font.c originally */
-size_t      BLI_wstrlen_utf8(const wchar_t *src);
-size_t      BLI_strlen_utf8(const char *strc);
-size_t      BLI_strncpy_wchar_as_utf8(char *dst, const wchar_t *src, const size_t maxcpy);
-size_t      BLI_strncpy_wchar_from_utf8(wchar_t *dst, const char *src, const size_t maxcpy);
+size_t       BLI_wstrlen_utf8(const wchar_t *src);
+size_t       BLI_strlen_utf8(const char *strc);
+size_t       BLI_strncpy_wchar_as_utf8(char *dst, const wchar_t *src, const size_t maxcpy);
+size_t       BLI_strncpy_wchar_from_utf8(wchar_t *dst, const char *src, const size_t maxcpy);
+
+#define BLI_STRING_MAX_UTF8 6
 
 #ifdef __cplusplus
 }