[entry] modify autoperiod policy

diff --git a/debian/changelog b/debian/changelog
index 5b8cb25..1fd07ca 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+edje (1.0.0.001+svn.51480slp2+build21) unstable; urgency=low
+
+  * [entry] process the key events of keypad 
+  * Git: 165.213.180.234:/git/slp/pkgs/edje
+  * Tag: edje_1.0.0.001+svn.51480slp2+build21
+
+ -- Jihoon Kim <jihoon48.kim@samsung.com>  Tue, 26 Oct 2010 14:13:50 +0900
+
 edje (1.0.0.001+svn.51480slp2+build20) unstable; urgency=low
 
   * [entry] changed the size of handler detection area

diff --git a/src/lib/edje_entry.c b/src/lib/edje_entry.c
index e9dc315..16bac1a 100644 (file)
--- a/src/lib/edje_entry.c
+++ b/src/lib/edje_entry.c
@@ -89,7 +89,7 @@ struct _Entry
    Eina_Bool had_sel : 1;
    Eina_Bool autocapital : 1;
    Eina_Bool uppercase : 1;
-   Eina_Bool autoperiod : 1;
+//   Eina_Bool autoperiod : 1;
    int select_dragging_state;
    double space_key_time;
 
@@ -1208,9 +1208,9 @@ _autoperiod_insert(Edje_Real_Part *rp)
    if (!edje_autoperiod_allow_get()) return;
 
    en = rp->entry_data;
-   if (!en || !en->autoperiod) return;
+//   if (!en->autoperiod) return;
 
-   if ((ecore_time_get() - en->space_key_time) > 0.6)
+   if ((ecore_time_get() - en->space_key_time) > EDJE_ENTRY_DOUBLE_SPACE_TIME)
      {
         goto done;
      }
@@ -2563,6 +2563,7 @@ _edje_entry_real_part_shutdown(Edje_Real_Part *rp)
    rp->edje->subobjs = eina_list_remove(rp->edje->subobjs, en->cursor_fg);
    evas_object_del(en->cursor_bg);
    evas_object_del(en->cursor_fg);
+
    if (en->pw_timer)
      {
         ecore_timer_del(en->pw_timer);
@@ -2964,16 +2965,19 @@ void
 _edje_entry_autocapitalization_set(Edje_Real_Part *rp, Eina_Bool autocap)
 {
    Entry *en = rp->entry_data;
-   if (!en) return;   
+   if (!en) return;
+
    en->autocapital = autocap;
 }
 
 void
 _edje_entry_autoperiod_set(Edje_Real_Part *rp, Eina_Bool autoperiod)
 {
+   /*
    Entry *en = rp->entry_data;
    if (!en) return;   
    en->autoperiod = autoperiod;
+   */
 }
 
 #ifdef HAVE_ECORE_IMF
@@ -2981,7 +2985,6 @@ Ecore_IMF_Context *
 _edje_entry_imf_context_get(Edje_Real_Part *rp)
 {
    Entry *en = rp->entry_data;
-
    if (!en) return NULL;
 
    return en->imf_context;
@@ -3499,13 +3502,15 @@ _edje_entry_imf_event_preedit_changed_cb(void *data, int type __UNUSED__, void *
 
    if (en->have_selection)
      {
+        /* delete selection block */
         _range_del(en->cursor, rp->object, en);
         _sel_clear(en->cursor, rp->object, en);
      }
 
+
    if (en->have_preedit)
      {
-        // delete the preedit characters
+        /* delete the preedit characters */
         for (i = 0;i < en->preedit_len; i++)
            _backspace(en->cursor, rp->object, en);
      }

diff --git a/src/lib/edje_private.h b/src/lib/edje_private.h
index b8e6748..c857619 100644 (file)
--- a/src/lib/edje_private.h
+++ b/src/lib/edje_private.h
@@ -343,6 +343,8 @@ typedef struct _Edje_Patterns                        Edje_Patterns;
 #define EDJE_ENTRY_SELECTION_MODE_EXPLICIT 1
 #define EDJE_ENTRY_SELECTION_MODE_BLOCK_HANDLE 2
 
+#define EDJE_ENTRY_DOUBLE_SPACE_TIME 0.6
+
 #define EDJE_PART_PATH_SEPARATOR ':'
 #define EDJE_PART_PATH_SEPARATOR_STRING ":"
 #define EDJE_PART_PATH_SEPARATOR_INDEXL '['