#include <Elementary.h>
#include <Elementary_Cursor.h>
#include "elm_priv.h"
+#include "els_scroller.h"
/* Maximum chunk size to be inserted to the entry at once
struct _Widget_Data
{
- Evas_Object *ent, *scroller, *end, *icon;
+ Evas_Object *ent, *scroller;
Evas_Object *hoversel;
Ecore_Job *deferred_recalc_job;
Ecore_Event_Handler *sel_notify_handler;
int cursor_pos;
Elm_Scroller_Policy policy_h, policy_v;
Elm_Wrap_Type linewrap;
+ Elm_Input_Panel_Layout input_panel_layout;
+ Elm_Autocapital_Type autocapital_type;
Eina_Bool changed : 1;
Eina_Bool single_line : 1;
Eina_Bool password : 1;
Eina_Bool textonly : 1;
Eina_Bool usedown : 1;
Eina_Bool scroll : 1;
+ Eina_Bool input_panel_enable : 1;
};
struct _Elm_Entry_Context_Menu_Item
static void _disable_hook(Evas_Object *obj);
static void _sizing_eval(Evas_Object *obj);
static void _on_focus_hook(void *data, Evas_Object *obj);
+static void _content_set_hook(Evas_Object *obj, const char *part, Evas_Object *content);
+static Evas_Object *_content_unset_hook(Evas_Object *obj, const char *part);
+static Evas_Object *_content_get_hook(const Evas_Object *obj, const char *part);
static void _resize(void *data, Evas *e, Evas_Object *obj, void *event_info);
static const char *_getbase(Evas_Object *obj);
static void _signal_entry_changed(void *data, Evas_Object *obj, const char *emission, const char *source);
static void _add_chars_till_limit(Evas_Object *obj, char **text, int can_add, Length_Unit unit);
static const char SIG_CHANGED[] = "changed";
+static const char SIG_CHANGED_USER[] = "changed,user";
static const char SIG_ACTIVATED[] = "activated";
static const char SIG_PRESS[] = "press";
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_ANCHOR_IN[] = "anchor,in";
static const char SIG_ANCHOR_OUT[] = "anchor,out";
static const char SIG_PREEDIT_CHANGED[] = "preedit,changed";
+static const char SIG_UNDO_REQUEST[] = "undo,request";
+static const char SIG_REDO_REQUEST[] = "redo,request";
static const Evas_Smart_Cb_Description _signals[] = {
{SIG_CHANGED, ""},
{SIG_ACTIVATED, ""},
{SIG_LONGPRESSED, ""},
{SIG_CLICKED, ""},
{SIG_CLICKED_DOUBLE, ""},
+ {SIG_CLICKED_TRIPLE, ""},
{SIG_FOCUSED, ""},
{SIG_UNFOCUSED, ""},
{SIG_SELECTION_PASTE, ""},
{SIG_ANCHOR_IN, ""},
{SIG_ANCHOR_OUT, ""},
{SIG_PREEDIT_CHANGED, ""},
+ {SIG_CHANGED_USER, ""},
+ {SIG_UNDO_REQUEST, ""},
+ {SIG_REDO_REQUEST, ""},
{NULL, NULL}
};
Elm_Entry_Item_Provider *ip;
Elm_Entry_Text_Filter *tf;
+ evas_event_freeze(evas_object_evas_get(obj));
+
if (wd->file) eina_stringshare_del(wd->file);
if (wd->hovdeljob) ecore_job_del(wd->hovdeljob);
{
_filter_free(tf);
}
+ if (wd->delay_write) ecore_timer_del(wd->delay_write);
free(wd);
+
+ evas_event_thaw(evas_object_evas_get(obj));
+ evas_event_thaw_eval(evas_object_evas_get(obj));
}
static void
{
Widget_Data *wd = elm_widget_data_get(obj);
const char *t;
+
+ evas_event_freeze(evas_object_evas_get(obj));
_elm_widget_mirrored_reload(obj);
_mirrored_set(obj, elm_widget_mirrored_get(obj));
eina_stringshare_del(t);
if (elm_widget_disabled_get(obj))
edje_object_signal_emit(wd->ent, "elm,state,disabled", "elm");
+ edje_object_part_text_input_panel_layout_set(wd->ent, "elm.text", wd->input_panel_layout);
+ edje_object_part_text_autocapital_type_set(wd->ent, "elm.text", wd->autocapital_type);
+ edje_object_part_text_input_panel_enabled_set(wd->ent, "elm.text", wd->input_panel_enable);
elm_entry_cursor_pos_set(obj, wd->cursor_pos);
if (elm_widget_focus_get(obj))
edje_object_signal_emit(wd->ent, "elm,action,focus", "elm");
elm_widget_highlight_in_theme_set(obj, EINA_FALSE);
}
_sizing_eval(obj);
+ evas_event_thaw(evas_object_evas_get(obj));
+ evas_event_thaw_eval(evas_object_evas_get(obj));
}
static void
}
static void
-_elm_win_recalc_job(void *data)
+_elm_deferred_recalc_job(void *data)
{
Widget_Data *wd = elm_widget_data_get(data);
Evas_Coord minh = -1, resw = -1, minw = -1, fw = 0, fh = 0;
evas_object_geometry_get(wd->ent, NULL, NULL, &resw, NULL);
edje_object_size_min_restricted_calc(wd->ent, &minw, &minh, resw, 0);
- elm_coords_finger_size_adjust(1, &minw, 1, &minh);
- wd->entmw = minw;
+ edje_object_size_min_restricted_calc(wd->ent, &fw, &fh, 0, 0);
+ elm_coords_finger_size_adjust(1, &fw, 1, &minh);
+ wd->entmw = fw;
wd->entmh = minh;
/* This is a hack to workaround the way min size hints are treated.
* If the minimum width is smaller than the restricted width, it means
if (wd->linewrap)
{
if ((resw == wd->lastw) && (!wd->changed)) return;
+ evas_event_freeze(evas_object_evas_get(obj));
wd->changed = EINA_FALSE;
wd->lastw = resw;
if (wd->scroll)
else
{
if (wd->deferred_recalc_job) ecore_job_del(wd->deferred_recalc_job);
- wd->deferred_recalc_job = ecore_job_add(_elm_win_recalc_job, obj);
+ wd->deferred_recalc_job = ecore_job_add(_elm_deferred_recalc_job, obj);
}
+ evas_event_thaw(evas_object_evas_get(obj));
+ evas_event_thaw_eval(evas_object_evas_get(obj));
}
else
{
if (!wd->changed) return;
+ evas_event_freeze(evas_object_evas_get(obj));
wd->changed = EINA_FALSE;
wd->lastw = resw;
if (wd->scroll)
else
evas_object_size_hint_max_set(obj, -1, -1);
}
+ evas_event_thaw(evas_object_evas_get(obj));
+ evas_event_thaw_eval(evas_object_evas_get(obj));
}
_recalc_cursor_geometry(obj);
{
evas_object_focus_set(wd->ent, EINA_TRUE);
edje_object_signal_emit(wd->ent, "elm,action,focus", "elm");
- if (top) elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_ON);
+ if (top && wd->input_panel_enable)
+ elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_ON);
evas_object_smart_callback_call(obj, SIG_FOCUSED, NULL);
}
else
{
edje_object_signal_emit(wd->ent, "elm,action,unfocus", "elm");
evas_object_focus_set(wd->ent, EINA_FALSE);
- if (top) elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_OFF);
+ if (top && wd->input_panel_enable)
+ elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_OFF);
evas_object_smart_callback_call(obj, SIG_UNFOCUSED, NULL);
}
}
static void
+_content_set_hook(Evas_Object *obj, const char *part, Evas_Object *content)
+{
+ Widget_Data *wd = elm_widget_data_get(obj);
+ Evas_Object *edje;
+ if ((!wd) || (!content)) return;
+
+ if (wd->scroll)
+ edje = elm_smart_scroller_edje_object_get(wd->scroller);
+ else
+ edje = wd->ent;
+
+ /* Delete the currently swallowed object */
+ {
+ Evas_Object *cswallow = edje_object_part_swallow_get(edje, part);
+ if (cswallow)
+ evas_object_del(cswallow);
+ }
+
+ if (!strcmp(part, "elm.swallow.icon"))
+ {
+ edje_object_signal_emit(edje, "elm,action,show,icon", "elm");
+ }
+ else if (!strcmp(part, "elm.swallow.end"))
+ {
+ edje_object_signal_emit(edje, "elm,action,show,end", "elm");
+ }
+ evas_event_freeze(evas_object_evas_get(obj));
+ elm_widget_sub_object_add(obj, content);
+ edje_object_part_swallow(edje, part, content);
+ _sizing_eval(obj);
+ evas_event_thaw(evas_object_evas_get(obj));
+ evas_event_thaw_eval(evas_object_evas_get(obj));
+}
+
+static Evas_Object *
+_content_unset_hook(Evas_Object *obj, const char *part)
+{
+ Widget_Data *wd = elm_widget_data_get(obj);
+ Evas_Object *content, *edje;
+ if (!wd) return NULL;
+
+ if (wd->scroll)
+ edje = elm_smart_scroller_edje_object_get(wd->scroller);
+ else
+ edje = wd->ent;
+
+ if (!strcmp(part, "elm.swallow.icon"))
+ {
+ edje_object_signal_emit(edje, "elm,action,hide,icon", "elm");
+ }
+ else if (!strcmp(part, "elm.swallow.end"))
+ {
+ edje_object_signal_emit(edje, "elm,action,hide,end", "elm");
+ }
+
+ content = edje_object_part_swallow_get(edje, part);
+ edje_object_part_swallow(edje, part, NULL);
+ if (!content) return NULL;
+ evas_event_freeze(evas_object_evas_get(obj));
+ elm_widget_sub_object_del(obj, content);
+ edje_object_part_unswallow(wd->ent, content);
+ _sizing_eval(obj);
+ evas_event_thaw(evas_object_evas_get(obj));
+ evas_event_thaw_eval(evas_object_evas_get(obj));
+
+ return content;
+}
+
+static Evas_Object *
+_content_get_hook(const Evas_Object *obj, const char *part)
+{
+ Widget_Data *wd = elm_widget_data_get(obj);
+ Evas_Object *content = NULL, *edje;
+ if (!wd) return NULL;
+
+ if (wd->scroll)
+ edje = elm_smart_scroller_edje_object_get(wd->scroller);
+ else
+ edje = wd->ent;
+
+ if (edje)
+ content = edje_object_part_swallow_get(edje, part);
+ return content;
+}
+
+static void
+_translate_hook(Evas_Object *obj)
+{
+ evas_object_smart_callback_call(obj, "language,changed", NULL);
+}
+
+static void
_signal_emit_hook(Evas_Object *obj, const char *emission, const char *source)
{
Widget_Data *wd = elm_widget_data_get(obj);
}
static void
+_sub_del(void *data, Evas_Object *obj, void *event_info)
+{
+ Widget_Data *wd = data;
+ Evas_Object *sub = event_info;
+ Evas_Object *edje;
+
+ if (wd->scroll)
+ edje = elm_smart_scroller_edje_object_get(wd->scroller);
+ else
+ edje = wd->ent;
+
+ if (sub == edje_object_part_swallow_get(edje, "elm.swallow.icon"))
+ {
+ edje_object_part_unswallow(edje, sub);
+ if (edje)
+ edje_object_signal_emit(edje, "elm,action,hide,icon", "elm");
+ }
+ else if (sub == edje_object_part_swallow_get(edje, "elm.swallow.end"))
+ {
+ edje_object_part_unswallow(edje, sub);
+ if (edje)
+ edje_object_signal_emit(edje, "elm,action,hide,end", "elm");
+ }
+ _sizing_eval(obj);
+}
+
+static void
_hoversel_position(Evas_Object *obj)
{
Widget_Data *wd = elm_widget_data_get(obj);
elm_widget_scroll_hold_push(data);
}
+void
+_elm_entry_entry_paste(Evas_Object *obj, const char *entry)
+{
+ elm_entry_entry_insert(obj, entry);
+ evas_object_smart_callback_call(obj, SIG_CHANGED_USER, NULL);
+}
+
static void
_paste(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
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
elm_hoversel_item_add(wd->hoversel, E_("Select"), NULL, ELM_ICON_NONE,
_select, obj);
}
- if (1) // need way to detect if someone has a selection
+ if (elm_selection_selection_has_owner())
{
if (wd->editable)
elm_hoversel_item_add(wd->hoversel, E_("Paste"), NULL, ELM_ICON_NONE,
}
}
}
- return "base";
}
static void
Widget_Data *wd = elm_widget_data_get(data);
Evas_Coord minh;
if (!wd) return;
+ evas_event_freeze(evas_object_evas_get(data));
wd->changed = EINA_TRUE;
/* Reset the size hints which are no more relevant.
* Keep the height, this is a hack, but doesn't really matter
_sizing_eval(data);
if (wd->text) eina_stringshare_del(wd->text);
wd->text = NULL;
- evas_object_smart_callback_call(data, event, NULL);
if (wd->delay_write)
{
ecore_timer_del(wd->delay_write);
wd->delay_write = NULL;
}
- if ((!wd->autosave) || (!wd->file)) return;
- wd->delay_write = ecore_timer_add(2.0, _delay_write, data);
+ evas_event_thaw(evas_object_evas_get(data));
+ evas_event_thaw_eval(evas_object_evas_get(data));
+ if ((wd->autosave) && (wd->file))
+ wd->delay_write = ecore_timer_add(2.0, _delay_write, data);
+ /* callback - this could call callbacks that delete the entry... thus...
+ * any access to wd after this could be invalid */
+ evas_object_smart_callback_call(data, event, NULL);
}
static void
}
static void
+_signal_entry_changed_user(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
+{
+ evas_object_smart_callback_call(data, SIG_CHANGED_USER, NULL);
+}
+
+static void
_signal_preedit_changed(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
{
_entry_changed_common_handling(data, SIG_PREEDIT_CHANGED);
}
static void
+_signal_undo_request(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
+{
+ evas_object_smart_callback_call(data, SIG_UNDO_REQUEST, NULL);
+}
+
+static void
+_signal_redo_request(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
+{
+ evas_object_smart_callback_call(data, SIG_REDO_REQUEST, NULL);
+}
+
+static void
_signal_selection_start(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_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
if (!wd) return;
p = emission + sizeof("nchor,mouse,down,");
ei.button = strtol(p, &p2, 10);
- ei.name = p2;
+ ei.name = p2 + 1;
ei.x = ei.y = ei.w = ei.h = 0;
_signal_anchor_geoms_do_things_with(wd, &ei);
if (!wd) return;
p = emission + sizeof("nchor,mouse,up,");
ei.button = strtol(p, &p2, 10);
- ei.name = p2;
+ ei.name = p2 + 1;
ei.x = ei.y = ei.w = ei.h = 0;
_signal_anchor_geoms_do_things_with(wd, &ei);
if (!wd) return;
p = emission + sizeof("nchor,mouse,clicked,");
ei.button = strtol(p, &p2, 10);
- ei.name = p2;
+ ei.name = p2 + 1;
ei.x = ei.y = ei.w = ei.h = 0;
_signal_anchor_geoms_do_things_with(wd, &ei);
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)
char backup;
Evas_Object *obj = (Evas_Object *) data;
Widget_Data *wd = elm_widget_data_get(obj);
+ evas_event_freeze(evas_object_evas_get(obj));
if (wd->text) eina_stringshare_del(wd->text);
wd->text = NULL;
wd->changed = EINA_TRUE;
start = wd->append_text_position;
- if(start + _CHUNK_SIZE < wd->append_text_len)
+ if (start + _CHUNK_SIZE < wd->append_text_len)
{
- wd->append_text_position = (start + _CHUNK_SIZE);
- /* Go to the start of the nearest codepoint, because we don't want
- * to cut it in the middle */
- eina_unicode_utf8_get_prev(wd->append_text_left,
- &wd->append_text_position);
+ int pos = start;
+ int tag_start, esc_start;
+
+ tag_start = esc_start = -1;
+ /* Find proper markup cut place */
+ while (pos - start < _CHUNK_SIZE)
+ {
+ int prev_pos = pos;
+ Eina_Unicode tmp =
+ eina_unicode_utf8_get_next(wd->append_text_left, &pos);
+ if (esc_start == -1)
+ {
+ if (tmp == '<')
+ tag_start = prev_pos;
+ else if (tmp == '>')
+ tag_start = -1;
+ }
+ if (tag_start == -1)
+ {
+ if (tmp == '&')
+ esc_start = prev_pos;
+ else if (tmp == ';')
+ esc_start = -1;
+ }
+ }
+
+ if (tag_start >= 0)
+ {
+ wd->append_text_position = tag_start;
+ }
+ else if (esc_start >= 0)
+ {
+ wd->append_text_position = esc_start;
+ }
+ else
+ {
+ wd->append_text_position = pos;
+ }
}
else
{
wd->append_text_left[wd->append_text_position] = backup;
+ evas_event_thaw(evas_object_evas_get(obj));
+ evas_event_thaw_eval(evas_object_evas_get(obj));
+
/* If there's still more to go, renew the idler, else, cleanup */
if (wd->append_text_position < wd->append_text_len)
{
static void
_add_chars_till_limit(Evas_Object *obj, char **text, int can_add, Length_Unit unit)
{
- int i = 0, unit_size;
- int current_len = strlen(*text);
- char *new_text = *text;
+ int i = 0, current_len = 0;
+ char *new_text;
+
+ if (!*text) return;
if (unit >= LENGTH_UNIT_LAST) return;
+ new_text = *text;
+ current_len = strlen(*text);
while (*new_text)
{
if (*new_text == '<')
}
else
{
- int index = 0;
+ int idx = 0, unit_size = 0;
+ char *markup, *utfstr;
if (*new_text == '&')
{
- while (*(new_text + index) != ';')
+ while (*(new_text + idx) != ';')
{
- index++;
- if (!*(new_text + index)) break;
+ idx++;
+ if (!*(new_text + idx)) break;
}
}
- char *markup;
- index = evas_string_char_next_get(new_text, index, NULL);
- markup = malloc(index + 1);
- strncpy(markup, new_text, index);
- markup[index] = 0;
- if (unit == LENGTH_UNIT_BYTE)
- unit_size = strlen(elm_entry_markup_to_utf8(markup));
- else if (unit == LENGTH_UNIT_CHAR)
- unit_size = evas_string_char_len_get(elm_entry_markup_to_utf8(markup));
+ idx = evas_string_char_next_get(new_text, idx, NULL);
+ markup = malloc(idx + 1);
if (markup)
{
+ strncpy(markup, new_text, idx);
+ markup[idx] = 0;
+ utfstr = elm_entry_markup_to_utf8(markup);
+ if (utfstr)
+ {
+ if (unit == LENGTH_UNIT_BYTE)
+ unit_size = strlen(utfstr);
+ else if (unit == LENGTH_UNIT_CHAR)
+ unit_size = evas_string_char_len_get(utfstr);
+ free(utfstr);
+ utfstr = NULL;
+ }
free(markup);
markup = NULL;
}
return;
}
can_add = 0;
- strncpy(new_text, new_text + index, current_len - ((new_text + index) - *text));
- current_len -= index;
+ strncpy(new_text, new_text + idx, current_len - ((new_text + idx) - *text));
+ current_len -= idx;
(*text)[current_len] = 0;
}
else
{
- new_text += index;
+ new_text += idx;
can_add -= unit_size;
}
i++;
{
int len = 0;
ELM_CHECK_WIDTYPE(obj, widtype);
- if (item && strcmp(item, "default")) return;
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return;
+ evas_event_freeze(evas_object_evas_get(obj));
if (!entry) entry = "";
+ if (item && strcmp(item, "default"))
+ {
+ edje_object_part_text_set(wd->ent, item, entry);
+ return;
+ }
+
if (wd->text) eina_stringshare_del(wd->text);
wd->text = NULL;
wd->changed = EINA_TRUE;
{
edje_object_part_text_set(wd->ent, "elm.text", entry);
}
+ evas_event_thaw(evas_object_evas_get(obj));
+ evas_event_thaw_eval(evas_object_evas_get(obj));
}
static const char *
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;
}
elm_widget_highlight_ignore_set(obj, EINA_TRUE);
elm_widget_text_set_hook_set(obj, _elm_entry_text_set);
elm_widget_text_get_hook_set(obj, _elm_entry_text_get);
+ elm_widget_content_set_hook_set(obj, _content_set_hook);
+ elm_widget_content_unset_hook_set(obj, _content_unset_hook);
+ elm_widget_content_get_hook_set(obj, _content_get_hook);
+ elm_widget_translate_hook_set(obj, _translate_hook);
+
+ evas_object_smart_callback_add(obj, "sub-object-del", _sub_del, wd);
wd->scroller = elm_smart_scroller_add(e);
elm_widget_sub_object_add(obj, wd->scroller);
+ evas_object_smart_member_add(wd->scroller, obj);
elm_smart_scroller_widget_set(wd->scroller, obj);
elm_smart_scroller_object_theme_set(obj, wd->scroller, "scroller", "entry",
elm_widget_style_get(obj));
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;
_elm_theme_object_set(obj, wd->ent, "entry", "base", "default");
edje_object_signal_callback_add(wd->ent, "entry,changed", "elm.text",
_signal_entry_changed, obj);
+ edje_object_signal_callback_add(wd->ent, "entry,changed,user", "elm.text",
+ _signal_entry_changed_user, obj);
edje_object_signal_callback_add(wd->ent, "preedit,changed", "elm.text",
_signal_preedit_changed, obj);
edje_object_signal_callback_add(wd->ent, "selection,start", "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,1", "elm.text",
- _signal_entry_paste_request, obj);
- edje_object_signal_callback_add(wd->ent, "entry,paste,request,3", "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);
edje_object_signal_callback_add(wd->ent, "entry,cut,notify", "elm.text",
_signal_entry_cut_notify, obj);
edje_object_signal_callback_add(wd->ent, "cursor,changed", "elm.text",
_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_signal_callback_add(wd->ent, "entry,undo,request", "elm.text",
+ _signal_undo_request, obj);
+ edje_object_signal_callback_add(wd->ent, "entry,redo,request", "elm.text",
+ _signal_redo_request, 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);
elm_widget_resize_object_set(obj, wd->ent);
_sizing_eval(obj);
+ elm_entry_input_panel_layout_set(obj, ELM_INPUT_PANEL_LAYOUT_NORMAL);
+
+ wd->input_panel_enable = edje_object_part_text_input_panel_enabled_get(wd->ent, "elm.text");
+ wd->autocapital_type = edje_object_part_text_autocapital_type_get(wd->ent, "elm.text");
+
#ifdef HAVE_ELEMENTARY_X
top = elm_widget_top_get(obj);
if ((top) && (elm_win_xwindow_get(top)))
edje_object_part_text_cursor_end_set(wd->ent, "elm.text", EDJE_CURSOR_MAIN);
if (wd->scroll)
{
- elm_widget_show_region_get(wd->ent, &x, &y, &w, &h);
+ elm_widget_show_region_get(obj, &x, &y, &w, &h);
elm_smart_scroller_child_region_show(wd->scroller, x, y, w, h);
}
}
elm_entry_filter_limit_size(void *data, Evas_Object *entry, char **text)
{
Elm_Entry_Filter_Limit_Size *lim = data;
- char *current;
+ char *current, *utfstr;
int len, newlen;
const char *(*text_get)(const Evas_Object *);
const char *widget_type;
return;
current = elm_entry_markup_to_utf8(text_get(entry));
+ utfstr = elm_entry_markup_to_utf8(*text);
if (lim->max_char_count > 0)
{
{
evas_object_smart_callback_call(entry, "maxlength,reached", NULL);
free(*text);
- free(current);
*text = NULL;
+ free(current);
+ free(utfstr);
return;
}
- newlen = evas_string_char_len_get(elm_entry_markup_to_utf8(*text));
+ newlen = evas_string_char_len_get(utfstr);
if ((len + newlen) > lim->max_char_count)
_add_chars_till_limit(entry, text, (lim->max_char_count - len), LENGTH_UNIT_CHAR);
}
{
evas_object_smart_callback_call(entry, "maxlength,reached", NULL);
free(*text);
- free(current);
*text = NULL;
+ free(current);
+ free(utfstr);
return;
}
- newlen = strlen(elm_entry_markup_to_utf8(*text));
+ newlen = strlen(utfstr);
if ((len + newlen) > lim->max_byte_count)
_add_chars_till_limit(entry, text, (lim->max_byte_count - len), LENGTH_UNIT_BYTE);
}
free(current);
+ free(utfstr);
}
EAPI void
elm_entry_icon_set(Evas_Object *obj, Evas_Object *icon)
{
ELM_CHECK_WIDTYPE(obj, widtype);
- Widget_Data *wd = elm_widget_data_get(obj);
- Evas_Object *edje;
- if (!wd) return;
EINA_SAFETY_ON_NULL_RETURN(icon);
- if (wd->icon == icon) return;
- if (wd->icon) evas_object_del(wd->icon);
- wd->icon = icon;
- edje = elm_smart_scroller_edje_object_get(wd->scroller);
- if (!edje) return;
- edje_object_part_swallow(edje, "elm.swallow.icon", wd->icon);
- edje_object_signal_emit(edje, "elm,action,show,icon", "elm");
- _sizing_eval(obj);
+ _content_set_hook(obj, "elm.swallow.icon", icon);
}
EAPI Evas_Object *
elm_entry_icon_get(const Evas_Object *obj)
{
ELM_CHECK_WIDTYPE(obj, widtype) NULL;
- Widget_Data *wd = elm_widget_data_get(obj);
- if (!wd) return NULL;
- return wd->icon;
+ return _content_get_hook(obj, "elm.swallow.icon");
}
EAPI Evas_Object *
elm_entry_icon_unset(Evas_Object *obj)
{
ELM_CHECK_WIDTYPE(obj, widtype) NULL;
- Widget_Data *wd = elm_widget_data_get(obj);
- Evas_Object *ret = NULL;
- if (!wd) return NULL;
- if (wd->icon)
- {
- Evas_Object *edje = elm_smart_scroller_edje_object_get(wd->scroller);
- if (!edje) return NULL;
- ret = wd->icon;
- edje_object_part_unswallow(edje, wd->icon);
- edje_object_signal_emit(edje, "elm,action,hide,icon", "elm");
- wd->icon = NULL;
- _sizing_eval(obj);
- }
- return ret;
+ return _content_unset_hook(obj, "elm.swallow.icon");
}
EAPI void
{
ELM_CHECK_WIDTYPE(obj, widtype);
Widget_Data *wd = elm_widget_data_get(obj);
- if ((!wd) || (!wd->icon)) return;
+ Evas_Object *edje;
+ if (!wd) return;
+ if (wd->scroll)
+ edje = elm_smart_scroller_edje_object_get(wd->scroller);
+ else
+ edje = wd->ent;
+
+ if ((!edje) || (!edje_object_part_swallow_get(edje, "elm.swallow.icon"))) return;
if (setting)
- evas_object_hide(wd->icon);
+ edje_object_signal_emit(edje, "elm,action,show,icon", "elm");
else
- evas_object_show(wd->icon);
+ edje_object_signal_emit(edje, "elm,action,hide,icon", "elm");
_sizing_eval(obj);
}
elm_entry_end_set(Evas_Object *obj, Evas_Object *end)
{
ELM_CHECK_WIDTYPE(obj, widtype);
- Widget_Data *wd = elm_widget_data_get(obj);
- Evas_Object *edje;
- if (!wd) return;
EINA_SAFETY_ON_NULL_RETURN(end);
- if (wd->end == end) return;
- if (wd->end) evas_object_del(wd->end);
- wd->end = end;
- edje = elm_smart_scroller_edje_object_get(wd->scroller);
- if (!edje) return;
- edje_object_part_swallow(edje, "elm.swallow.end", wd->end);
- edje_object_signal_emit(edje, "elm,action,show,end", "elm");
- _sizing_eval(obj);
+ _content_set_hook(obj, "elm.swallow.end", end);
}
EAPI Evas_Object *
elm_entry_end_get(const Evas_Object *obj)
{
ELM_CHECK_WIDTYPE(obj, widtype) NULL;
- Widget_Data *wd = elm_widget_data_get(obj);
- if (!wd) return NULL;
- return wd->end;
+ return _content_get_hook(obj, "elm.swallow.end");
}
EAPI Evas_Object *
elm_entry_end_unset(Evas_Object *obj)
{
ELM_CHECK_WIDTYPE(obj, widtype) NULL;
- Widget_Data *wd = elm_widget_data_get(obj);
- Evas_Object *ret = NULL;
- if (!wd) return NULL;
- if (wd->end)
- {
- Evas_Object *edje = elm_smart_scroller_edje_object_get(wd->scroller);
- if (!edje) return NULL;
- ret = wd->end;
- edje_object_part_unswallow(edje, wd->end);
- edje_object_signal_emit(edje, "elm,action,hide,end", "elm");
- wd->end = NULL;
- _sizing_eval(obj);
- }
- return ret;
+ return _content_unset_hook(obj, "elm.swallow.end");
}
EAPI void
{
ELM_CHECK_WIDTYPE(obj, widtype);
Widget_Data *wd = elm_widget_data_get(obj);
- if ((!wd) || (!wd->end)) return;
+ Evas_Object *edje;
+ if (!wd) return;
+ if (wd->scroll)
+ edje = elm_smart_scroller_edje_object_get(wd->scroller);
+ else
+ edje = wd->ent;
+
+ if ((!edje) || (!edje_object_part_swallow_get(edje, "elm.swallow.icon"))) return;
if (setting)
- evas_object_hide(wd->end);
+ edje_object_signal_emit(edje, "elm,action,show,end", "elm");
else
- evas_object_show(wd->end);
+ edje_object_signal_emit(edje, "elm,action,hide,end", "elm");
_sizing_eval(obj);
}
if (!wd) return;
elm_smart_scroller_bounce_allow_get(wd->scroller, h_bounce, v_bounce);
}
+
+EAPI void
+elm_entry_input_panel_layout_set(Evas_Object *obj, Elm_Input_Panel_Layout layout)
+{
+ ELM_CHECK_WIDTYPE(obj, widtype);
+ Widget_Data *wd = elm_widget_data_get(obj);
+ if (!wd) return;
+
+ wd->input_panel_layout = layout;
+
+ edje_object_part_text_input_panel_layout_set(wd->ent, "elm.text", layout);
+}
+
+EAPI Elm_Input_Panel_Layout
+elm_entry_input_panel_layout_get(Evas_Object *obj)
+{
+ ELM_CHECK_WIDTYPE(obj, widtype) ELM_INPUT_PANEL_LAYOUT_INVALID;
+ Widget_Data *wd = elm_widget_data_get(obj);
+ if (!wd) return ELM_INPUT_PANEL_LAYOUT_INVALID;
+
+ return wd->input_panel_layout;
+}
+
+EAPI void
+elm_entry_autocapital_type_set(Evas_Object *obj, Elm_Autocapital_Type autocapital_type)
+{
+ ELM_CHECK_WIDTYPE(obj, widtype);
+ Widget_Data *wd = elm_widget_data_get(obj);
+ if (!wd) return;
+
+ wd->autocapital_type = autocapital_type;
+ edje_object_part_text_autocapital_type_set(wd->ent, "elm.text", autocapital_type);
+}
+
+EAPI Elm_Autocapital_Type
+elm_entry_autocapital_type_get(Evas_Object *obj)
+{
+ ELM_CHECK_WIDTYPE(obj, widtype) ELM_AUTOCAPITAL_TYPE_NONE;
+ Widget_Data *wd = elm_widget_data_get(obj);
+ if (!wd) return ELM_AUTOCAPITAL_TYPE_NONE;
+
+ return wd->autocapital_type;
+}
+
+EAPI void
+elm_entry_input_panel_enabled_set(Evas_Object *obj, Eina_Bool enabled)
+{
+ ELM_CHECK_WIDTYPE(obj, widtype);
+ Widget_Data *wd = elm_widget_data_get(obj);
+ if (!wd) return;
+
+ wd->input_panel_enable = enabled;
+ edje_object_part_text_input_panel_enabled_set(wd->ent, "elm.text", enabled);
+}
+