Evas: textblock - fixed arabic shaping and fixed an issue with persistant paragraph...

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

diff --git a/src/lib/canvas/evas_object_textblock.c b/src/lib/canvas/evas_object_textblock.c
index 832d2fd..403b8e8 100644 (file)
--- a/src/lib/canvas/evas_object_textblock.c
+++ b/src/lib/canvas/evas_object_textblock.c
@@ -2292,6 +2292,10 @@ _layout_walk_back_to_item_word_redo(Ctxt *c, Evas_Object_Textblock_Item *it)
              new_it->source_pos = pit->source_pos + index;
              new_it->bidi_props.start = new_it->source_pos;
              new_it->bidi_props.props = &new_it->source_node->bidi_props;
+# ifdef BIDI_SUPPORT
+             evas_bidi_shape_string(new_it->text, &new_it->bidi_props,
+                   eina_unicode_strlen(new_it->text));
+# endif
              _layout_item_text_cutoff(c, pit, index);
              _layout_strip_trailing_whitespace(c, pit->format, pit);
              break;
@@ -2436,6 +2440,10 @@ _layout_text_append(Ctxt *c, Evas_Object_Textblock_Format *fmt, Evas_Object_Text
         it->source_pos = start + str - tbase;
         it->bidi_props.start = it->source_pos;
         it->bidi_props.props = &it->source_node->bidi_props;
+# ifdef BIDI_SUPPORT
+        evas_bidi_shape_string(it->text, &it->bidi_props,
+              eina_unicode_strlen(it->text));
+# endif
         tw = th = 0;
         if (fmt->font.font)
           c->ENFN->font_string_size_get(c->ENDT, fmt->font.font, it->text, &it->bidi_props, &tw, &th);
@@ -5452,6 +5460,8 @@ evas_textblock_cursor_text_append(Evas_Textblock_Cursor *cur, const char *_text)
    if (fnode && (fnode->text_node == cur->node))
      fnode->offset += len;
 #ifdef BIDI_SUPPORT
+   /* Reset paragraph direction */
+   n->bidi_props.direction = FRIBIDI_PAR_ON;
    evas_bidi_update_props(eina_ustrbuf_string_get(n->unicode), &n->bidi_props);
 #endif
    _evas_textblock_changed(o, cur->obj);
@@ -5752,7 +5762,6 @@ evas_textblock_cursor_range_delete(Evas_Textblock_Cursor *cur1, Evas_Textblock_C
    Evas_Object_Textblock *o;
    Evas_Object_Textblock_Node_Text *n1, *n2, *n;
    Evas_Object_Textblock_Node_Format *fnode = NULL;
-   /*FIXME: Update cursors */
 
    if (!cur1 || !cur1->node) return;
    if (!cur2 || !cur2->node) return;

diff --git a/src/lib/engines/common/evas_bidi_utils.c b/src/lib/engines/common/evas_bidi_utils.c
index 5f1a803..d8b4141 100644 (file)
--- a/src/lib/engines/common/evas_bidi_utils.c
+++ b/src/lib/engines/common/evas_bidi_utils.c
@@ -76,6 +76,9 @@ evas_bidi_is_rtl_str(const Eina_Unicode *str)
 Eina_Bool
 evas_bidi_shape_string(Eina_Unicode *ustr, const Evas_BiDi_Props *bidi_props, size_t len)
 {
+   if (!EVAS_BIDI_IS_BIDI_PROP(bidi_props->props))
+     return EINA_FALSE;
+
    EvasBiDiJoiningType *join_types = NULL;
    join_types = (EvasBiDiJoiningType *) malloc(sizeof(EvasBiDiJoiningType) * len);
    if (!join_types)
@@ -84,7 +87,7 @@ evas_bidi_shape_string(Eina_Unicode *ustr, const Evas_BiDi_Props *bidi_props, si
      }
    fribidi_get_joining_types(ustr, len, join_types);
 
-   fribidi_join_arabic(bidi_props->props->char_types, len, bidi_props->props->embedding_levels + bidi_props->start, join_types);
+   fribidi_join_arabic(bidi_props->props->char_types + bidi_props->start, len, bidi_props->props->embedding_levels + bidi_props->start, join_types);
 
 
    /* Actually modify the string */