forked from enlightenment/efl
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
This commit is contained in:
parent
6f209e48be
commit
ad63375199
|
@ -540,7 +540,7 @@ _entry_imf_event_preedit_changed_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUS
|
|||
|
||||
for (i = 0; i < (preedit_end_pos - preedit_start_pos); i++)
|
||||
{
|
||||
efl_text_cursor_move(en->preedit_start, EFL_TEXT_CURSOR_MOVE_TYPE_CHAR_PREV);
|
||||
efl_text_cursor_move(en->preedit_start, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_PREVIOUS);
|
||||
}
|
||||
|
||||
en->have_preedit = EINA_TRUE;
|
||||
|
@ -913,19 +913,19 @@ _delete_emit(Eo *obj, Efl_Text_Cursor *c, Efl_Ui_Internal_Text_Interactive_Data
|
|||
Eo * cur = efl_duplicate(c);
|
||||
if (backspace)
|
||||
{
|
||||
if (!efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHAR_PREV))
|
||||
if (!efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_PREVIOUS))
|
||||
{
|
||||
return;
|
||||
}
|
||||
efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHAR_NEXT);
|
||||
efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_NEXT);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (!efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHAR_NEXT))
|
||||
if (!efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_NEXT))
|
||||
{
|
||||
return;
|
||||
}
|
||||
efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHAR_PREV);
|
||||
efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_PREVIOUS);
|
||||
}
|
||||
efl_del(cur);
|
||||
cur = NULL;
|
||||
|
@ -1183,7 +1183,7 @@ _key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void
|
|||
#endif
|
||||
if (efl_text_interactive_have_selection_get(obj))
|
||||
ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
|
||||
if (efl_text_cursor_move(cur,EFL_TEXT_CURSOR_MOVE_TYPE_CHAR_PREV))
|
||||
if (efl_text_cursor_move(cur,EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_PREVIOUS))
|
||||
ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
|
||||
|
||||
_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
|
|||
#endif
|
||||
if (efl_text_interactive_have_selection_get(obj))
|
||||
ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
|
||||
if (efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHAR_NEXT))
|
||||
if (efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_NEXT))
|
||||
ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
|
||||
|
||||
_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
|
|||
{
|
||||
// del to start of previous word
|
||||
Efl_Text_Cursor *tc = efl_canvas_textblock_cursor_create(obj);
|
||||
|
||||
_cur_pos_copy(cur, tc);
|
||||
efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHAR_PREV);
|
||||
efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_PREVIOUS);
|
||||
efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_START);
|
||||
|
||||
_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
|
|||
|
||||
_cur_pos_copy(cur, tc);
|
||||
efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_END);
|
||||
efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHAR_NEXT);
|
||||
efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_NEXT);
|
||||
|
||||
_range_del_emit(obj, cur, tc);
|
||||
|
||||
|
@ -1589,7 +1588,7 @@ _mouse_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EIN
|
|||
else
|
||||
{
|
||||
efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_END);
|
||||
efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHAR_NEXT);
|
||||
efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_NEXT);
|
||||
}
|
||||
_sel_extend(cur, obj, en);
|
||||
}
|
||||
|
@ -1603,7 +1602,7 @@ _mouse_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EIN
|
|||
efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_START);
|
||||
_sel_init(cur, obj, en);
|
||||
efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_END);
|
||||
efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHAR_NEXT);
|
||||
efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_NEXT);
|
||||
_sel_extend(cur, obj, en);
|
||||
}
|
||||
goto end;
|
||||
|
|
|
@ -140,16 +140,16 @@ _efl_text_cursor_move(Eo *obj EINA_UNUSED, Efl_Text_Cursor_Data *pd, Efl_Text_Cu
|
|||
int pos = evas_textblock_cursor_pos_get(pd->handle);
|
||||
|
||||
switch (type) {
|
||||
case EFL_TEXT_CURSOR_MOVE_TYPE_CHAR_NEXT :
|
||||
case EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_NEXT :
|
||||
moved = evas_textblock_cursor_char_next(pd->handle);
|
||||
break;
|
||||
case EFL_TEXT_CURSOR_MOVE_TYPE_CHAR_PREV :
|
||||
case EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_PREVIOUS :
|
||||
moved = evas_textblock_cursor_char_prev(pd->handle);
|
||||
break;
|
||||
case EFL_TEXT_CURSOR_MOVE_TYPE_CLUSTER_NEXT :
|
||||
moved = evas_textblock_cursor_cluster_next(pd->handle);
|
||||
break;
|
||||
case EFL_TEXT_CURSOR_MOVE_TYPE_CLUSTER_PREV :
|
||||
case EFL_TEXT_CURSOR_MOVE_TYPE_CLUSTER_PREVIOUS :
|
||||
moved = evas_textblock_cursor_cluster_prev(pd->handle);
|
||||
break;
|
||||
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
|
|||
case EFL_TEXT_CURSOR_MOVE_TYPE_PARAGRAPH_NEXT :
|
||||
moved = evas_textblock_cursor_paragraph_next(pd->handle);
|
||||
break;
|
||||
case EFL_TEXT_CURSOR_MOVE_TYPE_PARAGRAPH_PREV :
|
||||
case EFL_TEXT_CURSOR_MOVE_TYPE_PARAGRAPH_PREVIOUS :
|
||||
moved = evas_textblock_cursor_paragraph_prev(pd->handle);
|
||||
break;
|
||||
}
|
||||
|
|
|
@ -10,22 +10,22 @@ enum @beta Efl.Text.Cursor_Type
|
|||
enum @beta Efl.Text.Cursor_Move_Type
|
||||
{
|
||||
[[Text cursor movement types.]]
|
||||
char_next, [[Advances to the next character.]]
|
||||
char_prev, [[Advances to the previous character.]]
|
||||
cluster_next, [[Advances to the next grapheme cluster
|
||||
character_next, [[Advances to the next character.]]
|
||||
character_previous, [[Advances to the previous character.]]
|
||||
cluster_next, [[Advances to the next grapheme cluster
|
||||
(A character sequence rendered together. See https://unicode.org/reports/tr29/).]]
|
||||
cluster_prev, [[Advances to the previous grapheme cluster
|
||||
cluster_previous, [[Advances to the previous grapheme cluster
|
||||
(A character sequence rendered together. See https://unicode.org/reports/tr29/).]]
|
||||
paragraph_start, [[Advances to the first character in current paragraph.]]
|
||||
paragraph_end, [[Advances to the last character in current paragraph.]]
|
||||
word_start, [[Advance to current word start.]]
|
||||
word_end, [[Advance to current word end.]]
|
||||
line_start, [[Advance to current line first character.]]
|
||||
line_end, [[Advance to current line last character.]]
|
||||
first, [[Advance to first character in the first paragraph.]]
|
||||
last, [[Advance to last character in the last paragraph.]]
|
||||
paragraph_next, [[Advances to the start of the next paragraph.]]
|
||||
paragraph_prev [[Advances to the end of the previous paragraph.]]
|
||||
paragraph_start, [[Advances to the first character in current paragraph.]]
|
||||
paragraph_end, [[Advances to the last character in current paragraph.]]
|
||||
word_start, [[Advance to current word start.]]
|
||||
word_end, [[Advance to current word end.]]
|
||||
line_start, [[Advance to current line first character.]]
|
||||
line_end, [[Advance to current line last character.]]
|
||||
first, [[Advance to first character in the first paragraph.]]
|
||||
last, [[Advance to last character in the last paragraph.]]
|
||||
paragraph_next, [[Advances to the start of the next paragraph.]]
|
||||
paragraph_previous [[Advances to the end of the previous paragraph.]]
|
||||
}
|
||||
|
||||
abstract @beta Efl.Text.Cursor extends Efl.Object implements Efl.Duplicate{
|
||||
|
|
|
@ -4536,10 +4536,10 @@ EFL_START_TEST(efl_canvas_textblock_cursor)
|
|||
ck_assert_int_eq(changed_emit, 6);
|
||||
|
||||
efl_text_set(txt, "");
|
||||
ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHAR_NEXT));
|
||||
ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHAR_PREV));
|
||||
ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_NEXT));
|
||||
ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_PREVIOUS));
|
||||
ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CLUSTER_NEXT));
|
||||
ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CLUSTER_PREV));
|
||||
ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CLUSTER_PREVIOUS));
|
||||
ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_PARAGRAPH_START));
|
||||
ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_PARAGRAPH_END));
|
||||
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)
|
|||
ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_START));
|
||||
ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_END));
|
||||
ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_PARAGRAPH_NEXT));
|
||||
ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_PARAGRAPH_PREV));
|
||||
ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_PARAGRAPH_PREVIOUS));
|
||||
ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_FIRST));
|
||||
ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_LAST));
|
||||
ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 0);
|
||||
|
@ -4555,13 +4555,13 @@ EFL_START_TEST(efl_canvas_textblock_cursor)
|
|||
ck_assert_int_eq(changed_emit, 7);
|
||||
|
||||
efl_text_markup_set(txt, "Hello World<ps/>This is EFL<br/>Enlightenment");
|
||||
ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHAR_NEXT));
|
||||
ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_NEXT));
|
||||
ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 1);
|
||||
ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHAR_PREV));
|
||||
ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_PREVIOUS));
|
||||
ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 0);
|
||||
ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CLUSTER_NEXT));
|
||||
ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 1);
|
||||
ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CLUSTER_PREV));
|
||||
ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CLUSTER_PREVIOUS));
|
||||
ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 0);
|
||||
|
||||
efl_text_cursor_position_set(cur_obj, 0);
|
||||
|
@ -4575,11 +4575,11 @@ EFL_START_TEST(efl_canvas_textblock_cursor)
|
|||
ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 0);
|
||||
|
||||
ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_END));
|
||||
ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHAR_NEXT));
|
||||
ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_NEXT));
|
||||
ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 5);
|
||||
ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_END));
|
||||
ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 10);
|
||||
ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHAR_NEXT));
|
||||
ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_NEXT));
|
||||
ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_END));
|
||||
ck_assert_int_ne(efl_text_cursor_position_get(cur_obj), 10);
|
||||
|
||||
|
@ -4591,7 +4591,7 @@ EFL_START_TEST(efl_canvas_textblock_cursor)
|
|||
ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 12);
|
||||
ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_LINE_START));
|
||||
ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 12);
|
||||
ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHAR_PREV));
|
||||
ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_PREVIOUS));
|
||||
ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_LINE_START));
|
||||
ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 0);
|
||||
|
||||
|
@ -4604,11 +4604,11 @@ EFL_START_TEST(efl_canvas_textblock_cursor)
|
|||
ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 3);
|
||||
ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CLUSTER_NEXT));
|
||||
ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 5);
|
||||
ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHAR_PREV));
|
||||
ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_PREVIOUS));
|
||||
ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 4);
|
||||
ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHAR_NEXT));
|
||||
ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_NEXT));
|
||||
ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 5);
|
||||
ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHAR_NEXT));
|
||||
ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_NEXT));
|
||||
ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 6);
|
||||
ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CLUSTER_NEXT));
|
||||
ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 7);
|
||||
|
|
Loading…
Reference in New Issue