{
return;
}
- text = evas_common_encoding_utf8_to_unicode(_text, &len);
+ text = eina_unicode_utf8_to_unicode(_text, &len);
if (!text) text = eina_unicode_strdup(EINA_UNICODE_EMPTY_STRING);
was = evas_object_is_in_output_rect(obj,
if (decoded) *decoded = 0;
if ((!str) || (pos < 0)) return 0;
p = pos;
- d = evas_common_encoding_utf8_get_next(str, &p);
+ d = eina_unicode_utf8_get_next(str, &p);
if (decoded) *decoded = d;
return p;
}
if (decoded) *decoded = 0;
if ((!str) || (pos < 1)) return 0;
p = pos;
- d = evas_common_encoding_utf8_get_prev(str, &p);
+ d = eina_unicode_utf8_get_prev(str, &p);
if (decoded) *decoded = d;
return p;
}
evas_string_char_len_get(const char *str)
{
if (!str) return 0;
- return evas_common_encoding_utf8_get_len(str);
+ return eina_unicode_utf8_get_len(str);
}
/**
if (o->items) _evas_object_text_items_clear(o);
if (o->cur.utf8_text)
- text = evas_common_encoding_utf8_to_unicode(o->cur.utf8_text,
+ text = eina_unicode_utf8_to_unicode(o->cur.utf8_text,
NULL);
if (!text) text = eina_unicode_strdup(EINA_UNICODE_EMPTY_STRING);
+++ /dev/null
-#include "evas_common.h"
-#include "evas_encoding.h"
-
-/* The replacement range that will be used for bad utf8 chars. */
-#define ERROR_REPLACEMENT_BASE 0xDC80
-#define ERROR_REPLACEMENT_END 0xDCFF
-#define IS_INVALID_BYTE(x) ((x == 192) || (x == 193) || (x >= 245))
-#define IS_CONTINUATION_BYTE(x) ((x & 0xC0) == 0x80)
-
-EAPI Eina_Unicode
-evas_common_encoding_utf8_get_next(const char *buf, int *iindex)
-{
- /* Reads UTF8 bytes from @buf, starting at *@index and returns
- * the decoded code point at iindex offset, and advances iindex
- * to the next code point after this.
- *
- * Returns 0 to indicate there is no next char
- */
- /* Note: we don't currently handle overlong forms and some other
- * broken cases. */
- int index = *iindex;
- Eina_Unicode r;
- unsigned char d;
-
- /* if this char is the null terminator, exit */
- if ((d = buf[index++]) == 0) return 0;
-
- if ((d & 0x80) == 0)
- { // 1 byte (7bit) - 0xxxxxxx
- *iindex = index;
- return d;
- }
- if ((d & 0xe0) == 0xc0)
- { // 2 byte (11bit) - 110xxxxx 10xxxxxx
- r = (d & 0x1f) << 6;
- if (((d = buf[index++]) == 0) || IS_INVALID_BYTE(d) ||
- !IS_CONTINUATION_BYTE(d)) goto error;
- r |= (d & 0x3f);
- if (!r) goto error;
- *iindex = index;
- return r;
- }
- if ((d & 0xf0) == 0xe0)
- { // 3 byte (16bit) - 1110xxxx 10xxxxxx 10xxxxxx
- r = (d & 0x0f) << 12;
- if (((d = buf[index++]) == 0) || IS_INVALID_BYTE(d) ||
- !IS_CONTINUATION_BYTE(d)) goto error;
- r |= (d & 0x3f) << 6;
- if (((d = buf[index++]) == 0) || IS_INVALID_BYTE(d) ||
- !IS_CONTINUATION_BYTE(d)) goto error;
- r |= (d & 0x3f);
- if (!r) goto error;
- *iindex = index;
- return r;
- }
- if ((d & 0xf8) == 0xf0)
- { // 4 byte (21bit) - 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
- r = (d & 0x07) << 18;
- if (((d = buf[index++]) == 0) || IS_INVALID_BYTE(d) ||
- !IS_CONTINUATION_BYTE(d)) goto error;
- r |= (d & 0x3f) << 12;
- if (((d = buf[index++]) == 0) || IS_INVALID_BYTE(d) ||
- !IS_CONTINUATION_BYTE(d)) goto error;
- r |= (d & 0x3f) << 6;
- if (((d = buf[index++]) == 0) || IS_INVALID_BYTE(d) ||
- !IS_CONTINUATION_BYTE(d)) goto error;
- r |= (d & 0x3f);
- if (!r) goto error;
- *iindex = index;
- return r;
- }
- if ((d & 0xfc) == 0xf8)
- { // 5 byte (26bit) - 111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
- r = (d & 0x03) << 24;
- if (((d = buf[index++]) == 0) || IS_INVALID_BYTE(d) ||
- !IS_CONTINUATION_BYTE(d)) goto error;
- r |= (d & 0x3f) << 18;
- if (((d = buf[index++]) == 0) || IS_INVALID_BYTE(d) ||
- !IS_CONTINUATION_BYTE(d)) goto error;
- r |= (d & 0x3f) << 12;
- if (((d = buf[index++]) == 0) || IS_INVALID_BYTE(d) ||
- !IS_CONTINUATION_BYTE(d)) goto error;
- r |= (d & 0x3f) << 6;
- if (((d = buf[index++]) == 0) || IS_INVALID_BYTE(d) ||
- !IS_CONTINUATION_BYTE(d)) goto error;
- r |= (d & 0x3f);
- if (!r) goto error;
- *iindex = index;
- return r;
- }
- if ((d & 0xfe) == 0xfc)
- { // 6 byte (31bit) - 1111110x 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
- r = (d & 0x01) << 30;
- if (((d = buf[index++]) == 0) || IS_INVALID_BYTE(d) ||
- !IS_CONTINUATION_BYTE(d)) goto error;
- r |= (d & 0x3f) << 24;
- if (((d = buf[index++]) == 0) || IS_INVALID_BYTE(d) ||
- !IS_CONTINUATION_BYTE(d)) goto error;
- r |= (d & 0x3f) << 18;
- if (((d = buf[index++]) == 0) || IS_INVALID_BYTE(d) ||
- !IS_CONTINUATION_BYTE(d)) goto error;
- r |= (d & 0x3f) << 12;
- if (((d = buf[index++]) == 0) || IS_INVALID_BYTE(d) ||
- !IS_CONTINUATION_BYTE(d)) goto error;
- r |= (d & 0x3f) << 6;
- if (((d = buf[index++]) == 0) || IS_INVALID_BYTE(d) ||
- !IS_CONTINUATION_BYTE(d)) goto error;
- r |= (d & 0x3f);
- if (!r) goto error;
- *iindex = index;
- return r;
- }
-
-/* Gets here where there was an error and we want to replace the char
- * we just use the invalid unicode codepoints 8 lower bits represent
- * the original char */
-error:
- d = buf[*iindex];
- (*iindex)++;
- return ERROR_REPLACEMENT_BASE | d;
-}
-
-EAPI Eina_Unicode
-evas_common_encoding_utf8_get_prev(const char *buf, int *iindex)
-{
- /* Reads UTF8 bytes from @buf, starting at *@index and returns
- * the decoded code point at iindex offset, and advances iindex
- * to the prev code point after this.
- *
- * Returns 0 to indicate there is no prev char
- */
-
- int r;
- int index = *iindex;
- /* First obtain the codepoint at iindex */
- r = evas_common_encoding_utf8_get_next(buf, &index);
-
- /* although when index == 0 there's no previous char, we still want to get
- * the current char */
- if (*iindex < 0)
- return r;
-
- /* Next advance iindex to previous codepoint */
- index = *iindex;
- index--;
- while ((index > 0) && ((buf[index] & 0xc0) == 0x80))
- index--;
-
- *iindex = index;
- return r;
-}
-
-EAPI Eina_Unicode
-evas_common_encoding_utf8_get_last(const char *buf, int buflen)
-{
- /* jumps to the nul byte at the buffer end and decodes backwards and
- * returns the offset index byte in the buffer where the last character
- * in the buffer begins.
- *
- * Returns -1 to indicate an error
- */
- /* Go one character backwards and then return the char at the new place */
- evas_common_encoding_utf8_get_prev(buf, &buflen);
- return evas_common_encoding_utf8_get_next(buf, &buflen);
-}
-
-EAPI int
-evas_common_encoding_utf8_get_len(const char *buf)
-{
- /* returns the number of utf8 characters (not bytes) in the string */
- int i = 0, len = 0;
-
- while (evas_common_encoding_utf8_get_next(buf, &i))
- len++;
-
- return len;
-}
-
-/* FIXME: Should optimize! */
-EAPI Eina_Unicode *
-evas_common_encoding_utf8_to_unicode(const char *utf, int *_len)
-{
- int len, i;
- int index;
- Eina_Unicode *buf, *ind;
-
- len = evas_common_encoding_utf8_get_len(utf);
- if (_len)
- *_len = len;
- buf = (Eina_Unicode *) calloc(sizeof(Eina_Unicode), (len + 1));
- if (!buf) return buf;
-
- for (i = 0, index = 0, ind = buf ; i < len ; i++, ind++)
- {
- *ind = evas_common_encoding_utf8_get_next(utf, &index);
- }
-
- return buf;
-}
-
-EAPI char *
-evas_common_encoding_unicode_to_utf8(const Eina_Unicode *uni, int *_len)
-{
- char *buf;
- const Eina_Unicode *uind;
- char *ind;
- int ulen, len;
-
- ulen = eina_unicode_strlen(uni);
- buf = (char *) calloc(ulen + 1, EVAS_ENCODING_UTF8_BYTES_PER_CHAR);
-
- len = 0;
- for (uind = uni, ind = buf ; *uind ; uind++)
- {
- if (*uind <= 0x7F) /* 1 byte char */
- {
- *ind++ = *uind;
- len += 1;
- }
- else if (*uind <= 0x7FF) /* 2 byte char */
- {
- *ind++ = 0xC0 | (unsigned char) (*uind >> 6);
- *ind++ = 0x80 | (unsigned char) (*uind & 0x3F);
- len += 2;
- }
- else if (*uind <= 0xFFFF) /* 3 byte char */
- {
- /* If it's a special replacement codepoint */
- if (*uind >= ERROR_REPLACEMENT_BASE &&
- *uind <= ERROR_REPLACEMENT_END)
- {
- *ind++ = *uind & 0xFF;
- len += 1;
- }
- else
- {
- *ind++ = 0xE0 | (unsigned char) (*uind >> 12);
- *ind++ = 0x80 | (unsigned char) ((*uind >> 6) & 0x3F);
- *ind++ = 0x80 | (unsigned char) (*uind & 0x3F);
- len += 3;
- }
- }
- else /* 4 byte char */
- {
- *ind++ = 0xF0 | (unsigned char) ((*uind >> 18) & 0x07);
- *ind++ = 0x80 | (unsigned char) ((*uind >> 12) & 0x3F);
- *ind++ = 0x80 | (unsigned char) ((*uind >> 6) & 0x3F);
- *ind++ = 0x80 | (unsigned char) (*uind & 0x3F);
- len += 4;
- }
- }
- buf = realloc(buf, len + 1);
- buf[len] = '\0';
- if (_len)
- *_len = len;
- return buf;
-}
-
-
projects / platform / upstream / efl.git / commitdiff