Merge branch 'tizen_3.0' into tizen

Change-Id: I16170381acb0677149a43c19d1a649ccc4c7a501

diff --cc packaging/e-mod-tizen-wl-textinput.spec
Simple merge

diff --cc src/e_mod_input_panel.c
index 1c47abd7bcba8ad444e49e27655aff7f672422f5,4ce46b999aa1fc5b02fd244d4e126f89d86b55c0..f403359630d6e5624d2eddc34d761c385c90b3bf
--- 1/src/e_mod_input_panel.c
--- 2/src/e_mod_input_panel.c
+++ b/src/e_mod_input_panel.c
@@@ -281,29 -292,25 +290,29 @@@ _e_input_panel_surface_visible_update(E
           * no need for trying re-run panel show command */
          if (panel_show_need_rerun)
            e_input_panel_show_need_rerun_set(EINA_FALSE);
 -#ifdef _TV
 -        _e_input_panel_position_set(ec, ec->client.w, ec->client.h);
 -        ec->visible = EINA_TRUE;
 -        evas_object_geometry_set(ec->frame, ec->x, ec->y, ec->w, ec->h);
 -        evas_object_show(ec->frame);
 -        e_comp_object_damage(ec->frame, 0, 0, ec->w, ec->h);
 -#else
 -        if (ec->visible)
 -          return;
  
 -        LOGD("IPS::DEFER_SHOW::ADD\n");
 -        ips->wait_update = EINA_TRUE;
 -        if (!ips->eh.buf_change)
 +        if (_TV)
            {
 -             ips->eh.buf_change =
 -                ecore_event_handler_add(E_EVENT_CLIENT_BUFFER_CHANGE,
 -                                        _ips_cb_buffer_change, ips);
 +             _e_input_panel_position_set(ec, ec->client.w, ec->client.h);
 +             ec->visible = EINA_TRUE;
 +             evas_object_geometry_set(ec->frame, ec->x, ec->y, ec->w, ec->h);
 +             evas_object_show(ec->frame);
 +             e_comp_object_damage(ec->frame, 0, 0, ec->w, ec->h);
 +          }
 +        else
 +          {
 +             if (ec->visible)
 +               return;
 +
-              WTI_LOG("IPS::DEFER_SHOW::ADD");
++             LOGD("IPS::DEFER_SHOW::ADD");
 +             ips->wait_update = EINA_TRUE;
 +             if (!ips->eh.buf_change)
 +               {
 +                  ips->eh.buf_change =
 +                     ecore_event_handler_add(E_EVENT_CLIENT_BUFFER_CHANGE,
 +                                             _ips_cb_buffer_change, ips);
 +               }
            }
 -#endif
       }
     else
       {
@@@ -814,35 -827,34 +827,35 @@@ end
  EINTERN void
  e_input_panel_wait_update_set(Eina_Bool wait_update)
  {
 -#ifndef _TV
 -   E_Input_Panel_Surface *ips;
 -   Eina_List *l;
 +   if (!_TV)
 +     {
 +        E_Input_Panel_Surface *ips;
 +        Eina_List *l;
  
 -   if (!g_input_panel)
 -     return;
 +        if (!g_input_panel)
 +          return;
  
 -   g_input_panel->wait_update = wait_update;
 +        g_input_panel->wait_update = wait_update;
  
 -   /* If we are in wait_update mode, the input panel surfaces have to be updated forcibly */
 -   if (wait_update)
 -     {
 -        EINA_LIST_FOREACH(g_input_panel->surfaces, l, ips)
 +        /* If we are in wait_update mode, the input panel surfaces have to be updated forcibly */
 +        if (wait_update)
            {
 -             if (!ips->ec) continue;
 -             _ips_client_frame_flush(ips);
 -          }
 +             EINA_LIST_FOREACH(g_input_panel->surfaces, l, ips)
 +               {
 +                  if (!ips->ec) continue;
 +                  _ips_client_frame_flush(ips);
 +               }
  
 -        if (!g_input_panel->buf_change_handler)
 -          {
 -             LOGD("IPS::WAIT::UPDATE::SET (add buf change handler)\n");
 -             g_input_panel->buf_change_handler = ecore_event_handler_add(E_EVENT_CLIENT_BUFFER_CHANGE,
 -                                                                         _ip_cb_e_buf_change, NULL);
 +             if (!g_input_panel->buf_change_handler)
 +               {
-                   WTI_LOG("IPS::WAIT::UPDATE::SET (add buf change handler)\n");
++                  LOGD("IPS::WAIT::UPDATE::SET (add buf change handler)\n");
 +                  g_input_panel->buf_change_handler = ecore_event_handler_add(E_EVENT_CLIENT_BUFFER_CHANGE,
 +                                                                              _ip_cb_e_buf_change, NULL);
 +               }
            }
 +        else
 +          E_FREE_FUNC(g_input_panel->buf_change_handler, ecore_event_handler_del);
       }
 -   else
 -     E_FREE_FUNC(g_input_panel->buf_change_handler, ecore_event_handler_del);
 -#endif
  }
  
  EINTERN void

diff --cc src/e_mod_main.c
index f2015e35f6c26c64407c22d482cf277910e99901,e571ad294013ca1b879df56a117eee8fddf90c30..920887e09bb3d9e5fad8a5273e5809696d6e2e3e
--- 1/src/e_mod_main.c
--- 2/src/e_mod_main.c
+++ b/src/e_mod_main.c
@@@ -16,40 -14,8 +16,42 @@@
  #endif
  #define LOG_TAG "WL_TEXTINPUT"
  
+ #define WTI_WARNING(resource, code, msg)     (_e_text_input_log_show((resource), (code), (msg), __func__))
+ 
 +tizen_profile_t _get_tizen_profile()
 +{
 +   static tizen_profile_t profile = TIZEN_PROFILE_UNKNOWN;
 +   if (__builtin_expect(profile != TIZEN_PROFILE_UNKNOWN, 1))
 +     return profile;
 +
 +   char *profileName;
 +   system_info_get_platform_string("http://tizen.org/feature/profile", &profileName);
 +   switch (*profileName)
 +     {
 +      case 'm':
 +      case 'M':
 +         profile = TIZEN_PROFILE_MOBILE;
 +         break;
 +      case 'w':
 +      case 'W':
 +         profile = TIZEN_PROFILE_WEARABLE;
 +         break;
 +      case 't':
 +      case 'T':
 +         profile = TIZEN_PROFILE_TV;
 +         break;
 +      case 'i':
 +      case 'I':
 +         profile = TIZEN_PROFILE_IVI;
 +         break;
 +      default: // common or unknown ==> ALL ARE COMMON.
 +         profile = TIZEN_PROFILE_COMMON;
 +     }
 +   free(profileName);
 +
 +   return profile;
 +}
 +
  static Eina_Bool _e_text_input_method_context_cb_client_resize(void *data EINA_UNUSED, int type, void *event);
  static void set_soft_keyboard_mode();