typedef struct _Sel Sel;
typedef struct _Anchor Anchor;
-static Eina_Bool keypad_show = EINA_FALSE;
static Ecore_Timer *hide_timer = NULL;
static Entry *focused_entry = NULL;
Eina_Bool autocapital : 1;
Eina_Bool uppercase : 1;
Eina_Bool autoperiod : 1;
+ Eina_Bool need_commit : 1;
int select_dragging_state;
double space_key_time;
Eina_Bool item : 1;
};
-static void
-_input_panel_hide(Ecore_IMF_Context *ctx)
-{
- Ecore_IMF_Input_Panel_State state;
-
- state = ecore_imf_context_input_panel_state_get(ctx);
-
- if (state == ECORE_IMF_INPUT_PANEL_STATE_SHOW)
- ecore_imf_context_input_panel_hide(ctx);
-}
-
static Eina_Bool
_punctuation_check(Entry *en)
{
tc = evas_object_textblock_cursor_new(en->rp->object);
evas_textblock_cursor_copy(en->cursor, tc);
- if (!evas_textblock_cursor_char_prev(tc))
+ if (!evas_textblock_cursor_char_prev(tc))
{
ret = EINA_TRUE;
goto done;
}
else
{
- if (evas_textblock_cursor_char_prev(tc))
+ if (evas_textblock_cursor_char_prev(tc))
{
str = evas_textblock_cursor_range_text_get(tc, en->cursor, EVAS_TEXTBLOCK_TEXT_MARKUP);
if (!str) goto done;
#endif
}
-/*
+#ifdef HAVE_ECORE_IMF
static void
-_text_prepend(Entry *en, Evas_Textblock_Cursor *cursor, const char *text)
+_input_panel_hide(Ecore_IMF_Context *ctx)
{
- char *str;
-
- if (!text) return;
-
- str = strdup(text);
- if (!str) return;
+ Ecore_IMF_Input_Panel_State state;
- if (en->uppercase)
- {
- str[0] = toupper(str[0]);
- }
+ state = ecore_imf_context_input_panel_state_get(ctx);
- evas_textblock_cursor_text_prepend(cursor, str);
- free(str);
+ if (state == ECORE_IMF_INPUT_PANEL_STATE_SHOW)
+ ecore_imf_context_input_panel_hide(ctx);
}
-*/
-#ifdef HAVE_ECORE_IMF
static Eina_Bool _hide_timer_handler(void *data)
{
Entry *en = (Entry *)data;
if (!en || !en->imf_context) goto done;
- if (!keypad_show)
- _input_panel_hide(en->imf_context);
+ _input_panel_hide(en->imf_context);
done:
hide_timer = NULL;
return ECORE_CALLBACK_CANCEL;
}
-static void
-_input_panel_hide_timer_start(void *data)
+static void
+_input_panel_hide_timer_start(Entry *en)
+{
+ if (!en || !en->input_panel_enable) return;
+
+ if (hide_timer)
+ {
+ ecore_timer_del(hide_timer);
+ }
+ hide_timer = ecore_timer_add(0.2, _hide_timer_handler, en);
+}
+
+static void
+_input_panel_show(Entry *en)
{
+ if (!en || !en->input_panel_enable) return;
+
if (hide_timer)
{
ecore_timer_del(hide_timer);
+ hide_timer = NULL;
}
- hide_timer = ecore_timer_add(0.2, _hide_timer_handler, data);
- focused_entry = (Entry *)data;
+
+ if(!en->imf_context) return;
+ ecore_imf_context_input_panel_show(en->imf_context);
+ focused_entry = en;
}
static void
if (evas_object_focus_get(rp->edje->obj))
{
+ printf("[Edje_entry::%s] pid : %d, obj : %p\n", __func__, getpid(), en);
ecore_imf_context_reset(en->imf_context);
ecore_imf_context_focus_in(en->imf_context);
- if (en->input_panel_enable)
- {
- keypad_show = EINA_TRUE;
- ecore_imf_context_input_panel_show(en->imf_context);
- }
+ _input_panel_show(en);
_caps_mode_check(en);
}
en = rp->entry_data;
if (!en || !en->imf_context) return;
+ printf("[Edje_entry::%s] pid : %d, obj : %p\n", __func__, getpid(), en);
ecore_imf_context_reset(en->imf_context);
ecore_imf_context_cursor_position_set(en->imf_context, evas_textblock_cursor_pos_get(en->cursor));
ecore_imf_context_focus_out(en->imf_context);
- if (en->input_panel_enable)
- {
- keypad_show = EINA_FALSE;
- _input_panel_hide_timer_start(en);
- }
+ _input_panel_hide_timer_start(en);
}
#endif /* HAVE_ECORE_IMF */
_edje_focus_in_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
Edje *ed = data;
-#ifdef HAVE_ECORE_IMF
+#ifdef HAVE_ECORE_IMF
Edje_Real_Part *rp;
Entry *en;
#endif
if (!en->imf_context) return;
+ printf("[Edje_entry::%s] pid : %d, obj : %p\n", __func__, getpid(), en);
ecore_imf_context_reset(en->imf_context);
ecore_imf_context_focus_in(en->imf_context);
- if (en->input_panel_enable)
- {
- keypad_show = EINA_TRUE;
- ecore_imf_context_input_panel_show(en->imf_context);
- }
+ _input_panel_show(en);
+ _caps_mode_check(en);
#endif /* HAVE_ECORE_IMF */
}
if (!en->imf_context) return;
+ printf("[Edje_entry::%s] pid : %d, obj : %p\n", __func__, getpid(), en);
ecore_imf_context_reset(en->imf_context);
ecore_imf_context_cursor_position_set(en->imf_context, evas_textblock_cursor_pos_get(en->cursor));
ecore_imf_context_focus_out(en->imf_context);
- if (en->input_panel_enable)
- {
- keypad_show = EINA_FALSE;
- _input_panel_hide_timer_start(en);
- }
+ _input_panel_hide_timer_start(en);
#endif /* HAVE_ECORE_IMF */
}
_curs_jump_line_by(Evas_Textblock_Cursor *c, Evas_Object *o, Entry *en, int by)
{
int ln;
-
+
ln = evas_textblock_cursor_line_geometry_get(c, NULL, NULL, NULL, NULL) + by;
_curs_jump_line(c, o, en, ln);
}
if (!en->sel_end) return;
_sel_enable(c, o, en);
if (!evas_textblock_cursor_compare(c, en->sel_end)) return;
-
+
if (en->rp->part->select_mode == EDJE_ENTRY_SELECTION_MODE_BLOCK_HANDLE)
{
if (evas_textblock_cursor_compare(en->sel_start, c) > 0)
list_cnt = eina_list_count(en->sel);
list_idx = 0;
-
+
evas_object_hide(en->cursor_fg);
evas_object_hide(en->cursor_bg);
evas_object_move(en->block_handler_btm, x + r->x + r->w, y + r->y + r->h);
evas_object_show(en->block_handler_btm);
}
- }
+ }
*(&(sel->rect)) = *r;
range = eina_list_remove_list(range, range);
free(r);
free(sel);
an->sel = eina_list_remove_list(an->sel, an->sel);
}
-
+
sel = calloc(1, sizeof(Sel));
an->sel = eina_list_append(an->sel, sel);
-
+
if (en->rp->edje->item_provider.func)
{
ob = en->rp->edje->item_provider.func
for (ll = range; ll; ll = eina_list_next(ll))
{
Evas_Object *ob;
-
+
sel = calloc(1, sizeof(Sel));
an->sel = eina_list_append(an->sel, sel);
ob = edje_object_add(en->rp->edje->evas);
}
static void
-_autoperiod_insert(Edje_Real_Part *rp)
+_autoperiod_insert(Entry *en, Evas_Textblock_Cursor *cursor)
{
- Entry *en;
- Evas_Textblock_Cursor *tc;
+ Evas_Textblock_Cursor *tc = NULL;
char *str;
unsigned int len = 0;
- if (!rp || !rp->entry_data || !rp->object) return;
-
+ if (!en || !en->autoperiod) return;
if (!edje_autoperiod_allow_get()) return;
- en = rp->entry_data;
- if (!en->autoperiod) return;
-
if ((ecore_time_get() - en->space_key_time) > EDJE_ENTRY_DOUBLE_SPACE_TIME)
- {
- goto done;
- }
+ goto done;
- tc = evas_object_textblock_cursor_new(rp->object);
- evas_textblock_cursor_copy(en->cursor, tc);
+ tc = evas_object_textblock_cursor_new(en->rp->object);
+ evas_textblock_cursor_copy(cursor, tc);
- if (evas_textblock_cursor_char_prev(tc))
- {
- if (evas_textblock_cursor_char_prev(tc))
- {
- str = evas_textblock_cursor_range_text_get(tc, en->cursor, EVAS_TEXTBLOCK_TEXT_MARKUP);
+ if (!evas_textblock_cursor_char_prev(tc)) goto done;
+ if (!evas_textblock_cursor_char_prev(tc)) goto done;
- if (str)
- {
- len = strlen(str);
+ str = evas_textblock_cursor_range_text_get(tc, cursor,
+ EVAS_TEXTBLOCK_TEXT_MARKUP);
- if ((len >= 2) &&
- ((str[len-2] != ':') && (str[len-2] != ';') &&
- (str[len-2] != '.') && (str[len-2] != ',') &&
- (str[0] != '?') && (str[len-2] != '!') &&
- (str[len-2] != ' ')) && (str[len-1] == ' '))
- {
- _backspace(en->cursor, rp->object, en);
- evas_textblock_cursor_text_prepend(en->cursor, ".");
- }
+ if (!str) goto done;
- free(str);
- }
- }
+ len = strlen(str);
+
+ if ((len >= 2) &&
+ ((str[len-2] != ':') && (str[len-2] != ';') &&
+ (str[len-2] != '.') && (str[len-2] != ',') &&
+ (str[0] != '?') && (str[len-2] != '!') &&
+ (str[len-2] != ' ')) && (str[len-1] == ' '))
+ {
+ _backspace(cursor, en->rp->object, en);
+ evas_textblock_cursor_text_prepend(cursor, ".");
}
- evas_textblock_cursor_free(tc);
+
+ free(str);
done:
+ if (tc) evas_textblock_cursor_free(tc);
en->space_key_time = ecore_time_get();
}
cursor_changed = EINA_FALSE;
if (!strcmp(ev->key, "Escape"))
{
-#ifdef HAVE_ECORE_IMF
- if (en->imf_context) ecore_imf_context_reset(en->imf_context);
-#endif
// dead keys here. Escape for now (should emit these)
_edje_emit(ed, "entry,key,escape", rp->part->name);
ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
else
{
_delete(en->cursor, rp->object, en);
- /*count characters*/
+ /*count characters*/
if (en->func)
en->func(en->data, NULL);
}
/* if inputting text is not allowed, dont allow text input */
if (en->func)
{
- if (en->func(en->data, "<br>")) return;
+ if (en->func(en->data, "<br>")) return;
}
if (multiline)
_caps_mode_check(en);
}
_edje_emit(ed, "entry,key,enter", rp->part->name);
- /*count characters*/
+ /*count characters*/
if (en->func)
en->func(en->data, NULL);
}
- else if ((!strcmp(ev->key, "space")) && edje_autoperiod_allow_get() && en->autoperiod)
- {
- _autoperiod_insert(rp);
- }
else
{
if (ev->string)
if (en->have_selection)
_range_del(en->cursor, rp->object, en);
_sel_clear(en->cursor, rp->object, en);
+
+ if (!strcmp(ev->key, "space")) _autoperiod_insert(en, en->cursor);
+
+ // if PASSWORD_SHOW_LAST_CHARACTER mode, appending it with password tag
if (rp->part->entry_mode == EDJE_ENTRY_EDIT_MODE_PASSWORD_SHOW_LAST_CHARACTER)
{
_edje_entry_hide_visible_password(en->rp);
return;
//evas_textblock_cursor_text_prepend(en->cursor, ev->string);
- //_text_prepend(en, en->cursor, ev->string);
_text_filter_text_prepend(en, en->cursor, ev->string);
/*count characters*/
- if (en->func) en->func(en->data, NULL);
+ if (en->func) en->func(en->data, NULL);
#if 0
// evas_textblock_cursor_text_prepend(en->cursor, ev->string);
_text_filter_text_prepend(en, en->cursor, ev->string);
do /* move cursor to the end point of the words */
{
ct = _edje_entry_cursor_content_get(rp, EDJE_CURSOR_MAIN);
- if (block_type != _get_char_type(ct))
+ if (block_type != _get_char_type(ct))
{
//_edje_entry_cursor_prev(rp, EDJE_CURSOR_MAIN);
break;
en->select_allow = EINA_TRUE;
en->had_sel = EINA_TRUE;
en->selecting = EINA_FALSE;
-
+
//printf("string : %s \n", eina_strbuf_string_get(str));
eina_strbuf_free(str);
}
ecore_imf_context_cursor_position_set(en->imf_context,
evas_textblock_cursor_pos_get(en->cursor));
- if (en->input_panel_enable)
- {
- keypad_show = EINA_TRUE;
- ecore_imf_context_input_panel_show(en->imf_context);
- }
+ _input_panel_show(en);
}
#endif
rp->entry_data = en;
en->rp = rp;
en->autoperiod = EINA_TRUE;
+ en->need_commit = EINA_TRUE;
#ifdef HAVE_ECORE_IMF
en->input_panel_enable = _edje_input_panel_enable;
ecore_imf_context_client_window_set(en->imf_context, rp->object);
ecore_imf_context_client_canvas_set(en->imf_context, rp->edje->evas);
- ecore_imf_context_retrieve_surrounding_callback_set(en->imf_context,
+ ecore_imf_context_retrieve_surrounding_callback_set(en->imf_context,
_edje_entry_imf_retrieve_surrounding_cb, rp->edje);
en->imf_ee_handler_commit = ecore_event_handler_add(ECORE_IMF_EVENT_COMMIT, _edje_entry_imf_event_commit_cb, rp->edje);
en->imf_ee_handler_delete = ecore_event_handler_add(ECORE_IMF_EVENT_DELETE_SURROUNDING, _edje_entry_imf_event_delete_surrounding_cb, rp->edje);
en->imf_ee_handler_changed = NULL;
}
- if (en->input_panel_enable)
+ if (focused_entry == en)
{
- if (focused_entry == en)
+ if (hide_timer)
{
- if (hide_timer)
- {
- ecore_timer_del(hide_timer);
- hide_timer = NULL;
-
- _input_panel_hide(en->imf_context);
- }
+ ecore_timer_del(hide_timer);
+ hide_timer = NULL;
}
}
if (!en) return;
// set text as markup
_sel_clear(en->cursor, rp->object, en);
+#ifdef HAVE_ECORE_IMF
+ if ((en->have_preedit) && (en->imf_context))
+ {
+ en->need_commit = EINA_FALSE;
+ ecore_imf_context_reset(en->imf_context);
+ }
+#endif
evas_object_textblock_text_markup_set(rp->object, text);
_anchors_get(en->cursor, rp->object, en);
_edje_emit(rp->edje, "entry,changed", rp->part->name);
_edje_entry_set_cursor_start(rp);
+#ifdef HAVE_ECORE_IMF
+ if (en->imf_context)
+ ecore_imf_context_cursor_position_set(en->imf_context,
+ evas_textblock_cursor_pos_get(en->cursor));
+#endif
}
void
_edje_entry_autoperiod_set(Edje_Real_Part *rp, Eina_Bool autoperiod)
{
Entry *en = rp->entry_data;
- if (!en) return;
+ if (!en) return;
en->autoperiod = autoperiod;
}
}
}
+ if (!en->need_commit)
+ {
+ en->need_commit = EINA_TRUE;
+ return ECORE_CALLBACK_PASS_ON;
+ }
+
tc = evas_object_textblock_cursor_new(rp->object);
/* calculate the cursor position to insert commit string */
}
else
{
- if (!strcmp(ev->str, " ")) _autoperiod_insert(rp);
+ if (!strcmp(ev->str, " ")) _autoperiod_insert(en, tc);
/* if inputtin text is not allowed, dont allow text input */
if (en->func)
{
- if (en->func(en->data, ev->str)) return ECORE_CALLBACK_PASS_ON;
+ if (en->func(en->data, ev->str)) return ECORE_CALLBACK_PASS_ON;
}
//evas_textblock_cursor_text_prepend(en->cursor, ev->str);
- //_text_prepend(en, tc, ev->str);
_text_filter_text_prepend(en, tc, ev->str);
/*count characters*/
Eina_List *attrs = NULL;
Ecore_IMF_Preedit_Attr *attr;
Eina_List *l;
- Eina_Strbuf *buf;
+ Eina_Strbuf *buf;
if (!rp) return ECORE_CALLBACK_PASS_ON;
if (!en->imf_context) return ECORE_CALLBACK_PASS_ON;
- if (!en->imf_context) return ECORE_CALLBACK_PASS_ON;
if (en->imf_context != ev->ctx) return ECORE_CALLBACK_PASS_ON;
// ecore_imf_context_preedit_string_get(en->imf_context, &preedit_string, &cursor_pos);
buf = eina_strbuf_new();
if (attrs)
{
- EINA_LIST_FOREACH(attrs, l, attr)
+ EINA_LIST_FOREACH(attrs, l, attr)
{
if (attr->preedit_type == ECORE_IMF_PREEDIT_TYPE_SUB1)
{
eina_strbuf_append(buf, "</>");
}
}
- }
+ }
// evas_object_textblock_text_markup_prepend(en->cursor, eina_strbuf_string_get(buf));
_text_filter_markup_prepend(en, en->cursor, eina_strbuf_string_get(buf));
eina_strbuf_free(buf);
projects / framework / uifw / edje.git / commitdiff