[Upstream Migration r62484]

diff --cc src/bin/edje_cc_handlers.c
Simple merge

diff --cc src/lib/Edje.h
index b9deee3,c204e09..25b117c
--- 1/src/lib/Edje.h
--- 2/src/lib/Edje.h
+++ b/src/lib/Edje.h
@@@ -1214,73 -1199,25 +1203,78 @@@ EAPI void edje_password_show_last_set(E
  EAPI void edje_password_show_last_timeout_set(double password_show_last_timeout);
  
  /**
-  * @brief Set the edje object's scaling factor.
 + * @brief Set the edje object's global input panel usage.
 + *
 + * @param enabled TRUE if you want to use the input panel.
 + *
 + */
 +EAPI void         edje_input_panel_enabled_set (Eina_Bool enabled);
 +
 +/**
 + * @brief Set whether the input panel is used or not.
 + *
 + * @param enabled TRUE if you want to use the input panel.
 + *
 + */
 +EAPI void         edje_input_panel_allow_set (Eina_Bool enabled);
 +
 +/**
 + * @brief Get whether the input panel is used or not.
 + *
 + * @return The allowance of the edje's global input panel.
 + *
 + * @see edje_input_panel_allow_set().
 + */
 +EAPI Eina_Bool    edje_input_panel_allow_get (void);
 +
 +/**
 + * @brief Turn on/off the edje's global autocapitalization function.
 + *
 + * @param autocap EINA_TRUE to enable, EINA_FALSE otherwise
 + */
 +EAPI void         edje_autocapitalization_allow_set (Eina_Bool autocap);
 +
 +/**
 + * @brief Get the edje's global autocapitalization allowance.
 + *
 + * @return The allowance of the edje's global autocapitalization.
 + */
 +EAPI Eina_Bool    edje_autocapitalization_allow_get (void);
 +
 +/**
 + * @brief Turn on/off the edje's global autoperiod function.
 + *
 + * @param autoperiod EINA_TRUE to enable, EINA_FALSE otherwise
 + */
 +EAPI void         edje_autoperiod_allow_set (Eina_Bool autoperiod);
 +
 +/**
 + * @brief Get the edje's global autoperiod allowance.
 + *
 + * @return The allowance of the edje's global autoperiod.
 + */
 +EAPI Eina_Bool    edje_autoperiod_allow_get (void);
 +
 +/**
+  * @brief Set the scaling factor for a given Edje object.
   *
-  * @param obj The edje object's reference.
-  * @param scale The edje object scale factor. The defaul is 1.0.
+  * @param obj A handle to an Edje object
+  * @param scale The scaling factor (the default value is @c 0.0,
+  * meaning indivinual scaling @b not set)
   *
-  * This function sets the individual scale factor of the @a obj edje
-  * object. This property (or edje's global scale factor, when
-  * applicable), will affect this object's parts. However, only parts
-  * which, at the EDC language level, were declared which the "scale"
-  * attribute set to 1 (default is zero) will be affected.
+  * This function sets an @b individual scaling factor on the @a obj
+  * Edje object. This property (or Edje's global scaling factor, when
+  * applicable), will affect this object's part sizes. If @p scale is
+  * not zero, than the individual scaling will @b override any global
+  * scaling set, for the object @p obj's parts. Put it back to zero to
+  * get the effects of the global scaling again.
   *
-  * This scale factor can be retrieved with edje_object_scale_get().
-  * @see edje_object_scale_get().
+  * @warning Only parts which, at EDC level, had the @c "scale"
+  * property set to @c 1, will be affected by this function. Check the
+  * complete @ref edcref "syntax reference" for EDC files.
   *
+  * @see edje_object_scale_get()
+  * @see edje_scale_get() for more details
   */
  EAPI Eina_Bool    edje_object_scale_set           (Evas_Object *obj, double scale);
  

diff --cc src/lib/edje_calc.c
Simple merge

diff --cc src/lib/edje_entry.c
index dd13e14,93ba081..85ab0eb
--- 1/src/lib/edje_entry.c
--- 2/src/lib/edje_entry.c
+++ b/src/lib/edje_entry.c
@@@ -482,11 -424,7 +479,10 @@@ _sel_extend(Evas_Textblock_Cursor *c, E
          en->selection = NULL;
       }
     _edje_emit(en->rp->edje, "selection,changed", en->rp->part->name);
- 
     _edje_entry_imf_context_reset(en);
 +#ifdef HAVE_ECORE_IMF
 +   _input_panel_hide(en);
 +#endif
  }
  
  static void
@@@ -1803,13 -1595,12 +1822,18 @@@ _edje_part_mouse_down_cb(void *data, Ev
     _edje_entry_imf_context_reset(en);
     _edje_entry_imf_cursor_info_set(en);
  
 -   _edje_entry_real_part_configure(rp);
 +   if (en->rp->part->select_mode == EDJE_ENTRY_SELECTION_MODE_BLOCK_HANDLE)
 +     {
 +        if (en->longpress_timer) ecore_timer_del(en->longpress_timer);
 +        en->longpress_timer = ecore_timer_add(1.0, _long_press, data);
 +     }
 +   else
 +      _edje_entry_real_part_configure(rp);
+    if (ev->button == 2)
+      {
+         _edje_emit(rp->edje, "entry,paste,request", rp->part->name);
+         _edje_emit(rp->edje, "entry,paste,request,1", rp->part->name);
+      }
  }
  
  static void
@@@ -3346,29 -2761,19 +3366,32 @@@ _edje_entry_imf_event_commit_cb(void *d
                                         _password_timer_cb, en);
       }
     else
+      _text_filter_text_prepend(en, tc, ev->str);
+ 
+    if (!cursor_move)
       {
 -        /* move cursor to the end of commit string */
 -        evas_textblock_cursor_copy(tc, en->cursor);
 +        //evas_textblock_cursor_text_prepend(en->cursor, ev->str);
 +        _text_filter_text_prepend(en, tc, ev->str);
 +#if 0
 +       //yy
 +//       evas_textblock_cursor_text_prepend(en->cursor, ev->str);
 +       _text_filter_text_prepend(en, ev->str);
 +#endif
 +
 +        if (!cursor_move)
 +          {
 +             /* move cursor to the end of commit string */
 +             evas_textblock_cursor_copy(tc, en->cursor);
 +          }
       }
  
 -   evas_textblock_cursor_free(tc);
 +#ifdef HAVE_ECORE_IMF
 +   _preedit_clear(en);
 +#endif
  
     _edje_entry_imf_cursor_info_set(en);
-    _anchors_get(en->cursor, rp->object, en);
     _edje_emit(rp->edje, "entry,changed", rp->part->name);
+    _edje_emit(ed, "entry,changed,user", rp->part->name);
     _edje_emit(ed, "cursor,changed", rp->part->name);
  
     return ECORE_CALLBACK_DONE;
@@@ -3520,16 -2867,9 +3543,15 @@@ _edje_entry_imf_event_preedit_changed_c
       }
  
     _edje_entry_imf_cursor_info_set(en);
-    _anchors_get(en->cursor, rp->object, en);
-    _edje_emit(rp->edje, "entry,changed", rp->part->name);
+    _edje_emit(rp->edje, "preedit,changed", rp->part->name);
     _edje_emit(ed, "cursor,changed", rp->part->name);
  
 +   /* delete attribute list */
 +   if (attrs)
 +     {
 +        EINA_LIST_FREE(attrs, attr) free(attr);
 +     }
 +
     free(preedit_string);
  
     return ECORE_CALLBACK_DONE;

diff --cc src/lib/edje_private.h
index f103b71,07a901e..84fb3b6
--- 1/src/lib/edje_private.h
--- 2/src/lib/edje_private.h
+++ b/src/lib/edje_private.h
@@@ -1449,11 -1450,10 +1452,14 @@@ extern FLOAT_T          _edje_scale
  extern int              _edje_freeze_val;
  extern int              _edje_freeze_calc_count;
  extern Eina_List       *_edje_freeze_calc_list;
 +extern Eina_Bool        _edje_input_panel_enable;
 +
 +extern Eina_Bool        _edje_password_show_last;
 +extern FLOAT_T          _edje_password_show_last_timeout;
  
+ extern Eina_Bool        _edje_password_show_last;
+ extern FLOAT_T          _edje_password_show_last_timeout;
+ 
  extern Eina_Mempool *_edje_real_part_mp;
  extern Eina_Mempool *_edje_real_part_state_mp;
  

diff --cc src/lib/edje_util.c
Simple merge