From e0cb892d2d2d9d1c95f5f0622f1f8237ee843f45 Mon Sep 17 00:00:00 2001 From: Ray Date: Fri, 11 Oct 2019 20:12:15 +0200 Subject: [PATCH] ADDED: GetCodepoints() Get the unicode equivalent characters (as int array) from a UTF-8 text array... maybe this function is renamed to be clearer to users... --- src/raylib.h | 4 ++-- src/text.c | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/src/raylib.h b/src/raylib.h index be5bcaf0b..11587e2ef 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -1188,8 +1188,8 @@ RLAPI void DrawTextRecEx(Font font, const char *text, Rectangle rec, float fontS RLAPI int MeasureText(const char *text, int fontSize); // Measure string width for default font RLAPI Vector2 MeasureTextEx(Font font, const char *text, float fontSize, float spacing); // Measure string size for Font RLAPI int GetGlyphIndex(Font font, int character); // Get index position for a unicode character on font -RLAPI int GetNextCodepoint(const char *text, int *bytesProcessed); // Returns next codepoint in a UTF8 encoded string - // NOTE: 0x3f('?') is returned on failure +RLAPI int GetNextCodepoint(const char *text, int *bytesProcessed); // Returns next codepoint in a UTF8 encoded string; 0x3f('?') is returned on failure +RLAPI int *GetCodepoints(const char *text, int *count); // Get all codepoints in a string, codepoints count returned by parameters // Text strings management functions // NOTE: Some strings allocate memory internally for returned strings, just be careful! diff --git a/src/text.c b/src/text.c index 4eb1b4b04..4dad8c6b8 100644 --- a/src/text.c +++ b/src/text.c @@ -65,6 +65,8 @@ //---------------------------------------------------------------------------------- #define MAX_TEXT_BUFFER_LENGTH 1024 // Size of internal static buffers of some Text*() functions +#define MAX_TEXT_UNICODE_CHARS 512 // Maximum number of unicode codepoints + //---------------------------------------------------------------------------------- // Types and Structures Definition //---------------------------------------------------------------------------------- @@ -869,6 +871,26 @@ int GetNextCodepoint(const char *text, int *bytesProcessed) return code; } +// Get all codepoints in a string, codepoints count returned by parameters +int *GetCodepoints(const char *text, int *count) +{ + static int codepoints[MAX_TEXT_UNICODE_CHARS] = { 0 }; + memset(codepoints, 0, MAX_TEXT_UNICODE_CHARS*sizeof(int)); + + int bytesProcessed = 0; + int textLength = strlen(text); + int codepointsCount = 0; + + for (int i = 0; i < textLength; codepointsCount++) + { + codepoints[codepointsCount] = GetNextCodepoint(text + i, &bytesProcessed); + i += bytesProcessed; + } + + return codepoints; +} + + // Draw text (using default font) // NOTE: fontSize work like in any drawing program but if fontSize is lower than font-base-size, then font-base-size is used