enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

Evas textblock: Fixed a few word start/end issues. 

Fixed issues with valgrind complaints at the end of the textblock, and
Fixed wrong jumping with some special cases like "a a a a "."

This fixes T995.
This commit is contained in:
Tom Hacohen 2014-02-19 14:32:39 +00:00
parent 00b2974a2c
commit 0e5d3f9b98
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/lib/evas/canvas/evas_object_textblock.c
View File

@ -7262,16 +7262,20 @@ evas_textblock_cursor_word_start(Evas_Textblock_Cursor *cur)
if (!cur) return EINA_FALSE;
TB_NULL_CHECK(cur->node, EINA_FALSE);
size_t len = eina_ustrbuf_length_get(cur->node->unicode);
text = eina_ustrbuf_string_get(cur->node->unicode);
{
const char *lang = ""; /* FIXME: get lang */
size_t len = eina_ustrbuf_length_get(cur->node->unicode);
breaks = malloc(len);
set_wordbreaks_utf32((const utf32_t *) text, len, lang, breaks);
}
for (i = cur->pos; BREAK_AFTER(i); i--)
if ((cur->pos > 0) && (cur->pos == len))
cur->pos--;
for (i = cur->pos ; _is_white(text[i]) && BREAK_AFTER(i) ; i--)
{
if (i == 0) break;
}
@ -7300,16 +7304,20 @@ evas_textblock_cursor_word_end(Evas_Textblock_Cursor *cur)
if (!cur) return EINA_FALSE;
TB_NULL_CHECK(cur->node, EINA_FALSE);
size_t len = eina_ustrbuf_length_get(cur->node->unicode);
text = eina_ustrbuf_string_get(cur->node->unicode);
{
const char *lang = ""; /* FIXME: get lang */
size_t len = eina_ustrbuf_length_get(cur->node->unicode);
breaks = malloc(len);
set_wordbreaks_utf32((const utf32_t *) text, len, lang, breaks);
}
for (i = cur->pos; (text[i]) && (BREAK_AFTER(i)); i++);
if (cur->pos == len)
return EINA_TRUE;
for (i = cur->pos; text[i] && _is_white(text[i]) && (BREAK_AFTER(i)) ; i++);
for ( ; text[i] ; i++)
{