NorwayFun
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Efl text: replace all usages of cursor handle to same type 

Changes cursor handle name from 'Efl.Text.Cursor.Cursor_Data' to
'Efl.Text.Cursor.Cursor'.
Also, replace all usages of Efl_Canvas_Text_Cursor
with Efl_Text_Cursor_Cursor as the handle for the cursor.
This commit is contained in:
Daniel Hirt 2017-07-17 12:45:36 +03:00
parent c4ea25cbdb
commit d5f781da2b
16 changed files with 291 additions and 298 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bin/elementary/test_efl_ui_text.c
View File

@ -9,7 +9,7 @@
static void static void
_apply_style(Eo *obj, size_t start_pos, size_t end_pos, const char *style) _apply_style(Eo *obj, size_t start_pos, size_t end_pos, const char *style)
{ {
Efl_Canvas_Text_Cursor *start, *end; Efl_Text_Cursor_Cursor *start, *end;
start = efl_text_cursor_new(obj); start = efl_text_cursor_new(obj);
end = efl_text_cursor_new(obj); end = efl_text_cursor_new(obj);
@ -104,7 +104,7 @@ typedef struct
static void static void
my_efl_ui_text_bt_3(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) my_efl_ui_text_bt_3(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{ {
Efl_Canvas_Text_Cursor *sel_start, *sel_end; Efl_Text_Cursor_Cursor *sel_start, *sel_end;
efl_ui_text_interactive_selection_cursors_get(data, &sel_start, &sel_end); efl_ui_text_interactive_selection_cursors_get(data, &sel_start, &sel_end);
const char *s = efl_canvas_text_range_text_get(data, sel_start, sel_end); const char *s = efl_canvas_text_range_text_get(data, sel_start, sel_end);
@ -162,7 +162,7 @@ void
test_efl_ui_text(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) test_efl_ui_text(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{ {
Evas_Object *win, *bx, *bx2, *bx3, *bt, *en; Evas_Object *win, *bx, *bx2, *bx3, *bt, *en;
Efl_Canvas_Text_Cursor *main_cur, *cur; Efl_Text_Cursor_Cursor *main_cur, *cur;
win = elm_win_util_standard_add("entry", "Entry"); win = elm_win_util_standard_add("entry", "Entry");
elm_win_autodel_set(win, EINA_TRUE); elm_win_autodel_set(win, EINA_TRUE);

26
src/lib/edje/edje_entry.c
View File

@ -4017,7 +4017,7 @@ _cursor_get(Edje_Real_Part *rp, Edje_Cursor cur)
} }
Eina_Bool Eina_Bool
_edje_text_cursor_next(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor_Data *c) _edje_text_cursor_next(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor *c)
{ {
Entry *en; Entry *en;
@ -4051,7 +4051,7 @@ _edje_entry_cursor_next(Edje_Real_Part *rp, Edje_Cursor cur)
Eina_Bool Eina_Bool
_edje_text_cursor_prev(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor_Data *c) _edje_text_cursor_prev(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor *c)
{ {
Entry *en; Entry *en;
@ -4086,7 +4086,7 @@ _edje_entry_cursor_prev(Edje_Real_Part *rp, Edje_Cursor cur)
} }
Eina_Bool Eina_Bool
_edje_text_cursor_up(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor_Data *c) _edje_text_cursor_up(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor *c)
{ {
Entry *en; Entry *en;
Evas_Coord lx, ly, lw, lh, cx, cy, cw, ch; Evas_Coord lx, ly, lw, lh, cx, cy, cw, ch;
@ -4126,7 +4126,7 @@ _edje_entry_cursor_up(Edje_Real_Part *rp, Edje_Cursor cur)
} }
Eina_Bool Eina_Bool
_edje_text_cursor_down(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor_Data *c) _edje_text_cursor_down(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor *c)
{ {
Entry *en; Entry *en;
Evas_Coord lx, ly, lw, lh, cx, cy, cw, ch; Evas_Coord lx, ly, lw, lh, cx, cy, cw, ch;
@ -4165,7 +4165,7 @@ _edje_entry_cursor_down(Edje_Real_Part *rp, Edje_Cursor cur)
} }
void void
_edje_text_cursor_begin(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor_Data *c) _edje_text_cursor_begin(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor *c)
{ {
Entry *en; Entry *en;
int old_cur_pos; int old_cur_pos;
@ -4200,7 +4200,7 @@ _edje_entry_cursor_begin(Edje_Real_Part *rp, Edje_Cursor cur)
} }
void void
_edje_text_cursor_end(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor_Data *c) _edje_text_cursor_end(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor *c)
{ {
Entry *en; Entry *en;
int old_cur_pos; int old_cur_pos;
@ -4234,7 +4234,7 @@ _edje_entry_cursor_end(Edje_Real_Part *rp, Edje_Cursor cur)
} }
void void
_edje_text_cursor_copy(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor_Data *d, Efl_Text_Cursor_Cursor_Data *c) _edje_text_cursor_copy(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor *d, Efl_Text_Cursor_Cursor *c)
{ {
Entry *en; Entry *en;
@ -4264,7 +4264,7 @@ _edje_entry_cursor_copy(Edje_Real_Part *rp, Edje_Cursor cur, Edje_Cursor dst)
} }
void void
_edje_text_cursor_line_begin(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor_Data *c) _edje_text_cursor_line_begin(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor *c)
{ {
Entry *en; Entry *en;
int old_cur_pos; int old_cur_pos;
@ -4298,7 +4298,7 @@ _edje_entry_cursor_line_begin(Edje_Real_Part *rp, Edje_Cursor cur)
} }
void void
_edje_text_cursor_line_end(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor_Data *c) _edje_text_cursor_line_end(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor *c)
{ {
Entry *en; Entry *en;
int old_cur_pos; int old_cur_pos;
@ -4331,7 +4331,7 @@ _edje_entry_cursor_line_end(Edje_Real_Part *rp, Edje_Cursor cur)
} }
Eina_Bool Eina_Bool
_edje_text_cursor_coord_set(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor_Data *c, _edje_text_cursor_coord_set(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor *c,
Evas_Coord x, Evas_Coord y) Evas_Coord x, Evas_Coord y)
{ {
Entry *en = rp->typedata.text->entry_data; Entry *en = rp->typedata.text->entry_data;
@ -4378,7 +4378,7 @@ _edje_entry_cursor_is_visible_format_get(Edje_Real_Part *rp, Edje_Cursor cur)
} }
char * char *
_edje_text_cursor_content_get(Edje_Real_Part *rp EINA_UNUSED, Efl_Text_Cursor_Cursor_Data *c) _edje_text_cursor_content_get(Edje_Real_Part *rp EINA_UNUSED, Efl_Text_Cursor_Cursor *c)
{ {
return evas_textblock_cursor_content_get(c); return evas_textblock_cursor_content_get(c);
} }
@ -4394,7 +4394,7 @@ _edje_entry_cursor_content_get(Edje_Real_Part *rp, Edje_Cursor cur)
} }
void void
_edje_text_cursor_pos_set(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor_Data *c, int pos) _edje_text_cursor_pos_set(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor *c, int pos)
{ {
if ((rp->type != EDJE_RP_TYPE_TEXT) || if ((rp->type != EDJE_RP_TYPE_TEXT) ||
(!rp->typedata.text)) return; (!rp->typedata.text)) return;
@ -4423,7 +4423,7 @@ _edje_entry_cursor_pos_set(Edje_Real_Part *rp, Edje_Cursor cur, int pos)
} }
int int
_edje_text_cursor_pos_get(Edje_Real_Part *rp EINA_UNUSED, Efl_Text_Cursor_Cursor_Data *c) _edje_text_cursor_pos_get(Edje_Real_Part *rp EINA_UNUSED, Efl_Text_Cursor_Cursor *c)
{ {
return evas_textblock_cursor_pos_get(c); return evas_textblock_cursor_pos_get(c);
} }

36
src/lib/edje/edje_part_text.c
View File

@ -23,7 +23,7 @@ _efl_canvas_layout_internal_text_efl_text_text_get(Eo *obj,
RETURN_VAL(_edje_efl_text_get(obj, pd->ed, pd->part)); RETURN_VAL(_edje_efl_text_get(obj, pd->ed, pd->part));
} }
EOLIAN static Efl_Text_Cursor_Cursor_Data * EOLIAN static Efl_Text_Cursor_Cursor *
_efl_canvas_layout_internal_text_efl_text_cursor_cursor_get(Eo *obj, _efl_canvas_layout_internal_text_efl_text_cursor_cursor_get(Eo *obj,
void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor_Get_Type get_type) void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor_Get_Type get_type)
{ {
@ -33,7 +33,7 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_get(Eo *obj,
EOLIAN static void EOLIAN static void
_efl_canvas_layout_internal_text_efl_text_cursor_cursor_paragraph_first(Eo *obj, _efl_canvas_layout_internal_text_efl_text_cursor_cursor_paragraph_first(Eo *obj,
void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor_Data *cur) void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
{ {
PROXY_DATA_GET(obj, pd); PROXY_DATA_GET(obj, pd);
_edje_text_cursor_begin(pd->rp, cur); _edje_text_cursor_begin(pd->rp, cur);
@ -42,7 +42,7 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_paragraph_first(Eo *obj,
EOLIAN static void EOLIAN static void
_efl_canvas_layout_internal_text_efl_text_cursor_cursor_paragraph_last(Eo *obj, _efl_canvas_layout_internal_text_efl_text_cursor_cursor_paragraph_last(Eo *obj,
void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor_Data *cur) void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
{ {
PROXY_DATA_GET(obj, pd); PROXY_DATA_GET(obj, pd);
_edje_text_cursor_end(pd->rp, cur); _edje_text_cursor_end(pd->rp, cur);
@ -51,7 +51,7 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_paragraph_last(Eo *obj,
EOLIAN static void EOLIAN static void
_efl_canvas_layout_internal_text_efl_text_cursor_cursor_position_set(Eo *obj, _efl_canvas_layout_internal_text_efl_text_cursor_cursor_position_set(Eo *obj,
void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor_Data *cur, int pos) void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur, int pos)
{ {
PROXY_DATA_GET(obj, pd); PROXY_DATA_GET(obj, pd);
_edje_text_cursor_pos_set(pd->rp, cur, pos); _edje_text_cursor_pos_set(pd->rp, cur, pos);
@ -60,7 +60,7 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_position_set(Eo *obj,
EOLIAN static int EOLIAN static int
_efl_canvas_layout_internal_text_efl_text_cursor_cursor_position_get(Eo *obj, _efl_canvas_layout_internal_text_efl_text_cursor_cursor_position_get(Eo *obj,
void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor_Data *cur) void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
{ {
PROXY_DATA_GET(obj, pd); PROXY_DATA_GET(obj, pd);
RETURN_VAL(_edje_text_cursor_pos_get(pd->rp, cur)); RETURN_VAL(_edje_text_cursor_pos_get(pd->rp, cur));
@ -68,7 +68,7 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_position_get(Eo *obj,
EOLIAN static void EOLIAN static void
_efl_canvas_layout_internal_text_efl_text_cursor_cursor_coord_set(Eo *obj, _efl_canvas_layout_internal_text_efl_text_cursor_cursor_coord_set(Eo *obj,
void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor_Data *cur, void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur,
int x, int y) int x, int y)
{ {
PROXY_DATA_GET(obj, pd); PROXY_DATA_GET(obj, pd);
@ -78,7 +78,7 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_coord_set(Eo *obj,
EOLIAN static void EOLIAN static void
_efl_canvas_layout_internal_text_efl_text_cursor_cursor_line_char_first(Eo *obj, _efl_canvas_layout_internal_text_efl_text_cursor_cursor_line_char_first(Eo *obj,
void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor_Data *cur) void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
{ {
PROXY_DATA_GET(obj, pd); PROXY_DATA_GET(obj, pd);
_edje_text_cursor_line_begin(pd->rp, cur); _edje_text_cursor_line_begin(pd->rp, cur);
@ -87,7 +87,7 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_line_char_first(Eo *obj,
EOLIAN static void EOLIAN static void
_efl_canvas_layout_internal_text_efl_text_cursor_cursor_line_char_last(Eo *obj, _efl_canvas_layout_internal_text_efl_text_cursor_cursor_line_char_last(Eo *obj,
void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor_Data *cur) void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
{ {
PROXY_DATA_GET(obj, pd); PROXY_DATA_GET(obj, pd);
_edje_text_cursor_line_end(pd->rp, cur); _edje_text_cursor_line_end(pd->rp, cur);
@ -96,7 +96,7 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_line_char_last(Eo *obj,
EOLIAN static void EOLIAN static void
_efl_canvas_layout_internal_text_efl_text_cursor_cursor_char_prev(Eo *obj, _efl_canvas_layout_internal_text_efl_text_cursor_cursor_char_prev(Eo *obj,
void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor_Data *cur) void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
{ {
PROXY_DATA_GET(obj, pd); PROXY_DATA_GET(obj, pd);
_edje_text_cursor_prev(pd->rp, cur); _edje_text_cursor_prev(pd->rp, cur);
@ -105,7 +105,7 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_char_prev(Eo *obj,
EOLIAN static void EOLIAN static void
_efl_canvas_layout_internal_text_efl_text_cursor_cursor_char_next(Eo *obj, _efl_canvas_layout_internal_text_efl_text_cursor_cursor_char_next(Eo *obj,
void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor_Data *cur) void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
{ {
PROXY_DATA_GET(obj, pd); PROXY_DATA_GET(obj, pd);
_edje_text_cursor_next(pd->rp, cur); _edje_text_cursor_next(pd->rp, cur);
@ -114,7 +114,7 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_char_next(Eo *obj,
EOLIAN static void EOLIAN static void
_efl_canvas_layout_internal_text_efl_text_cursor_cursor_line_jump_by(Eo *obj, _efl_canvas_layout_internal_text_efl_text_cursor_cursor_line_jump_by(Eo *obj,
void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor_Data *cur, int by) void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur, int by)
{ {
PROXY_DATA_GET(obj, pd); PROXY_DATA_GET(obj, pd);
if (by == 1) if (by == 1)
@ -131,18 +131,18 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_line_jump_by(Eo *obj,
EOLIAN static void EOLIAN static void
_efl_canvas_layout_internal_text_efl_text_cursor_cursor_copy(Eo *obj, _efl_canvas_layout_internal_text_efl_text_cursor_cursor_copy(Eo *obj,
void *_pd EINA_UNUSED, void *_pd EINA_UNUSED,
Efl_Text_Cursor_Cursor_Data *dst, Efl_Text_Cursor_Cursor *dst,
const Efl_Text_Cursor_Cursor_Data *cur) const Efl_Text_Cursor_Cursor *cur)
{ {
PROXY_DATA_GET(obj, pd); PROXY_DATA_GET(obj, pd);
_edje_text_cursor_copy(pd->rp, (Efl_Text_Cursor_Cursor_Data *) cur, dst); _edje_text_cursor_copy(pd->rp, (Efl_Text_Cursor_Cursor *) cur, dst);
RETURN_VOID; RETURN_VOID;
} }
EOLIAN static Eina_Unicode EOLIAN static Eina_Unicode
_efl_canvas_layout_internal_text_efl_text_cursor_cursor_content_get(Eo *obj, _efl_canvas_layout_internal_text_efl_text_cursor_cursor_content_get(Eo *obj,
void *_pd EINA_UNUSED, void *_pd EINA_UNUSED,
const Efl_Text_Cursor_Cursor_Data *cur) const Efl_Text_Cursor_Cursor *cur)
{ {
Eina_Unicode *ustr; Eina_Unicode *ustr;
Eina_Unicode uc = { 0 }; Eina_Unicode uc = { 0 };
@ -150,7 +150,7 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_content_get(Eo *obj,
int len; int len;
PROXY_DATA_GET(obj, pd); PROXY_DATA_GET(obj, pd);
c = _edje_text_cursor_content_get(pd->rp, (Efl_Text_Cursor_Cursor_Data *) cur); c = _edje_text_cursor_content_get(pd->rp, (Efl_Text_Cursor_Cursor *) cur);
ustr = eina_unicode_utf8_to_unicode(c, &len); ustr = eina_unicode_utf8_to_unicode(c, &len);
free(c); free(c);
if (ustr) if (ustr)
@ -164,7 +164,7 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_content_get(Eo *obj,
EOLIAN static Eina_Bool EOLIAN static Eina_Bool
_efl_canvas_layout_internal_text_efl_text_cursor_cursor_geometry_get(Eo *obj, _efl_canvas_layout_internal_text_efl_text_cursor_cursor_geometry_get(Eo *obj,
void *_pd EINA_UNUSED, void *_pd EINA_UNUSED,
const Efl_Text_Cursor_Cursor_Data *cur EINA_UNUSED, const Efl_Text_Cursor_Cursor *cur EINA_UNUSED,
Efl_Text_Cursor_Cursor_Type ctype EINA_UNUSED, Efl_Text_Cursor_Cursor_Type ctype EINA_UNUSED,
Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch,
Evas_Coord *cx2 EINA_UNUSED, Evas_Coord *cy2 EINA_UNUSED, Evas_Coord *cx2 EINA_UNUSED, Evas_Coord *cy2 EINA_UNUSED,
@ -182,7 +182,7 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_geometry_get(Eo *obj,
EOLIAN static int EOLIAN static int
_efl_canvas_layout_internal_text_efl_text_cursor_cursor_text_insert(Eo *obj, _efl_canvas_layout_internal_text_efl_text_cursor_cursor_text_insert(Eo *obj,
void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor_Data *cur EINA_UNUSED, void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur EINA_UNUSED,
const char *text) const char *text)
{ {
PROXY_DATA_GET(obj, pd); PROXY_DATA_GET(obj, pd);

26
src/lib/edje/edje_private.h
View File

@ -3159,19 +3159,19 @@ Eo *_edje_text_internal_proxy_get(Edje_Object *obj, Edje *ed, Edje_Real_Part *rp
Eina_Bool _edje_efl_text_set(Eo *obj, Edje *ed, const char *part, const char *text); Eina_Bool _edje_efl_text_set(Eo *obj, Edje *ed, const char *part, const char *text);
const char *_edje_efl_text_get(Eo *obj, Edje *ed, const char *part); const char *_edje_efl_text_get(Eo *obj, Edje *ed, const char *part);
Evas_Textblock_Cursor *_edje_text_cursor_get(Edje_Real_Part *rp, Edje_Cursor cur); Evas_Textblock_Cursor *_edje_text_cursor_get(Edje_Real_Part *rp, Edje_Cursor cur);
void _edje_text_cursor_begin(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor_Data *cur); void _edje_text_cursor_begin(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor *cur);
void _edje_text_cursor_end(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor_Data *cur); void _edje_text_cursor_end(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor *cur);
void _edje_text_cursor_pos_set(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor_Data *cur, int pos); void _edje_text_cursor_pos_set(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor *cur, int pos);
int _edje_text_cursor_pos_get(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor_Data *cur); int _edje_text_cursor_pos_get(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor *cur);
Eina_Bool _edje_text_cursor_coord_set(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor_Data *cur, int x, int y); Eina_Bool _edje_text_cursor_coord_set(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor *cur, int x, int y);
void _edje_text_cursor_line_begin(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor_Data *cur); void _edje_text_cursor_line_begin(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor *cur);
void _edje_text_cursor_line_end(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor_Data *cur); void _edje_text_cursor_line_end(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor *cur);
Eina_Bool _edje_text_cursor_next(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor_Data *cur); Eina_Bool _edje_text_cursor_next(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor *cur);
Eina_Bool _edje_text_cursor_prev(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor_Data *cur); Eina_Bool _edje_text_cursor_prev(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor *cur);
Eina_Bool _edje_text_cursor_up(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor_Data *cur); Eina_Bool _edje_text_cursor_up(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor *cur);
Eina_Bool _edje_text_cursor_down(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor_Data *cur); Eina_Bool _edje_text_cursor_down(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor *cur);
void _edje_text_cursor_copy(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor_Data *dst, Efl_Text_Cursor_Cursor_Data *cur); void _edje_text_cursor_copy(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor *dst, Efl_Text_Cursor_Cursor *cur);
char * _edje_text_cursor_content_get(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor_Data *cur); char * _edje_text_cursor_content_get(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor *cur);
void _edje_object_part_text_insert(Edje *ed, Edje_Real_Part *rp, const char *text); void _edje_object_part_text_insert(Edje *ed, Edje_Real_Part *rp, const char *text);
void _edje_internal_proxy_shutdown(void); void _edje_internal_proxy_shutdown(void);

2
src/lib/efl/Efl.h
View File

@ -52,7 +52,7 @@ extern "C" {
*/ */
typedef struct tm Efl_Time; typedef struct tm Efl_Time;
typedef struct _Efl_Text_Cursor_Cursor_Data Efl_Text_Cursor_Cursor_Data; typedef struct _Efl_Text_Cursor_Cursor Efl_Text_Cursor_Cursor;
typedef struct _Efl_Canvas_Text_Annotation Efl_Canvas_Text_Annotation; typedef struct _Efl_Canvas_Text_Annotation Efl_Canvas_Text_Annotation;
#ifdef EFL_BETA_API_SUPPORT #ifdef EFL_BETA_API_SUPPORT

16
src/lib/efl/interfaces/efl_text_annotate.eo
View File

@ -40,8 +40,8 @@ interface Efl.Text.Annotate {
]] ]]
legacy: null; legacy: null;
params { params {
@in start: ptr(const(Efl.Text.Cursor.Cursor_Data)); [[Start of range]] @in start: ptr(const(Efl.Text.Cursor.Cursor)); [[Start of range]]
@in end: ptr(const(Efl.Text.Cursor.Cursor_Data)); [[End of range]] @in end: ptr(const(Efl.Text.Cursor.Cursor)); [[End of range]]
} }
return: free(own(iterator<ptr(Efl.Canvas.Text.Annotation)>), return: free(own(iterator<ptr(Efl.Canvas.Text.Annotation)>),
eina_iterator_free); [[Handle of the Annotation]] eina_iterator_free); [[Handle of the Annotation]]
@ -56,8 +56,8 @@ interface Efl.Text.Annotate {
]] ]]
legacy: null; legacy: null;
params { params {
@in start: ptr(Efl.Text.Cursor.Cursor_Data); [[Start of range]] @in start: ptr(Efl.Text.Cursor.Cursor); [[Start of range]]
@in end: ptr(Efl.Text.Cursor.Cursor_Data); [[End of range]] @in end: ptr(Efl.Text.Cursor.Cursor); [[End of range]]
@in format: string; [[Annotation format]] @in format: string; [[Annotation format]]
} }
return: ptr(Efl.Canvas.Text.Annotation); [[Handle of inserted annotation]] return: ptr(Efl.Canvas.Text.Annotation); [[Handle of inserted annotation]]
@ -106,9 +106,9 @@ interface Efl.Text.Annotate {
params { params {
@in annotation: ptr(const(Efl.Canvas.Text.Annotation)); [[Annotation @in annotation: ptr(const(Efl.Canvas.Text.Annotation)); [[Annotation
handle to query]] handle to query]]
@in start: ptr(Efl.Text.Cursor.Cursor_Data); [[Cursor to be set to the start @in start: ptr(Efl.Text.Cursor.Cursor); [[Cursor to be set to the start
position of the annotation in the text]] position of the annotation in the text]]
@in end: ptr(Efl.Text.Cursor.Cursor_Data); [[Cursor to be set to the end @in end: ptr(Efl.Text.Cursor.Cursor); [[Cursor to be set to the end
position of the annotation in the text]] position of the annotation in the text]]
} }
} }
@ -122,7 +122,7 @@ interface Efl.Text.Annotate {
annotation: ptr(Efl.Canvas.Text.Annotation); [[Annotation]] annotation: ptr(Efl.Canvas.Text.Annotation); [[Annotation]]
} }
keys { keys {
cur: ptr(Efl.Text.Cursor.Cursor_Data); cur: ptr(Efl.Text.Cursor.Cursor);
} }
} }
cursor_object_item_insert { cursor_object_item_insert {
@ -134,7 +134,7 @@ interface Efl.Text.Annotate {
]] ]]
legacy: null; legacy: null;
params { params {
cur: ptr(Efl.Text.Cursor.Cursor_Data); cur: ptr(Efl.Text.Cursor.Cursor);
@in format: string; [[Format of the inserted item. @in format: string; [[Format of the inserted item.
See Format styles.]] See Format styles.]]
} }

56
src/lib/efl/interfaces/efl_text_cursor.eo
View File

@ -36,7 +36,7 @@ interface Efl.Text.Cursor {
]] ]]
get { get {
legacy: null; legacy: null;
return: ptr(Efl.Text.Cursor.Cursor_Data); [[Text cursor object]] return: ptr(Efl.Text.Cursor.Cursor); [[Text cursor object]]
} }
keys { keys {
get_type: Efl.Text.Cursor.Cursor_Get_Type; get_type: Efl.Text.Cursor.Cursor_Get_Type;
@ -49,7 +49,7 @@ interface Efl.Text.Cursor {
position: int; position: int;
} }
keys { keys {
cur: ptr(Efl.Text.Cursor.Cursor_Data); cur: ptr(Efl.Text.Cursor.Cursor);
} }
} }
@property cursor_content { @property cursor_content {
@ -61,7 +61,7 @@ interface Efl.Text.Cursor {
content: Eina.Unicode; [[The unicode codepoint of the character]] content: Eina.Unicode; [[The unicode codepoint of the character]]
} }
keys { keys {
cur: ptr(const(Efl.Text.Cursor.Cursor_Data)); cur: ptr(const(Efl.Text.Cursor.Cursor));
} }
} }
@property cursor_geometry { @property cursor_geometry {
@ -78,7 +78,7 @@ interface Efl.Text.Cursor {
return: bool; [[ $true if split cursor, $false otherwise.]] return: bool; [[ $true if split cursor, $false otherwise.]]
} }
keys { keys {
cur: ptr(const(Efl.Text.Cursor.Cursor_Data)); cur: ptr(const(Efl.Text.Cursor.Cursor));
ctype: Efl.Text.Cursor.Cursor_Type; [[The type of the cursor.]] ctype: Efl.Text.Cursor.Cursor_Type; [[The type of the cursor.]]
} }
values { values {
@ -94,122 +94,122 @@ interface Efl.Text.Cursor {
} }
cursor_new { cursor_new {
legacy: null; legacy: null;
return: ptr(Efl.Text.Cursor.Cursor_Data); return: ptr(Efl.Text.Cursor.Cursor);
} }
cursor_free { cursor_free {
legacy: null; legacy: null;
params { params {
cur: ptr(Efl.Text.Cursor.Cursor_Data); cur: ptr(Efl.Text.Cursor.Cursor);
} }
} }
cursor_equal { cursor_equal {
legacy: null; legacy: null;
params { params {
cur1: ptr(const(Efl.Text.Cursor.Cursor_Data)); cur1: ptr(const(Efl.Text.Cursor.Cursor));
cur2: ptr(const(Efl.Text.Cursor.Cursor_Data)); cur2: ptr(const(Efl.Text.Cursor.Cursor));
} }
return: bool; return: bool;
} }
cursor_compare { cursor_compare {
legacy: null; legacy: null;
params { params {
cur1: ptr(const(Efl.Text.Cursor.Cursor_Data)); cur1: ptr(const(Efl.Text.Cursor.Cursor));
cur2: ptr(const(Efl.Text.Cursor.Cursor_Data)); cur2: ptr(const(Efl.Text.Cursor.Cursor));
} }
return: int; return: int;
} }
cursor_copy { cursor_copy {
legacy: null; legacy: null;
params { params {
dst: ptr(Efl.Text.Cursor.Cursor_Data); dst: ptr(Efl.Text.Cursor.Cursor);
src: ptr(const(Efl.Text.Cursor.Cursor_Data)); src: ptr(const(Efl.Text.Cursor.Cursor));
} }
} }
cursor_char_next { cursor_char_next {
legacy: null; legacy: null;
params { params {
cur: ptr(Efl.Text.Cursor.Cursor_Data); cur: ptr(Efl.Text.Cursor.Cursor);
} }
} }
cursor_char_prev { cursor_char_prev {
legacy: null; legacy: null;
params { params {
cur: ptr(Efl.Text.Cursor.Cursor_Data); cur: ptr(Efl.Text.Cursor.Cursor);
} }
} }
cursor_paragraph_char_first { cursor_paragraph_char_first {
legacy: null; legacy: null;
params { params {
cur: ptr(Efl.Text.Cursor.Cursor_Data); cur: ptr(Efl.Text.Cursor.Cursor);
} }
} }
cursor_paragraph_char_last { cursor_paragraph_char_last {
legacy: null; legacy: null;
params { params {
cur: ptr(Efl.Text.Cursor.Cursor_Data); cur: ptr(Efl.Text.Cursor.Cursor);
} }
} }
cursor_word_start { cursor_word_start {
legacy: null; legacy: null;
params { params {
cur: ptr(Efl.Text.Cursor.Cursor_Data); cur: ptr(Efl.Text.Cursor.Cursor);
} }
} }
cursor_word_end { cursor_word_end {
legacy: null; legacy: null;
params { params {
cur: ptr(Efl.Text.Cursor.Cursor_Data); cur: ptr(Efl.Text.Cursor.Cursor);
} }
} }
cursor_line_char_first { cursor_line_char_first {
legacy: null; legacy: null;
params { params {
cur: ptr(Efl.Text.Cursor.Cursor_Data); cur: ptr(Efl.Text.Cursor.Cursor);
} }
} }
cursor_line_char_last { cursor_line_char_last {
legacy: null; legacy: null;
params { params {
cur: ptr(Efl.Text.Cursor.Cursor_Data); cur: ptr(Efl.Text.Cursor.Cursor);
} }
} }
cursor_paragraph_first { cursor_paragraph_first {
legacy: null; legacy: null;
params { params {
cur: ptr(Efl.Text.Cursor.Cursor_Data); cur: ptr(Efl.Text.Cursor.Cursor);
} }
} }
cursor_paragraph_last { cursor_paragraph_last {
legacy: null; legacy: null;
params { params {
cur: ptr(Efl.Text.Cursor.Cursor_Data); cur: ptr(Efl.Text.Cursor.Cursor);
} }
} }
cursor_paragraph_next { cursor_paragraph_next {
[[Advances to the start of the next text node]] [[Advances to the start of the next text node]]
legacy: null; legacy: null;
params { params {
cur: ptr(Efl.Text.Cursor.Cursor_Data); cur: ptr(Efl.Text.Cursor.Cursor);
} }
} }
cursor_paragraph_prev { cursor_paragraph_prev {
[[Advances to the end of the previous text node]] [[Advances to the end of the previous text node]]
legacy: null; legacy: null;
params { params {
cur: ptr(Efl.Text.Cursor.Cursor_Data); cur: ptr(Efl.Text.Cursor.Cursor);
} }
} }
cursor_line_jump_by { cursor_line_jump_by {
legacy: null; legacy: null;
params { params {
cur: ptr(Efl.Text.Cursor.Cursor_Data); cur: ptr(Efl.Text.Cursor.Cursor);
by: int; by: int;
} }
} }
cursor_coord_set { cursor_coord_set {
legacy: null; legacy: null;
params { params {
cur: ptr(Efl.Text.Cursor.Cursor_Data); cur: ptr(Efl.Text.Cursor.Cursor);
@in x: int; [[X coord to set by.]] @in x: int; [[X coord to set by.]]
@in y: int; [[Y coord to set by.]] @in y: int; [[Y coord to set by.]]
} }
@ -220,7 +220,7 @@ interface Efl.Text.Cursor {
]] ]]
legacy: null; legacy: null;
params { params {
cur: ptr(Efl.Text.Cursor.Cursor_Data); cur: ptr(Efl.Text.Cursor.Cursor);
@in text: string; [[Text to append (UTF-8 format).]] @in text: string; [[Text to append (UTF-8 format).]]
} }
return: int; [[Length of the appended text.]] return: int; [[Length of the appended text.]]
@ -229,7 +229,7 @@ interface Efl.Text.Cursor {
[[Deletes a single character from position pointed by given cursor.]] [[Deletes a single character from position pointed by given cursor.]]
legacy: null; legacy: null;
params { params {
cur: ptr(Efl.Text.Cursor.Cursor_Data); cur: ptr(Efl.Text.Cursor.Cursor);
} }
} }
} }

2
src/lib/efl/interfaces/efl_text_types.eot
View File

@ -9,5 +9,5 @@ enum Efl.Text.Bidirectional_Type {
type @extern Efl.Canvas.Text.Annotation: __undefined_type; [[EFL text annotations data structure]] type @extern Efl.Canvas.Text.Annotation: __undefined_type; [[EFL text annotations data structure]]
type @extern Efl.Text.Cursor.Cursor_Data: __undefined_type; [[Text cursor data structure]] type @extern Efl.Text.Cursor.Cursor: __undefined_type; [[Text cursor data structure]]

30
src/lib/elementary/efl_ui_internal_text_interactive.c
View File

@ -75,7 +75,7 @@ static Eina_Bool
_entry_imf_retrieve_surrounding_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, char **text, int *cursor_pos) _entry_imf_retrieve_surrounding_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, char **text, int *cursor_pos)
{ {
Efl_Canvas_Text *obj = data; Efl_Canvas_Text *obj = data;
Efl_Canvas_Text_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN); Efl_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN);
const char *str; const char *str;
if (text) if (text)
@ -177,7 +177,7 @@ static void
_entry_imf_event_preedit_changed_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info EINA_UNUSED) _entry_imf_event_preedit_changed_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info EINA_UNUSED)
{ {
Efl_Canvas_Text *obj = data; Efl_Canvas_Text *obj = data;
Efl_Canvas_Text_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN); Efl_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN);
Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS); Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
int cursor_pos; int cursor_pos;
int preedit_start_pos, preedit_end_pos; int preedit_start_pos, preedit_end_pos;
@ -330,7 +330,7 @@ static void
_entry_imf_event_delete_surrounding_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info) _entry_imf_event_delete_surrounding_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info)
{ {
Efl_Canvas_Text *obj = data; Efl_Canvas_Text *obj = data;
Efl_Canvas_Text_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN); Efl_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN);
Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS); Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
Ecore_IMF_Event_Delete_Surrounding *ev = event_info; Ecore_IMF_Event_Delete_Surrounding *ev = event_info;
Evas_Textblock_Cursor *del_start, *del_end; Evas_Textblock_Cursor *del_start, *del_end;
@ -373,7 +373,7 @@ static void
_entry_imf_event_selection_set_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info) _entry_imf_event_selection_set_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info)
{ {
Efl_Canvas_Text *obj = data; Efl_Canvas_Text *obj = data;
Efl_Canvas_Text_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN); Efl_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN);
Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS); Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
Ecore_IMF_Event_Selection *ev = event_info; Ecore_IMF_Event_Selection *ev = event_info;
@ -415,7 +415,7 @@ _entry_imf_retrieve_selection_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED,
#endif #endif
static void static void
_entry_imf_cursor_location_set(Eo *obj, Efl_Canvas_Text_Cursor *cur, Efl_Ui_Internal_Text_Interactive_Data *en) _entry_imf_cursor_location_set(Eo *obj, Efl_Text_Cursor_Cursor *cur, Efl_Ui_Internal_Text_Interactive_Data *en)
{ {
#ifdef HAVE_ECORE_IMF #ifdef HAVE_ECORE_IMF
Evas_Coord cx = 0, cy = 0, cw = 0, ch = 0; Evas_Coord cx = 0, cy = 0, cw = 0, ch = 0;
@ -460,7 +460,7 @@ _focus_in_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void
{ {
#ifdef HAVE_ECORE_IMF #ifdef HAVE_ECORE_IMF
Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS); Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
Efl_Canvas_Text_Cursor *cur; Efl_Text_Cursor_Cursor *cur;
if (!en->imf_context) return; if (!en->imf_context) return;
@ -581,7 +581,7 @@ _sel_clear(Evas_Object *o EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en
} }
static void static void
_range_del_emit(Evas_Object *obj, Efl_Canvas_Text_Cursor *cur1, Efl_Canvas_Text_Cursor *cur2) _range_del_emit(Evas_Object *obj, Efl_Text_Cursor_Cursor *cur1, Efl_Text_Cursor_Cursor *cur2)
{ {
size_t start, end; size_t start, end;
char *tmp; char *tmp;
@ -668,7 +668,7 @@ _compose_seq_reset(Efl_Ui_Internal_Text_Interactive_Data *en)
* movement_forward: if the movement we are going to do is forward (towards the end of the textblock) * movement_forward: if the movement we are going to do is forward (towards the end of the textblock)
*/ */
static void static void
_key_down_sel_pre(Efl_Ui_Internal_Text_Interactive *obj, Efl_Canvas_Text_Cursor *cur, Efl_Ui_Internal_Text_Interactive_Data *en, Eina_Bool shift, Eina_Bool movement_forward) _key_down_sel_pre(Efl_Ui_Internal_Text_Interactive *obj, Efl_Text_Cursor_Cursor *cur, Efl_Ui_Internal_Text_Interactive_Data *en, Eina_Bool shift, Eina_Bool movement_forward)
{ {
if (en->select_allow) if (en->select_allow)
{ {
@ -689,7 +689,7 @@ _key_down_sel_pre(Efl_Ui_Internal_Text_Interactive *obj, Efl_Canvas_Text_Cursor
} }
static void static void
_key_down_sel_post(Efl_Ui_Internal_Text_Interactive *obj, Efl_Canvas_Text_Cursor *cur, Efl_Ui_Internal_Text_Interactive_Data *en, Eina_Bool shift) _key_down_sel_post(Efl_Ui_Internal_Text_Interactive *obj, Efl_Text_Cursor_Cursor *cur, Efl_Ui_Internal_Text_Interactive_Data *en, Eina_Bool shift)
{ {
if (en->select_allow) if (en->select_allow)
{ {
@ -702,7 +702,7 @@ static void
_key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info) _key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info)
{ {
Evas_Event_Key_Down *ev = event_info; Evas_Event_Key_Down *ev = event_info;
Efl_Canvas_Text_Cursor *cur; Efl_Text_Cursor_Cursor *cur;
Eina_Bool control, alt, shift; Eina_Bool control, alt, shift;
#if defined(__APPLE__) && defined(__MACH__) #if defined(__APPLE__) && defined(__MACH__)
Eina_Bool super, altgr; Eina_Bool super, altgr;
@ -1057,7 +1057,7 @@ end:
} }
static void static void
_cursor_char_coord_set(Efl_Canvas_Text *obj, Efl_Canvas_Text_Cursor *cur, Evas_Coord canvasx, Evas_Coord canvasy, Evas_Coord *_cx, Evas_Coord *_cy) _cursor_char_coord_set(Efl_Canvas_Text *obj, Efl_Text_Cursor_Cursor *cur, Evas_Coord canvasx, Evas_Coord canvasy, Evas_Coord *_cx, Evas_Coord *_cy)
{ {
Evas_Coord cx, cy; Evas_Coord cx, cy;
Evas_Coord x, y, lh = 0, cly = 0; Evas_Coord x, y, lh = 0, cly = 0;
@ -1099,7 +1099,7 @@ _mouse_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EIN
Evas_Coord cx, cy; Evas_Coord cx, cy;
Evas_Event_Mouse_Down *ev = event_info; Evas_Event_Mouse_Down *ev = event_info;
Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS); Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
Efl_Canvas_Text_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN); Efl_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN);
Evas_Textblock_Cursor *tc = NULL; Evas_Textblock_Cursor *tc = NULL;
Eina_Bool dosel = EINA_FALSE; Eina_Bool dosel = EINA_FALSE;
Eina_Bool shift; Eina_Bool shift;
@ -1210,7 +1210,7 @@ _mouse_up_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void
{ {
Evas_Coord cx, cy; Evas_Coord cx, cy;
Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS); Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
Efl_Canvas_Text_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN); Efl_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN);
Evas_Event_Mouse_Up *ev = event_info; Evas_Event_Mouse_Up *ev = event_info;
if ((!ev) || (ev->button != 1)) return; if ((!ev) || (ev->button != 1)) return;
@ -1251,7 +1251,7 @@ _mouse_move_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, vo
{ {
Evas_Coord cx, cy; Evas_Coord cx, cy;
Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS); Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
Efl_Canvas_Text_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN); Efl_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN);
Evas_Event_Mouse_Move *ev = event_info; Evas_Event_Mouse_Move *ev = event_info;
Evas_Coord x, y, w, h; Evas_Coord x, y, w, h;
Evas_Textblock_Cursor *tc; Evas_Textblock_Cursor *tc;
@ -1408,7 +1408,7 @@ _efl_ui_internal_text_interactive_efl_ui_text_interactive_selection_allowed_get(
} }
EOLIAN static void EOLIAN static void
_efl_ui_internal_text_interactive_efl_ui_text_interactive_selection_cursors_get(Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *pd, Efl_Canvas_Text_Cursor **start, Evas_Textblock_Cursor **end) _efl_ui_internal_text_interactive_efl_ui_text_interactive_selection_cursors_get(Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *pd, Efl_Text_Cursor_Cursor **start, Evas_Textblock_Cursor **end)
{ {
if (start) *start = pd->sel_start; if (start) *start = pd->sel_start;
if (end) *end = pd->sel_end; if (end) *end = pd->sel_end;

42
src/lib/elementary/efl_ui_text.c
View File

@ -76,7 +76,7 @@ struct _Efl_Ui_Text_Data
Elm_Input_Panel_Lang input_panel_lang; Elm_Input_Panel_Lang input_panel_lang;
Elm_Input_Panel_Return_Key_Type input_panel_return_key_type; Elm_Input_Panel_Return_Key_Type input_panel_return_key_type;
Elm_Input_Hints input_hints; Elm_Input_Hints input_hints;
Efl_Canvas_Text_Cursor *sel_handler_cursor; Efl_Text_Cursor_Cursor *sel_handler_cursor;
void *input_panel_imdata; void *input_panel_imdata;
int input_panel_imdata_len; int input_panel_imdata_len;
int input_panel_layout_variation; int input_panel_layout_variation;
@ -564,7 +564,7 @@ _update_selection_handler(Eo *obj)
Eina_Rectangle *rect; Eina_Rectangle *rect;
Evas_Coord hx, hy; Evas_Coord hx, hy;
Eina_Bool hidden = EINA_FALSE; Eina_Bool hidden = EINA_FALSE;
Efl_Canvas_Text_Cursor *sel_start, *sel_end; Efl_Text_Cursor_Cursor *sel_start, *sel_end;
efl_ui_text_interactive_selection_cursors_get(obj, &sel_start, &sel_end); efl_ui_text_interactive_selection_cursors_get(obj, &sel_start, &sel_end);
@ -757,7 +757,7 @@ _selection_data_cb(void *data EINA_UNUSED,
} }
else else
{ {
Efl_Canvas_Text_Cursor *cur, *start, *end; Efl_Text_Cursor_Cursor *cur, *start, *end;
efl_ui_text_interactive_selection_cursors_get(obj, &start, &end); efl_ui_text_interactive_selection_cursors_get(obj, &start, &end);
if (!efl_text_cursor_equal(obj, start, end)) if (!efl_text_cursor_equal(obj, start, end))
{ {
@ -1048,7 +1048,7 @@ _cursor_geometry_recalc(Evas_Object *obj)
x2 = y2 = w2 = h2 = 0; x2 = y2 = w2 = h2 = 0;
x = y = w = h = 0; x = y = w = h = 0;
Efl_Canvas_Text_Cursor *main_cur = Efl_Text_Cursor_Cursor *main_cur =
efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN); efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN);
efl_text_cursor_geometry_get(obj, main_cur, efl_text_cursor_geometry_get(obj, main_cur,
@ -1466,7 +1466,7 @@ _selection_store(Elm_Sel_Type seltype,
Evas_Object *obj) Evas_Object *obj)
{ {
char *sel; char *sel;
Efl_Canvas_Text_Cursor *start, *end; Efl_Text_Cursor_Cursor *start, *end;
Elm_Sel_Format format = ELM_SEL_FORMAT_TEXT; Elm_Sel_Format format = ELM_SEL_FORMAT_TEXT;
EFL_UI_TEXT_DATA_GET(obj, sd); EFL_UI_TEXT_DATA_GET(obj, sd);
@ -1488,7 +1488,7 @@ _selection_store(Elm_Sel_Type seltype,
static void static void
_cut_cb(Eo *obj) _cut_cb(Eo *obj)
{ {
Efl_Canvas_Text_Cursor *start, *end; Efl_Text_Cursor_Cursor *start, *end;
EFL_UI_TEXT_DATA_GET(obj, sd); EFL_UI_TEXT_DATA_GET(obj, sd);
efl_event_callback_legacy_call efl_event_callback_legacy_call
@ -2807,8 +2807,8 @@ _start_handler_mouse_down_cb(void *data,
Evas_Event_Mouse_Down *ev = event_info; Evas_Event_Mouse_Down *ev = event_info;
int start_pos, end_pos, pos; int start_pos, end_pos, pos;
Efl_Canvas_Text_Cursor *sel_start, *sel_end; Efl_Text_Cursor_Cursor *sel_start, *sel_end;
Efl_Canvas_Text_Cursor *main_cur; Efl_Text_Cursor_Cursor *main_cur;
Eo *text_obj = edje_object_part_swallow_get(sd->entry_edje, "elm.text"); Eo *text_obj = edje_object_part_swallow_get(sd->entry_edje, "elm.text");
@ -2893,8 +2893,8 @@ _end_handler_mouse_down_cb(void *data,
EFL_UI_TEXT_DATA_GET(data, sd); EFL_UI_TEXT_DATA_GET(data, sd);
Evas_Event_Mouse_Down *ev = event_info; Evas_Event_Mouse_Down *ev = event_info;
Efl_Canvas_Text_Cursor *sel_start, *sel_end; Efl_Text_Cursor_Cursor *sel_start, *sel_end;
Efl_Canvas_Text_Cursor *main_cur; Efl_Text_Cursor_Cursor *main_cur;
int pos, start_pos, end_pos; int pos, start_pos, end_pos;
sd->end_handler_down = EINA_TRUE; sd->end_handler_down = EINA_TRUE;
@ -3435,7 +3435,7 @@ _efl_ui_text_calc_force(Eo *obj, Efl_Ui_Text_Data *sd)
static const char* static const char*
_efl_ui_text_selection_get(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd) _efl_ui_text_selection_get(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd)
{ {
Efl_Canvas_Text_Cursor *start_obj, *end_obj; Efl_Text_Cursor_Cursor *start_obj, *end_obj;
if ((sd->password)) return NULL; if ((sd->password)) return NULL;
@ -3459,7 +3459,7 @@ _efl_ui_text_selection_handler_disabled_get(Eo *obj EINA_UNUSED, Efl_Ui_Text_Dat
static void static void
_efl_ui_text_entry_insert(Eo *obj, Efl_Ui_Text_Data *sd, const char *entry) _efl_ui_text_entry_insert(Eo *obj, Efl_Ui_Text_Data *sd, const char *entry)
{ {
Efl_Canvas_Text_Cursor *cur_obj = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN); Efl_Text_Cursor_Cursor *cur_obj = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN);
efl_text_cursor_text_insert(obj, cur_obj, entry); efl_text_cursor_text_insert(obj, cur_obj, entry);
sd->changed = EINA_TRUE; sd->changed = EINA_TRUE;
elm_layout_sizing_eval(obj); elm_layout_sizing_eval(obj);
@ -3524,7 +3524,7 @@ _efl_ui_text_select_none(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd)
static void static void
_efl_ui_text_select_region_set(Eo *obj, Efl_Ui_Text_Data *sd, int start, int end) _efl_ui_text_select_region_set(Eo *obj, Efl_Ui_Text_Data *sd, int start, int end)
{ {
Efl_Canvas_Text_Cursor *sel_start, *sel_end; Efl_Text_Cursor_Cursor *sel_start, *sel_end;
if ((sd->password)) return; if ((sd->password)) return;
@ -4503,7 +4503,7 @@ _efl_ui_text_elm_interface_atspi_text_default_attributes_get(Eo *obj, Efl_Ui_Tex
{ {
Eina_List *ret = NULL; Eina_List *ret = NULL;
Elm_Atspi_Text_Attribute *attr; Elm_Atspi_Text_Attribute *attr;
Efl_Canvas_Text_Cursor *start, *end; Efl_Text_Cursor_Cursor *start, *end;
Eina_Iterator *annotations; Eina_Iterator *annotations;
Efl_Canvas_Text_Annotation *an; Efl_Canvas_Text_Annotation *an;
@ -4537,7 +4537,7 @@ _efl_ui_text_elm_interface_atspi_text_editable_content_set(Eo *obj, Efl_Ui_Text_
EOLIAN static Eina_Bool EOLIAN static Eina_Bool
_efl_ui_text_elm_interface_atspi_text_editable_insert(Eo *obj, Efl_Ui_Text_Data *pd, const char *string, int position) _efl_ui_text_elm_interface_atspi_text_editable_insert(Eo *obj, Efl_Ui_Text_Data *pd, const char *string, int position)
{ {
Efl_Canvas_Text_Cursor *cur_obj = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN); Efl_Text_Cursor_Cursor *cur_obj = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN);
efl_text_cursor_position_set(obj, cur_obj, position); efl_text_cursor_position_set(obj, cur_obj, position);
_efl_ui_text_entry_insert(obj, pd, string); _efl_ui_text_entry_insert(obj, pd, string);
@ -4587,7 +4587,7 @@ _efl_ui_text_elm_interface_atspi_text_editable_delete(Eo *obj, Efl_Ui_Text_Data
EOLIAN static Eina_Bool EOLIAN static Eina_Bool
_efl_ui_text_elm_interface_atspi_text_editable_paste(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, int position) _efl_ui_text_elm_interface_atspi_text_editable_paste(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, int position)
{ {
Efl_Canvas_Text_Cursor *cur_obj = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN); Efl_Text_Cursor_Cursor *cur_obj = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN);
efl_text_cursor_position_set(obj, cur_obj, position); efl_text_cursor_position_set(obj, cur_obj, position);
efl_ui_text_selection_paste(obj); efl_ui_text_selection_paste(obj);
return EINA_TRUE; return EINA_TRUE;
@ -4623,7 +4623,7 @@ _efl_ui_text_elm_interface_atspi_accessible_name_get(Eo *obj, Efl_Ui_Text_Data *
return ret; return ret;
} }
EOLIAN static Efl_Canvas_Text_Cursor * EOLIAN static Efl_Text_Cursor_Cursor *
_efl_ui_text_cursor_new(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd EINA_UNUSED) _efl_ui_text_cursor_new(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd EINA_UNUSED)
{ {
Eo *text_obj = edje_object_part_swallow_get(sd->entry_edje, "elm.text"); Eo *text_obj = edje_object_part_swallow_get(sd->entry_edje, "elm.text");
@ -4750,7 +4750,7 @@ static void
_update_text_selection(Eo *obj, Eo *text_obj) _update_text_selection(Eo *obj, Eo *text_obj)
{ {
Evas_Coord x, y; Evas_Coord x, y;
Efl_Canvas_Text_Cursor *sel_start, *sel_end; Efl_Text_Cursor_Cursor *sel_start, *sel_end;
Eina_List *l; Eina_List *l;
Eina_Iterator *range; Eina_Iterator *range;
@ -4982,7 +4982,7 @@ _anchors_create(Eo *obj, Efl_Ui_Text_Data *sd)
{ {
Eina_Iterator *it; Eina_Iterator *it;
Anchor *an = NULL; Anchor *an = NULL;
Efl_Canvas_Text_Cursor *start, *end; Efl_Text_Cursor_Cursor *start, *end;
Efl_Canvas_Text_Annotation *anchor; Efl_Canvas_Text_Annotation *anchor;
Eo *text_obj = edje_object_part_swallow_get(sd->entry_edje, "elm.text"); Eo *text_obj = edje_object_part_swallow_get(sd->entry_edje, "elm.text");
@ -5135,7 +5135,7 @@ _anchors_update(Eo *o, Efl_Ui_Text_Data *sd)
else else
{ {
Eina_Iterator *range; Eina_Iterator *range;
Efl_Canvas_Text_Cursor *start, *end; Efl_Text_Cursor_Cursor *start, *end;
Eina_List *range_list; Eina_List *range_list;
Eina_Rectangle *r; Eina_Rectangle *r;
@ -5326,7 +5326,7 @@ static void
_efl_ui_text_selection_changed_cb(void *data, const Efl_Event *event EINA_UNUSED) _efl_ui_text_selection_changed_cb(void *data, const Efl_Event *event EINA_UNUSED)
{ {
Eo *obj = data; Eo *obj = data;
Efl_Canvas_Text_Cursor *start, *end; Efl_Text_Cursor_Cursor *start, *end;
char *text; char *text;
EFL_UI_TEXT_DATA_GET(obj, sd); EFL_UI_TEXT_DATA_GET(obj, sd);

2
src/lib/elementary/efl_ui_text.eo
View File

@ -393,7 +393,7 @@ class Efl.Ui.Text (Elm.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
} }
cursor_new { cursor_new {
[[Creates and returns a new cursor for the text.]] [[Creates and returns a new cursor for the text.]]
return: ptr(Efl.Text.Cursor.Cursor_Data); [[Text cursor]] return: ptr(Efl.Text.Cursor.Cursor); [[Text cursor]]
} }
} }
implements { implements {

4
src/lib/elementary/efl_ui_text_interactive.eo
View File

@ -36,8 +36,8 @@ interface Efl.Ui.Text.Interactive (Efl.Text, Efl.Text.Font,
]] ]]
get {} get {}
values { values {
start: ptr(Efl.Text.Cursor.Cursor_Data); [[The start of the selection]] start: ptr(Efl.Text.Cursor.Cursor); [[The start of the selection]]
end: ptr(Efl.Text.Cursor.Cursor_Data); [[The end of the selection]] end: ptr(Efl.Text.Cursor.Cursor); [[The end of the selection]]
} }
} }
@property editable { @property editable {

20
src/lib/evas/canvas/efl_canvas_text.eo
View File

@ -31,8 +31,8 @@ Efl.Text.Font, Efl.Text.Style, Efl.Text.Format, Efl.Text.Cursor, Efl.Text.Annota
]] ]]
return: bool; [[$true on success, $false otherwise]] return: bool; [[$true on success, $false otherwise]]
params { params {
@in start: ptr(Efl.Text.Cursor.Cursor_Data); [[Range start position]] @in start: ptr(Efl.Text.Cursor.Cursor); [[Range start position]]
@in end: ptr(Efl.Text.Cursor.Cursor_Data); [[Range end position]] @in end: ptr(Efl.Text.Cursor.Cursor); [[Range end position]]
} }
} }
@property style_insets { @property style_insets {
@ -161,8 +161,8 @@ Efl.Text.Font, Efl.Text.Style, Efl.Text.Format, Efl.Text.Cursor, Efl.Text.Annota
legacy: null; legacy: null;
return: own(ptr(char)); [[The text in the given range]] return: own(ptr(char)); [[The text in the given range]]
params { params {
@in cur1: const(ptr(Efl.Text.Cursor.Cursor_Data)); [[Start of range]] @in cur1: const(ptr(Efl.Text.Cursor.Cursor)); [[Start of range]]
@in cur2: const(ptr(Efl.Text.Cursor.Cursor_Data)); [[End of range]] @in cur2: const(ptr(Efl.Text.Cursor.Cursor)); [[End of range]]
} }
} }
range_geometry_get { range_geometry_get {
@ -175,8 +175,8 @@ Efl.Text.Font, Efl.Text.Style, Efl.Text.Format, Efl.Text.Cursor, Efl.Text.Annota
]] ]]
legacy: null; legacy: null;
params { params {
@in cur1: const(ptr(Efl.Text.Cursor.Cursor_Data)); [[Start of range]] @in cur1: const(ptr(Efl.Text.Cursor.Cursor)); [[Start of range]]
@in cur2: const(ptr(Efl.Text.Cursor.Cursor_Data)); [[End of range]] @in cur2: const(ptr(Efl.Text.Cursor.Cursor)); [[End of range]]
} }
return: free(own(iterator<Eina.Rectangle>), return: free(own(iterator<Eina.Rectangle>),
eina_iterator_free); [[Iterator on all geoemtries of eina_iterator_free); [[Iterator on all geoemtries of
@ -193,8 +193,8 @@ Efl.Text.Font, Efl.Text.Style, Efl.Text.Format, Efl.Text.Cursor, Efl.Text.Annota
]] ]]
legacy: null; legacy: null;
params { params {
@in cur1: ptr(const(Efl.Text.Cursor.Cursor_Data)); [[Start of range]] @in cur1: ptr(const(Efl.Text.Cursor.Cursor)); [[Start of range]]
@in cur2: ptr(const(Efl.Text.Cursor.Cursor_Data)); [[End of range]] @in cur2: ptr(const(Efl.Text.Cursor.Cursor)); [[End of range]]
} }
return: free(own(iterator<Eina.Rectangle>), return: free(own(iterator<Eina.Rectangle>),
eina_iterator_free); [[Iterator on all simple eina_iterator_free); [[Iterator on all simple
@ -207,8 +207,8 @@ Efl.Text.Font, Efl.Text.Style, Efl.Text.Format, Efl.Text.Cursor, Efl.Text.Annota
]] ]]
legacy: null; legacy: null;
params { params {
@in cur1: ptr(Efl.Text.Cursor.Cursor_Data); [[Range start position]] @in cur1: ptr(Efl.Text.Cursor.Cursor); [[Range start position]]
@in cur2: ptr(Efl.Text.Cursor.Cursor_Data); [[Range end position]] @in cur2: ptr(Efl.Text.Cursor.Cursor); [[Range end position]]
} }
} }
// Obstacles // Obstacles

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

File diff suppressed because it is too large Load Diff

11
src/lib/evas/canvas/evas_textblock_legacy.h
View File

@ -146,8 +146,7 @@ typedef struct _Efl_Canvas_Text_Style Evas_Textblock_Style;
* @see evas_object_textblock_cursor_new * @see evas_object_textblock_cursor_new
* *
*/ */
typedef struct _Efl_Text_Cursor_Cursor_Data Evas_Textblock_Cursor; typedef struct _Efl_Text_Cursor_Cursor Evas_Textblock_Cursor;
typedef struct _Efl_Text_Cursor_Cursor_Data Efl_Canvas_Text_Cursor;
/** /**
* @typedef Evas_Object_Textblock_Node_Format * @typedef Evas_Object_Textblock_Node_Format
@ -584,8 +583,6 @@ EAPI Eina_Bool evas_textblock_cursor_eol_get(cons
* @brief Advances the cursor one char backwards. * @brief Advances the cursor one char backwards.
* *
* @return @c true on success, @c false otherwise. * @return @c true on success, @c false otherwise.
*
* @ingroup Efl_Canvas_Text_Cursor
*/ */
EAPI Eina_Bool evas_textblock_cursor_char_prev(Evas_Textblock_Cursor *obj); EAPI Eina_Bool evas_textblock_cursor_char_prev(Evas_Textblock_Cursor *obj);
@ -850,8 +847,6 @@ EAPI Evas_Textblock_Cursor *evas_object_textblock_cursor_new(const Evas_Object *
* @param[in] y y coord to set by. * @param[in] y y coord to set by.
* *
* @return @c true on success, @c false otherwise. * @return @c true on success, @c false otherwise.
*
* @ingroup Efl_Canvas_Text_Cursor
*/ */
EAPI Eina_Bool evas_textblock_cursor_char_coord_set(Evas_Textblock_Cursor *obj, Evas_Coord x, Evas_Coord y); EAPI Eina_Bool evas_textblock_cursor_char_coord_set(Evas_Textblock_Cursor *obj, Evas_Coord x, Evas_Coord y);
@ -970,10 +965,8 @@ EAPI int evas_textblock_cursor_compare(const Evas_Textblock_Cursor *cur1, const
* @return @c true if equal * @return @c true if equal
* *
* @since 1.18 * @since 1.18
*
* @ingroup Efl_Canvas_Text_Cursor
*/ */
EAPI Eina_Bool evas_textblock_cursor_equal(const Efl_Canvas_Text_Cursor *obj, const Efl_Canvas_Text_Cursor *cur); EAPI Eina_Bool evas_textblock_cursor_equal(const Evas_Textblock_Cursor *obj, const Evas_Textblock_Cursor *cur);
/** /**
* Go to the start of the current line * Go to the start of the current line

4
src/tests/evas/evas_test_textblock.c
View File

@ -4157,7 +4157,7 @@ _test_check_annotation(Evas_Object *tb,
size_t len, const char **formats) size_t len, const char **formats)
{ {
Efl_Canvas_Text_Annotation *an; Efl_Canvas_Text_Annotation *an;
Efl_Canvas_Text_Cursor *start, *end; Efl_Text_Cursor_Cursor *start, *end;
start = evas_object_textblock_cursor_new(tb); start = evas_object_textblock_cursor_new(tb);
end = evas_object_textblock_cursor_new(tb); end = evas_object_textblock_cursor_new(tb);
@ -4197,7 +4197,7 @@ START_TEST(evas_textblock_annotation)
{ {
START_TB_TEST(); START_TB_TEST();
Efl_Canvas_Text_Annotation *an, *an2; Efl_Canvas_Text_Annotation *an, *an2;
Efl_Canvas_Text_Cursor *start, *end; Efl_Text_Cursor_Cursor *start, *end;
start = evas_object_textblock_cursor_new(tb); start = evas_object_textblock_cursor_new(tb);
end = evas_object_textblock_cursor_new(tb); end = evas_object_textblock_cursor_new(tb);