Add function to get the length in characters of a string

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@38158 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/Evas.h b/src/lib/Evas.h
index 4f5955a..4eb8a5b 100644 (file)
--- a/src/lib/Evas.h
+++ b/src/lib/Evas.h
@@ -602,6 +602,7 @@ extern "C" {
 /* string and font handling */
    EAPI int               evas_string_char_next_get         (const char *str, int pos, int *decoded);
    EAPI int               evas_string_char_prev_get         (const char *str, int pos, int *decoded);
+   EAPI int               evas_string_char_len_get          (const char *str);
 
    EAPI void              evas_font_path_clear              (Evas *e);
    EAPI void              evas_font_path_append             (Evas *e, const char *path);

diff --git a/src/lib/canvas/evas_object_text.c b/src/lib/canvas/evas_object_text.c
index 40fd01b..6078ede 100644 (file)
--- a/src/lib/canvas/evas_object_text.c
+++ b/src/lib/canvas/evas_object_text.c
@@ -1215,6 +1215,18 @@ evas_string_char_prev_get(const char *str, int pos, int *decoded)
 }
 
 /**
+ * Get the length in characters of the string.
+ * @param  str The string to get the length of.
+ * @return The length in characters (not bytes)
+ */
+EAPI int
+evas_string_char_len_get(const char *str)
+{
+       if (!str) return 0;
+       return evas_common_font_utf8_get_len(str);
+}
+
+/**
  * Get the minimum padding a style adds to the text.
  * @param style The style to determine padding.
  * @param     l Pointer to the current left padding value

diff --git a/src/lib/canvas/evas_object_textblock.c b/src/lib/canvas/evas_object_textblock.c
index 030542f..2680d0b 100644 (file)
--- a/src/lib/canvas/evas_object_textblock.c
+++ b/src/lib/canvas/evas_object_textblock.c
@@ -1803,11 +1803,10 @@ _layout_text_append(Ctxt *c, Evas_Object_Textblock_Format *fmt, Evas_Object_Text
 
    if ((repch) && (n->text))
      {
-       int i = 0, len = 0, chlen;
+       int i, len, chlen;
        char *ptr;
 
-       while (evas_common_font_utf8_get_next(n->text, &i))
-         len++;
+       len = evas_common_font_utf8_get_len(n->text);
        chlen = strlen(repch);
        str = alloca((len * chlen) + 1);
        tbase = str;

diff --git a/src/lib/engines/common/evas_font.h b/src/lib/engines/common/evas_font.h
index 0bf799c..ab7b879 100644 (file)
--- a/src/lib/engines/common/evas_font.h
+++ b/src/lib/engines/common/evas_font.h
@@ -20,6 +20,7 @@ EAPI int               evas_common_font_get_line_advance     (RGBA_Font *fn);
 EAPI int               evas_common_font_utf8_get_next        (unsigned char *buf, int *iindex);
 EAPI int               evas_common_font_utf8_get_prev        (unsigned char *buf, int *iindex);
 EAPI int               evas_common_font_utf8_get_last        (unsigned char *buf, int buflen);
+EAPI int               evas_common_font_utf8_get_len         (unsigned char *buf);
 
 /* draw */
 

diff --git a/src/lib/engines/common/evas_font_main.c b/src/lib/engines/common/evas_font_main.c
index 7f95760..0099e1d 100644 (file)
--- a/src/lib/engines/common/evas_font_main.c
+++ b/src/lib/engines/common/evas_font_main.c
@@ -271,3 +271,18 @@ evas_common_font_utf8_get_last(unsigned char *buf, int buflen)
      }
    return 0;
 }
+
+EAPI int
+evas_common_font_utf8_get_len(unsigned char *buf)
+{
+   /* returns the number of utf8 characters (not bytes) in the string */
+   int index = 0, len = 0;
+
+   while (buf[index])
+     {
+       if ((buf[index] & 0xc0) != 0x80)
+         len++;
+       index++;
+     }
+   return len;
+}