add elm_autocapitalization_allow_set, elm_autoperiod_allow_set API

diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in
index b26df50..ecdf603 100644 (file)
--- a/src/lib/Elementary.h.in
+++ b/src/lib/Elementary.h.in
@@ -277,6 +277,9 @@ extern "C" {
    EAPI void         elm_finger_size_set(Evas_Coord size);
    EAPI void         elm_finger_size_all_set(Evas_Coord size);
 
+   EAPI void         elm_autocapitalization_allow_all_set(Eina_Bool autocap);
+   EAPI void         elm_autoperiod_allow_all_set(Eina_Bool autoperiod);
+
    EAPI Eina_Bool    elm_object_focus_get(Evas_Object *obj);
    EAPI void         elm_object_focus(Evas_Object *obj);
    EAPI void         elm_object_unfocus(Evas_Object *obj);
@@ -2098,8 +2101,8 @@ extern "C" {
    /* Tab */
    typedef enum _Elm_Tab_Move_Type
      {
-       ELM_TAB_MOVE_LEFT = 0,
-       ELM_TAB_MOVE_RIGHT = 1
+        ELM_TAB_MOVE_LEFT = 0,
+        ELM_TAB_MOVE_RIGHT = 1
      } Elm_Tab_Move_Type;
 
    typedef enum _Elm_Tab_Mode_Type
@@ -2861,17 +2864,17 @@ extern "C" {
     */
 
    /* do not use except clipboard history module */
-   EAPI Eina_Bool elm_cbhm_helper_init(Evas_Object *self);
-   EAPI void      elm_cbhm_send_raw_data(char *cmd);
+   EAPI Eina_Bool    elm_cbhm_helper_init(Evas_Object *self);
+   EAPI void         elm_cbhm_send_raw_data(char *cmd);
 
    /* Xml Animator */
    typedef struct _Elm_Xml_Animator Elm_Xml_Animator;
 
-   EAPI Eina_Bool elm_xml_animator_file_set(Elm_Xml_Animator *xa, const char *file);
-   EAPI Eina_Bool elm_xml_animator_object_add(Elm_Xml_Animator *xa, Evas_Object *obj, const char *title, void (*end_func)(void *data, Evas_Object *obj), void *data);
-   EAPI void      elm_xml_animator_object_del(Elm_Xml_Animator *xa, Evas_Object *obj);
-   EAPI void      elm_xml_animator_del(Elm_Xml_Animator *xa);
-   EAPI void      elm_xml_animator_run(Elm_Xml_Animator *xa);
+   EAPI Eina_Bool    elm_xml_animator_file_set(Elm_Xml_Animator *xa, const char *file);
+   EAPI Eina_Bool    elm_xml_animator_object_add(Elm_Xml_Animator *xa, Evas_Object *obj, const char *title, void (*end_func)(void *data, Evas_Object *obj), void *data);
+   EAPI void         elm_xml_animator_object_del(Elm_Xml_Animator *xa, Evas_Object *obj);
+   EAPI void         elm_xml_animator_del(Elm_Xml_Animator *xa);
+   EAPI void         elm_xml_animator_run(Elm_Xml_Animator *xa);
    
 #ifdef __cplusplus
 }

diff --git a/src/lib/elm_config.c b/src/lib/elm_config.c
index 466f05a..6cc6c09 100644 (file)
--- a/src/lib/elm_config.c
+++ b/src/lib/elm_config.c
@@ -24,7 +24,7 @@ static void _env_get(void);
 #ifdef HAVE_ELEMENTARY_X
 static Ecore_Event_Handler *_prop_change_handler = NULL;
 static Ecore_X_Window _root_1st = 0;
-#define ATOM_COUNT 6
+#define ATOM_COUNT 8
 static Ecore_X_Atom _atom[ATOM_COUNT];
 static Ecore_X_Atom _atom_config = 0;
 static Ecore_X_Atom _atom_config_specific = 0;
@@ -36,8 +36,8 @@ static const char *_atom_names[ATOM_COUNT] =
      "ENLIGHTENMENT_PROFILE",
      "ENLIGHTENMENT_CONFIG",
      "ENLIGHTENMENT_INPUT_PANEL",
-     "ENLIGHTENMENT_AUTOCAPITAL",
-     "ENLIGHTENMENT_AUTOPERIOD",
+     "ENLIGHTENMENT_AUTOCAPITAL_ALLOW",
+     "ENLIGHTENMENT_AUTOPERIOD_ALLOW",
 };
 #define ATOM_E_SCALE 0
 #define ATOM_E_FINGER_SIZE 1
@@ -45,8 +45,8 @@ static const char *_atom_names[ATOM_COUNT] =
 #define ATOM_E_PROFILE 3
 #define ATOM_E_CONFIG 4
 #define ATOM_E_INPUT_PANEL 5
-#define ATOM_E_AUTOCAPITAL 6
-#define ATOM_E_AUTOPERIOD 7
+#define ATOM_E_AUTOCAPITAL_ALLOW 6
+#define ATOM_E_AUTOPERIOD_ALLOW 7
 
 static Eina_Bool _prop_config_get(void);
 static Eina_Bool _prop_change(void *data __UNUSED__, int ev_type __UNUSED__, void *ev);
@@ -99,61 +99,61 @@ _prop_change(void *data __UNUSED__, int ev_type __UNUSED__, void *ev)
 
    if (event->win == _root_1st)
      {
-       if (event->atom == _atom[ATOM_E_SCALE])
-         {
-            unsigned int val = 1000;
+        if (event->atom == _atom[ATOM_E_SCALE])
+          {
+             unsigned int val = 1000;
 
-            if (ecore_x_window_prop_card32_get(event->win,
-                                               event->atom,
-                                               &val, 1) > 0)
-              {
-                 double pscale;
+             if (ecore_x_window_prop_card32_get(event->win,
+                                                event->atom,
+                                                &val, 1) > 0)
+               {
+                  double pscale;
 
-                 pscale = _elm_config->scale;
-                 if (val > 0) _elm_config->scale = (double)val / 1000.0;
-                 if (pscale != _elm_config->scale) _elm_rescale();
-              }
-         }
-       else if (event->atom == _atom[ATOM_E_FINGER_SIZE])
-         {
-            unsigned int val = 1000;
+                  pscale = _elm_config->scale;
+                  if (val > 0) _elm_config->scale = (double)val / 1000.0;
+                  if (pscale != _elm_config->scale) _elm_rescale();
+               }
+          }
+        else if (event->atom == _atom[ATOM_E_FINGER_SIZE])
+          {
+             unsigned int val = 1000;
 
-            if (ecore_x_window_prop_card32_get(event->win,
-                                               event->atom,
-                                               &val, 1) > 0)
-              {
-                 int pfinger_size;
+             if (ecore_x_window_prop_card32_get(event->win,
+                                                event->atom,
+                                                &val, 1) > 0)
+               {
+                  int pfinger_size;
 
-                 pfinger_size = _elm_config->finger_size;
-                 _elm_config->finger_size = val;
-                 if (pfinger_size != _elm_config->finger_size) _elm_rescale();
-              }
-         }
-       else if (event->atom == _atom[ATOM_E_THEME])
-         {
+                  pfinger_size = _elm_config->finger_size;
+                  _elm_config->finger_size = val;
+                  if (pfinger_size != _elm_config->finger_size) _elm_rescale();
+               }
+          }
+        else if (event->atom == _atom[ATOM_E_THEME])
+          {
              char *val = NULL;
-             
+
              val = ecore_x_window_prop_string_get(event->win,
                                                   event->atom);
-            eina_stringshare_replace(&_elm_config->theme, val);
-            if (val)
-              {
-                 _elm_theme_parse(NULL, val);
-                 free(val);
-                 _elm_rescale();
-              }
-         }
-       else if (event->atom == _atom[ATOM_E_PROFILE])
+             eina_stringshare_replace(&_elm_config->theme, val);
+             if (val)
+               {
+                  _elm_theme_parse(NULL, val);
+                  free(val);
+                  _elm_rescale();
+               }
+          }
+        else if (event->atom == _atom[ATOM_E_PROFILE])
           {
              char *val = NULL;
-             
+
              val = ecore_x_window_prop_string_get(event->win,
                                                   event->atom);
-            eina_stringshare_replace(&_elm_config->theme, val);
-            if (val)
-              {
+             eina_stringshare_replace(&_elm_config->theme, val);
+             if (val)
+               {
                   int changed = 0;
-                  
+
                   if (_elm_profile)
                     {
                        if (strcmp(_elm_profile, val)) changed = 1;
@@ -170,20 +170,27 @@ _prop_change(void *data __UNUSED__, int ev_type __UNUSED__, void *ev)
                             _elm_rescale();
                          }
                     }
-              }
+               }
           }
-       else if (event->atom == _atom[ATOM_E_INPUT_PANEL])
-         {
-            unsigned int val = 0;
+        else if (event->atom == _atom[ATOM_E_INPUT_PANEL])
+          {
+             unsigned int val = 0;
 
-            if (ecore_x_window_prop_card32_get(event->win,
-                                               event->atom,
-                                               &val, 1) > 0)
-              {
-               edje_input_panel_enabled_set(val);
-              }
+             if (ecore_x_window_prop_card32_get(event->win,
+                                                event->atom,
+                                                &val, 1) > 0)
+               {
+                   int input_panel_enable;
+
+                   input_panel_enable = _elm_config->input_panel_enable;
+                   _elm_config->input_panel_enable = val;
+                   if (input_panel_enable != _elm_config->input_panel_enable) 
+                     {
+                        edje_input_panel_enabled_set(_elm_config->input_panel_enable);
+                     }
+               }
           }
-        else if (event->atom == _atom[ATOM_E_AUTOCAPITAL])
+        else if (event->atom == _atom[ATOM_E_AUTOCAPITAL_ALLOW])
           {
              unsigned int val = 0;
 
@@ -191,10 +198,17 @@ _prop_change(void *data __UNUSED__, int ev_type __UNUSED__, void *ev)
                                                 event->atom,
                                                 &val, 1) > 0)
                {
-                  edje_autocapitalization_set(val);
+                   int autocapital_allow;
+
+                   autocapital_allow = _elm_config->autocapital_allow;
+                   _elm_config->autocapital_allow = val;
+                   if (autocapital_allow != _elm_config->autocapital_allow) 
+                     {
+                        edje_autocapitalization_allow_set(_elm_config->autocapital_allow);
+                     }
                }
-          }
-        else if (event->atom == _atom[ATOM_E_AUTOPERIOD])
+          }            
+        else if (event->atom == _atom[ATOM_E_AUTOPERIOD_ALLOW])
           {
              unsigned int val = 0;
 
@@ -202,10 +216,17 @@ _prop_change(void *data __UNUSED__, int ev_type __UNUSED__, void *ev)
                                                 event->atom,
                                                 &val, 1) > 0)
                {
-                  edje_autoperiod_set(val);
+                  int autoperiod_allow;
+
+                  autoperiod_allow = _elm_config->autoperiod_allow;
+                  _elm_config->autoperiod_allow = val;
+                  if (autoperiod_allow != _elm_config->autoperiod_allow) 
+                    {
+                       edje_autoperiod_allow_set(_elm_config->autoperiod_allow);
+                    }
                }
-          }
-       else if (((_atom_config > 0) && (event->atom == _atom_config)) ||
+          }                            
+        else if (((_atom_config > 0) && (event->atom == _atom_config)) ||
                  (event->atom == _atom[ATOM_E_CONFIG]))
           {
              _prop_config_get();
@@ -346,6 +367,8 @@ _config_apply(void)
    edje_frametime_set(1.0 / _elm_config->fps);
    edje_scale_set(_elm_config->scale);
    edje_input_panel_enabled_set(_elm_config->input_panel_enable);
+   edje_autocapitalization_allow_set(_elm_config->autocapital_allow);
+   edje_autoperiod_allow_set(_elm_config->autoperiod_allow);
 }
 
 static void
@@ -402,6 +425,8 @@ _config_load(void)
    _elm_config->theme = eina_stringshare_add("default");
    _elm_config->modules = NULL;
    _elm_config->input_panel_enable = 0;
+   _elm_config->autocapital_allow = 0;
+   _elm_config->autoperiod_allow = 0;
 }
 
 static void
@@ -550,11 +575,17 @@ _env_get(void)
    s = getenv("ELM_INPUT_PANEL");
    if (s) _elm_config->input_panel_enable = atoi(s);
 
-   s = getenv("ELM_AUTOCAPITAL");
-   if (s) _elm_config->autocapital = atoi(s);
+   s = getenv("ELM_ENTRY_AUTOCAPITAL_ALLOW");
+   if (s) 
+     {
+        _elm_config->autocapital_allow = atoi(s);
+     }
 
-   s = getenv("ELM_AUTOPERIOD");
-   if (s) _elm_config->autoperiod = atoi(s);
+   s = getenv("ELM_ENTRY_AUTOPERIOD_ALLOW");
+   if (s)
+     {
+        _elm_config->autoperiod_allow = atoi(s);
+     }
 }
 
 void
@@ -662,30 +693,33 @@ _elm_config_sub_init(void)
                   if (val > 0)
                     {
                        _elm_config->input_panel_enable = val;
+                       edje_input_panel_enabled_set(_elm_config->input_panel_enable);
                     }
                }
           }
-        if (!getenv("ELM_AUTOCAPITAL"))
+        if (!getenv("ELM_ENTRY_AUTOCAPITAL_ALLOW"))
           {
              if (ecore_x_window_prop_card32_get(_root_1st,
-                                                _atom[ATOM_E_AUTOCAPITAL],
+                                                _atom[ATOM_E_AUTOCAPITAL_ALLOW],
                                                 &val, 1) > 0)
                {
                   if (val > 0)
                     {
-                       _elm_config->autocapital = val;
+                       _elm_config->autocapital_allow = val;
+                       edje_autocapitalization_allow_set(_elm_config->autocapital_allow);
                     }
                }
           }
-        if (!getenv("ELM_AUTOPERIOD"))
+        if (!getenv("ELM_ENTRY_AUTOPERIOD_ALLOW"))
           {
              if (ecore_x_window_prop_card32_get(_root_1st,
-                                                _atom[ATOM_E_AUTOPERIOD],
+                                                _atom[ATOM_E_AUTOPERIOD_ALLOW],
                                                 &val, 1) > 0)
                {
                   if (val > 0)
                     {
-                       _elm_config->autoperiod = val;
+                       _elm_config->autoperiod_allow = val;
+                       edje_autoperiod_allow_set(_elm_config->autoperiod_allow);
                     }
                }
           }

diff --git a/src/lib/elm_main.c b/src/lib/elm_main.c
index dfb2a7a..52bd045 100644 (file)
--- a/src/lib/elm_main.c
+++ b/src/lib/elm_main.c
@@ -424,7 +424,7 @@ _elm_unneed_e_dbus(void)
    if (_elm_need_e_dbus)
      {
         _elm_need_e_dbus = 0;
-   e_hal_shutdown();
+        e_hal_shutdown();
         e_dbus_shutdown();
      }
 #endif   
@@ -1226,6 +1226,33 @@ elm_finger_size_all_set(Evas_Coord size)
 #endif   
 }
 
+EAPI void
+elm_autocapitalization_allow_all_set(Eina_Bool on)
+{
+#ifdef HAVE_ELEMENTARY_X
+   static Ecore_X_Atom atom = 0;
+   unsigned int on_i = (unsigned int)on;
+
+   if (!atom) atom = ecore_x_atom_get("ENLIGHTENMENT_AUTOCAPITAL_ALLOW");
+   ecore_x_window_prop_card32_set(ecore_x_window_root_first_get(),
+                                  atom, &on_i, 1);
+#endif
+}
+
+EAPI void
+elm_autoperiod_allow_all_set(Eina_Bool on)
+{
+#ifdef HAVE_ELEMENTARY_X
+   static Ecore_X_Atom atom = 0;
+   unsigned int on_i = (unsigned int)on;
+
+   if (!atom) atom = ecore_x_atom_get("ENLIGHTENMENT_AUTOPERIOD_ALLOW");
+   ecore_x_window_prop_card32_set(ecore_x_window_root_first_get(),
+                                  atom, &on_i, 1);
+#endif
+}
+
+
 /**
  * Adjust size of an element for finger usage
  *

diff --git a/src/lib/elm_priv.h b/src/lib/elm_priv.h
index 1a5d8bb..4798ab1 100644 (file)
--- a/src/lib/elm_priv.h
+++ b/src/lib/elm_priv.h
@@ -110,8 +110,8 @@ struct _Elm_Config
    const char *theme;
    const char *modules;
    int input_panel_enable;
-   int autocapital;
-   int autoperiod;   
+   int autocapital_allow;
+   int autoperiod_allow;   
 };
 
 struct _Elm_Module