summaryrefslogtreecommitdiff
path: root/src/tests/evas
diff options
context:
space:
mode:
authorXavi Artigas <xavierartigas@yahoo.es>2020-04-07 11:11:13 +0000
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2020-04-14 12:25:55 +0200
commitf526ad8c26aef17ff1af444217d065d33ba2387a (patch)
treed2ee22ec668bd26c64bc980c1c869dbed9a2db74 /src/tests/evas
parent8a155aecb6c98bccd92a3986d9224c600e08cbe5 (diff)
Fix namespace clashes for Efl.Text.Cursor
Three renames are applied here: Efl.Text.Cursor -> Efl.Text_Cursor.Object (class) Efl.Text.Cursor_Type -> Efl.Text_Cursor.Type (enum) Efl.Text.Cursor_Move_Type -> Efl.Text_Cursor.Move_Type (enum) Nothing changes for the enums on the C side. For the class... Well, the method names are a bit more verbose now. These renames are required to avoid clashing with the Efl.Text interface. This did not cause trouble to C# because interfaces are prefixed with "I", but it did cause trouble to Eolian when the EO files were installed and somebody tried to use them. Ref T8648 Differential Revision: https://phab.enlightenment.org/D11663
Diffstat (limited to 'src/tests/evas')
-rw-r--r--src/tests/evas/evas_test_textblock.c386
1 files changed, 193 insertions, 193 deletions
diff --git a/src/tests/evas/evas_test_textblock.c b/src/tests/evas/evas_test_textblock.c
index 79d69a6104..ef1596207f 100644
--- a/src/tests/evas/evas_test_textblock.c
+++ b/src/tests/evas/evas_test_textblock.c
@@ -38,7 +38,7 @@ static const char *style_buf =
38 Evas_Object *tb; \ 38 Evas_Object *tb; \
39 Evas_Textblock_Style *st; \ 39 Evas_Textblock_Style *st; \
40 Evas_Textblock_Cursor *cur; \ 40 Evas_Textblock_Cursor *cur; \
41 Efl_Text_Cursor *cur_obj; \ 41 Efl_Text_Cursor_Object *cur_obj; \
42 evas = EVAS_TEST_INIT_EVAS(); \ 42 evas = EVAS_TEST_INIT_EVAS(); \
43 evas_font_hinting_set(evas, EVAS_FONT_HINTING_AUTO); \ 43 evas_font_hinting_set(evas, EVAS_FONT_HINTING_AUTO); \
44 tb = evas_object_textblock_add(evas); \ 44 tb = evas_object_textblock_add(evas); \
@@ -4351,7 +4351,7 @@ EFL_END_TEST;
4351EFL_START_TEST(evas_textblock_annotation) 4351EFL_START_TEST(evas_textblock_annotation)
4352{ 4352{
4353 START_TB_TEST(); 4353 START_TB_TEST();
4354 Efl_Text_Cursor *start, *end; 4354 Efl_Text_Cursor_Object *start, *end;
4355 4355
4356 start = efl_canvas_textblock_cursor_create(tb); 4356 start = efl_canvas_textblock_cursor_create(tb);
4357 end = efl_canvas_textblock_cursor_create(tb); 4357 end = efl_canvas_textblock_cursor_create(tb);
@@ -4367,18 +4367,18 @@ EFL_START_TEST(evas_textblock_annotation)
4367 4367
4368 /* Check some trivial cases */ 4368 /* Check some trivial cases */
4369 4369
4370 efl_text_cursor_position_set(start, 0); 4370 efl_text_cursor_object_position_set(start, 0);
4371 efl_text_cursor_position_set(end, 3); 4371 efl_text_cursor_object_position_set(end, 3);
4372 efl_text_formatter_attribute_insert(start, end, "font_size=80"); 4372 efl_text_formatter_attribute_insert(start, end, "font_size=80");
4373 efl_text_cursor_position_set(start, 1); 4373 efl_text_cursor_object_position_set(start, 1);
4374 efl_text_cursor_position_set(end, 2); 4374 efl_text_cursor_object_position_set(end, 2);
4375 efl_text_formatter_attribute_insert(start, end, "font=arial"); 4375 efl_text_formatter_attribute_insert(start, end, "font=arial");
4376 efl_text_cursor_position_set(start, 2); 4376 efl_text_cursor_object_position_set(start, 2);
4377 efl_text_cursor_position_set(end, 3); 4377 efl_text_cursor_object_position_set(end, 3);
4378 efl_text_formatter_attribute_insert(start, end, "color=#fff"); 4378 efl_text_formatter_attribute_insert(start, end, "color=#fff");
4379 4379
4380 efl_text_cursor_position_set(start, 0); 4380 efl_text_cursor_object_position_set(start, 0);
4381 efl_text_cursor_position_set(end, 3); 4381 efl_text_cursor_object_position_set(end, 3);
4382 unsigned int count = efl_text_formatter_attribute_clear(start, end); 4382 unsigned int count = efl_text_formatter_attribute_clear(start, end);
4383 fail_if(count != 3); 4383 fail_if(count != 3);
4384} 4384}
@@ -4391,7 +4391,7 @@ static const char *efl_style_buf =
4391 Evas *evas; \ 4391 Evas *evas; \
4392 Eo *txt; \ 4392 Eo *txt; \
4393 Efl_Text_Cursor_Handle *cur; \ 4393 Efl_Text_Cursor_Handle *cur; \
4394 Efl_Text_Cursor *cur_obj; \ 4394 Efl_Text_Cursor_Object *cur_obj; \
4395 evas = EVAS_TEST_INIT_EVAS(); \ 4395 evas = EVAS_TEST_INIT_EVAS(); \
4396 evas_font_hinting_set(evas, EVAS_FONT_HINTING_AUTO); \ 4396 evas_font_hinting_set(evas, EVAS_FONT_HINTING_AUTO); \
4397 txt = efl_add(EFL_CANVAS_TEXTBLOCK_CLASS, evas); \ 4397 txt = efl_add(EFL_CANVAS_TEXTBLOCK_CLASS, evas); \
@@ -4497,30 +4497,30 @@ EFL_START_TEST(efl_canvas_textblock_cursor)
4497 efl_text_set(txt, buf); 4497 efl_text_set(txt, buf);
4498 ck_assert_int_eq(strcmp(efl_text_get(txt), buf), 0); 4498 ck_assert_int_eq(strcmp(efl_text_get(txt), buf), 0);
4499 4499
4500 pos = efl_text_cursor_position_get(cur_obj); 4500 pos = efl_text_cursor_object_position_get(cur_obj);
4501 ck_assert_int_eq(pos, 0); 4501 ck_assert_int_eq(pos, 0);
4502 ck_assert(!efl_text_cursor_line_jump_by(cur_obj, -1)); 4502 ck_assert(!efl_text_cursor_object_line_jump_by(cur_obj, -1));
4503 pos = efl_text_cursor_position_get(cur_obj); 4503 pos = efl_text_cursor_object_position_get(cur_obj);
4504 ck_assert_int_eq(pos, 0); 4504 ck_assert_int_eq(pos, 0);
4505 ck_assert(efl_text_cursor_line_jump_by(cur_obj, 1)); 4505 ck_assert(efl_text_cursor_object_line_jump_by(cur_obj, 1));
4506 pos = efl_text_cursor_position_get(cur_obj); 4506 pos = efl_text_cursor_object_position_get(cur_obj);
4507 ck_assert_int_eq(pos, 10); 4507 ck_assert_int_eq(pos, 10);
4508 4508
4509 efl_text_markup_set(txt, "Hello World<ps/>This is EFL<br/>Enlightenment"); 4509 efl_text_markup_set(txt, "Hello World<ps/>This is EFL<br/>Enlightenment");
4510 efl_text_cursor_position_set(cur_obj, 0); 4510 efl_text_cursor_object_position_set(cur_obj, 0);
4511 ck_assert_int_eq(efl_text_cursor_line_number_get(cur_obj), 0); 4511 ck_assert_int_eq(efl_text_cursor_object_line_number_get(cur_obj), 0);
4512 ck_assert(efl_text_cursor_line_jump_by(cur_obj, 2)); 4512 ck_assert(efl_text_cursor_object_line_jump_by(cur_obj, 2));
4513 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 24); 4513 ck_assert_int_eq(efl_text_cursor_object_position_get(cur_obj), 24);
4514 ck_assert_int_eq(efl_text_cursor_line_number_get(cur_obj), 2); 4514 ck_assert_int_eq(efl_text_cursor_object_line_number_get(cur_obj), 2);
4515 ck_assert(efl_text_cursor_line_jump_by(cur_obj, -2)); 4515 ck_assert(efl_text_cursor_object_line_jump_by(cur_obj, -2));
4516 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 0); 4516 ck_assert_int_eq(efl_text_cursor_object_position_get(cur_obj), 0);
4517 ck_assert_int_eq(efl_text_cursor_line_number_get(cur_obj), 0); 4517 ck_assert_int_eq(efl_text_cursor_object_line_number_get(cur_obj), 0);
4518 4518
4519 ck_assert(efl_text_cursor_line_jump_by(cur_obj, 2)); 4519 ck_assert(efl_text_cursor_object_line_jump_by(cur_obj, 2));
4520 efl_text_cursor_line_number_set(cur_obj, 2); 4520 efl_text_cursor_object_line_number_set(cur_obj, 2);
4521 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 24); 4521 ck_assert_int_eq(efl_text_cursor_object_position_get(cur_obj), 24);
4522 efl_text_cursor_line_number_set(cur_obj, 0); 4522 efl_text_cursor_object_line_number_set(cur_obj, 0);
4523 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 0); 4523 ck_assert_int_eq(efl_text_cursor_object_position_get(cur_obj), 0);
4524 4524
4525 Eo * cursor_temp = efl_duplicate(cur_obj); 4525 Eo * cursor_temp = efl_duplicate(cur_obj);
4526 ck_assert_ptr_ne(cursor_temp, NULL); 4526 ck_assert_ptr_ne(cursor_temp, NULL);
@@ -4528,172 +4528,172 @@ EFL_START_TEST(efl_canvas_textblock_cursor)
4528 cursor_temp = NULL; 4528 cursor_temp = NULL;
4529 4529
4530 Eo * cursor1 = efl_canvas_textblock_cursor_create(txt); 4530 Eo * cursor1 = efl_canvas_textblock_cursor_create(txt);
4531 efl_text_cursor_position_set(cursor1, 1); 4531 efl_text_cursor_object_position_set(cursor1, 1);
4532 pos = efl_text_cursor_position_get(cursor1); 4532 pos = efl_text_cursor_object_position_get(cursor1);
4533 ck_assert_int_eq(pos, 1); 4533 ck_assert_int_eq(pos, 1);
4534 4534
4535 efl_text_set(txt, ""); 4535 efl_text_set(txt, "");
4536 efl_text_set(txt, ""); 4536 efl_text_set(txt, "");
4537 efl_text_cursor_text_insert(cursor1, "aa"); 4537 efl_text_cursor_object_text_insert(cursor1, "aa");
4538 ck_assert_int_eq(changed_emit, 4); 4538 ck_assert_int_eq(changed_emit, 4);
4539 4539
4540 efl_text_markup_set(txt, "Hello<br/>Word"); 4540 efl_text_markup_set(txt, "Hello<br/>Word");
4541 efl_text_markup_set(txt, "Hello<br/>Word"); 4541 efl_text_markup_set(txt, "Hello<br/>Word");
4542 efl_text_cursor_markup_insert(cursor1, "aa"); 4542 efl_text_cursor_object_markup_insert(cursor1, "aa");
4543 ck_assert_int_eq(changed_emit, 6); 4543 ck_assert_int_eq(changed_emit, 6);
4544 4544
4545 efl_text_set(txt, ""); 4545 efl_text_set(txt, "");
4546 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_NEXT)); 4546 ck_assert(!efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_NEXT));
4547 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_PREVIOUS)); 4547 ck_assert(!efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_PREVIOUS));
4548 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CLUSTER_NEXT)); 4548 ck_assert(!efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CLUSTER_NEXT));
4549 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CLUSTER_PREVIOUS)); 4549 ck_assert(!efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CLUSTER_PREVIOUS));
4550 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_PARAGRAPH_START)); 4550 ck_assert(!efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_PARAGRAPH_START));
4551 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_PARAGRAPH_END)); 4551 ck_assert(!efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_PARAGRAPH_END));
4552 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_LINE_START)); 4552 ck_assert(!efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_LINE_START));
4553 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_LINE_END)); 4553 ck_assert(!efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_LINE_END));
4554 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_START)); 4554 ck_assert(!efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_START));
4555 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_END)); 4555 ck_assert(!efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_END));
4556 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_PARAGRAPH_NEXT)); 4556 ck_assert(!efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_PARAGRAPH_NEXT));
4557 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_PARAGRAPH_PREVIOUS)); 4557 ck_assert(!efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_PARAGRAPH_PREVIOUS));
4558 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_FIRST)); 4558 ck_assert(!efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_FIRST));
4559 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_LAST)); 4559 ck_assert(!efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_LAST));
4560 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 0); 4560 ck_assert_int_eq(efl_text_cursor_object_position_get(cur_obj), 0);
4561 4561
4562 ck_assert_int_eq(changed_emit, 7); 4562 ck_assert_int_eq(changed_emit, 7);
4563 4563
4564 efl_text_markup_set(txt, "Hello World<ps/>This is EFL<br/>Enlightenment"); 4564 efl_text_markup_set(txt, "Hello World<ps/>This is EFL<br/>Enlightenment");
4565 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_NEXT)); 4565 ck_assert(efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_NEXT));
4566 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 1); 4566 ck_assert_int_eq(efl_text_cursor_object_position_get(cur_obj), 1);
4567 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_PREVIOUS)); 4567 ck_assert(efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_PREVIOUS));
4568 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 0); 4568 ck_assert_int_eq(efl_text_cursor_object_position_get(cur_obj), 0);
4569 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CLUSTER_NEXT)); 4569 ck_assert(efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CLUSTER_NEXT));
4570 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 1); 4570 ck_assert_int_eq(efl_text_cursor_object_position_get(cur_obj), 1);
4571 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CLUSTER_PREVIOUS)); 4571 ck_assert(efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CLUSTER_PREVIOUS));
4572 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 0); 4572 ck_assert_int_eq(efl_text_cursor_object_position_get(cur_obj), 0);
4573 4573
4574 efl_text_cursor_position_set(cur_obj, 0); 4574 efl_text_cursor_object_position_set(cur_obj, 0);
4575 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_END)); 4575 ck_assert(efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_END));
4576 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 4); 4576 ck_assert_int_eq(efl_text_cursor_object_position_get(cur_obj), 4);
4577 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_END)); 4577 ck_assert(!efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_END));
4578 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 4); 4578 ck_assert_int_eq(efl_text_cursor_object_position_get(cur_obj), 4);
4579 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_START)); 4579 ck_assert(efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_START));
4580 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 0); 4580 ck_assert_int_eq(efl_text_cursor_object_position_get(cur_obj), 0);
4581 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_START)); 4581 ck_assert(!efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_START));
4582 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 0); 4582 ck_assert_int_eq(efl_text_cursor_object_position_get(cur_obj), 0);
4583 4583
4584 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_END)); 4584 ck_assert(efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_END));
4585 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_NEXT)); 4585 ck_assert(efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_NEXT));
4586 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 5); 4586 ck_assert_int_eq(efl_text_cursor_object_position_get(cur_obj), 5);
4587 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_END)); 4587 ck_assert(efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_END));
4588 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 10); 4588 ck_assert_int_eq(efl_text_cursor_object_position_get(cur_obj), 10);
4589 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_NEXT)); 4589 ck_assert(efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_NEXT));
4590 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_END)); 4590 ck_assert(efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_END));
4591 ck_assert_int_ne(efl_text_cursor_position_get(cur_obj), 10); 4591 ck_assert_int_ne(efl_text_cursor_object_position_get(cur_obj), 10);
4592 4592
4593 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_LINE_END)); 4593 ck_assert(efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_LINE_END));
4594 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 23); 4594 ck_assert_int_eq(efl_text_cursor_object_position_get(cur_obj), 23);
4595 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_LINE_END)); 4595 ck_assert(!efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_LINE_END));
4596 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 23); 4596 ck_assert_int_eq(efl_text_cursor_object_position_get(cur_obj), 23);
4597 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_LINE_START)); 4597 ck_assert(efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_LINE_START));
4598 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 12); 4598 ck_assert_int_eq(efl_text_cursor_object_position_get(cur_obj), 12);
4599 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_LINE_START)); 4599 ck_assert(!efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_LINE_START));
4600 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 12); 4600 ck_assert_int_eq(efl_text_cursor_object_position_get(cur_obj), 12);
4601 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_PREVIOUS)); 4601 ck_assert(efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_PREVIOUS));
4602 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_LINE_START)); 4602 ck_assert(efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_LINE_START));
4603 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 0); 4603 ck_assert_int_eq(efl_text_cursor_object_position_get(cur_obj), 0);
4604 4604
4605#if defined(HAVE_FRIBIDI) && defined(HAVE_HARFBUZZ) 4605#if defined(HAVE_FRIBIDI) && defined(HAVE_HARFBUZZ)
4606 efl_text_markup_set(txt, "الْبَرْمَجةُ<ps/>مَرْحبَاً"); 4606 efl_text_markup_set(txt, "الْبَرْمَجةُ<ps/>مَرْحبَاً");
4607 efl_text_cursor_cluster_coord_set(cur_obj, EINA_POSITION2D(0, 0)); 4607 efl_text_cursor_object_cluster_coord_set(cur_obj, EINA_POSITION2D(0, 0));
4608 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CLUSTER_NEXT)); 4608 ck_assert(efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CLUSTER_NEXT));
4609 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 1); 4609 ck_assert_int_eq(efl_text_cursor_object_position_get(cur_obj), 1);
4610 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CLUSTER_NEXT)); 4610 ck_assert(efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CLUSTER_NEXT));
4611 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 3); 4611 ck_assert_int_eq(efl_text_cursor_object_position_get(cur_obj), 3);
4612 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CLUSTER_NEXT)); 4612 ck_assert(efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CLUSTER_NEXT));
4613 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 5); 4613 ck_assert_int_eq(efl_text_cursor_object_position_get(cur_obj), 5);
4614 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_PREVIOUS)); 4614 ck_assert(efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_PREVIOUS));
4615 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 4); 4615 ck_assert_int_eq(efl_text_cursor_object_position_get(cur_obj), 4);
4616 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_NEXT)); 4616 ck_assert(efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_NEXT));
4617 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 5); 4617 ck_assert_int_eq(efl_text_cursor_object_position_get(cur_obj), 5);
4618 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_NEXT)); 4618 ck_assert(efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_NEXT));
4619 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 6); 4619 ck_assert_int_eq(efl_text_cursor_object_position_get(cur_obj), 6);
4620 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CLUSTER_NEXT)); 4620 ck_assert(efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CLUSTER_NEXT));
4621 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 7); 4621 ck_assert_int_eq(efl_text_cursor_object_position_get(cur_obj), 7);
4622 4622
4623 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_PARAGRAPH_NEXT)); 4623 ck_assert(efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_PARAGRAPH_NEXT));
4624 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 13); 4624 ck_assert_int_eq(efl_text_cursor_object_position_get(cur_obj), 13);
4625 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_PARAGRAPH_NEXT)); 4625 ck_assert(!efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_PARAGRAPH_NEXT));
4626 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 13); 4626 ck_assert_int_eq(efl_text_cursor_object_position_get(cur_obj), 13);
4627 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_PARAGRAPH_END)); 4627 ck_assert(efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_PARAGRAPH_END));
4628 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 22); 4628 ck_assert_int_eq(efl_text_cursor_object_position_get(cur_obj), 22);
4629 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_PARAGRAPH_END)); 4629 ck_assert(!efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_PARAGRAPH_END));
4630 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 22); 4630 ck_assert_int_eq(efl_text_cursor_object_position_get(cur_obj), 22);
4631 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_LAST)); 4631 ck_assert(!efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_LAST));
4632 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 22); 4632 ck_assert_int_eq(efl_text_cursor_object_position_get(cur_obj), 22);
4633 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_PARAGRAPH_START)); 4633 ck_assert(efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_PARAGRAPH_START));
4634 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 13); 4634 ck_assert_int_eq(efl_text_cursor_object_position_get(cur_obj), 13);
4635 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_PARAGRAPH_END)); 4635 ck_assert(efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_PARAGRAPH_END));
4636 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 22); 4636 ck_assert_int_eq(efl_text_cursor_object_position_get(cur_obj), 22);
4637 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_FIRST)); 4637 ck_assert(efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_FIRST));
4638 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 0); 4638 ck_assert_int_eq(efl_text_cursor_object_position_get(cur_obj), 0);
4639#endif 4639#endif
4640 4640
4641 Eo *nCur = efl_canvas_textblock_cursor_create(txt); 4641 Eo *nCur = efl_canvas_textblock_cursor_create(txt);
4642 Eo *nCur2 = efl_canvas_textblock_cursor_create(txt); 4642 Eo *nCur2 = efl_canvas_textblock_cursor_create(txt);
4643 Eo *nCur3 = efl_canvas_textblock_cursor_create(txt); 4643 Eo *nCur3 = efl_canvas_textblock_cursor_create(txt);
4644 efl_text_markup_set(txt, "Hello World<ps/>This is EFL<br/>Enlightenment"); 4644 efl_text_markup_set(txt, "Hello World<ps/>This is EFL<br/>Enlightenment");
4645 efl_text_cursor_position_set(cur_obj, 0); 4645 efl_text_cursor_object_position_set(cur_obj, 0);
4646 ck_assert_ptr_ne(nCur, NULL); 4646 ck_assert_ptr_ne(nCur, NULL);
4647 ck_assert_ptr_ne(nCur2, NULL); 4647 ck_assert_ptr_ne(nCur2, NULL);
4648 ck_assert_ptr_ne(nCur3, NULL); 4648 ck_assert_ptr_ne(nCur3, NULL);
4649 4649
4650 ck_assert(efl_text_cursor_equal(cur_obj, nCur)); 4650 ck_assert(efl_text_cursor_object_equal(cur_obj, nCur));
4651 ck_assert(efl_text_cursor_equal(cur_obj, nCur2)); 4651 ck_assert(efl_text_cursor_object_equal(cur_obj, nCur2));
4652 ck_assert(efl_text_cursor_equal(cur_obj, nCur3)); 4652 ck_assert(efl_text_cursor_object_equal(cur_obj, nCur3));
4653 ck_assert(efl_text_cursor_equal(nCur2, nCur3)); 4653 ck_assert(efl_text_cursor_object_equal(nCur2, nCur3));
4654 4654
4655 ck_assert_int_eq(efl_text_cursor_compare(cur_obj, nCur3), 0); 4655 ck_assert_int_eq(efl_text_cursor_object_compare(cur_obj, nCur3), 0);
4656 ck_assert_int_eq(efl_text_cursor_compare(nCur2, nCur3), 0); 4656 ck_assert_int_eq(efl_text_cursor_object_compare(nCur2, nCur3), 0);
4657 ck_assert_int_eq(efl_text_cursor_compare(cur_obj, nCur), 0); 4657 ck_assert_int_eq(efl_text_cursor_object_compare(cur_obj, nCur), 0);
4658 4658
4659 ck_assert(efl_text_cursor_move(nCur, EFL_TEXT_CURSOR_MOVE_TYPE_PARAGRAPH_NEXT)); 4659 ck_assert(efl_text_cursor_object_move(nCur, EFL_TEXT_CURSOR_MOVE_TYPE_PARAGRAPH_NEXT));
4660 ck_assert_int_lt(efl_text_cursor_compare(cur_obj, nCur), 0); 4660 ck_assert_int_lt(efl_text_cursor_object_compare(cur_obj, nCur), 0);
4661 ck_assert_int_gt(efl_text_cursor_compare(nCur, cur_obj), 0); 4661 ck_assert_int_gt(efl_text_cursor_object_compare(nCur, cur_obj), 0);
4662 efl_text_cursor_position_set(nCur2, efl_text_cursor_position_get(nCur)); 4662 efl_text_cursor_object_position_set(nCur2, efl_text_cursor_object_position_get(nCur));
4663 ck_assert_int_lt(efl_text_cursor_compare(cur_obj, nCur2), 0); 4663 ck_assert_int_lt(efl_text_cursor_object_compare(cur_obj, nCur2), 0);
4664 ck_assert_int_gt(efl_text_cursor_compare(nCur2, cur_obj), 0); 4664 ck_assert_int_gt(efl_text_cursor_object_compare(nCur2, cur_obj), 0);
4665 ck_assert(!efl_text_cursor_equal(nCur2, nCur3)); 4665 ck_assert(!efl_text_cursor_object_equal(nCur2, nCur3));
4666 4666
4667 efl_text_set(txt, ""); 4667 efl_text_set(txt, "");
4668 efl_text_cursor_text_insert(cur_obj, "Hello World"); 4668 efl_text_cursor_object_text_insert(cur_obj, "Hello World");
4669 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 11); 4669 ck_assert_int_eq(efl_text_cursor_object_position_get(cur_obj), 11);
4670 efl_text_cursor_text_insert(cur_obj, "Hello World"); 4670 efl_text_cursor_object_text_insert(cur_obj, "Hello World");
4671 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 22); 4671 ck_assert_int_eq(efl_text_cursor_object_position_get(cur_obj), 22);
4672 ck_assert_str_eq(efl_text_get(txt), "Hello WorldHello World"); 4672 ck_assert_str_eq(efl_text_get(txt), "Hello WorldHello World");
4673 4673
4674 efl_text_set(txt, ""); 4674 efl_text_set(txt, "");
4675 efl_text_cursor_markup_insert(cur_obj, "Hello World<ps/>Hello World"); 4675 efl_text_cursor_object_markup_insert(cur_obj, "Hello World<ps/>Hello World");
4676 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 23); 4676 ck_assert_int_eq(efl_text_cursor_object_position_get(cur_obj), 23);
4677 4677
4678 efl_text_cursor_char_coord_set(cur_obj, EINA_POSITION2D(0, 0)); 4678 efl_text_cursor_object_char_coord_set(cur_obj, EINA_POSITION2D(0, 0));
4679 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 0); 4679 ck_assert_int_eq(efl_text_cursor_object_position_get(cur_obj), 0);
4680 efl_text_cursor_char_coord_set(cur_obj, EINA_POSITION2D(500, 500)); 4680 efl_text_cursor_object_char_coord_set(cur_obj, EINA_POSITION2D(500, 500));
4681 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 23); 4681 ck_assert_int_eq(efl_text_cursor_object_position_get(cur_obj), 23);
4682 efl_text_cursor_cluster_coord_set(cur_obj, EINA_POSITION2D(0, 0)); 4682 efl_text_cursor_object_cluster_coord_set(cur_obj, EINA_POSITION2D(0, 0));
4683 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 0); 4683 ck_assert_int_eq(efl_text_cursor_object_position_get(cur_obj), 0);
4684 efl_text_cursor_cluster_coord_set(cur_obj, EINA_POSITION2D(500, 500)); 4684 efl_text_cursor_object_cluster_coord_set(cur_obj, EINA_POSITION2D(500, 500));
4685 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 23); 4685 ck_assert_int_eq(efl_text_cursor_object_position_get(cur_obj), 23);
4686 4686
4687 efl_text_cursor_position_set(nCur, 0); 4687 efl_text_cursor_object_position_set(nCur, 0);
4688 efl_text_cursor_position_set(cur_obj, 5); 4688 efl_text_cursor_object_position_set(cur_obj, 5);
4689 4689
4690 ck_assert_str_eq(efl_text_cursor_range_text_get(cur_obj, nCur), "Hello"); 4690 ck_assert_str_eq(efl_text_cursor_object_range_text_get(cur_obj, nCur), "Hello");
4691 ck_assert_str_eq(efl_text_cursor_range_text_get(nCur, cur_obj), "Hello"); 4691 ck_assert_str_eq(efl_text_cursor_object_range_text_get(nCur, cur_obj), "Hello");
4692 4692
4693 efl_text_cursor_position_set(nCur, 0); 4693 efl_text_cursor_object_position_set(nCur, 0);
4694 efl_text_cursor_position_set(cur_obj, 17); 4694 efl_text_cursor_object_position_set(cur_obj, 17);
4695 4695
4696 Eina_Iterator *iter = efl_text_cursor_range_geometry_get(cur_obj, nCur); 4696 Eina_Iterator *iter = efl_text_cursor_object_range_geometry_get(cur_obj, nCur);
4697 Eina_Rect *geoRect; 4697 Eina_Rect *geoRect;
4698 int x = 0; 4698 int x = 0;
4699 4699
@@ -4706,7 +4706,7 @@ EFL_START_TEST(efl_canvas_textblock_cursor)
4706 4706
4707 ck_assert_int_eq(x, 3); 4707 ck_assert_int_eq(x, 3);
4708 4708
4709 iter = efl_text_cursor_range_precise_geometry_get(cur_obj, nCur); 4709 iter = efl_text_cursor_object_range_precise_geometry_get(cur_obj, nCur);
4710 x = 0; 4710 x = 0;
4711 4711
4712 EINA_ITERATOR_FOREACH(iter, geoRect) 4712 EINA_ITERATOR_FOREACH(iter, geoRect)
@@ -4718,46 +4718,46 @@ EFL_START_TEST(efl_canvas_textblock_cursor)
4718 4718
4719 ck_assert_int_eq(x, 2); 4719 ck_assert_int_eq(x, 2);
4720 4720
4721 ck_assert_str_eq(efl_text_cursor_range_markup_get(cur_obj, nCur), "Hello World<ps/>Hello"); 4721 ck_assert_str_eq(efl_text_cursor_object_range_markup_get(cur_obj, nCur), "Hello World<ps/>Hello");
4722 ck_assert_str_eq(efl_text_cursor_range_markup_get(nCur, cur_obj), "Hello World<ps/>Hello"); 4722 ck_assert_str_eq(efl_text_cursor_object_range_markup_get(nCur, cur_obj), "Hello World<ps/>Hello");
4723 4723
4724 efl_text_cursor_position_set(nCur, 0); 4724 efl_text_cursor_object_position_set(nCur, 0);
4725 efl_text_cursor_position_set(cur_obj, 5); 4725 efl_text_cursor_object_position_set(cur_obj, 5);
4726 4726
4727 efl_text_cursor_range_delete(nCur, cur_obj); 4727 efl_text_cursor_object_range_delete(nCur, cur_obj);
4728 4728
4729 ck_assert_str_eq(efl_text_markup_get(txt), " World<ps/>Hello World"); 4729 ck_assert_str_eq(efl_text_markup_get(txt), " World<ps/>Hello World");
4730 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 0); 4730 ck_assert_int_eq(efl_text_cursor_object_position_get(cur_obj), 0);
4731 ck_assert_int_eq(efl_text_cursor_position_get(nCur), 0); 4731 ck_assert_int_eq(efl_text_cursor_object_position_get(nCur), 0);
4732 4732
4733 efl_text_markup_set(txt, "Hello World<ps/>Hello World"); 4733 efl_text_markup_set(txt, "Hello World<ps/>Hello World");
4734 efl_text_cursor_position_set(cur_obj, 6); 4734 efl_text_cursor_object_position_set(cur_obj, 6);
4735 Eina_Unicode str[2] = {0}; 4735 Eina_Unicode str[2] = {0};
4736 str[0] = efl_text_cursor_content_get(cur_obj); 4736 str[0] = efl_text_cursor_object_content_get(cur_obj);
4737 ck_assert_str_eq(eina_unicode_unicode_to_utf8(str, NULL), "W"); 4737 ck_assert_str_eq(eina_unicode_unicode_to_utf8(str, NULL), "W");
4738 4738
4739 efl_text_cursor_char_delete(cur_obj); 4739 efl_text_cursor_object_char_delete(cur_obj);
4740 4740
4741 str[0] = efl_text_cursor_content_get(cur_obj); 4741 str[0] = efl_text_cursor_object_content_get(cur_obj);
4742 ck_assert_str_eq(eina_unicode_unicode_to_utf8(str, NULL), "o"); 4742 ck_assert_str_eq(eina_unicode_unicode_to_utf8(str, NULL), "o");
4743 4743
4744 Eo *cur_txt = efl_text_cursor_text_object_get(cur_obj); 4744 Eo *cur_txt = efl_text_cursor_object_text_object_get(cur_obj);
4745 Eo *cur_txt2 = efl_text_cursor_text_object_get(nCur); 4745 Eo *cur_txt2 = efl_text_cursor_object_text_object_get(nCur);
4746 ck_assert_ptr_eq(cur_txt, txt); 4746 ck_assert_ptr_eq(cur_txt, txt);
4747 ck_assert_ptr_eq(cur_txt2, txt); 4747 ck_assert_ptr_eq(cur_txt2, txt);
4748 4748
4749 efl_text_cursor_position_set(cur_obj, 1); 4749 efl_text_cursor_object_position_set(cur_obj, 1);
4750 Eina_Rect rect = efl_text_cursor_content_geometry_get(cur_obj); 4750 Eina_Rect rect = efl_text_cursor_object_content_geometry_get(cur_obj);
4751 ck_assert_int_ne(rect.w, 0); 4751 ck_assert_int_ne(rect.w, 0);
4752 ck_assert_int_ne(rect.h, 0); 4752 ck_assert_int_ne(rect.h, 0);
4753 ck_assert_int_ne(rect.x, 0); 4753 ck_assert_int_ne(rect.x, 0);
4754 4754
4755 rect = efl_text_cursor_geometry_get(cur_obj, EFL_TEXT_CURSOR_TYPE_BEFORE); 4755 rect = efl_text_cursor_object_cursor_geometry_get(cur_obj, EFL_TEXT_CURSOR_TYPE_BEFORE);
4756 ck_assert_int_eq(rect.w, 0); 4756 ck_assert_int_eq(rect.w, 0);
4757 ck_assert_int_ne(rect.h, 0); 4757 ck_assert_int_ne(rect.h, 0);
4758 ck_assert_int_ne(rect.x, 0); 4758 ck_assert_int_ne(rect.x, 0);
4759 4759
4760 Eina_Rect rect2 = efl_text_cursor_geometry_get(cur_obj, EFL_TEXT_CURSOR_TYPE_UNDER); 4760 Eina_Rect rect2 = efl_text_cursor_object_cursor_geometry_get(cur_obj, EFL_TEXT_CURSOR_TYPE_UNDER);
4761 ck_assert_int_ne(rect2.w, 0); 4761 ck_assert_int_ne(rect2.w, 0);
4762 ck_assert_int_ne(rect2.h, 0); 4762 ck_assert_int_ne(rect2.h, 0);
4763 ck_assert_int_ne(rect2.x, 0); 4763 ck_assert_int_ne(rect2.x, 0);
@@ -4768,12 +4768,12 @@ EFL_START_TEST(efl_canvas_textblock_cursor)
4768 ck_assert_int_eq(rect2.y, rect.y); 4768 ck_assert_int_eq(rect2.y, rect.y);
4769 4769
4770 efl_text_markup_set(txt, "Hello World"); 4770 efl_text_markup_set(txt, "Hello World");
4771 efl_text_cursor_position_set(cur_obj, 11); 4771 efl_text_cursor_object_position_set(cur_obj, 11);
4772 ck_assert(!efl_text_cursor_lower_cursor_geometry_get(cur_obj, &rect2)); 4772 ck_assert(!efl_text_cursor_object_lower_cursor_geometry_get(cur_obj, &rect2));
4773#ifdef HAVE_FRIBIDI 4773#ifdef HAVE_FRIBIDI
4774 efl_text_cursor_text_insert(cur_obj, "مرحباً"); 4774 efl_text_cursor_object_text_insert(cur_obj, "مرحباً");
4775 rect = efl_text_cursor_geometry_get(cur_obj, EFL_TEXT_CURSOR_TYPE_BEFORE); 4775 rect = efl_text_cursor_object_cursor_geometry_get(cur_obj, EFL_TEXT_CURSOR_TYPE_BEFORE);
4776 ck_assert(efl_text_cursor_lower_cursor_geometry_get(cur_obj, &rect2)); 4776 ck_assert(efl_text_cursor_object_lower_cursor_geometry_get(cur_obj, &rect2));
4777 ck_assert_int_eq(rect2.w, 0); 4777 ck_assert_int_eq(rect2.w, 0);
4778 ck_assert_int_ne(rect2.h, 0); 4778 ck_assert_int_ne(rect2.h, 0);
4779 ck_assert_int_ne(rect2.x, 0); 4779 ck_assert_int_ne(rect2.x, 0);
@@ -4786,9 +4786,9 @@ EFL_START_TEST(efl_canvas_textblock_cursor)
4786 4786
4787 //Efl able to deal with br tab without closing tag "/" 4787 //Efl able to deal with br tab without closing tag "/"
4788 efl_text_markup_set(txt, "a<br>a<tab>a"); 4788 efl_text_markup_set(txt, "a<br>a<tab>a");
4789 efl_text_cursor_move(nCur, EFL_TEXT_CURSOR_MOVE_TYPE_FIRST); 4789 efl_text_cursor_object_move(nCur, EFL_TEXT_CURSOR_MOVE_TYPE_FIRST);
4790 efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_LAST); 4790 efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_LAST);
4791 efl_text_cursor_range_delete(nCur, cur_obj); 4791 efl_text_cursor_object_range_delete(nCur, cur_obj);
4792 ck_assert_str_eq(efl_text_markup_get(txt), ""); 4792 ck_assert_str_eq(efl_text_markup_get(txt), "");
4793 4793
4794 END_EFL_CANVAS_TEXTBLOCK_TEST(); 4794 END_EFL_CANVAS_TEXTBLOCK_TEST();
@@ -4799,7 +4799,7 @@ EFL_END_TEST
4799EFL_START_TEST(efl_canvas_textblock_markup) 4799EFL_START_TEST(efl_canvas_textblock_markup)
4800{ 4800{
4801 START_EFL_CANVAS_TEXTBLOCK_TEST(); 4801 START_EFL_CANVAS_TEXTBLOCK_TEST();
4802 Efl_Text_Cursor *start, *end; 4802 Efl_Text_Cursor_Object *start, *end;
4803 char *res; 4803 char *res;
4804 4804
4805 start = efl_canvas_textblock_cursor_create(txt); 4805 start = efl_canvas_textblock_cursor_create(txt);
@@ -4807,16 +4807,16 @@ EFL_START_TEST(efl_canvas_textblock_markup)
4807 4807
4808 efl_text_set(txt, "\n\n\n"); 4808 efl_text_set(txt, "\n\n\n");
4809 4809
4810 efl_text_cursor_position_set(start, 1); 4810 efl_text_cursor_object_position_set(start, 1);
4811 efl_text_cursor_position_set(end, 2); 4811 efl_text_cursor_object_position_set(end, 2);
4812 res = efl_text_cursor_range_markup_get(start, end); 4812 res = efl_text_cursor_object_range_markup_get(start, end);
4813 ck_assert_str_eq(res, "<br>"); 4813 ck_assert_str_eq(res, "<br>");
4814 free(res); 4814 free(res);
4815 4815
4816 efl_text_set(txt, "a\u2029bc\ndef\n\u2029"); 4816 efl_text_set(txt, "a\u2029bc\ndef\n\u2029");
4817 efl_text_cursor_position_set(start, 2); 4817 efl_text_cursor_object_position_set(start, 2);
4818 efl_text_cursor_position_set(end, 5); 4818 efl_text_cursor_object_position_set(end, 5);
4819 res = efl_text_cursor_range_markup_get(start, end); 4819 res = efl_text_cursor_object_range_markup_get(start, end);
4820 ck_assert_str_eq(res, "bc<br>"); 4820 ck_assert_str_eq(res, "bc<br>");
4821 free(res); 4821 free(res);
4822 4822