summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorali <ali198724@gmail.com>2020-01-20 10:07:40 +0900
committerWooHyun Jung <wh0705.jung@samsung.com>2020-01-20 10:07:40 +0900
commitad633751997324274303176696cbfc14e1ecba5d (patch)
treee6e01d1422d0cfec15d0eb2e905e07d7f88f0023
parent6f209e48be8f875872e59e524940134f4e354c4e (diff)
efl.text.cursor: movement types rename
Summary: replace prev with previous, replace char with character Reviewers: woohyun, segfaultxavi Reviewed By: segfaultxavi Subscribers: cedric, #reviewers, #committers Tags: #efl Maniphest Tasks: T8567 Differential Revision: https://phab.enlightenment.org/D11095
-rw-r--r--src/lib/elementary/efl_ui_internal_text_interactive.c23
-rw-r--r--src/lib/evas/canvas/efl_text_cursor.c8
-rw-r--r--src/lib/evas/canvas/efl_text_cursor.eo28
-rw-r--r--src/tests/evas/evas_test_textblock.c26
4 files changed, 42 insertions, 43 deletions
diff --git a/src/lib/elementary/efl_ui_internal_text_interactive.c b/src/lib/elementary/efl_ui_internal_text_interactive.c
index 8e1ad98c6a..829c952a65 100644
--- a/src/lib/elementary/efl_ui_internal_text_interactive.c
+++ b/src/lib/elementary/efl_ui_internal_text_interactive.c
@@ -540,7 +540,7 @@ _entry_imf_event_preedit_changed_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUS
540 540
541 for (i = 0; i < (preedit_end_pos - preedit_start_pos); i++) 541 for (i = 0; i < (preedit_end_pos - preedit_start_pos); i++)
542 { 542 {
543 efl_text_cursor_move(en->preedit_start, EFL_TEXT_CURSOR_MOVE_TYPE_CHAR_PREV); 543 efl_text_cursor_move(en->preedit_start, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_PREVIOUS);
544 } 544 }
545 545
546 en->have_preedit = EINA_TRUE; 546 en->have_preedit = EINA_TRUE;
@@ -913,19 +913,19 @@ _delete_emit(Eo *obj, Efl_Text_Cursor *c, Efl_Ui_Internal_Text_Interactive_Data
913 Eo * cur = efl_duplicate(c); 913 Eo * cur = efl_duplicate(c);
914 if (backspace) 914 if (backspace)
915 { 915 {
916 if (!efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHAR_PREV)) 916 if (!efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_PREVIOUS))
917 { 917 {
918 return; 918 return;
919 } 919 }
920 efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHAR_NEXT); 920 efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_NEXT);
921 } 921 }
922 else 922 else
923 { 923 {
924 if (!efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHAR_NEXT)) 924 if (!efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_NEXT))
925 { 925 {
926 return; 926 return;
927 } 927 }
928 efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHAR_PREV); 928 efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_PREVIOUS);
929 } 929 }
930 efl_del(cur); 930 efl_del(cur);
931 cur = NULL; 931 cur = NULL;
@@ -1183,7 +1183,7 @@ _key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void
1183#endif 1183#endif
1184 if (efl_text_interactive_have_selection_get(obj)) 1184 if (efl_text_interactive_have_selection_get(obj))
1185 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; 1185 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
1186 if (efl_text_cursor_move(cur,EFL_TEXT_CURSOR_MOVE_TYPE_CHAR_PREV)) 1186 if (efl_text_cursor_move(cur,EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_PREVIOUS))
1187 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; 1187 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
1188 1188
1189 _key_down_sel_post(obj, cur, en, shift); 1189 _key_down_sel_post(obj, cur, en, shift);
@@ -1202,7 +1202,7 @@ _key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void
1202#endif 1202#endif
1203 if (efl_text_interactive_have_selection_get(obj)) 1203 if (efl_text_interactive_have_selection_get(obj))
1204 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; 1204 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
1205 if (efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHAR_NEXT)) 1205 if (efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_NEXT))
1206 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; 1206 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
1207 1207
1208 _key_down_sel_post(obj, cur, en, shift); 1208 _key_down_sel_post(obj, cur, en, shift);
@@ -1214,9 +1214,8 @@ _key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void
1214 { 1214 {
1215 // del to start of previous word 1215 // del to start of previous word
1216 Efl_Text_Cursor *tc = efl_canvas_textblock_cursor_create(obj); 1216 Efl_Text_Cursor *tc = efl_canvas_textblock_cursor_create(obj);
1217
1218 _cur_pos_copy(cur, tc); 1217 _cur_pos_copy(cur, tc);
1219 efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHAR_PREV); 1218 efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_PREVIOUS);
1220 efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_START); 1219 efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_START);
1221 1220
1222 _range_del_emit(obj, cur, tc); 1221 _range_del_emit(obj, cur, tc);
@@ -1252,7 +1251,7 @@ _key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void
1252 1251
1253 _cur_pos_copy(cur, tc); 1252 _cur_pos_copy(cur, tc);
1254 efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_END); 1253 efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_END);
1255 efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHAR_NEXT); 1254 efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_NEXT);
1256 1255
1257 _range_del_emit(obj, cur, tc); 1256 _range_del_emit(obj, cur, tc);
1258 1257
@@ -1589,7 +1588,7 @@ _mouse_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EIN
1589 else 1588 else
1590 { 1589 {
1591 efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_END); 1590 efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_END);
1592 efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHAR_NEXT); 1591 efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_NEXT);
1593 } 1592 }
1594 _sel_extend(cur, obj, en); 1593 _sel_extend(cur, obj, en);
1595 } 1594 }
@@ -1603,7 +1602,7 @@ _mouse_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EIN
1603 efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_START); 1602 efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_START);
1604 _sel_init(cur, obj, en); 1603 _sel_init(cur, obj, en);
1605 efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_END); 1604 efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_END);
1606 efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHAR_NEXT); 1605 efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_NEXT);
1607 _sel_extend(cur, obj, en); 1606 _sel_extend(cur, obj, en);
1608 } 1607 }
1609 goto end; 1608 goto end;
diff --git a/src/lib/evas/canvas/efl_text_cursor.c b/src/lib/evas/canvas/efl_text_cursor.c
index 0a19a3b281..c1e344136d 100644
--- a/src/lib/evas/canvas/efl_text_cursor.c
+++ b/src/lib/evas/canvas/efl_text_cursor.c
@@ -140,16 +140,16 @@ _efl_text_cursor_move(Eo *obj EINA_UNUSED, Efl_Text_Cursor_Data *pd, Efl_Text_Cu
140 int pos = evas_textblock_cursor_pos_get(pd->handle); 140 int pos = evas_textblock_cursor_pos_get(pd->handle);
141 141
142 switch (type) { 142 switch (type) {
143 case EFL_TEXT_CURSOR_MOVE_TYPE_CHAR_NEXT : 143 case EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_NEXT :
144 moved = evas_textblock_cursor_char_next(pd->handle); 144 moved = evas_textblock_cursor_char_next(pd->handle);
145 break; 145 break;
146 case EFL_TEXT_CURSOR_MOVE_TYPE_CHAR_PREV : 146 case EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_PREVIOUS :
147 moved = evas_textblock_cursor_char_prev(pd->handle); 147 moved = evas_textblock_cursor_char_prev(pd->handle);
148 break; 148 break;
149 case EFL_TEXT_CURSOR_MOVE_TYPE_CLUSTER_NEXT : 149 case EFL_TEXT_CURSOR_MOVE_TYPE_CLUSTER_NEXT :
150 moved = evas_textblock_cursor_cluster_next(pd->handle); 150 moved = evas_textblock_cursor_cluster_next(pd->handle);
151 break; 151 break;
152 case EFL_TEXT_CURSOR_MOVE_TYPE_CLUSTER_PREV : 152 case EFL_TEXT_CURSOR_MOVE_TYPE_CLUSTER_PREVIOUS :
153 moved = evas_textblock_cursor_cluster_prev(pd->handle); 153 moved = evas_textblock_cursor_cluster_prev(pd->handle);
154 break; 154 break;
155 case EFL_TEXT_CURSOR_MOVE_TYPE_PARAGRAPH_START : 155 case EFL_TEXT_CURSOR_MOVE_TYPE_PARAGRAPH_START :
@@ -191,7 +191,7 @@ _efl_text_cursor_move(Eo *obj EINA_UNUSED, Efl_Text_Cursor_Data *pd, Efl_Text_Cu
191 case EFL_TEXT_CURSOR_MOVE_TYPE_PARAGRAPH_NEXT : 191 case EFL_TEXT_CURSOR_MOVE_TYPE_PARAGRAPH_NEXT :
192 moved = evas_textblock_cursor_paragraph_next(pd->handle); 192 moved = evas_textblock_cursor_paragraph_next(pd->handle);
193 break; 193 break;
194 case EFL_TEXT_CURSOR_MOVE_TYPE_PARAGRAPH_PREV : 194 case EFL_TEXT_CURSOR_MOVE_TYPE_PARAGRAPH_PREVIOUS :
195 moved = evas_textblock_cursor_paragraph_prev(pd->handle); 195 moved = evas_textblock_cursor_paragraph_prev(pd->handle);
196 break; 196 break;
197 } 197 }
diff --git a/src/lib/evas/canvas/efl_text_cursor.eo b/src/lib/evas/canvas/efl_text_cursor.eo
index 9b90854a23..2c77f84a14 100644
--- a/src/lib/evas/canvas/efl_text_cursor.eo
+++ b/src/lib/evas/canvas/efl_text_cursor.eo
@@ -10,22 +10,22 @@ enum @beta Efl.Text.Cursor_Type
10enum @beta Efl.Text.Cursor_Move_Type 10enum @beta Efl.Text.Cursor_Move_Type
11{ 11{
12 [[Text cursor movement types.]] 12 [[Text cursor movement types.]]
13 char_next, [[Advances to the next character.]] 13 character_next, [[Advances to the next character.]]
14 char_prev, [[Advances to the previous character.]] 14 character_previous, [[Advances to the previous character.]]
15 cluster_next, [[Advances to the next grapheme cluster 15 cluster_next, [[Advances to the next grapheme cluster
16 (A character sequence rendered together. See https://unicode.org/reports/tr29/).]] 16 (A character sequence rendered together. See https://unicode.org/reports/tr29/).]]
17 cluster_prev, [[Advances to the previous grapheme cluster 17 cluster_previous, [[Advances to the previous grapheme cluster
18 (A character sequence rendered together. See https://unicode.org/reports/tr29/).]] 18 (A character sequence rendered together. See https://unicode.org/reports/tr29/).]]
19 paragraph_start, [[Advances to the first character in current paragraph.]] 19 paragraph_start, [[Advances to the first character in current paragraph.]]
20 paragraph_end, [[Advances to the last character in current paragraph.]] 20 paragraph_end, [[Advances to the last character in current paragraph.]]
21 word_start, [[Advance to current word start.]] 21 word_start, [[Advance to current word start.]]
22 word_end, [[Advance to current word end.]] 22 word_end, [[Advance to current word end.]]
23 line_start, [[Advance to current line first character.]] 23 line_start, [[Advance to current line first character.]]
24 line_end, [[Advance to current line last character.]] 24 line_end, [[Advance to current line last character.]]
25 first, [[Advance to first character in the first paragraph.]] 25 first, [[Advance to first character in the first paragraph.]]
26 last, [[Advance to last character in the last paragraph.]] 26 last, [[Advance to last character in the last paragraph.]]
27 paragraph_next, [[Advances to the start of the next paragraph.]] 27 paragraph_next, [[Advances to the start of the next paragraph.]]
28 paragraph_prev [[Advances to the end of the previous paragraph.]] 28 paragraph_previous [[Advances to the end of the previous paragraph.]]
29} 29}
30 30
31abstract @beta Efl.Text.Cursor extends Efl.Object implements Efl.Duplicate{ 31abstract @beta Efl.Text.Cursor extends Efl.Object implements Efl.Duplicate{
diff --git a/src/tests/evas/evas_test_textblock.c b/src/tests/evas/evas_test_textblock.c
index 8560e36e7c..1fee7eb5b1 100644
--- a/src/tests/evas/evas_test_textblock.c
+++ b/src/tests/evas/evas_test_textblock.c
@@ -4536,10 +4536,10 @@ EFL_START_TEST(efl_canvas_textblock_cursor)
4536 ck_assert_int_eq(changed_emit, 6); 4536 ck_assert_int_eq(changed_emit, 6);
4537 4537
4538 efl_text_set(txt, ""); 4538 efl_text_set(txt, "");
4539 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHAR_NEXT)); 4539 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_NEXT));
4540 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHAR_PREV)); 4540 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_PREVIOUS));
4541 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CLUSTER_NEXT)); 4541 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CLUSTER_NEXT));
4542 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CLUSTER_PREV)); 4542 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CLUSTER_PREVIOUS));
4543 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_PARAGRAPH_START)); 4543 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_PARAGRAPH_START));
4544 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_PARAGRAPH_END)); 4544 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_PARAGRAPH_END));
4545 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_LINE_START)); 4545 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_LINE_START));
@@ -4547,7 +4547,7 @@ EFL_START_TEST(efl_canvas_textblock_cursor)
4547 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_START)); 4547 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_START));
4548 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_END)); 4548 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_END));
4549 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_PARAGRAPH_NEXT)); 4549 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_PARAGRAPH_NEXT));
4550 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_PARAGRAPH_PREV)); 4550 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_PARAGRAPH_PREVIOUS));
4551 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_FIRST)); 4551 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_FIRST));
4552 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_LAST)); 4552 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_LAST));
4553 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 0); 4553 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 0);
@@ -4555,13 +4555,13 @@ EFL_START_TEST(efl_canvas_textblock_cursor)
4555 ck_assert_int_eq(changed_emit, 7); 4555 ck_assert_int_eq(changed_emit, 7);
4556 4556
4557 efl_text_markup_set(txt, "Hello World<ps/>This is EFL<br/>Enlightenment"); 4557 efl_text_markup_set(txt, "Hello World<ps/>This is EFL<br/>Enlightenment");
4558 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHAR_NEXT)); 4558 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_NEXT));
4559 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 1); 4559 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 1);
4560 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHAR_PREV)); 4560 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_PREVIOUS));
4561 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 0); 4561 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 0);
4562 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CLUSTER_NEXT)); 4562 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CLUSTER_NEXT));
4563 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 1); 4563 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 1);
4564 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CLUSTER_PREV)); 4564 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CLUSTER_PREVIOUS));
4565 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 0); 4565 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 0);
4566 4566
4567 efl_text_cursor_position_set(cur_obj, 0); 4567 efl_text_cursor_position_set(cur_obj, 0);
@@ -4575,11 +4575,11 @@ EFL_START_TEST(efl_canvas_textblock_cursor)
4575 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 0); 4575 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 0);
4576 4576
4577 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_END)); 4577 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_END));
4578 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHAR_NEXT)); 4578 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_NEXT));
4579 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 5); 4579 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 5);
4580 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_END)); 4580 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_END));
4581 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 10); 4581 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 10);
4582 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHAR_NEXT)); 4582 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_NEXT));
4583 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_END)); 4583 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_END));
4584 ck_assert_int_ne(efl_text_cursor_position_get(cur_obj), 10); 4584 ck_assert_int_ne(efl_text_cursor_position_get(cur_obj), 10);
4585 4585
@@ -4591,7 +4591,7 @@ EFL_START_TEST(efl_canvas_textblock_cursor)
4591 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 12); 4591 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 12);
4592 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_LINE_START)); 4592 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_LINE_START));
4593 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 12); 4593 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 12);
4594 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHAR_PREV)); 4594 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_PREVIOUS));
4595 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_LINE_START)); 4595 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_LINE_START));
4596 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 0); 4596 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 0);
4597 4597
@@ -4604,11 +4604,11 @@ EFL_START_TEST(efl_canvas_textblock_cursor)
4604 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 3); 4604 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 3);
4605 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CLUSTER_NEXT)); 4605 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CLUSTER_NEXT));
4606 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 5); 4606 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 5);
4607 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHAR_PREV)); 4607 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_PREVIOUS));
4608 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 4); 4608 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 4);
4609 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHAR_NEXT)); 4609 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_NEXT));
4610 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 5); 4610 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 5);
4611 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHAR_NEXT)); 4611 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_NEXT));
4612 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 6); 4612 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 6);
4613 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CLUSTER_NEXT)); 4613 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CLUSTER_NEXT));
4614 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 7); 4614 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 7);