struct _Elm_Entry_Text_Filter
{
- void (*func) (void *data, Evas_Object *entry, char **text);
+ Elm_Entry_Filter_Cb func;
void *data;
};
static const char SIG_LONGPRESSED[] = "longpressed";
static const char SIG_CLICKED[] = "clicked";
static const char SIG_CLICKED_DOUBLE[] = "clicked,double";
+static const char SIG_CLICKED_TRIPLE[] = "clicked,triple";
static const char SIG_FOCUSED[] = "focused";
static const char SIG_UNFOCUSED[] = "unfocused";
static const char SIG_SELECTION_PASTE[] = "selection,paste";
static const char SIG_SELECTION_CLEARED[] = "selection,cleared";
static const char SIG_CURSOR_CHANGED[] = "cursor,changed";
static const char SIG_ANCHOR_CLICKED[] = "anchor,clicked";
+static const char SIG_ANCHOR_DOWN[] = "anchor,down";
+static const char SIG_ANCHOR_UP[] = "anchor,up";
+static const char SIG_ANCHOR_IN[] = "anchor,in";
+static const char SIG_ANCHOR_OUT[] = "anchor,out";
static const char SIG_PREEDIT_CHANGED[] = "preedit,changed";
static const Evas_Smart_Cb_Description _signals[] = {
{SIG_CHANGED, ""},
{SIG_LONGPRESSED, ""},
{SIG_CLICKED, ""},
{SIG_CLICKED_DOUBLE, ""},
+ {SIG_CLICKED_TRIPLE, ""},
{SIG_FOCUSED, ""},
{SIG_UNFOCUSED, ""},
{SIG_SELECTION_PASTE, ""},
{SIG_SELECTION_CLEARED, ""},
{SIG_CURSOR_CHANGED, ""},
{SIG_ANCHOR_CLICKED, ""},
+ {SIG_ANCHOR_DOWN, ""},
+ {SIG_ANCHOR_UP, ""},
+ {SIG_ANCHOR_IN, ""},
+ {SIG_ANCHOR_OUT, ""},
{SIG_PREEDIT_CHANGED, ""},
{NULL, NULL}
};
}
static Elm_Entry_Text_Filter *
-_filter_new(void (*func) (void *data, Evas_Object *entry, char **text), void *data)
+_filter_new(Elm_Entry_Filter_Cb func, void *data)
{
Elm_Entry_Text_Filter *tf = ELM_NEW(Elm_Entry_Text_Filter);
if (!tf) return NULL;
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return;
evas_object_smart_callback_call(obj, SIG_CURSOR_CHANGED, NULL);
+ if (!elm_object_focus_get(obj)) return;
if (!wd->deferred_recalc_job)
{
Evas_Coord cx, cy, cw, ch;
}
}
- if (wd->deferred_cur)
+ if ((wd->deferred_cur) && (elm_object_focus_get(data)))
{
Evas_Coord cx, cy, cw, ch;
edje_object_part_text_cursor_geometry_get(wd->ent, "elm.text",
if (!wd) return;
sel = edje_object_part_text_selection_get(wd->ent, "elm.text");
+ if ((!sel) || (!sel[0])) return; /* avoid deleting our own selection */
elm_selection_set(seltype, obj, ELM_SEL_FORMAT_MARKUP, sel);
if (seltype == ELM_SEL_CLIPBOARD)
eina_stringshare_replace(&wd->cut_sel, sel);
_store_selection(ELM_SEL_CLIPBOARD, data);
edje_object_part_text_insert(wd->ent, "elm.text", "");
edje_object_part_text_select_none(wd->ent, "elm.text");
+ _sizing_eval(data);
}
static void
}
static void
+_signal_selection_all(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
+{
+ Widget_Data *wd = elm_widget_data_get(data);
+ if (!wd) return;
+ elm_entry_select_all(data);
+}
+
+static void
+_signal_selection_none(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
+{
+ Widget_Data *wd = elm_widget_data_get(data);
+ if (!wd) return;
+ elm_entry_select_none(data);
+}
+
+static void
_signal_selection_changed(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
{
Widget_Data *wd = elm_widget_data_get(data);
if (!wd) return;
wd->have_selection = EINA_TRUE;
evas_object_smart_callback_call(data, SIG_SELECTION_CHANGED, NULL);
- elm_selection_set(ELM_SEL_PRIMARY, obj, ELM_SEL_FORMAT_MARKUP,
- elm_entry_selection_get(data));
+ _store_selection(ELM_SEL_PRIMARY, data);
}
static void
}
static void
-_signal_entry_paste_request(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
+_signal_entry_paste_request(void *data, Evas_Object *obj __UNUSED__, const char *emission, const char *source __UNUSED__)
{
Widget_Data *wd = elm_widget_data_get(data);
+ Elm_Sel_Type type = (emission[sizeof("ntry,paste,request,")] == '1') ? ELM_SEL_PRIMARY : ELM_SEL_CLIPBOARD;
if (!wd) return;
evas_object_smart_callback_call(data, SIG_SELECTION_PASTE, NULL);
if (wd->sel_notify_handler)
if ((top) && (elm_win_xwindow_get(top)))
{
wd->selection_asked = EINA_TRUE;
- elm_selection_get(ELM_SEL_CLIPBOARD, ELM_SEL_FORMAT_MARKUP, data,
+ elm_selection_get(type, ELM_SEL_FORMAT_MARKUP, data,
NULL, NULL);
}
#endif
static void
_signal_entry_copy_notify(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
{
- Widget_Data *wd = elm_widget_data_get(data);
- if (!wd) return;
- evas_object_smart_callback_call(data, SIG_SELECTION_COPY, NULL);
- elm_selection_set(ELM_SEL_CLIPBOARD, obj, ELM_SEL_FORMAT_MARKUP,
- elm_entry_selection_get(data));
+ _copy(data, NULL, NULL);
}
static void
_signal_entry_cut_notify(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
{
- Widget_Data *wd = elm_widget_data_get(data);
- if (!wd) return;
- evas_object_smart_callback_call(data, SIG_SELECTION_CUT, NULL);
- elm_selection_set(ELM_SEL_CLIPBOARD, obj, ELM_SEL_FORMAT_MARKUP,
- elm_entry_selection_get(data));
- edje_object_part_text_insert(wd->ent, "elm.text", "");
- wd->changed = EINA_TRUE;
- _sizing_eval(data);
+ _cut(data, NULL, NULL);
}
static void
}
static void
+_signal_anchor_geoms_do_things_with(Widget_Data *wd, Elm_Entry_Anchor_Info *ei)
+{
+ const Eina_List *geoms, *l;
+ Evas_Textblock_Rectangle *r;
+ Evas_Coord px, py, x, y;
+
+ geoms = edje_object_part_text_anchor_geometry_get(wd->ent, "elm.text", ei->name);
+ if (!geoms) return;
+
+
+ evas_object_geometry_get(wd->ent, &x, &y, NULL, NULL);
+ evas_pointer_canvas_xy_get(evas_object_evas_get(wd->ent), &px, &py);
+ EINA_LIST_FOREACH(geoms, l, r)
+ {
+ if (((r->x + x) <= px) && ((r->y + y) <= py) &&
+ ((r->x + x + r->w) > px) && ((r->y + y + r->h) > py))
+ {
+ ei->x = r->x + x;
+ ei->y = r->y + y;
+ ei->w = r->w;
+ ei->h = r->h;
+ break;
+ }
+ }
+}
+
+static void
_signal_anchor_down(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
{
Widget_Data *wd = elm_widget_data_get(data);
+ Elm_Entry_Anchor_Info ei;
+ const char *p;
+ char *p2;
if (!wd) return;
+ p = emission + sizeof("nchor,mouse,down,");
+ ei.button = strtol(p, &p2, 10);
+ ei.name = p2;
+ ei.x = ei.y = ei.w = ei.h = 0;
+
+ _signal_anchor_geoms_do_things_with(wd, &ei);
+
+ if (!wd->disabled)
+ evas_object_smart_callback_call(data, SIG_ANCHOR_DOWN, &ei);
}
static void
_signal_anchor_up(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
{
Widget_Data *wd = elm_widget_data_get(data);
+ Elm_Entry_Anchor_Info ei;
+ const char *p;
+ char *p2;
if (!wd) return;
+ p = emission + sizeof("nchor,mouse,up,");
+ ei.button = strtol(p, &p2, 10);
+ ei.name = p2;
+ ei.x = ei.y = ei.w = ei.h = 0;
+
+ _signal_anchor_geoms_do_things_with(wd, &ei);
+
+ if (!wd->disabled)
+ evas_object_smart_callback_call(data, SIG_ANCHOR_UP, &ei);
}
static void
{
Widget_Data *wd = elm_widget_data_get(data);
Elm_Entry_Anchor_Info ei;
- char *buf2, *p, *p2, *n;
- const Eina_List *geoms;
+ const char *p;
+ char *p2;
if (!wd) return;
- p = strrchr(emission, ',');
- if (!p) return;
-
- n = p + 1;
- p2 = p -1;
- while (p2 >= emission)
- {
- if (*p2 == ',') break;
- p2--;
- }
- p2++;
- buf2 = alloca(5 + p - p2);
- strncpy(buf2, p2, p - p2);
- buf2[p - p2] = 0;
- ei.name = n;
- ei.button = atoi(buf2);
+ p = emission + sizeof("nchor,mouse,clicked,");
+ ei.button = strtol(p, &p2, 10);
+ ei.name = p2;
ei.x = ei.y = ei.w = ei.h = 0;
- geoms =
- edje_object_part_text_anchor_geometry_get(wd->ent, "elm.text", ei.name);
- if (geoms)
- {
- Evas_Textblock_Rectangle *r;
- const Eina_List *l;
- Evas_Coord px, py, x, y;
- evas_object_geometry_get(wd->ent, &x, &y, NULL, NULL);
- evas_pointer_canvas_xy_get(evas_object_evas_get(wd->ent), &px, &py);
- EINA_LIST_FOREACH(geoms, l, r)
- {
- if (((r->x + x) <= px) && ((r->y + y) <= py) &&
- ((r->x + x + r->w) > px) && ((r->y + y + r->h) > py))
- {
- ei.x = r->x + x;
- ei.y = r->y + y;
- ei.w = r->w;
- ei.h = r->h;
- break;
- }
- }
- }
+ _signal_anchor_geoms_do_things_with(wd, &ei);
+
if (!wd->disabled)
evas_object_smart_callback_call(data, SIG_ANCHOR_CLICKED, &ei);
}
_signal_anchor_in(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
{
Widget_Data *wd = elm_widget_data_get(data);
+ Elm_Entry_Anchor_Info ei;
if (!wd) return;
+ ei.name = emission + sizeof("nchor,mouse,in,");
+ ei.button = 0;
+ ei.x = ei.y = ei.w = ei.h = 0;
+
+ _signal_anchor_geoms_do_things_with(wd, &ei);
+
+ if (!wd->disabled)
+ evas_object_smart_callback_call(data, SIG_ANCHOR_IN, &ei);
}
static void
_signal_anchor_out(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
{
Widget_Data *wd = elm_widget_data_get(data);
+ Elm_Entry_Anchor_Info ei;
if (!wd) return;
+ ei.name = emission + sizeof("nchor,mouse,out,");
+ ei.button = 0;
+ ei.x = ei.y = ei.w = ei.h = 0;
+
+ _signal_anchor_geoms_do_things_with(wd, &ei);
+
+ if (!wd->disabled)
+ evas_object_smart_callback_call(data, SIG_ANCHOR_OUT, &ei);
}
static void
evas_object_smart_callback_call(data, SIG_CLICKED_DOUBLE, NULL);
}
+static void
+_signal_mouse_triple(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
+{
+ Widget_Data *wd = elm_widget_data_get(data);
+ if (!wd) return;
+ evas_object_smart_callback_call(data, SIG_CLICKED_TRIPLE, NULL);
+}
+
#ifdef HAVE_ELEMENTARY_X
static Eina_Bool
_event_selection_notify(void *data, int type __UNUSED__, void *event)
ERR("text=NULL for edje %p, part 'elm.text'", wd->ent);
return NULL;
}
- eina_stringshare_replace(&wd->text, text);
+
+ if (wd->append_text_len > 0)
+ {
+ char *tmpbuf;
+ size_t tlen;
+ tlen = strlen(text);
+ tmpbuf = malloc(tlen + wd->append_text_len + 1);
+ if (!tmpbuf)
+ {
+ ERR("Failed to allocate memory for entry's text %p", obj);
+ return NULL;
+ }
+ memcpy(tmpbuf, text, tlen);
+ memcpy(tmpbuf + tlen, wd->append_text_left, wd->append_text_len);
+ tmpbuf[tlen + wd->append_text_len] = '\0';
+ eina_stringshare_replace(&wd->text, tmpbuf);
+ free(tmpbuf);
+ }
+ else
+ {
+ eina_stringshare_replace(&wd->text, text);
+ }
return wd->text;
}
evas_object_size_hint_align_set(wd->scroller, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_smart_scroller_bounce_allow_set(wd->scroller, EINA_FALSE, EINA_FALSE);
evas_object_propagate_events_set(wd->scroller, EINA_TRUE);
+ evas_object_propagate_events_set(elm_smart_scroller_edje_object_get(
+ wd->scroller), EINA_TRUE);
wd->linewrap = ELM_WRAP_WORD;
wd->editable = EINA_TRUE;
_signal_selection_start, obj);
edje_object_signal_callback_add(wd->ent, "selection,changed", "elm.text",
_signal_selection_changed, obj);
+ edje_object_signal_callback_add(wd->ent, "entry,selection,all,request", "elm.text",
+ _signal_selection_all, obj);
+ edje_object_signal_callback_add(wd->ent, "entry,selection,none,request", "elm.text",
+ _signal_selection_none, obj);
edje_object_signal_callback_add(wd->ent, "selection,cleared", "elm.text",
_signal_selection_cleared, obj);
- edje_object_signal_callback_add(wd->ent, "entry,paste,request", "elm.text",
+ edje_object_signal_callback_add(wd->ent, "entry,paste,request,*", "elm.text",
_signal_entry_paste_request, obj);
edje_object_signal_callback_add(wd->ent, "entry,copy,notify", "elm.text",
_signal_entry_copy_notify, obj);
_signal_mouse_clicked, obj);
edje_object_signal_callback_add(wd->ent, "mouse,down,1,double", "elm.text",
_signal_mouse_double, obj);
+ edje_object_signal_callback_add(wd->ent, "mouse,down,1,triple", "elm.text",
+ _signal_mouse_triple, obj);
edje_object_part_text_set(wd->ent, "elm.text", "");
if (_elm_config->desktop_entry)
edje_object_part_text_select_allow_set(wd->ent, "elm.text", EINA_TRUE);
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return;
int x, y, w, h;
+ x = y = w = h = 1;
edje_object_part_text_cursor_end_set(wd->ent, "elm.text", EDJE_CURSOR_MAIN);
if (wd->scroll)
{
}
EAPI void
-elm_entry_text_filter_append(Evas_Object *obj, void (*func) (void *data, Evas_Object *entry, char **text), void *data)
+elm_entry_text_filter_append(Evas_Object *obj, Elm_Entry_Filter_Cb func, void *data)
{
Widget_Data *wd;
Elm_Entry_Text_Filter *tf;
}
EAPI void
-elm_entry_text_filter_prepend(Evas_Object *obj, void (*func) (void *data, Evas_Object *entry, char **text), void *data)
+elm_entry_text_filter_prepend(Evas_Object *obj, Elm_Entry_Filter_Cb func, void *data)
{
Widget_Data *wd;
Elm_Entry_Text_Filter *tf;
}
EAPI void
-elm_entry_text_filter_remove(Evas_Object *obj, void (*func) (void *data, Evas_Object *entry, char **text), void *data)
+elm_entry_text_filter_remove(Evas_Object *obj, Elm_Entry_Filter_Cb func, void *data)
{
Widget_Data *wd;
Eina_List *l;
projects / framework / uifw / elementary.git / blobdiff