efl_ui_win: rename elm_win to efl_ui_win

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 217d0ff..203f5f3 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -172,7 +172,7 @@ src/lib/elementary/elm_util.c
 src/lib/elementary/elm_video.c
 src/lib/elementary/elm_web2.c
 src/lib/elementary/elm_widget.c
-src/lib/elementary/elm_win.c
+src/lib/elementary/efl_ui_win.c
 src/lib/elementary/els_box.c
 src/lib/elementary/els_cursor.c
 src/lib/elementary/els_tooltip.c

diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index 2da4f8e..268a56f 100644 (file)
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -95,8 +95,8 @@ elm_public_eolian_files = \
        lib/elementary/elm_view_form.eo \
        lib/elementary/elm_web.eo \
        lib/elementary/elm_widget.eo \
-       lib/elementary/elm_win.eo \
-       lib/elementary/elm_win_standard.eo \
+       lib/elementary/efl_ui_win.eo \
+       lib/elementary/efl_ui_win_standard.eo \
        lib/elementary/elm_widget_item.eo \
        lib/elementary/elm_color_item.eo \
        lib/elementary/elm_dayselector_item.eo \
@@ -665,8 +665,8 @@ lib_elementary_libelementary_la_SOURCES = \
        lib/elementary/elm_view_form.c \
        lib/elementary/elm_web2.c \
        lib/elementary/elm_widget.c \
-       lib/elementary/elm_win.c \
-       lib/elementary/elm_win_standard.c \
+       lib/elementary/efl_ui_win.c \
+       lib/elementary/efl_ui_win_standard.c \
        lib/elementary/elm_helper.c \
        lib/elementary/els_box.c \
        lib/elementary/els_cursor.c \

diff --git a/src/lib/elementary/Elementary.h.in b/src/lib/elementary/Elementary.h.in
index 3947fd7..6f362ec 100644 (file)
--- a/src/lib/elementary/Elementary.h.in
+++ b/src/lib/elementary/Elementary.h.in
@@ -273,6 +273,8 @@ EAPI extern Elm_Version *elm_version;
 # include <efl_ui_box_flow.eo.h>
 # include <efl_ui_grid.eo.h>
 # include <efl_ui_image.eo.h>
+# include <efl_ui_win.eo.h>
+# include <efl_ui_win_standard.eo.h>
 #endif
 
 /* include deprecated calls last of all */

diff --git a/src/lib/elementary/Makefile.am b/src/lib/elementary/Makefile.am
index 364bc85..5c2b914 100644 (file)
--- a/src/lib/elementary/Makefile.am
+++ b/src/lib/elementary/Makefile.am
@@ -102,8 +102,8 @@ elm_eolian_files = \
        elm_view_form.eo \
        elm_web.eo \
        elm_widget.eo \
-       elm_win.eo \
-       elm_win_standard.eo \
+       efl_ui_win.eo \
+       efl_ui_win_standard.eo \
        elm_widget_item.eo \
        elm_color_item.eo \
        elm_dayselector_item.eo \
@@ -616,8 +616,8 @@ libelementary_la_SOURCES = \
        elm_view_form.c \
        elm_web2.c \
        elm_widget.c \
-       elm_win.c \
-       elm_win_standard.c \
+       efl_ui_win.c \
+       efl_ui_win_standard.c \
        elm_helper.c \
        els_box.c \
        els_cursor.c \

diff --git a/src/lib/elementary/elm_win.c b/src/lib/elementary/efl_ui_win.c
similarity index 92%
rename from src/lib/elementary/elm_win.c
rename to src/lib/elementary/efl_ui_win.c
index 653a28b..ab1cb7f 100644 (file)
--- a/src/lib/elementary/elm_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -20,9 +20,9 @@
 #define EFL_INTERNAL_UNSTABLE
 #include "interfaces/efl_common_internal.h"
 
-#define MY_CLASS ELM_WIN_CLASS
+#define MY_CLASS EFL_UI_WIN_CLASS
 
-#define MY_CLASS_NAME "Elm_Win"
+#define MY_CLASS_NAME "Efl_Ui_Win"
 #define MY_CLASS_NAME_LEGACY "elm_win"
 
 static const Elm_Win_Trap *trap = NULL;
@@ -39,7 +39,7 @@ static const Elm_Win_Trap *trap = NULL;
   while (0)
 
 #define ELM_WIN_DATA_GET(o, sd) \
-  Elm_Win_Data * sd = eo_data_scope_get(o, MY_CLASS)
+  Efl_Ui_Win_Data * sd = eo_data_scope_get(o, MY_CLASS)
 
 #define ELM_WIN_DATA_GET_OR_RETURN(o, ptr, ...)      \
   ELM_WIN_DATA_GET(o, ptr);                          \
@@ -82,16 +82,16 @@ static const Elm_Win_Trap *trap = NULL;
          {                                                      \
             edje_object_signal_emit(cursd->edje, \
                              "elm,action,show_blocker", "elm"); \
-            eo_event_callback_call(cursd->main_menu, ELM_WIN_EVENT_ELM_ACTION_BLOCK_MENU, NULL); \
+            eo_event_callback_call(cursd->main_menu, EFL_UI_WIN_EVENT_ELM_ACTION_BLOCK_MENU, NULL); \
          }                                                      \
     }
 
 #define ENGINE_GET() (_elm_preferred_engine ? _elm_preferred_engine : _elm_config->engine)
 
-typedef struct _Elm_Win_Data Elm_Win_Data;
+typedef struct _Efl_Ui_Win_Data Efl_Ui_Win_Data;
 typedef struct _Box_Item_Iterator Box_Item_Iterator;
 
-struct _Elm_Win_Data
+struct _Efl_Ui_Win_Data
 {
    Ecore_Evas           *ee;
    Evas                 *evas;
@@ -133,8 +133,8 @@ struct _Elm_Win_Data
    Eina_Bool                     deferred_resize_job;
    Ecore_Job                     *deferred_child_eval_job;
 
-   Elm_Win_Type                   type;
-   Elm_Win_Keyboard_Mode          kbdmode;
+   Efl_Ui_Win_Type                   type;
+   Efl_Ui_Win_Keyboard_Mode          kbdmode;
    Elm_Win_Indicator_Mode         indmode;
    Elm_Win_Indicator_Opacity_Mode ind_o_mode;
    struct
@@ -309,12 +309,12 @@ _elm_win_on_resize_obj_changed_size_hints(void *data,
                                           void *event_info);
 static void
 _elm_win_img_callbacks_del(Evas_Object *obj, Evas_Object *imgobj);
-static Eina_Bool _elm_win_theme_internal(Eo *obj, Elm_Win_Data *sd);
-static void _elm_win_frame_add(Elm_Win_Data *sd, const char *style);
-static void _elm_win_frame_del(Elm_Win_Data *sd);
+static Eina_Bool _elm_win_theme_internal(Eo *obj, Efl_Ui_Win_Data *sd);
+static void _elm_win_frame_add(Efl_Ui_Win_Data *sd, const char *style);
+static void _elm_win_frame_del(Efl_Ui_Win_Data *sd);
 
 #ifdef HAVE_ELEMENTARY_X
-static void _elm_win_xwin_update(Elm_Win_Data *sd);
+static void _elm_win_xwin_update(Efl_Ui_Win_Data *sd);
 #endif
 
 EAPI double _elm_startup_time = 0;
@@ -379,7 +379,7 @@ elm_process_state_get(void)
 }
 
 static void
-_elm_win_apply_alpha(Eo *obj, Elm_Win_Data *sd)
+_elm_win_apply_alpha(Eo *obj, Efl_Ui_Win_Data *sd)
 {
    Eina_Bool enabled;
 
@@ -557,7 +557,7 @@ _elm_win_state_eval_queue(void)
 // ELM_ENGINE="shot:delay=0.1:file=my-window.png"
 
 static double
-_shot_delay_get(Elm_Win_Data *sd)
+_shot_delay_get(Efl_Ui_Win_Data *sd)
 {
    char *p, *pd;
    char *d = strdup(sd->shot.info);
@@ -585,7 +585,7 @@ _shot_delay_get(Elm_Win_Data *sd)
 }
 
 static char *
-_shot_file_get(Elm_Win_Data *sd)
+_shot_file_get(Efl_Ui_Win_Data *sd)
 {
    char *p;
    char *tmp = strdup(sd->shot.info);
@@ -628,7 +628,7 @@ _shot_file_get(Elm_Win_Data *sd)
 }
 
 static int
-_shot_repeat_count_get(Elm_Win_Data *sd)
+_shot_repeat_count_get(Efl_Ui_Win_Data *sd)
 {
    char *p, *pd;
    char *d = strdup(sd->shot.info);
@@ -658,19 +658,19 @@ _shot_repeat_count_get(Elm_Win_Data *sd)
 }
 
 static char *
-_shot_key_get(Elm_Win_Data *sd EINA_UNUSED)
+_shot_key_get(Efl_Ui_Win_Data *sd EINA_UNUSED)
 {
    return NULL;
 }
 
 static char *
-_shot_flags_get(Elm_Win_Data *sd EINA_UNUSED)
+_shot_flags_get(Efl_Ui_Win_Data *sd EINA_UNUSED)
 {
    return NULL;
 }
 
 static void
-_shot_do(Elm_Win_Data *sd)
+_shot_do(Efl_Ui_Win_Data *sd)
 {
    Ecore_Evas *ee;
    Evas_Object *o;
@@ -726,7 +726,7 @@ _shot_delay(void *data)
 }
 
 static void
-_shot_init(Elm_Win_Data *sd)
+_shot_init(Efl_Ui_Win_Data *sd)
 {
    if (!sd->shot.info) return;
 
@@ -735,7 +735,7 @@ _shot_init(Elm_Win_Data *sd)
 }
 
 static void
-_shot_handle(Elm_Win_Data *sd)
+_shot_handle(Efl_Ui_Win_Data *sd)
 {
    if (!sd->shot.info) return;
 
@@ -747,7 +747,7 @@ _shot_handle(Elm_Win_Data *sd)
 /* elm-win specific associate, does the trap while ecore_evas_object_associate()
  * does not.
  */
-static Elm_Win_Data *
+static Efl_Ui_Win_Data *
 _elm_win_associate_get(const Ecore_Evas *ee)
 {
    Evas_Object *obj = ecore_evas_data_get(ee, "elm_win");
@@ -811,7 +811,7 @@ _elm_win_obj_callback_changed_size_hints(void *data, Evas *e EINA_UNUSED, Evas_O
 static void
 _elm_win_move(Ecore_Evas *ee)
 {
-   Elm_Win_Data *sd = _elm_win_associate_get(ee);
+   Efl_Ui_Win_Data *sd = _elm_win_associate_get(ee);
    int x, y;
 
    if (!sd) return;
@@ -819,7 +819,7 @@ _elm_win_move(Ecore_Evas *ee)
    ecore_evas_geometry_get(ee, &x, &y, NULL, NULL);
    sd->screen.x = x;
    sd->screen.y = y;
-   eo_event_callback_call(sd->obj, ELM_WIN_EVENT_MOVED, NULL);
+   eo_event_callback_call(sd->obj, EFL_UI_WIN_EVENT_MOVED, NULL);
    evas_nochange_push(evas_object_evas_get(sd->obj));
    sd->response++;
    evas_object_move(sd->obj, x, y);
@@ -860,7 +860,7 @@ _elm_win_resize_job(void *data)
 static void
 _elm_win_pre_render(Ecore_Evas *ee)
 {
-   Elm_Win_Data *sd = _elm_win_associate_get(ee);
+   Efl_Ui_Win_Data *sd = _elm_win_associate_get(ee);
    if (!sd) return;
 
    if (sd->deferred_resize_job)
@@ -870,7 +870,7 @@ _elm_win_pre_render(Ecore_Evas *ee)
 static void
 _elm_win_resize(Ecore_Evas *ee)
 {
-   Elm_Win_Data *sd = _elm_win_associate_get(ee);
+   Efl_Ui_Win_Data *sd = _elm_win_associate_get(ee);
    if (!sd) return;
 
    sd->deferred_resize_job = EINA_TRUE;
@@ -879,7 +879,7 @@ _elm_win_resize(Ecore_Evas *ee)
 static void
 _elm_win_mouse_in(Ecore_Evas *ee)
 {
-   Elm_Win_Data *sd = _elm_win_associate_get(ee);
+   Efl_Ui_Win_Data *sd = _elm_win_associate_get(ee);
    if (!sd) return;
 
    if (sd->resizing) sd->resizing = EINA_FALSE;
@@ -890,13 +890,13 @@ _elm_win_mouse_in(Ecore_Evas *ee)
 }
 
 static void
-_elm_win_focus_highlight_reconfigure_job_stop(Elm_Win_Data *sd)
+_elm_win_focus_highlight_reconfigure_job_stop(Efl_Ui_Win_Data *sd)
 {
    ELM_SAFE_FREE(sd->focus_highlight.reconf_job, ecore_job_del);
 }
 
 static void
-_elm_win_focus_highlight_visible_set(Elm_Win_Data *sd,
+_elm_win_focus_highlight_visible_set(Efl_Ui_Win_Data *sd,
                                      Eina_Bool visible)
 {
    Evas_Object *fobj = sd->focus_highlight.fobj;
@@ -922,7 +922,7 @@ _elm_win_focus_highlight_object_get(Evas_Object *obj)
 }
 
 static void
-_elm_win_focus_highlight_anim_setup(Elm_Win_Data *sd,
+_elm_win_focus_highlight_anim_setup(Efl_Ui_Win_Data *sd,
                                     Evas_Object *obj)
 {
    Evas_Coord tx, ty, tw, th;
@@ -954,7 +954,7 @@ _elm_win_focus_highlight_anim_setup(Elm_Win_Data *sd,
 }
 
 static void
-_elm_win_focus_highlight_simple_setup(Elm_Win_Data *sd,
+_elm_win_focus_highlight_simple_setup(Efl_Ui_Win_Data *sd,
                                       Evas_Object *obj)
 {
    Evas_Object *clip, *target = sd->focus_highlight.cur.target;
@@ -1085,7 +1085,7 @@ the_end:
 }
 
 static void
-_elm_win_focus_highlight_reconfigure_job_start(Elm_Win_Data *sd)
+_elm_win_focus_highlight_reconfigure_job_start(Efl_Ui_Win_Data *sd)
 {
    ecore_job_del(sd->focus_highlight.reconf_job);
 
@@ -1096,7 +1096,7 @@ _elm_win_focus_highlight_reconfigure_job_start(Elm_Win_Data *sd)
 static void
 _elm_win_focus_in(Ecore_Evas *ee)
 {
-   Elm_Win_Data *sd = _elm_win_associate_get(ee);
+   Efl_Ui_Win_Data *sd = _elm_win_associate_get(ee);
    Evas_Object *obj;
 
    if ((!sd) || (sd->modal_count)) return;
@@ -1149,7 +1149,7 @@ _elm_win_focus_in(Ecore_Evas *ee)
 static void
 _elm_win_focus_out(Ecore_Evas *ee)
 {
-   Elm_Win_Data *sd = _elm_win_associate_get(ee);
+   Efl_Ui_Win_Data *sd = _elm_win_associate_get(ee);
    Evas_Object *obj;
 
    if (!sd) return;
@@ -1183,7 +1183,7 @@ _elm_win_focus_out(Ecore_Evas *ee)
 }
 
 static void
-_elm_win_available_profiles_del(Elm_Win_Data *sd)
+_elm_win_available_profiles_del(Efl_Ui_Win_Data *sd)
 {
    if (!sd->profile.available_list) return;
 
@@ -1195,13 +1195,13 @@ _elm_win_available_profiles_del(Elm_Win_Data *sd)
 }
 
 static void
-_elm_win_profile_del(Elm_Win_Data *sd)
+_elm_win_profile_del(Efl_Ui_Win_Data *sd)
 {
    ELM_SAFE_FREE(sd->profile.name, eina_stringshare_del);
 }
 
 static Eina_Bool
-_internal_elm_win_profile_set(Elm_Win_Data *sd, const char *profile)
+_internal_elm_win_profile_set(Efl_Ui_Win_Data *sd, const char *profile)
 {
    Eina_Bool changed = EINA_FALSE;
    if (profile)
@@ -1227,7 +1227,7 @@ _internal_elm_win_profile_set(Elm_Win_Data *sd, const char *profile)
 }
 
 static void
-_elm_win_profile_update(Elm_Win_Data *sd)
+_elm_win_profile_update(Efl_Ui_Win_Data *sd)
 {
    if (getenv("ELM_PROFILE")) return;
 
@@ -1266,12 +1266,12 @@ _elm_win_profile_update(Elm_Win_Data *sd)
    EINA_LIST_FOREACH(sub, l, ee2)
      ecore_evas_window_profile_set(ee2, sd->profile.name);
 
-   eo_event_callback_call(sd->obj, ELM_WIN_EVENT_PROFILE_CHANGED, NULL);
+   eo_event_callback_call(sd->obj, EFL_UI_WIN_EVENT_PROFILE_CHANGED, NULL);
 }
 
 #ifdef HAVE_ELEMENTARY_WL2
 static void
-_elm_win_opaque_update(Elm_Win_Data *sd)
+_elm_win_opaque_update(Efl_Ui_Win_Data *sd)
 {
    int ox, oy, ow, oh;
    Eina_Bool alpha;
@@ -1305,7 +1305,7 @@ _elm_win_opaque_update(Elm_Win_Data *sd)
 #endif
 
 static void
-_elm_win_frame_obj_update(Elm_Win_Data *sd)
+_elm_win_frame_obj_update(Efl_Ui_Win_Data *sd)
 {
    int fx, fy, fw, fh;
    int ox, oy, ow, oh;
@@ -1330,7 +1330,7 @@ _elm_win_frame_obj_update(Elm_Win_Data *sd)
 }
 
 static void
-_elm_win_frame_maximized_state_update(Elm_Win_Data *sd, Eina_Bool maximized)
+_elm_win_frame_maximized_state_update(Efl_Ui_Win_Data *sd, Eina_Bool maximized)
 {
    const char *emission;
 
@@ -1352,7 +1352,7 @@ _elm_win_frame_maximized_state_update(Elm_Win_Data *sd, Eina_Bool maximized)
 static void
 _elm_win_state_change(Ecore_Evas *ee)
 {
-   Elm_Win_Data *sd = _elm_win_associate_get(ee);
+   Efl_Ui_Win_Data *sd = _elm_win_associate_get(ee);
    Evas_Object *obj;
    Eina_Bool ch_withdrawn = EINA_FALSE;
    Eina_Bool ch_sticky = EINA_FALSE;
@@ -1413,16 +1413,16 @@ _elm_win_state_change(Ecore_Evas *ee)
    if ((ch_withdrawn) || (ch_iconified))
      {
         if (sd->withdrawn)
-          eo_event_callback_call(obj, ELM_WIN_EVENT_WITHDRAWN, NULL);
+          eo_event_callback_call(obj, EFL_UI_WIN_EVENT_WITHDRAWN, NULL);
         else if (sd->iconified)
           {
-             eo_event_callback_call(obj, ELM_WIN_EVENT_ICONIFIED, NULL);
+             eo_event_callback_call(obj, EFL_UI_WIN_EVENT_ICONIFIED, NULL);
              if (_elm_config->atspi_mode)
                elm_interface_atspi_window_minimized_signal_emit(obj);
           }
         else
           {
-             eo_event_callback_call(obj, ELM_WIN_EVENT_NORMAL, NULL);
+             eo_event_callback_call(obj, EFL_UI_WIN_EVENT_NORMAL, NULL);
              if (_elm_config->atspi_mode)
                elm_interface_atspi_window_restored_signal_emit(obj);
           }
@@ -1430,9 +1430,9 @@ _elm_win_state_change(Ecore_Evas *ee)
    if (ch_sticky)
      {
         if (sd->sticky)
-          eo_event_callback_call(obj, ELM_WIN_EVENT_STICK, NULL);
+          eo_event_callback_call(obj, EFL_UI_WIN_EVENT_STICK, NULL);
         else
-          eo_event_callback_call(obj, ELM_WIN_EVENT_UNSTICK, NULL);
+          eo_event_callback_call(obj, EFL_UI_WIN_EVENT_UNSTICK, NULL);
      }
    if (ch_fullscreen)
      {
@@ -1460,7 +1460,7 @@ _elm_win_state_change(Ecore_Evas *ee)
                }
 #endif
              eo_event_callback_call
-               (obj, ELM_WIN_EVENT_FULLSCREEN, NULL);
+               (obj, EFL_UI_WIN_EVENT_FULLSCREEN, NULL);
           }
         else
           {
@@ -1472,20 +1472,20 @@ _elm_win_state_change(Ecore_Evas *ee)
                }
 #endif
              eo_event_callback_call
-               (obj, ELM_WIN_EVENT_UNFULLSCREEN, NULL);
+               (obj, EFL_UI_WIN_EVENT_UNFULLSCREEN, NULL);
           }
      }
    if (ch_maximized)
      {
         if (sd->maximized)
           {
-             eo_event_callback_call(obj, ELM_WIN_EVENT_MAXIMIZED, NULL);
+             eo_event_callback_call(obj, EFL_UI_WIN_EVENT_MAXIMIZED, NULL);
              if (_elm_config->atspi_mode)
                elm_interface_atspi_window_maximized_signal_emit(obj);
           }
         else
           {
-             eo_event_callback_call(obj, ELM_WIN_EVENT_UNMAXIMIZED, NULL);
+             eo_event_callback_call(obj, EFL_UI_WIN_EVENT_UNMAXIMIZED, NULL);
              if (_elm_config->atspi_mode)
                elm_interface_atspi_window_restored_signal_emit(obj);
           }
@@ -1505,20 +1505,20 @@ _elm_win_state_change(Ecore_Evas *ee)
 #endif
         elm_widget_orientation_set(obj, sd->rot);
         eo_event_callback_call
-          (obj, ELM_WIN_EVENT_ROTATION_CHANGED, NULL);
+          (obj, EFL_UI_WIN_EVENT_ROTATION_CHANGED, NULL);
         eo_event_callback_call
-          (obj, ELM_WIN_EVENT_WM_ROTATION_CHANGED, NULL);
+          (obj, EFL_UI_WIN_EVENT_WM_ROTATION_CHANGED, NULL);
      }
 }
 
 EOLIAN static Eina_Bool
-_elm_win_elm_widget_focus_next_manager_is(Eo *obj EINA_UNUSED, Elm_Win_Data *_pd EINA_UNUSED)
+_efl_ui_win_elm_widget_focus_next_manager_is(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *_pd EINA_UNUSED)
 {
    return EINA_TRUE;
 }
 
 EOLIAN static Eina_Bool
-_elm_win_elm_widget_focus_next(Eo *obj, Elm_Win_Data *_pd EINA_UNUSED, Elm_Focus_Direction dir, Evas_Object **next, Elm_Object_Item **next_item)
+_efl_ui_win_elm_widget_focus_next(Eo *obj, Efl_Ui_Win_Data *_pd EINA_UNUSED, Elm_Focus_Direction dir, Evas_Object **next, Elm_Object_Item **next_item)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
 
@@ -1545,13 +1545,13 @@ _elm_win_elm_widget_focus_next(Eo *obj, Elm_Win_Data *_pd EINA_UNUSED, Elm_Focus
 }
 
 EOLIAN static Eina_Bool
-_elm_win_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Elm_Win_Data *_pd EINA_UNUSED)
+_efl_ui_win_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *_pd EINA_UNUSED)
 {
    return EINA_TRUE;
 }
 
 EOLIAN static Eina_Bool
-_elm_win_elm_widget_focus_direction(Eo *obj, Elm_Win_Data *_pd EINA_UNUSED, const Evas_Object *base, double degree, Evas_Object **direction, Elm_Object_Item **direction_item, double *weight)
+_efl_ui_win_elm_widget_focus_direction(Eo *obj, Efl_Ui_Win_Data *_pd EINA_UNUSED, const Evas_Object *base, double degree, Evas_Object **direction, Elm_Object_Item **direction_item, double *weight)
 {
    const Eina_List *items;
    void *(*list_data_get)(const Eina_List *list);
@@ -1574,7 +1574,7 @@ _elm_win_elm_widget_focus_direction(Eo *obj, Elm_Win_Data *_pd EINA_UNUSED, cons
 }
 
 EOLIAN static Eina_Bool
-_elm_win_elm_widget_on_focus(Eo *obj, Elm_Win_Data *sd, Elm_Object_Item *item EINA_UNUSED)
+_efl_ui_win_elm_widget_on_focus(Eo *obj, Efl_Ui_Win_Data *sd, Elm_Object_Item *item EINA_UNUSED)
 {
    Eina_Bool int_ret = EINA_FALSE;
    int_ret = elm_obj_widget_on_focus(eo_super(obj, MY_CLASS), NULL);
@@ -1618,7 +1618,7 @@ _key_action_move(Evas_Object *obj, const char *params)
 }
 
 EOLIAN static Eina_Bool
-_elm_win_elm_widget_event(Eo *obj, Elm_Win_Data *_pd EINA_UNUSED, Evas_Object *src EINA_UNUSED, Evas_Callback_Type type, void *event_info)
+_efl_ui_win_elm_widget_event(Eo *obj, Efl_Ui_Win_Data *_pd EINA_UNUSED, Evas_Object *src EINA_UNUSED, Evas_Callback_Type type, void *event_info)
 {
    Evas_Event_Key_Down *ev = event_info;
 
@@ -1740,7 +1740,7 @@ _deferred_ecore_evas_free(void *data)
 }
 
 EOLIAN static void
-_elm_win_evas_object_smart_show(Eo *obj, Elm_Win_Data *sd)
+_efl_ui_win_evas_object_smart_show(Eo *obj, Efl_Ui_Win_Data *sd)
 {
    if (sd->modal_count) return;
    const Eina_List *l;
@@ -1783,7 +1783,7 @@ _elm_win_evas_object_smart_show(Eo *obj, Elm_Win_Data *sd)
 }
 
 EOLIAN static void
-_elm_win_evas_object_smart_hide(Eo *obj, Elm_Win_Data *sd)
+_efl_ui_win_evas_object_smart_hide(Eo *obj, Efl_Ui_Win_Data *sd)
 {
    if (sd->modal_count) return;
    const Eina_List *l;
@@ -1904,7 +1904,7 @@ _elm_win_focus_target_get(Evas_Object *obj)
 }
 
 static void
-_elm_win_focus_target_callbacks_add(Elm_Win_Data *sd)
+_elm_win_focus_target_callbacks_add(Efl_Ui_Win_Data *sd)
 {
    Evas_Object *obj = sd->focus_highlight.cur.target;
    if (!obj) return;
@@ -1916,7 +1916,7 @@ _elm_win_focus_target_callbacks_add(Elm_Win_Data *sd)
 }
 
 static void
-_elm_win_focus_target_callbacks_del(Elm_Win_Data *sd)
+_elm_win_focus_target_callbacks_del(Efl_Ui_Win_Data *sd)
 {
    Evas_Object *obj = sd->focus_highlight.cur.target;
 
@@ -1974,7 +1974,7 @@ _elm_win_object_focus_out(void *data,
 }
 
 static void
-_elm_win_focus_highlight_shutdown(Elm_Win_Data *sd)
+_elm_win_focus_highlight_shutdown(Efl_Ui_Win_Data *sd)
 {
    _elm_win_focus_highlight_reconfigure_job_stop(sd);
    if (sd->focus_highlight.cur.target)
@@ -2062,7 +2062,7 @@ _elm_win_img_callbacks_del(Evas_Object *obj, Evas_Object *imgobj)
 }
 
 EOLIAN static void
-_elm_win_evas_object_smart_del(Eo *obj, Elm_Win_Data *sd)
+_efl_ui_win_evas_object_smart_del(Eo *obj, Efl_Ui_Win_Data *sd)
 {
    const Eina_List *l;
    Evas_Object *current;
@@ -2214,7 +2214,7 @@ _elm_win_obj_intercept_show(void *data,
 }
 
 EOLIAN static void
-_elm_win_evas_object_smart_move(Eo *obj, Elm_Win_Data *sd, Evas_Coord x, Evas_Coord y)
+_efl_ui_win_evas_object_smart_move(Eo *obj, Efl_Ui_Win_Data *sd, Evas_Coord x, Evas_Coord y)
 {
    if (sd->img_obj)
      {
@@ -2222,7 +2222,7 @@ _elm_win_evas_object_smart_move(Eo *obj, Elm_Win_Data *sd, Evas_Coord x, Evas_Co
           {
              sd->screen.x = x;
              sd->screen.y = y;
-             eo_event_callback_call(obj, ELM_WIN_EVENT_MOVED, NULL);
+             eo_event_callback_call(obj, EFL_UI_WIN_EVENT_MOVED, NULL);
           }
         return;
      }
@@ -2238,7 +2238,7 @@ _elm_win_evas_object_smart_move(Eo *obj, Elm_Win_Data *sd, Evas_Coord x, Evas_Co
      {
         sd->screen.x = x;
         sd->screen.y = y;
-        eo_event_callback_call(obj, ELM_WIN_EVENT_MOVED, NULL);
+        eo_event_callback_call(obj, EFL_UI_WIN_EVENT_MOVED, NULL);
      }
    if (sd->frame_obj)
      {
@@ -2257,7 +2257,7 @@ _elm_win_evas_object_smart_move(Eo *obj, Elm_Win_Data *sd, Evas_Coord x, Evas_Co
 }
 
 EOLIAN static void
-_elm_win_evas_object_smart_resize(Eo *obj, Elm_Win_Data *sd, Evas_Coord w, Evas_Coord h)
+_efl_ui_win_evas_object_smart_resize(Eo *obj, Efl_Ui_Win_Data *sd, Evas_Coord w, Evas_Coord h)
 {
    if (sd->img_obj)
      {
@@ -2282,7 +2282,7 @@ _elm_win_evas_object_smart_resize(Eo *obj, Elm_Win_Data *sd, Evas_Coord w, Evas_
 static void
 _elm_win_delete_request(Ecore_Evas *ee)
 {
-   Elm_Win_Data *sd = _elm_win_associate_get(ee);
+   Efl_Ui_Win_Data *sd = _elm_win_associate_get(ee);
    Evas_Object *obj;
 
    if (!sd) return;
@@ -2292,7 +2292,7 @@ _elm_win_delete_request(Ecore_Evas *ee)
    int autodel = sd->autodel;
    sd->autodel_clear = &autodel;
    evas_object_ref(obj);
-   eo_event_callback_call(obj, ELM_WIN_EVENT_DELETE_REQUEST, NULL);
+   eo_event_callback_call(obj, EFL_UI_WIN_EVENT_DELETE_REQUEST, NULL);
    if (sd->autohide)
      evas_object_hide(obj);
    // FIXME: if above callback deletes - then the below will be invalid
@@ -2329,7 +2329,7 @@ _elm_ee_xwin_get(const Ecore_Evas *ee)
 
 #ifdef HAVE_ELEMENTARY_X
 static void
-_internal_elm_win_xwindow_get(Elm_Win_Data *sd)
+_internal_elm_win_xwindow_get(Efl_Ui_Win_Data *sd)
 {
    sd->x.xwin = _elm_ee_xwin_get(sd->ee);
 }
@@ -2359,7 +2359,7 @@ _elm_ee_wlwin_get(const Ecore_Evas *ee)
 
 #ifdef HAVE_ELEMENTARY_WL2
 static void
-_elm_win_wlwindow_get(Elm_Win_Data *sd)
+_elm_win_wlwindow_get(Efl_Ui_Win_Data *sd)
 {
    sd->wl.win = _elm_ee_wlwin_get(sd->ee);
 }
@@ -2409,7 +2409,7 @@ _elm_ee_win32win_get(const Ecore_Evas *ee)
 
 #ifdef HAVE_ELEMENTARY_COCOA
 static void
-_elm_win_cocoawindow_get(Elm_Win_Data *sd)
+_elm_win_cocoawindow_get(Efl_Ui_Win_Data *sd)
 {
    sd->cocoa.win = _elm_ee_cocoa_win_get(sd->ee);
 }
@@ -2417,7 +2417,7 @@ _elm_win_cocoawindow_get(Elm_Win_Data *sd)
 
 #ifdef HAVE_ELEMENTARY_WIN32
 static void
-_internal_elm_win_win32window_get(Elm_Win_Data *sd)
+_internal_elm_win_win32window_get(Efl_Ui_Win_Data *sd)
 {
    sd->win32.win = _elm_ee_win32win_get(sd->ee);
 }
@@ -2425,7 +2425,7 @@ _internal_elm_win_win32window_get(Elm_Win_Data *sd)
 
 #ifdef HAVE_ELEMENTARY_X
 static void
-_elm_win_xwin_update(Elm_Win_Data *sd)
+_elm_win_xwin_update(Efl_Ui_Win_Data *sd)
 {
    const char *s;
 
@@ -2845,7 +2845,7 @@ _elm_win_property_change(void *data,
           {
              sd->indmode = (Elm_Win_Indicator_Mode)ecore_x_e_illume_indicator_state_get(e->win);
              eo_event_callback_call
-               (sd->obj, ELM_WIN_EVENT_INDICATOR_PROP_CHANGED, NULL);
+               (sd->obj, EFL_UI_WIN_EVENT_INDICATOR_PROP_CHANGED, NULL);
           }
      }
    return ECORE_CALLBACK_PASS_ON;
@@ -2873,7 +2873,7 @@ _elm_win_focus_highlight_anim_end(void *data,
 }
 
 static void
-_elm_win_focus_highlight_init(Elm_Win_Data *sd)
+_elm_win_focus_highlight_init(Efl_Ui_Win_Data *sd)
 {
    evas_event_callback_add(sd->evas, EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_IN,
                            _elm_win_object_focus_in, sd->obj);
@@ -2987,7 +2987,7 @@ _elm_win_frame_obj_move(void *data,
                         Evas_Object *obj EINA_UNUSED,
                         void *event_info EINA_UNUSED)
 {
-   Elm_Win_Data *sd;
+   Efl_Ui_Win_Data *sd;
 
    if (!(sd = data)) return;
    if (!sd->client_obj) return;
@@ -3001,7 +3001,7 @@ _elm_win_frame_obj_resize(void *data,
                           Evas_Object *obj EINA_UNUSED,
                           void *event_info EINA_UNUSED)
 {
-   Elm_Win_Data *sd;
+   Efl_Ui_Win_Data *sd;
 
    if (!(sd = data)) return;
    if (!sd->client_obj) return;
@@ -3170,7 +3170,7 @@ _elm_win_frame_cb_close(void *data,
    int autodel = sd->autodel;
    sd->autodel_clear = &autodel;
    evas_object_ref(win);
-   eo_event_callback_call(win, ELM_WIN_EVENT_DELETE_REQUEST, NULL);
+   eo_event_callback_call(win, EFL_UI_WIN_EVENT_DELETE_REQUEST, NULL);
    if (sd->autohide)
      evas_object_hide(win);
    // FIXME: if above callback deletes - then the below will be invalid
@@ -3194,7 +3194,7 @@ _elm_win_wl_configure(void *data, int t EINA_UNUSED, void *event)
 static void
 _elm_win_frame_pre_render(void *data, Evas *e EINA_UNUSED, void *ev EINA_UNUSED)
 {
-   Elm_Win_Data *sd = data;
+   Efl_Ui_Win_Data *sd = data;
 
    if (sd->wl.opaque_dirty)
      _elm_win_opaque_update(sd);
@@ -3203,7 +3203,7 @@ _elm_win_frame_pre_render(void *data, Evas *e EINA_UNUSED, void *ev EINA_UNUSED)
 #endif
 
 static void
-_elm_win_frame_add(Elm_Win_Data *sd, const char *style)
+_elm_win_frame_add(Efl_Ui_Win_Data *sd, const char *style)
 {
    Evas_Object *obj = sd->obj;
    int w, h, mw, mh;
@@ -3305,7 +3305,7 @@ _elm_win_frame_add(Elm_Win_Data *sd, const char *style)
 }
 
 static void
-_elm_win_frame_del(Elm_Win_Data *sd)
+_elm_win_frame_del(Efl_Ui_Win_Data *sd)
 {
    int w, h;
 
@@ -3375,7 +3375,7 @@ _debug_key_down(void *data EINA_UNUSED,
 #endif
 
 static void
-_win_inlined_image_set(Elm_Win_Data *sd)
+_win_inlined_image_set(Efl_Ui_Win_Data *sd)
 {
    evas_object_image_alpha_set(sd->img_obj, EINA_FALSE);
    evas_object_image_filled_set(sd->img_obj, EINA_TRUE);
@@ -3404,7 +3404,7 @@ _elm_win_on_icon_del(void *data,
 }
 
 EOLIAN static void
-_elm_win_evas_object_smart_add(Eo *obj, Elm_Win_Data *_pd EINA_UNUSED)
+_efl_ui_win_evas_object_smart_add(Eo *obj, Efl_Ui_Win_Data *_pd EINA_UNUSED)
 {
    evas_obj_smart_add(eo_super(obj, MY_CLASS));
 
@@ -3421,7 +3421,7 @@ _elm_x_io_err(void *data EINA_UNUSED)
    Evas_Object *obj;
 
    EINA_LIST_FOREACH(_elm_win_list, l, obj)
-     eo_event_callback_call(obj, ELM_WIN_EVENT_IOERR, NULL);
+     eo_event_callback_call(obj, EFL_UI_WIN_EVENT_IOERR, NULL);
    elm_exit();
 }
 #endif
@@ -3431,14 +3431,14 @@ elm_win_add(Evas_Object *parent,
             const char *name,
             Elm_Win_Type type)
 {
-   Evas_Object *obj = eo_add(MY_CLASS, parent, elm_obj_win_name_set(eo_self, name), elm_obj_win_type_set(eo_self, type));
+   Evas_Object *obj = eo_add(MY_CLASS, parent, efl_ui_win_name_set(eo_self, name), efl_ui_win_type_set(eo_self, type));
    return obj;
 }
 
 EAPI Evas_Object *
 elm_win_fake_add(Ecore_Evas *ee)
 {
-   return eo_add(MY_CLASS, NULL, elm_win_fake_canvas_set(eo_self, ee), elm_obj_win_name_set(eo_self, NULL), elm_obj_win_type_set(eo_self, ELM_WIN_FAKE));
+   return eo_add(MY_CLASS, NULL, elm_win_fake_canvas_set(eo_self, ee), efl_ui_win_name_set(eo_self, NULL), efl_ui_win_type_set(eo_self, ELM_WIN_FAKE));
 }
 
 static void
@@ -3537,7 +3537,7 @@ _accel_is_gl(void)
 }
 
 static Eo *
-_elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_Type type)
+_elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Elm_Win_Type type)
 {
    sd->obj = obj; // in ctor
 
@@ -3547,12 +3547,12 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_
    const char *fontpath, *engine = NULL, *enginelist[32], *disp;
    int i, p = 0;
 
-   Elm_Win_Data tmp_sd;
+   Efl_Ui_Win_Data tmp_sd;
 
    parent = eo_parent_get(obj);
 
    /* just to store some data while trying out to create a canvas */
-   memset(&tmp_sd, 0, sizeof(Elm_Win_Data));
+   memset(&tmp_sd, 0, sizeof(Efl_Ui_Win_Data));
 
    switch (type)
      {
@@ -4152,7 +4152,7 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_
 }
 
 EOLIAN static Eo *
-_elm_win_eo_base_finalize(Eo *obj, Elm_Win_Data *_pd)
+_efl_ui_win_eo_base_finalize(Eo *obj, Efl_Ui_Win_Data *_pd)
 {
    obj = _elm_win_finalize_internal(obj, _pd, _pd->name, _pd->type);
    if (obj)
@@ -4163,7 +4163,7 @@ _elm_win_eo_base_finalize(Eo *obj, Elm_Win_Data *_pd)
 }
 
 EOLIAN static Eo *
-_elm_win_eo_base_constructor(Eo *obj, Elm_Win_Data *_pd EINA_UNUSED)
+_efl_ui_win_eo_base_constructor(Eo *obj, Efl_Ui_Win_Data *_pd EINA_UNUSED)
 {
    /* Do nothing. */
    /* XXX: We are calling the constructor chain from the finalizer. It's
@@ -4173,25 +4173,7 @@ _elm_win_eo_base_constructor(Eo *obj, Elm_Win_Data *_pd EINA_UNUSED)
 }
 
 EOLIAN static void
-_elm_win_efl_text_text_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, const char *title)
-{
-   if (!title) return;
-   eina_stringshare_replace(&(sd->title), title);
-   if (sd->ee)
-     TRAP(sd, title_set, sd->title);
-   if (sd->frame_obj)
-     edje_object_part_text_escaped_set
-       (sd->frame_obj, "elm.text.title", sd->title);
-}
-
-EOLIAN static const char*
-_elm_win_efl_text_text_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd)
-{
-   return sd->title;
-}
-
-EOLIAN static void
-_elm_win_type_set(Eo *obj, Elm_Win_Data *sd, Elm_Win_Type type)
+_efl_ui_win_type_set(Eo *obj, Efl_Ui_Win_Data *sd, Elm_Win_Type type)
 {
    if (eo_finalized_get(obj))
      {
@@ -4201,14 +4183,14 @@ _elm_win_type_set(Eo *obj, Elm_Win_Data *sd, Elm_Win_Type type)
    sd->type = type;
 }
 
-EOLIAN static Elm_Win_Type
-_elm_win_type_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd)
+EOLIAN static Efl_Ui_Win_Type
+_efl_ui_win_type_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
 {
    return sd->type;
 }
 
 EOLIAN static void
-_elm_win_name_set(Eo *obj, Elm_Win_Data *sd, const char *name)
+_efl_ui_win_name_set(Eo *obj, Efl_Ui_Win_Data *sd, const char *name)
 {
    if (eo_finalized_get(obj))
      {
@@ -4219,7 +4201,7 @@ _elm_win_name_set(Eo *obj, Elm_Win_Data *sd, const char *name)
 }
 
 EOLIAN static void
-_elm_win_noblank_set(Eo *obj EINA_UNUSED, Elm_Win_Data *pd, Eina_Bool noblank)
+_efl_ui_win_noblank_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *pd, Eina_Bool noblank)
 {
    noblank = !!noblank;
    if (pd->noblank == noblank) return;
@@ -4228,7 +4210,7 @@ _elm_win_noblank_set(Eo *obj EINA_UNUSED, Elm_Win_Data *pd, Eina_Bool noblank)
 }
 
 EOLIAN static Eina_Bool
-_elm_win_noblank_get(Eo *obj EINA_UNUSED, Elm_Win_Data *pd)
+_efl_ui_win_noblank_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *pd)
 {
    return pd->noblank;
 }
@@ -4278,7 +4260,7 @@ elm_win_util_dialog_add(Evas_Object *parent, const char *name, const char *title
 }
 
 EOLIAN static Eina_Bool
-_elm_win_efl_pack_pack(Eo *obj, Elm_Win_Data *sd, Efl_Gfx *subobj)
+_efl_ui_win_efl_pack_pack(Eo *obj, Efl_Ui_Win_Data *sd, Efl_Gfx *subobj)
 {
    Eina_Bool ret;
 
@@ -4292,7 +4274,7 @@ _elm_win_efl_pack_pack(Eo *obj, Elm_Win_Data *sd, Efl_Gfx *subobj)
 }
 
 EOLIAN static Eina_Bool
-_elm_win_efl_pack_unpack(Eo *obj, Elm_Win_Data *sd, Efl_Gfx *subobj)
+_efl_ui_win_efl_pack_unpack(Eo *obj, Efl_Ui_Win_Data *sd, Efl_Gfx *subobj)
 {
    Eina_Bool ret;
 
@@ -4306,14 +4288,14 @@ _elm_win_efl_pack_unpack(Eo *obj, Elm_Win_Data *sd, Efl_Gfx *subobj)
 }
 
 EOLIAN static Eina_Bool
-_elm_win_efl_container_content_remove(Eo *obj, Elm_Win_Data *sd EINA_UNUSED,
+_efl_ui_win_efl_container_content_remove(Eo *obj, Efl_Ui_Win_Data *sd EINA_UNUSED,
                                       Efl_Gfx *subobj)
 {
    return efl_pack_unpack(obj, subobj);
 }
 
 EOLIAN static int
-_elm_win_efl_container_content_count(Eo *obj EINA_UNUSED, Elm_Win_Data *sd)
+_efl_ui_win_efl_container_content_count(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
 {
    Evas_Object_Box_Data *bd;
 
@@ -4351,7 +4333,7 @@ _box_item_iterator_free(Box_Item_Iterator *it)
 }
 
 EOLIAN static Eina_Iterator *
-_elm_win_efl_container_content_iterate(Eo *obj EINA_UNUSED, Elm_Win_Data *sd)
+_efl_ui_win_efl_container_content_iterate(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
 {
    Box_Item_Iterator *it;
 
@@ -4374,7 +4356,7 @@ _elm_win_efl_container_content_iterate(Eo *obj EINA_UNUSED, Elm_Win_Data *sd)
 }
 
 EOLIAN static void
-_elm_win_role_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, const char *role)
+_efl_ui_win_role_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, const char *role)
 {
    if (!role) return;
    eina_stringshare_replace(&(sd->role), role);
@@ -4384,13 +4366,13 @@ _elm_win_role_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, const char *role)
 }
 
 EOLIAN static const char*
-_elm_win_role_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd)
+_efl_ui_win_role_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
 {
    return sd->role;
 }
 
 EOLIAN static void
-_elm_win_icon_object_set(Eo *obj, Elm_Win_Data *sd, Evas_Object *icon)
+_efl_ui_win_icon_object_set(Eo *obj, Efl_Ui_Win_Data *sd, Evas_Object *icon)
 {
    if (sd->icon)
      evas_object_event_callback_del_full(sd->icon, EVAS_CALLBACK_DEL,
@@ -4410,49 +4392,49 @@ _elm_win_icon_object_set(Eo *obj, Elm_Win_Data *sd, Evas_Object *icon)
 }
 
 EOLIAN static const Evas_Object*
-_elm_win_icon_object_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd)
+_efl_ui_win_icon_object_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
 {
    return sd->icon;
 }
 
 EOLIAN static void
-_elm_win_autodel_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, Eina_Bool autodel)
+_efl_ui_win_autodel_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Eina_Bool autodel)
 {
    sd->autodel = autodel;
 }
 
 EOLIAN static Eina_Bool
-_elm_win_autodel_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd)
+_efl_ui_win_autodel_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
 {
    return sd->autodel;
 }
 
 EOLIAN static void
-_elm_win_autohide_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, Eina_Bool autohide)
+_efl_ui_win_autohide_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Eina_Bool autohide)
 {
    sd->autohide = autohide;
 }
 
 EOLIAN static Eina_Bool
-_elm_win_autohide_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd)
+_efl_ui_win_autohide_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
 {
    return sd->autohide;
 }
 
 EOLIAN static void
-_elm_win_activate(Eo *obj EINA_UNUSED, Elm_Win_Data *sd)
+_efl_ui_win_activate(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
 {
    TRAP(sd, activate);
 }
 
 EOLIAN static void
-_elm_win_raise(Eo *obj EINA_UNUSED, Elm_Win_Data *sd)
+_efl_ui_win_raise(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
 {
    TRAP(sd, raise);
 }
 
 EOLIAN static void
-_elm_win_center(Eo *obj, Elm_Win_Data *sd, Eina_Bool h, Eina_Bool v)
+_efl_ui_win_center(Eo *obj, Efl_Ui_Win_Data *sd, Eina_Bool h, Eina_Bool v)
 {
    int win_w, win_h, screen_w, screen_h, nx, ny;
 
@@ -4474,7 +4456,7 @@ _elm_win_center(Eo *obj, Elm_Win_Data *sd, Eina_Bool h, Eina_Bool v)
 }
 
 EOLIAN static void
-_elm_win_borderless_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, Eina_Bool borderless)
+_efl_ui_win_borderless_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Eina_Bool borderless)
 {
    const char *engine_name = ecore_evas_engine_name_get(sd->ee);
    Eina_Bool need_frame = engine_name &&
@@ -4505,20 +4487,20 @@ _elm_win_borderless_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, Eina_Bool borderl
 }
 
 EOLIAN static Eina_Bool
-_elm_win_borderless_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd)
+_efl_ui_win_borderless_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
 {
    return ecore_evas_borderless_get(sd->ee);
 }
 
 EOLIAN static void
-_elm_win_alpha_set(Eo *obj, Elm_Win_Data *sd, Eina_Bool enabled)
+_efl_ui_win_alpha_set(Eo *obj, Efl_Ui_Win_Data *sd, Eina_Bool enabled)
 {
    sd->application_alpha = enabled;
    _elm_win_apply_alpha(obj, sd);
 }
 
 EOLIAN static Eina_Bool
-_elm_win_alpha_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd)
+_efl_ui_win_alpha_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
 {
    if (sd->img_obj)
      {
@@ -4533,7 +4515,7 @@ _elm_win_alpha_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd)
 }
 
 EOLIAN static void
-_elm_win_fullscreen_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, Eina_Bool fullscreen)
+_efl_ui_win_fullscreen_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Eina_Bool fullscreen)
 {
    const char *engine_name = ecore_evas_engine_name_get(sd->ee);
    // YYY: handle if sd->img_obj
@@ -4558,7 +4540,7 @@ _elm_win_fullscreen_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, Eina_Bool fullscr
 }
 
 EOLIAN static Eina_Bool
-_elm_win_fullscreen_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd)
+_efl_ui_win_fullscreen_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
 {
    const char *engine_name = ecore_evas_engine_name_get(sd->ee);
 
@@ -4594,7 +4576,7 @@ _dbus_menu_set(Eina_Bool dbus_connect, void *data)
 }
 
 EOLIAN static void
-_elm_win_maximized_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, Eina_Bool maximized)
+_efl_ui_win_maximized_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Eina_Bool maximized)
 {
    _elm_win_frame_maximized_state_update(sd, maximized);
    // YYY: handle if sd->img_obj
@@ -4605,13 +4587,13 @@ _elm_win_maximized_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, Eina_Bool maximize
 }
 
 EOLIAN static Eina_Bool
-_elm_win_maximized_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd)
+_efl_ui_win_maximized_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
 {
    return sd->maximized;
 }
 
 EOLIAN static void
-_elm_win_iconified_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, Eina_Bool iconified)
+_efl_ui_win_iconified_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Eina_Bool iconified)
 {
 //   sd->iconified = iconified;
    TRAP(sd, iconified_set, iconified);
@@ -4621,13 +4603,13 @@ _elm_win_iconified_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, Eina_Bool iconifie
 }
 
 EOLIAN static Eina_Bool
-_elm_win_iconified_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd)
+_efl_ui_win_iconified_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
 {
    return sd->iconified;
 }
 
 EOLIAN static void
-_elm_win_available_profiles_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, const char **profiles, unsigned int count)
+_efl_ui_win_available_profiles_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, const char **profiles, unsigned int count)
 {
    Eina_Bool found = EINA_FALSE;
 
@@ -4678,7 +4660,7 @@ _elm_win_available_profiles_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, const cha
 }
 
 EOLIAN static Eina_Bool
-_elm_win_available_profiles_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, char ***profiles, unsigned int *count)
+_efl_ui_win_available_profiles_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, char ***profiles, unsigned int *count)
 {
    if (ecore_evas_window_profile_supported_get(sd->ee))
      {
@@ -4695,7 +4677,7 @@ _elm_win_available_profiles_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, char ***p
 }
 
 EOLIAN static void
-_elm_win_urgent_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, Elm_Win_Urgent_Mode urgent)
+_efl_ui_win_urgent_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Efl_Ui_Win_Urgent_Mode urgent)
 {
    Eina_Bool urgent_tmp = !!urgent;
 
@@ -4708,15 +4690,15 @@ _elm_win_urgent_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, Elm_Win_Urgent_Mode u
 #endif
 }
 
-EOLIAN static Elm_Win_Urgent_Mode
-_elm_win_urgent_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd)
+EOLIAN static Efl_Ui_Win_Urgent_Mode
+_efl_ui_win_urgent_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
 {
-   if (sd->urgent) return ELM_WIN_URGENT_MODE_URGENT;
-   return ELM_WIN_URGENT_MODE_NONE;
+   if (sd->urgent) return EFL_UI_WIN_URGENT_URGENT;
+   return EFL_UI_WIN_URGENT_NONE;
 }
 
 EOLIAN static void
-_elm_win_modal_set(Eo *obj, Elm_Win_Data *sd, Elm_Win_Modal_Mode modal)
+_efl_ui_win_modal_set(Eo *obj, Efl_Ui_Win_Data *sd, Efl_Ui_Win_Modal_Mode modal)
 {
    Eina_Bool modal_tmp = !!modal;
 
@@ -4741,15 +4723,15 @@ _elm_win_modal_set(Eo *obj, Elm_Win_Data *sd, Elm_Win_Modal_Mode modal)
 #endif
 }
 
-EOLIAN static Elm_Win_Modal_Mode
-_elm_win_modal_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd)
+EOLIAN static Efl_Ui_Win_Modal_Mode
+_efl_ui_win_modal_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
 {
-   if (sd->modal) return ELM_WIN_MODAL_MODE_MODAL;
-   return ELM_WIN_MODAL_MODE_NONE;
+   if (sd->modal) return EFL_UI_WIN_MODAL_MODAL;
+   return EFL_UI_WIN_MODAL_NONE;
 }
 
 EOLIAN static void
-_elm_win_aspect_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, double aspect)
+_efl_ui_win_aspect_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, double aspect)
 {
    sd->aspect = aspect;
    TRAP(sd, aspect_set, aspect);
@@ -4759,13 +4741,13 @@ _elm_win_aspect_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, double aspect)
 }
 
 EOLIAN static double
-_elm_win_aspect_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd)
+_efl_ui_win_aspect_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
 {
    return sd->aspect;
 }
 
 EOLIAN static void
-_elm_win_efl_gfx_size_hint_base_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, int w, int h)
+_efl_ui_win_efl_gfx_size_hint_base_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, int w, int h)
 {
    sd->size_base_w = w;
    sd->size_base_h = h;
@@ -4776,14 +4758,14 @@ _elm_win_efl_gfx_size_hint_base_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, int w
 }
 
 EOLIAN static void
-_elm_win_efl_gfx_size_hint_base_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, int *w, int *h)
+_efl_ui_win_efl_gfx_size_hint_base_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, int *w, int *h)
 {
    if (w) *w = sd->size_base_w;
    if (h) *h = sd->size_base_h;
 }
 
 EOLIAN static void
-_elm_win_efl_gfx_size_hint_step_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, int w, int h)
+_efl_ui_win_efl_gfx_size_hint_step_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, int w, int h)
 {
    sd->size_step_w = w;
    sd->size_step_h = h;
@@ -4794,7 +4776,7 @@ _elm_win_efl_gfx_size_hint_step_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, int w
 }
 
 EOLIAN static void
-_elm_win_efl_gfx_size_hint_step_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, int *w, int *h)
+_efl_ui_win_efl_gfx_size_hint_step_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, int *w, int *h)
 {
    if (w) *w = sd->size_step_w;
    if (h) *h = sd->size_step_h;
@@ -4854,7 +4836,7 @@ _win_rotation_degree_check(int rotation)
  * But this does not resize the elm window object and its contents.
  */
 static void
-_win_rotate(Evas_Object *obj, Elm_Win_Data *sd, int rotation, Eina_Bool resize)
+_win_rotate(Evas_Object *obj, Efl_Ui_Win_Data *sd, int rotation, Eina_Bool resize)
 {
    rotation = _win_rotation_degree_check(rotation);
    if (sd->rot == rotation) return;
@@ -4870,11 +4852,11 @@ _win_rotate(Evas_Object *obj, Elm_Win_Data *sd, int rotation, Eina_Bool resize)
    _elm_win_frame_obj_update(sd);
    elm_widget_orientation_set(obj, rotation);
    eo_event_callback_call
-     (obj, ELM_WIN_EVENT_ROTATION_CHANGED, NULL);
+     (obj, EFL_UI_WIN_EVENT_ROTATION_CHANGED, NULL);
 }
 
 EOLIAN static void
-_elm_win_wm_available_rotations_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, const int *rotations, unsigned int count)
+_efl_ui_win_wm_available_rotations_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, const int *rotations, unsigned int count)
 {
    unsigned int i;
    int r;
@@ -4904,7 +4886,7 @@ _elm_win_wm_available_rotations_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, const
 }
 
 EOLIAN static Eina_Bool
-_elm_win_wm_available_rotations_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, int **rotations, unsigned int *count)
+_efl_ui_win_wm_available_rotations_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, int **rotations, unsigned int *count)
 {
    if (!sd->wm_rot.use) return EINA_FALSE;
 
@@ -4927,7 +4909,7 @@ _elm_win_wm_available_rotations_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, int *
 }
 
 EOLIAN static void
-_elm_win_sticky_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, Eina_Bool sticky)
+_efl_ui_win_sticky_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Eina_Bool sticky)
 {
 //   sd->sticky = sticky;
    TRAP(sd, sticky_set, sticky);
@@ -4937,13 +4919,13 @@ _elm_win_sticky_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, Eina_Bool sticky)
 }
 
 EOLIAN static Eina_Bool
-_elm_win_sticky_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd)
+_efl_ui_win_sticky_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
 {
    return sd->sticky;
 }
 
 EOLIAN static void
-_elm_win_keyboard_mode_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, Elm_Win_Keyboard_Mode mode)
+_efl_ui_win_keyboard_mode_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Elm_Win_Keyboard_Mode mode)
 {
    if (mode == sd->kbdmode) return;
 #ifdef HAVE_ELEMENTARY_X
@@ -4958,72 +4940,72 @@ _elm_win_keyboard_mode_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, Elm_Win_Keyboa
 }
 
 EOLIAN static Elm_Win_Keyboard_Mode
-_elm_win_keyboard_mode_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd)
+_efl_ui_win_keyboard_mode_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
 {
    return sd->kbdmode;
 }
 
 EOLIAN static void
-_elm_win_indicator_enabled_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd EINA_UNUSED, Eina_Bool enable EINA_UNUSED)
+_efl_ui_win_indicator_enabled_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd EINA_UNUSED, Eina_Bool enable EINA_UNUSED)
 {
    //TODO: this mode will be implemented after removing the conformant.
    return;
 }
 
 EOLIAN static Eina_Bool
-_elm_win_indicator_enabled_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd EINA_UNUSED)
+_efl_ui_win_indicator_enabled_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd EINA_UNUSED)
 {
    //TODO: this mode will be implemented after removing the conformant.
    return EINA_FALSE;
 }
 
 EOLIAN static void
-_elm_win_indicator_type_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd EINA_UNUSED, Elm_Win_Indicator_Type type EINA_UNUSED)
+_efl_ui_win_indicator_type_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd EINA_UNUSED, Efl_Ui_Win_Indicator_Type type EINA_UNUSED)
 {
    //TODO: this mode will be implemented after removing the conformant.
    return;
 }
 
-EOLIAN static Elm_Win_Indicator_Type
-_elm_win_indicator_type_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd EINA_UNUSED)
+EOLIAN static Efl_Ui_Win_Indicator_Type
+_efl_ui_win_indicator_type_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd EINA_UNUSED)
 {
    //TODO: this mode will be implemented after removing the conformant.
 
-   return ELM_WIN_INDICATOR_TYPE_UNKNOWN;
+   return EFL_UI_WIN_INDICATOR_TYPE_UNKNOWN;
 }
 
 EOLIAN static Eina_Bool
-_elm_win_focus_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd)
+_efl_ui_win_focus_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
 {
    return ecore_evas_focus_get(sd->ee);
 }
 
 EOLIAN static void
-_elm_win_screen_constrain_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, Eina_Bool constrain)
+_efl_ui_win_screen_constrain_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Eina_Bool constrain)
 {
    sd->constrain = !!constrain;
 }
 
 EOLIAN static Eina_Bool
-_elm_win_screen_constrain_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd)
+_efl_ui_win_screen_constrain_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
 {
    return sd->constrain;
 }
 
 EOLIAN static void
-_elm_win_efl_screen_size_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, int *w, int *h)
+_efl_ui_win_efl_screen_size_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, int *w, int *h)
 {
    ecore_evas_screen_geometry_get(sd->ee, NULL, NULL, w, h);
 }
 
 EOLIAN static void
-_elm_win_efl_screen_dpi_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, int *xdpi, int *ydpi)
+_efl_ui_win_efl_screen_dpi_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, int *xdpi, int *ydpi)
 {
    ecore_evas_screen_dpi_get(sd->ee, xdpi, ydpi);
 }
 
 EOLIAN static int
-_elm_win_efl_screen_rotation_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd)
+_efl_ui_win_efl_screen_rotation_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
 {
    //TODO: query to wm about device's rotation
    (void)sd;
@@ -5032,14 +5014,14 @@ _elm_win_efl_screen_rotation_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd)
 }
 
 EOLIAN static void
-_elm_win_prop_focus_skip_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, Eina_Bool skip)
+_efl_ui_win_prop_focus_skip_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Eina_Bool skip)
 {
    sd->skip_focus = skip;
    TRAP(sd, focus_skip_set, skip);
 }
 
 EOLIAN static Eina_Bool
-_elm_win_keygrab_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, const char *key, Evas_Modifier_Mask modifiers EINA_UNUSED, Evas_Modifier_Mask not_modifiers EINA_UNUSED, int priority EINA_UNUSED, Elm_Win_Keygrab_Mode grab_mode)
+_efl_ui_win_keygrab_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, const char *key, Evas_Modifier_Mask modifiers EINA_UNUSED, Evas_Modifier_Mask not_modifiers EINA_UNUSED, int priority EINA_UNUSED, Efl_Ui_Win_Keygrab_Mode grab_mode)
 {
    Eina_Bool ret = EINA_FALSE;
 #ifdef HAVE_ELEMENTARY_X
@@ -5075,7 +5057,7 @@ _elm_win_keygrab_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, const char *key, Eva
 }
 
 EOLIAN static Eina_Bool
-_elm_win_keygrab_unset(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, const char *key, Evas_Modifier_Mask modifiers EINA_UNUSED, Evas_Modifier_Mask not_modifiers EINA_UNUSED)
+_efl_ui_win_keygrab_unset(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, const char *key, Evas_Modifier_Mask modifiers EINA_UNUSED, Evas_Modifier_Mask not_modifiers EINA_UNUSED)
 {
    Eina_Bool ret = EINA_FALSE;
 #ifdef HAVE_ELEMENTARY_X
@@ -5090,7 +5072,7 @@ _elm_win_keygrab_unset(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, const char *key, E
 }
 
 EOLIAN static void
-_elm_win_focus_highlight_enabled_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, Eina_Bool enabled)
+_efl_ui_win_focus_highlight_enabled_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Eina_Bool enabled)
 {
    enabled = !!enabled;
    if (sd->focus_highlight.enabled == enabled)
@@ -5105,13 +5087,13 @@ _elm_win_focus_highlight_enabled_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, Eina
 }
 
 EOLIAN static Eina_Bool
-_elm_win_focus_highlight_enabled_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd)
+_efl_ui_win_focus_highlight_enabled_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
 {
    return sd->focus_highlight.enabled;
 }
 
 static Eina_Bool
-_elm_win_theme_internal(Eo *obj, Elm_Win_Data *sd)
+_elm_win_theme_internal(Eo *obj, Efl_Ui_Win_Data *sd)
 {
    Eina_Bool ret = EINA_FALSE;
    const char *s;
@@ -5124,7 +5106,7 @@ _elm_win_theme_internal(Eo *obj, Elm_Win_Data *sd)
    edje_object_scale_set(sd->edje,
                          elm_widget_scale_get(obj) * elm_config_scale_get());
 
-   eo_event_callback_call(obj, ELM_WIN_EVENT_THEME_CHANGED, NULL);
+   eo_event_callback_call(obj, EFL_UI_WIN_EVENT_THEME_CHANGED, NULL);
    ret = elm_obj_widget_disable(obj);
 
    if (!sd->theme_alpha && !sd->application_alpha)
@@ -5145,7 +5127,7 @@ _elm_win_theme_internal(Eo *obj, Elm_Win_Data *sd)
 }
 
 EOLIAN static Eina_Bool
-_elm_win_elm_widget_theme_apply(Eo *obj, Elm_Win_Data *sd)
+_efl_ui_win_elm_widget_theme_apply(Eo *obj, Efl_Ui_Win_Data *sd)
 {
    Eina_Bool int_ret = EINA_FALSE;
    int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
@@ -5160,7 +5142,7 @@ _elm_win_elm_widget_theme_apply(Eo *obj, Elm_Win_Data *sd)
 }
 
 EOLIAN static void
-_elm_win_focus_highlight_style_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, const char *style)
+_efl_ui_win_focus_highlight_style_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, const char *style)
 {
    eina_stringshare_replace(&sd->focus_highlight.style, style);
    sd->focus_highlight.theme_changed = EINA_TRUE;
@@ -5168,13 +5150,13 @@ _elm_win_focus_highlight_style_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, const
 }
 
 EOLIAN static const char*
-_elm_win_focus_highlight_style_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd)
+_efl_ui_win_focus_highlight_style_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
 {
    return sd->focus_highlight.style;
 }
 
 EOLIAN static void
-_elm_win_focus_highlight_animate_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, Eina_Bool animate)
+_efl_ui_win_focus_highlight_animate_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Eina_Bool animate)
 {
    animate = !!animate;
    if (sd->focus_highlight.animate == animate)
@@ -5186,13 +5168,13 @@ _elm_win_focus_highlight_animate_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, Eina
 }
 
 EOLIAN static Eina_Bool
-_elm_win_focus_highlight_animate_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd)
+_efl_ui_win_focus_highlight_animate_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
 {
    return sd->focus_highlight.animate;
 }
 
 EOLIAN static Eina_Bool
-_elm_win_socket_listen(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, const char *svcname, int svcnum, Eina_Bool svcsys)
+_efl_ui_win_socket_listen(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, const char *svcname, int svcnum, Eina_Bool svcsys)
 {
    if (!sd->ee) return EINA_FALSE;
 
@@ -5329,7 +5311,7 @@ _on_atspi_bus_connected(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSE
 }
 
 EOLIAN static void
-_elm_win_class_constructor(Eo_Class *klass)
+_efl_ui_win_class_constructor(Eo_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 
@@ -5342,7 +5324,7 @@ _elm_win_class_constructor(Eo_Class *klass)
 }
 
 EOLIAN static Eo*
-_elm_win_elm_interface_atspi_accessible_parent_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd EINA_UNUSED)
+_efl_ui_win_elm_interface_atspi_accessible_parent_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd EINA_UNUSED)
 {
    // attach all kinds of windows directly to ATSPI application root object
    Eo *root;
@@ -5351,7 +5333,7 @@ _elm_win_elm_interface_atspi_accessible_parent_get(Eo *obj EINA_UNUSED, Elm_Win_
 }
 
 EOLIAN static const Elm_Atspi_Action*
-_elm_win_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd EINA_UNUSED)
+_efl_ui_win_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd EINA_UNUSED)
 {
    static Elm_Atspi_Action atspi_actions[] = {
           { "move,previous", "move", "previous", _key_action_move},
@@ -5366,7 +5348,7 @@ _elm_win_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED,
 }
 
 EOLIAN static Elm_Atspi_State_Set
-_elm_win_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Win_Data *sd EINA_UNUSED)
+_efl_ui_win_elm_interface_atspi_accessible_state_set_get(Eo *obj, Efl_Ui_Win_Data *sd EINA_UNUSED)
 {
    Elm_Atspi_State_Set ret;
    ret = elm_interface_atspi_accessible_state_set_get(eo_super(obj, MY_CLASS));
@@ -5378,24 +5360,24 @@ _elm_win_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Win_Data *sd
 }
 
 EOLIAN static char*
-_elm_win_elm_interface_atspi_accessible_name_get(Eo *obj, Elm_Win_Data *sd EINA_UNUSED)
+_efl_ui_win_elm_interface_atspi_accessible_name_get(Eo *obj, Efl_Ui_Win_Data *sd EINA_UNUSED)
 {
    char *ret;
-   ret = elm_interface_atspi_accessible_name_get(eo_super(obj, ELM_WIN_CLASS));
+   ret = elm_interface_atspi_accessible_name_get(eo_super(obj, EFL_UI_WIN_CLASS));
    if (ret) return ret;
    const char *name = elm_win_title_get(obj);
    return name ? strdup(name) : NULL;
 }
 
 EOLIAN static Eina_Bool
-_elm_win_efl_input_state_modifier_enabled_get(Eo *obj EINA_UNUSED, Elm_Win_Data *pd, const char *name)
+_efl_ui_win_efl_input_state_modifier_enabled_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *pd, const char *name)
 {
    const Evas_Modifier *m = evas_key_modifier_get(pd->evas);
    return evas_key_modifier_is_set(m, name);
 }
 
 EOLIAN static Eina_Bool
-_elm_win_efl_input_state_lock_enabled_get(Eo *obj EINA_UNUSED, Elm_Win_Data *pd, const char *name)
+_efl_ui_win_efl_input_state_lock_enabled_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *pd, const char *name)
 {
    const Evas_Lock *m = evas_key_lock_get(pd->evas);
    return evas_key_lock_is_set(m, name);
@@ -5406,7 +5388,7 @@ _elm_win_efl_input_state_lock_enabled_get(Eo *obj EINA_UNUSED, Elm_Win_Data *pd,
 #endif
 
 static EOLIAN void
-_elm_win_teamwork_uri_preload(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, const char *uri)
+_efl_ui_win_teamwork_uri_preload(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, const char *uri)
 {
 #ifdef HAVE_ELEMENTARY_X
    if (sd->x.xwin)
@@ -5428,7 +5410,7 @@ _elm_win_teamwork_uri_preload(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, const char
 }
 
 static EOLIAN void
-_elm_win_teamwork_uri_show(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, const char *uri)
+_efl_ui_win_teamwork_uri_show(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, const char *uri)
 {
    int x, y;
 
@@ -5457,7 +5439,7 @@ _elm_win_teamwork_uri_show(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, const char *ur
 }
 
 static EOLIAN void
-_elm_win_teamwork_uri_hide(Eo *obj EINA_UNUSED, Elm_Win_Data *sd)
+_efl_ui_win_teamwork_uri_hide(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
 {
    if (!sd->teamwork_uri) return;
 #ifdef HAVE_ELEMENTARY_X
@@ -5480,7 +5462,7 @@ _elm_win_teamwork_uri_hide(Eo *obj EINA_UNUSED, Elm_Win_Data *sd)
 }
 
 static EOLIAN void
-_elm_win_teamwork_uri_open(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, const char *uri)
+_efl_ui_win_teamwork_uri_open(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, const char *uri)
 {
    EINA_SAFETY_ON_NULL_RETURN(uri);
 #ifdef HAVE_ELEMENTARY_X
@@ -5802,7 +5784,7 @@ elm_win_indicator_mode_set(Evas_Object *obj, Elm_Win_Indicator_Mode mode)
      }
 #endif
    eo_event_callback_call
-     (obj, ELM_WIN_EVENT_INDICATOR_PROP_CHANGED, NULL);
+     (obj, EFL_UI_WIN_EVENT_INDICATOR_PROP_CHANGED, NULL);
 }
 
 EAPI Elm_Win_Indicator_Mode
@@ -5838,7 +5820,7 @@ elm_win_indicator_opacity_set(Evas_Object *obj, Elm_Win_Indicator_Opacity_Mode m
      }
 #endif
    eo_event_callback_call
-     (obj, ELM_WIN_EVENT_INDICATOR_PROP_CHANGED, NULL);
+     (obj, EFL_UI_WIN_EVENT_INDICATOR_PROP_CHANGED, NULL);
 }
 
 EAPI Elm_Win_Indicator_Opacity_Mode
@@ -6203,13 +6185,25 @@ elm_win_shaped_get(const Evas_Object *obj)
 EAPI void
 elm_win_title_set(Evas_Object *obj, const char *title)
 {
-   efl_text_set(obj, title);
+   ELM_WIN_CHECK(obj);
+   ELM_WIN_DATA_GET_OR_RETURN(obj, sd);
+
+   if (!title) return;
+   eina_stringshare_replace(&(sd->title), title);
+   if (sd->ee)
+     TRAP(sd, title_set, sd->title);
+   if (sd->frame_obj)
+     edje_object_part_text_escaped_set
+       (sd->frame_obj, "elm.text.title", sd->title);
 }
 
 EAPI const char*
 elm_win_title_get(const Evas_Object *obj)
 {
-   return efl_text_get(obj);
+   ELM_WIN_CHECK(obj) NULL;
+   ELM_WIN_DATA_GET_OR_RETURN(obj, sd, NULL);
+
+   return sd->title;
 }
 
 EAPI void
@@ -6351,7 +6345,7 @@ elm_win_inlined_image_object_get(const Evas_Object *obj)
 }
 
 static Ecore_Window
-_elm_win_window_id_get(Elm_Win_Data *sd)
+_elm_win_window_id_get(Efl_Ui_Win_Data *sd)
 {
    const char *engine_name = ecore_evas_engine_name_get(sd->ee);
 
@@ -6471,4 +6465,4 @@ end:
    return sd->main_menu;
 }
 
-#include "elm_win.eo.c"
+#include "efl_ui_win.eo.c"

diff --git a/src/lib/elementary/elm_win.eo b/src/lib/elementary/efl_ui_win.eo
similarity index 95%
rename from src/lib/elementary/elm_win.eo
rename to src/lib/elementary/efl_ui_win.eo
index 8f1eb5d..9e4e32c 100644 (file)
--- a/src/lib/elementary/elm_win.eo
+++ b/src/lib/elementary/efl_ui_win.eo
@@ -1,8 +1,5 @@
-/* FIXME: Shouldn't be here. */
-type Ecore_Evas: __undefined_type;
-type Ecore_Window: __undefined_type;
 
-enum Elm.Win.Type
+enum Efl.Ui.Win.Type
 {
    [[Defines the types of window that can be created
 
@@ -12,8 +9,7 @@ enum Elm.Win.Type
 
      Currently, only the X11 backed engines use them.
    ]]
-
-   legacy: elm_win;
+   legacy: efl_ui_win;
 
    unknown = -1,
    basic, [[A normal window. Indicates a normal, top-level window. Almost every
@@ -65,15 +61,14 @@ enum Elm.Win.Type
         ]]
 }
 
-enum Elm.Win.Keyboard_Mode
+enum Efl.Ui.Win.Keyboard_Mode
 {
    [[The different layouts that can be requested for the virtual keyboard.
 
      When the application window is being managed by Illume, it may request
      any of the following layouts for the virtual keyboard.
    ]]
-
-   legacy: elm_win_keyboard;
+   legacy: efl_ui_win_keyboard;
 
    unknown, [[Unknown keyboard state]]
    off, [[Request to deactivate the keyboard]]
@@ -93,10 +88,10 @@ enum Elm.Win.Keyboard_Mode
    j2me [[J2ME keyboard layout]]
 }
 
-enum Elm.Win.Indicator_Type
+enum Efl.Ui.Win.Indicator_Type
 {
    [[Defines the type indicator that can be shown]]
-   legacy: elm_win_indicator;
+   legacy: efl_ui_win_indicator;
 
    type_unknown, [[Unknown indicator type]]
    bg_opaque, [[The icon of indicator is opaque, the background of indicator is also opaque. 
@@ -111,12 +106,12 @@ enum Elm.Win.Indicator_Type
 
 /**
  */
-enum Elm.Win.Keygrab_Mode
+enum Efl.Ui.Win.Keygrab_Mode
 {
    [[Define the keygrab modes of window. A window may send commands to the
      Keyrouter according this mode, and perform different actions.]]
-   legacy: elm_win_keygrab;
 
+   legacy: efl_ui_win_keygrab;
    unknown = 0, [[Unknown keygrab mode]]
    shared = (1 << 8), [[Getting the grabbed-key together with the other client
                         windows]]
@@ -130,30 +125,32 @@ enum Elm.Win.Keygrab_Mode
                                     window]]
 }
 
-enum Elm.Win.Modal_Mode
+enum Efl.Ui.Win.Modal_Mode
 {
    [[Defines the mode of a modal window]]
+   legacy: efl_ui_win_modal;
 
    none, [[The window is not modal window.]]
    modal [[The window is modal window.]]
 }
 
-enum Elm.Win.Urgent_Mode
+enum Efl.Ui.Win.Urgent_Mode
 {
    [[Defines the mode of a urgent window.]]
+   legacy: efl_ui_win_urgent;
 
    none,  [[The window is not a urgent window.]]
    urgent [[The window is a urgent window.]]
 }
 
-class Elm.Win (Elm.Widget, Elm.Interface.Atspi.Window,
+class Efl.Ui.Win (Elm.Widget, Elm.Interface.Atspi.Window,
                Elm.Interface.Atspi_Widget_Action, Efl.Pack,
                Efl.Input.State, Efl.Input.Interface, Efl.Screen,
-               Efl.Gfx.Size.Hint, Efl.Text)
+               Efl.Gfx.Size.Hint)
 {
    legacy_prefix: elm_win;
-   eo_prefix: elm_obj_win;
-   event_prefix: elm_win;
+   eo_prefix: efl_ui_win;
+   event_prefix: efl_ui_win;
    methods {
       @property indicator_enabled {
          set {
@@ -167,9 +164,11 @@ class Elm.Win (Elm.Widget, Elm.Interface.Atspi.Window,
                But like TV, default is to disable the indicator.
 
                Sets the indicator enable of the window.]]
+            legacy: null;
          }
          get {
             [[Get the indicator enable of the window.]]
+            legacy: null;
          }
          values {
             enabled: bool; [[If true, the indicator is enabled,
@@ -179,12 +178,14 @@ class Elm.Win (Elm.Widget, Elm.Interface.Atspi.Window,
       @property indicator_type {
          set {
             [[Sets the indicator type of the window.]]
+            legacy: null;
          }
          get {
             [[Get the indicator type of the window.]]
+            legacy: null;
          }
          values {
-            type: Elm.Win.Indicator_Type; [[The type, one of #Elm_Win_Indicator_Type.]]
+            type: Efl.Ui.Win.Indicator_Type; [[The type, one of #Efl_Ui_Win_Indicator_Type.]]
          }
       }
       @property keyboard_mode {
@@ -195,7 +196,7 @@ class Elm.Win (Elm.Widget, Elm.Interface.Atspi.Window,
             [[Get the keyboard mode of the window.]]
          }
          values {
-            mode: Elm.Win.Keyboard_Mode; [[The mode, one of #Elm_Win_Keyboard_Mode.]]
+            mode: Efl.Ui.Win.Keyboard_Mode; [[The mode, one of #Efl_Ui_Win_Keyboard_Mode.]]
          }
       }
       @property wm_available_rotations {
@@ -473,8 +474,8 @@ class Elm.Win (Elm.Widget, Elm.Interface.Atspi.Window,
             legacy: null;
          }
          values {
-            urgent: Elm.Win.Urgent_Mode;
-                [[The mode of a urgent window, one of #Elm_Win_Urgent_Mode.]]
+            urgent: Efl.Ui.Win.Urgent_Mode;
+                [[The mode of a urgent window, one of #Efl_Ui_Win_Urgent_Mode.]]
          }
       }
       @property modal {
@@ -487,7 +488,7 @@ class Elm.Win (Elm.Widget, Elm.Interface.Atspi.Window,
             legacy: null;
          }
          values {
-            modal: Elm.Win.Modal_Mode; [[The mode of a window, one of #Elm_Win_Modal_Mode.]]
+            modal: Efl.Ui.Win.Modal_Mode; [[The mode of a window, one of #Efl_Ui_Win_Modal_Mode.]]
          }
       }
       @property noblank {
@@ -564,13 +565,12 @@ class Elm.Win (Elm.Widget, Elm.Interface.Atspi.Window,
          */
          set {
             [[Can only be used at creation time, within \@ref eo_add.]]
-            legacy: null;
          }
          values {
             name: string @nullable;
          }
       }
-      @property type {
+      @property type { /* FIXME: before finalize */
          [[The type of the window.
 
            It is a hint of how the Window Manager should handle it.
@@ -592,9 +592,10 @@ class Elm.Win (Elm.Widget, Elm.Interface.Atspi.Window,
          }
          get {
             [[If the object is not window object, return #ELM_WIN_UNKNOWN.]]
+            legacy: null;
          }
          values {
-            type: Elm.Win.Type(Elm.Win.Type.unknown);
+            type: Efl.Ui.Win.Type(Efl.Ui.Win.Type.unknown);
          }
       }
       @property available_profiles {
@@ -716,7 +717,7 @@ class Elm.Win (Elm.Widget, Elm.Interface.Atspi.Window,
             @in modifiers: Evas.Modifier_Mask; [[This is for the keymask feature. Currently this feature is not supported.]]
             @in not_modifiers: Evas.Modifier_Mask; [[This is for the keymask feature. Currently this feature is not supported.]]
             @in proirity: int; [[This is for the priority of keygrab. Currently this feature is not supported.]]
-            @in grab_mode: Elm.Win.Keygrab_Mode; [[According to the grabmode, it can grab key differently.]]
+            @in grab_mode: Efl.Ui.Win.Keygrab_Mode; [[According to the grabmode, it can grab key differently.]]
          }
       }
       keygrab_unset {
@@ -804,8 +805,6 @@ class Elm.Win (Elm.Widget, Elm.Interface.Atspi.Window,
       Efl.Gfx.Size.Hint.base.get;
       Efl.Gfx.Size.Hint.step.set;
       Efl.Gfx.Size.Hint.step.get;
-      Efl.Text.text.set;
-      Efl.Text.text.get;
    }
    constructors {
       .name;

diff --git a/src/lib/elementary/elm_win_standard.c b/src/lib/elementary/efl_ui_win_standard.c
similarity index 81%
rename from src/lib/elementary/elm_win_standard.c
rename to src/lib/elementary/efl_ui_win_standard.c
index bfe09ca..d98c2f4 100644 (file)
--- a/src/lib/elementary/elm_win_standard.c
+++ b/src/lib/elementary/efl_ui_win_standard.c
@@ -10,10 +10,10 @@
 
 #include "elm_priv.h"
 
-#define MY_CLASS ELM_WIN_STANDARD_CLASS
+#define MY_CLASS EFL_UI_WIN_STANDARD_CLASS
 
 EOLIAN static Eo *
-_elm_win_standard_eo_base_finalize(Eo *obj, void *pd EINA_UNUSED)
+_efl_ui_win_standard_eo_base_finalize(Eo *obj, void *pd EINA_UNUSED)
 {
    obj = eo_finalize(eo_super(obj, MY_CLASS));
    if (!obj)
@@ -33,4 +33,4 @@ _elm_win_standard_eo_base_finalize(Eo *obj, void *pd EINA_UNUSED)
    return obj;
 }
 
-#include "elm_win_standard.eo.c"
+#include "efl_ui_win_standard.eo.c"

diff --git a/src/lib/elementary/elm_win_standard.eo b/src/lib/elementary/efl_ui_win_standard.eo
similarity index 62%
rename from src/lib/elementary/elm_win_standard.eo
rename to src/lib/elementary/efl_ui_win_standard.eo
index 36de626..d2a72c3 100644 (file)
--- a/src/lib/elementary/elm_win_standard.eo
+++ b/src/lib/elementary/efl_ui_win_standard.eo
@@ -1,4 +1,4 @@
-class Elm.Win.Standard (Elm.Win)
+class Efl.Ui.Win.Standard (Efl.Ui.Win)
 {
    data: null;
    implements {

diff --git a/src/lib/elementary/elc_ctxpopup.c b/src/lib/elementary/elc_ctxpopup.c
index 2cfc15c..7fb6779 100644 (file)
--- a/src/lib/elementary/elc_ctxpopup.c
+++ b/src/lib/elementary/elc_ctxpopup.c
@@ -228,7 +228,7 @@ _base_geometry_calc(Evas_Object *obj,
    evas_object_geometry_get
      (sd->parent, &hover_area.x, &hover_area.y, &hover_area.w,
      &hover_area.h);
-   if (sd->parent && eo_isa(sd->parent, ELM_WIN_CLASS))
+   if (sd->parent && eo_isa(sd->parent, EFL_UI_WIN_CLASS))
      hover_area.x = hover_area.y = 0;
 
    evas_object_geometry_get(obj, &pos.x, &pos.y, NULL, NULL);
@@ -1204,7 +1204,7 @@ _elm_ctxpopup_hover_parent_set(Eo *obj, Elm_Ctxpopup_Data *sd, Evas_Object *pare
 
    //Update Background
    evas_object_geometry_get(parent, &x, &y, &w, &h);
-   if (parent && eo_isa(parent, ELM_WIN_CLASS))
+   if (parent && eo_isa(parent, EFL_UI_WIN_CLASS))
      x = y = 0;
    evas_object_move(sd->bg, x, y);
    evas_object_resize(sd->bg, w, h);

diff --git a/src/lib/elementary/elc_fileselector_button.c b/src/lib/elementary/elc_fileselector_button.c
index 6007b17..5cfdcfd 100644 (file)
--- a/src/lib/elementary/elc_fileselector_button.c
+++ b/src/lib/elementary/elc_fileselector_button.c
@@ -138,7 +138,7 @@ _new_window_add(Elm_Fileselector_Button_Data *sd)
    elm_win_title_set(win, sd->window_title);
    elm_win_autodel_set(win, EINA_TRUE);
    eo_event_callback_add
-         (win, ELM_WIN_EVENT_DELETE_REQUEST, _selection_done, sd);
+         (win, EFL_UI_WIN_EVENT_DELETE_REQUEST, _selection_done, sd);
 
    bg = elm_bg_add(win);
    evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -152,7 +152,7 @@ _new_window_add(Elm_Fileselector_Button_Data *sd)
 static Evas_Object *
 _parent_win_get(Evas_Object *obj)
 {
-   while (!eo_isa(obj, ELM_WIN_CLASS))
+   while (!eo_isa(obj, EFL_UI_WIN_CLASS))
      obj = elm_object_parent_widget_get(obj);
 
    return obj;

diff --git a/src/lib/elementary/elc_hoversel.c b/src/lib/elementary/elc_hoversel.c
index 3d97254..8505c97 100644 (file)
--- a/src/lib/elementary/elc_hoversel.c
+++ b/src/lib/elementary/elc_hoversel.c
@@ -272,7 +272,7 @@ _resizing_eval(Evas_Object *obj, Elm_Hoversel_Data *sd)
      }
 
    evas_object_geometry_get(sd->hover_parent, &x, &y, &w, &h);
-   if (eo_isa(sd->hover_parent, ELM_WIN_CLASS))
+   if (eo_isa(sd->hover_parent, EFL_UI_WIN_CLASS))
      {
         x = 0;
         y = 0;

diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c
index 51a6e68..c2aa9d8 100644 (file)
--- a/src/lib/elementary/elc_popup.c
+++ b/src/lib/elementary/elc_popup.c
@@ -1576,7 +1576,7 @@ _parent_geom_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_i
 
    evas_object_geometry_get(obj, &x, &y, &w, &h);
 
-   if (eo_isa(obj, ELM_WIN_CLASS))
+   if (eo_isa(obj, EFL_UI_WIN_CLASS))
      {
         x = 0;
         y = 0;
@@ -1592,7 +1592,7 @@ _elm_popup_elm_widget_widget_parent_set(Eo *obj, Elm_Popup_Data *sd, Evas_Object
    Evas_Coord x, y, w, h;
    evas_object_geometry_get(parent, &x, &y, &w, &h);
 
-   if (eo_isa(parent, ELM_WIN_CLASS))
+   if (eo_isa(parent, EFL_UI_WIN_CLASS))
      {
         x = 0;
         y = 0;

diff --git a/src/lib/elementary/elm_cnp.c b/src/lib/elementary/elm_cnp.c
index 42fe7e8..9e03260 100644 (file)
--- a/src/lib/elementary/elm_cnp.c
+++ b/src/lib/elementary/elm_cnp.c
@@ -366,7 +366,7 @@ _dropable_coords_adjust(Dropable *dropable, Evas_Coord *x, Evas_Coord *y)
    if (elm_widget_is(dropable->obj))
      {
         win = elm_widget_top_get(dropable->obj);
-        if (win && eo_isa(win, ELM_WIN_CLASS))
+        if (win && eo_isa(win, EFL_UI_WIN_CLASS))
           {
              Evas_Coord x2, y2;
              int rot = elm_win_rotation_get(win);
@@ -1817,8 +1817,8 @@ _x11_drag_mouse_up(void *data, int etype EINA_UNUSED, void *event)
                   if (elm_widget_is(dragwidget))
                     {
                        Evas_Object *win = elm_widget_top_get(dragwidget);
-                       if (win && eo_isa(win, ELM_WIN_CLASS))
-                         eo_event_callback_del(win, ELM_WIN_EVENT_ROTATION_CHANGED, _x11_win_rotation_changed_cb, dragwin);
+                       if (win && eo_isa(win, EFL_UI_WIN_CLASS))
+                         eo_event_callback_del(win, EFL_UI_WIN_EVENT_ROTATION_CHANGED, _x11_win_rotation_changed_cb, dragwin);
                     }
                }
 
@@ -1883,7 +1883,7 @@ _x11_elm_widget_xwin_get(const Evas_Object *obj)
              par = elm_widget_parent_widget_get(obj);
              if (par) top = elm_widget_top_get(par);
           }
-        if (top && (eo_isa(top, ELM_WIN_CLASS)))
+        if (top && (eo_isa(top, EFL_UI_WIN_CLASS)))
             xwin = elm_win_xwindow_get(top);
      }
    if (!xwin)
@@ -2271,10 +2271,10 @@ _x11_elm_drag_start(Evas_Object *obj, Elm_Sel_Format format, const char *data,
    if (elm_widget_is(obj))
      {
         Evas_Object *win = elm_widget_top_get(obj);
-        if (win && eo_isa(win, ELM_WIN_CLASS))
+        if (win && eo_isa(win, EFL_UI_WIN_CLASS))
           {
              elm_win_rotation_set(dragwin, elm_win_rotation_get(win));
-             eo_event_callback_add(win, ELM_WIN_EVENT_ROTATION_CHANGED, _x11_win_rotation_changed_cb, dragwin);
+             eo_event_callback_add(win, EFL_UI_WIN_EVENT_ROTATION_CHANGED, _x11_win_rotation_changed_cb, dragwin);
           }
      }
 
@@ -3418,7 +3418,7 @@ _wl_elm_drag_start(Evas_Object *obj, Elm_Sel_Format format, const char *data,
 
         top = elm_widget_top_get(obj);
         if (!top) top = elm_widget_top_get(elm_widget_parent_widget_get(obj));
-        if (top && (eo_isa(top, ELM_WIN_CLASS)))
+        if (top && (eo_isa(top, EFL_UI_WIN_CLASS)))
           parent = elm_win_wl_window_get(top);
      }
    if (!parent)
@@ -3913,7 +3913,7 @@ _wl_elm_widget_window_get(const Evas_Object *obj)
      {
         top = elm_widget_top_get(obj);
         if (!top) top = elm_widget_top_get(elm_widget_parent_widget_get(obj));
-        if (top && (eo_isa(top, ELM_WIN_CLASS)))
+        if (top && (eo_isa(top, EFL_UI_WIN_CLASS)))
             win = elm_win_wl_window_get(top);
      }
    if (!win)
@@ -3987,7 +3987,7 @@ _cocoa_elm_widget_cocoa_window_get(const Evas_Object *obj)
               par = elm_widget_parent_widget_get(obj);
               if (par) top = elm_widget_top_get(par);
            }
-         if ((top) && (eo_isa(top, ELM_WIN_CLASS)))
+         if ((top) && (eo_isa(top, EFL_UI_WIN_CLASS)))
            win = elm_win_cocoa_window_get(top);
      }
    if (!win)
@@ -4537,7 +4537,7 @@ _win32_elm_widget_window_get(const Evas_Object *obj)
              par = elm_widget_parent_widget_get(obj);
              if (par) top = elm_widget_top_get(par);
           }
-        if (top && (eo_isa(top, ELM_WIN_CLASS)))
+        if (top && (eo_isa(top, EFL_UI_WIN_CLASS)))
           win = elm_win_win32_window_get(top);
      }
 
@@ -5581,8 +5581,8 @@ elm_drag_cancel(Evas_Object *obj)
              if (elm_widget_is(dragwidget))
                {
                   Evas_Object *win = elm_widget_top_get(dragwidget);
-                  if (win && eo_isa(win, ELM_WIN_CLASS))
-                     eo_event_callback_del(win, ELM_WIN_EVENT_ROTATION_CHANGED, _x11_win_rotation_changed_cb, dragwin);
+                  if (win && eo_isa(win, EFL_UI_WIN_CLASS))
+                     eo_event_callback_del(win, EFL_UI_WIN_EVENT_ROTATION_CHANGED, _x11_win_rotation_changed_cb, dragwin);
                }
           }
         goto end;

diff --git a/src/lib/elementary/elm_conform.c b/src/lib/elementary/elm_conform.c
index 95516a3..2bdec87 100644 (file)
--- a/src/lib/elementary/elm_conform.c
+++ b/src/lib/elementary/elm_conform.c
@@ -952,8 +952,8 @@ _elm_conformant_evas_object_smart_del(Eo *obj, Elm_Conformant_Data *sd)
 
    evas_object_data_set(sd->win, "\377 elm,conformant", NULL);
 
-   eo_event_callback_del(sd->win, ELM_WIN_EVENT_INDICATOR_PROP_CHANGED, _on_indicator_mode_changed, obj);
-   eo_event_callback_del(sd->win, ELM_WIN_EVENT_ROTATION_CHANGED, _on_rotation_changed, obj);
+   eo_event_callback_del(sd->win, EFL_UI_WIN_EVENT_INDICATOR_PROP_CHANGED, _on_indicator_mode_changed, obj);
+   eo_event_callback_del(sd->win, EFL_UI_WIN_EVENT_ROTATION_CHANGED, _on_rotation_changed, obj);
 
    evas_obj_smart_del(eo_super(obj, MY_CLASS));
 }
@@ -1014,8 +1014,8 @@ _elm_conformant_eo_base_constructor(Eo *obj, Elm_Conformant_Data *sd)
    sd->rot = elm_win_rotation_get(sd->win);
    evas_object_data_set(sd->win, "\377 elm,conformant", obj);
 
-   eo_event_callback_add(sd->win, ELM_WIN_EVENT_INDICATOR_PROP_CHANGED, _on_indicator_mode_changed, obj);
-   eo_event_callback_add(sd->win, ELM_WIN_EVENT_ROTATION_CHANGED, _on_rotation_changed, obj);
+   eo_event_callback_add(sd->win, EFL_UI_WIN_EVENT_INDICATOR_PROP_CHANGED, _on_indicator_mode_changed, obj);
+   eo_event_callback_add(sd->win, EFL_UI_WIN_EVENT_ROTATION_CHANGED, _on_rotation_changed, obj);
 
    return obj;
 }

diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index 915c03b..91963cc 100644 (file)
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -1224,7 +1224,7 @@ _elm_entry_elm_widget_on_focus(Eo *obj, Elm_Entry_Data *sd, Elm_Object_Item *ite
    if (!sd->editable) return EINA_FALSE;
 
    top = elm_widget_top_get(obj);
-   if (top && eo_isa(top, ELM_WIN_CLASS))
+   if (top && eo_isa(top, EFL_UI_WIN_CLASS))
      top_is_win = EINA_TRUE;
 
    if (elm_widget_focus_get(obj))
@@ -1827,7 +1827,7 @@ _magnifier_move(void *data)
 
    // keep magnifier inside window
    top = elm_widget_top_get(data);
-   if (top && eo_isa(top, ELM_WIN_CLASS))
+   if (top && eo_isa(top, EFL_UI_WIN_CLASS))
      {
         Evas_Coord wh, ww;
         evas_object_geometry_get(top, NULL, NULL, &ww, &wh);
@@ -1994,7 +1994,7 @@ _mouse_up_cb(void *data,
              top = elm_widget_top_get(data);
              if (top)
                {
-                  if (eo_isa(top, ELM_WIN_CLASS))
+                  if (eo_isa(top, EFL_UI_WIN_CLASS))
                     top_is_win = EINA_TRUE;
 
                   if (top_is_win && sd->input_panel_enable && sd->input_panel_show_on_demand &&

diff --git a/src/lib/elementary/elm_hover.c b/src/lib/elementary/elm_hover.c
index 5246986..f8019da 100644 (file)
--- a/src/lib/elementary/elm_hover.c
+++ b/src/lib/elementary/elm_hover.c
@@ -139,7 +139,7 @@ _elm_hover_left_space_calc(Elm_Hover_Data *sd,
    if (sd->parent)
      {
         evas_object_geometry_get(sd->parent, &x, &y, &w, &h);
-        if (eo_isa(sd->parent, ELM_WIN_CLASS))
+        if (eo_isa(sd->parent, EFL_UI_WIN_CLASS))
           {
              x = 0;
              y = 0;
@@ -318,7 +318,7 @@ _elm_hover_elm_layout_sizing_eval(Eo *obj, Elm_Hover_Data *sd)
    if (sd->parent)
      {
         evas_object_geometry_get(sd->parent, &x, &y, &w, &h);
-        if (eo_isa(sd->parent, ELM_WIN_CLASS))
+        if (eo_isa(sd->parent, EFL_UI_WIN_CLASS))
           {
              x = 0;
              y = 0;

diff --git a/src/lib/elementary/elm_inwin.c b/src/lib/elementary/elm_inwin.c
index 9ec6ba3..8018aca 100644 (file)
--- a/src/lib/elementary/elm_inwin.c
+++ b/src/lib/elementary/elm_inwin.c
@@ -109,7 +109,7 @@ _elm_inwin_eo_base_constructor(Eo *obj, void *_pd EINA_UNUSED)
 
    parent = eo_parent_get(obj);
 
-   if (parent && !eo_isa(parent, ELM_WIN_CLASS))
+   if (parent && !eo_isa(parent, EFL_UI_WIN_CLASS))
      {
         ERR("Failed");
         return NULL;

diff --git a/src/lib/elementary/elm_main.c b/src/lib/elementary/elm_main.c
index 52e3106..2b14893 100644 (file)
--- a/src/lib/elementary/elm_main.c
+++ b/src/lib/elementary/elm_main.c
@@ -1386,7 +1386,7 @@ elm_object_focus_set(Evas_Object *obj,
         if (focus == elm_widget_focus_get(obj)) return;
 
         // ugly, but, special case for inlined windows
-        if (eo_isa(obj, ELM_WIN_CLASS))
+        if (eo_isa(obj, EFL_UI_WIN_CLASS))
           {
              Evas_Object *inlined = elm_win_inlined_image_object_get(obj);
 

diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c
index e9339a0..b2f3346 100644 (file)
--- a/src/lib/elementary/elm_menu.c
+++ b/src/lib/elementary/elm_menu.c
@@ -119,7 +119,7 @@ _submenu_sizing_eval(Elm_Menu_Item_Data *parent_it)
    evas_object_geometry_get(VIEW(parent_it), &x2, &y2, &w2, &h2);
    evas_object_geometry_get(parent_it->submenu.bx, &bx, &by, &bw, &bh);
    evas_object_geometry_get(sd->parent, &px, &py, &pw, &ph);
-   if (eo_isa(sd->parent, ELM_WIN_CLASS))
+   if (eo_isa(sd->parent, EFL_UI_WIN_CLASS))
      {
         px = 0;
         py = 0;
@@ -185,7 +185,7 @@ _sizing_eval(Evas_Object *obj)
 
    evas_object_geometry_get(sd->location, NULL, NULL, &w_p, &h_p);
    evas_object_geometry_get(sd->parent, &x2, &y2, &w2, &h2);
-   if (eo_isa(sd->parent, ELM_WIN_CLASS))
+   if (eo_isa(sd->parent, EFL_UI_WIN_CLASS))
      {
         x2 = 0;
         y2 = 0;

diff --git a/src/lib/elementary/elm_notify.c b/src/lib/elementary/elm_notify.c
index 95d13d8..552252a 100644 (file)
--- a/src/lib/elementary/elm_notify.c
+++ b/src/lib/elementary/elm_notify.c
@@ -131,7 +131,7 @@ _sizing_eval(Evas_Object *obj)
 
    if (!sd->parent) return;
    evas_object_geometry_get(sd->parent, &x, &y, &w, &h);
-   if (eo_isa(sd->parent, ELM_WIN_CLASS))
+   if (eo_isa(sd->parent, EFL_UI_WIN_CLASS))
      {
         x = 0;
         y = 0;

diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c
index 206dfe3..7aa146b 100644 (file)
--- a/src/lib/elementary/elm_widget.c
+++ b/src/lib/elementary/elm_widget.c
@@ -164,7 +164,7 @@ _elm_widget_focus_highlight_start(const Evas_Object *obj)
 {
    Evas_Object *top = elm_widget_top_get(obj);
 
-   if (top && eo_isa(top, ELM_WIN_CLASS))
+   if (top && eo_isa(top, EFL_UI_WIN_CLASS))
      _elm_win_focus_highlight_start(top);
 }
 
@@ -173,7 +173,7 @@ _elm_widget_focus_highlight_object_get(const Evas_Object *obj)
 {
    Evas_Object *top = elm_widget_top_get(obj);
 
-   if (top && eo_isa(top, ELM_WIN_CLASS))
+   if (top && eo_isa(top, EFL_UI_WIN_CLASS))
      return _elm_win_focus_highlight_object_get(top);
    return NULL;
 }
@@ -183,7 +183,7 @@ elm_widget_focus_highlight_enabled_get(const Evas_Object *obj)
 {
    const Evas_Object *win = elm_widget_top_get(obj);
 
-   if (win && eo_isa(win, ELM_WIN_CLASS))
+   if (win && eo_isa(win, EFL_UI_WIN_CLASS))
      return elm_win_focus_highlight_enabled_get(win);
    return EINA_FALSE;
 }
@@ -1546,7 +1546,7 @@ _elm_widget_highlight_in_theme_update(Eo *obj)
 {
    Evas_Object *top = elm_widget_top_get(obj);
 
-   if (top && eo_isa(top, ELM_WIN_CLASS))
+   if (top && eo_isa(top, EFL_UI_WIN_CLASS))
      {
         _elm_win_focus_highlight_in_theme_update(
            top, elm_widget_highlight_in_theme_get(obj));
@@ -3013,7 +3013,7 @@ void
 _elm_widget_focus_auto_show(Evas_Object *obj)
 {
    Evas_Object *top = elm_widget_top_get(obj);
-   if (top && eo_isa(top, ELM_WIN_CLASS)) _elm_win_focus_auto_show(top);
+   if (top && eo_isa(top, EFL_UI_WIN_CLASS)) _elm_win_focus_auto_show(top);
 }
 
 void
@@ -4004,7 +4004,7 @@ _elm_widget_focus_mouse_up_handle(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSE
    if (!obj) return;
    if (!_is_focusable(obj)) return;
    top = elm_widget_top_get(obj);
-   if (top && eo_isa(top, ELM_WIN_CLASS)) _elm_win_focus_auto_hide(top);
+   if (top && eo_isa(top, EFL_UI_WIN_CLASS)) _elm_win_focus_auto_hide(top);
    elm_widget_focus_steal(obj, NULL);
 }
 

diff --git a/src/lib/elementary/elm_win.h b/src/lib/elementary/elm_win.h
index 7720b98..467666c 100644 (file)
--- a/src/lib/elementary/elm_win.h
+++ b/src/lib/elementary/elm_win.h
@@ -105,7 +105,7 @@
 
 #include <elm_win_common.h>
 #ifdef EFL_EO_API_SUPPORT
-#include <elm_win_eo.h>
+#include <efl_ui_win.eo.h>
 #endif
 #ifndef EFL_NOLEGACY_API_SUPPORT
 #include <elm_win_legacy.h>

diff --git a/src/lib/elementary/elm_win_eo.h b/src/lib/elementary/elm_win_eo.h
index 30c2bba..cdddf88 100644 (file)
--- a/src/lib/elementary/elm_win_eo.h
+++ b/src/lib/elementary/elm_win_eo.h
@@ -4,7 +4,7 @@
  * @{
  */
 
-#include "elm_win.eo.h"
+#include "efl_ui_win.eo.h"
 
 /**
  * @}

diff --git a/src/lib/elementary/elm_win_legacy.h b/src/lib/elementary/elm_win_legacy.h
index 5930f35..a09a21a 100644 (file)
--- a/src/lib/elementary/elm_win_legacy.h
+++ b/src/lib/elementary/elm_win_legacy.h
@@ -1,4 +1,4 @@
-#include "elm_win.eo.legacy.h"
+#include "efl_ui_win.eo.legacy.h"
 
 /**
  * @brief In some environments, like phones, you may have an indicator that
@@ -50,6 +50,54 @@ typedef enum
   ELM_ILLUME_COMMAND_CLOSE /** Closes the currently active window */
 } Elm_Illume_Command;
 
+typedef Efl_Ui_Win_Type       Elm_Win_Type;
+
+#define ELM_WIN_UNKNOWN         EFL_UI_WIN_UNKNOWN
+#define ELM_WIN_BASIC           EFL_UI_WIN_BASIC
+#define ELM_WIN_DIALOG_BASIC    EFL_UI_WIN_DIALOG_BASIC
+#define ELM_WIN_DESKTOP         EFL_UI_WIN_DESKTOP
+#define ELM_WIN_DOCK            EFL_UI_WIN_DOCK
+#define ELM_WIN_TOOLBAR         EFL_UI_WIN_TOOLBAR
+#define ELM_WIN_MENU            EFL_UI_WIN_MENU
+#define ELM_WIN_UTILITY         EFL_UI_WIN_UTILITY
+#define ELM_WIN_SPLASH          EFL_UI_WIN_SPLASH
+#define ELM_WIN_DROPDOWN_MENU   EFL_UI_WIN_DROPDOWN_MENU
+#define ELM_WIN_POPUP_MENU      EFL_UI_WIN_POPUP_MENU
+#define ELM_WIN_TOOLTIP         EFL_UI_WIN_TOOLTIP
+#define ELM_WIN_NOTIFICATION    EFL_UI_WIN_NOTIFICATION
+#define ELM_WIN_COMBO           EFL_UI_WIN_COMBO
+#define ELM_WIN_DND             EFL_UI_WIN_DND
+#define ELM_WIN_INLINED_IMAGE   EFL_UI_WIN_INLINED_IMAGE
+#define ELM_WIN_SOCKET_IMAGE    EFL_UI_WIN_SOCKET_IMAGE
+#define ELM_WIN_FAKE            EFL_UI_WIN_FAKE
+
+typedef Efl_Ui_Win_Keyboard_Mode        Elm_Win_Keyboard_Mode;
+
+#define ELM_WIN_KEYBOARD_UNKNOWN        EFL_UI_WIN_KEYBOARD_UNKNOWN
+#define ELM_WIN_KEYBOARD_OFF            EFL_UI_WIN_KEYBOARD_OFF
+#define ELM_WIN_KEYBOARD_ON             EFL_UI_WIN_KEYBOARD_ON
+#define ELM_WIN_KEYBOARD_ALPHA          EFL_UI_WIN_KEYBOARD_ALPHA
+#define ELM_WIN_KEYBOARD_NUMERIC        EFL_UI_WIN_KEYBOARD_NUMERIC
+#define ELM_WIN_KEYBOARD_PIN            EFL_UI_WIN_KEYBOARD_PIN
+#define ELM_WIN_KEYBOARD_PHONE_NUMBER   EFL_UI_WIN_KEYBOARD_PHONE_NUMBER
+#define ELM_WIN_KEYBOARD_HEX            EFL_UI_WIN_KEYBOARD_HEX
+#define ELM_WIN_KEYBOARD_TERMINAL       EFL_UI_WIN_KEYBOARD_TERMINAL
+#define ELM_WIN_KEYBOARD_PASSWORD       EFL_UI_WIN_KEYBOARD_PASSWORD
+#define ELM_WIN_KEYBOARD_IP             EFL_UI_WIN_KEYBOARD_IP
+#define ELM_WIN_KEYBOARD_HOST           EFL_UI_WIN_KEYBOARD_HOST
+#define ELM_WIN_KEYBOARD_FILE           EFL_UI_WIN_KEYBOARD_FILE
+#define ELM_WIN_KEYBOARD_URL            EFL_UI_WIN_KEYBOARD_URL
+#define ELM_WIN_KEYBOARD_KEYPAD         EFL_UI_WIN_KEYBOARD_KEYPAD
+#define ELM_WIN_KEYBOARD_J2ME           EFL_UI_WIN_KEYBOARD_J2ME
+
+typedef Efl_Ui_Win_Keygrab_Mode         Elm_Win_Keygrab_Mode;
+
+#define ELM_WIN_KEYGRAB_UNKNOWN              EFL_UI_WIN_KEYGRAB_UNKNOWN
+#define ELM_WIN_KEYGRAB_SHARED               EFL_UI_WIN_KEYGRAB_SHARED
+#define ELM_WIN_KEYGRAB_TOPMOST              EFL_UI_WIN_KEYGRAB_TOPMOST
+#define ELM_WIN_KEYGRAB_EXCLUSIVE            EFL_UI_WIN_KEYGRAB_EXCLUSIVE
+#define ELM_WIN_KEYGRAB_OVERRIDE_EXCLUSIVE   EFL_UI_WIN_KEYGRAB_OVERRIDE_EXCLUSIVE
+
 /**
  * Adds a window object. If this is the first window created, pass NULL as
  * @p parent.
@@ -68,6 +116,8 @@ typedef enum
  */
 EAPI Evas_Object          *elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type);
 
+typedef Evas_Object Elm_Win;
+
 /**
  * Creates a fake window object using a pre-existing canvas.
  *
@@ -1004,3 +1054,55 @@ EAPI Ecore_Window          elm_win_window_id_get(const Evas_Object *obj);
  */
 EAPI Evas_Object *elm_win_main_menu_get(Evas_Object *obj);
 
+/**
+ * @brief Sets the keyboard mode of the window.
+ *
+ * @param[in] mode The mode, one of #Elm_Win_Keyboard_Mode.
+ *
+ * @ingroup Elm_Win
+ */
+EAPI void elm_win_keyboard_mode_set(Elm_Win *obj, Elm_Win_Keyboard_Mode mode);
+
+/**
+ * @brief Get the keyboard mode of the window.
+ *
+ * @return The mode, one of #Elm_Win_Keyboard_Mode.
+ *
+ * @ingroup Elm_Win
+ */
+EAPI Elm_Win_Keyboard_Mode elm_win_keyboard_mode_get(const Elm_Win *obj);
+
+/**
+ * @brief The type of the window.
+ *
+ * It is a hint of how the Window Manager should handle it.
+ *
+ * The window type is a constructing property that need to be set at creation
+ * within @ref eo_add.
+ *
+ * @note Once set, it can NOT be modified afterward.
+ *
+ * Can only be used at creation time, within @ref eo_add.
+ *
+ * @param[in] type
+ *
+ * @ingroup Elm_Win
+ */
+EAPI void elm_win_type_set(Elm_Win *obj, Elm_Win_Type type);
+
+/**
+ * @brief The type of the window.
+ *
+ * It is a hint of how the Window Manager should handle it.
+ *
+ * The window type is a constructing property that need to be set at creation
+ * within @ref eo_add.
+ *
+ * @note Once set, it can NOT be modified afterward.
+ *
+ * If the object is not window object, return #ELM_WIN_UNKNOWN.
+ *
+ * @ingroup Elm_Win
+ */
+EAPI Elm_Win_Type elm_win_type_get(const Elm_Win *obj);
+

diff --git a/src/lib/elementary/elm_win_standard.h b/src/lib/elementary/elm_win_standard.h
index 2222bbb..3de5ce4 100644 (file)
--- a/src/lib/elementary/elm_win_standard.h
+++ b/src/lib/elementary/elm_win_standard.h
@@ -1,3 +1,3 @@
 #ifdef EFL_EO_API_SUPPORT
-#include <elm_win_standard.eo.h>
+#include <efl_ui_win_standard.eo.h>
 #endif

diff --git a/src/lib/elementary/els_cursor.c b/src/lib/elementary/els_cursor.c
index 5db692f..a7e9c19 100644 (file)
--- a/src/lib/elementary/els_cursor.c
+++ b/src/lib/elementary/els_cursor.c
@@ -440,7 +440,7 @@ _elm_cursor_cur_set(Elm_Cursor *cur)
         Evas_Object *top;
 
         top = elm_widget_top_get(cur->owner);
-        if ((top) && (eo_isa(top, ELM_WIN_CLASS)))
+        if ((top) && (eo_isa(top, EFL_UI_WIN_CLASS)))
           {
 #ifdef HAVE_ELEMENTARY_X
              cur->x.win = elm_win_xwindow_get(top);

diff --git a/src/lib/elementary/els_tooltip.c b/src/lib/elementary/els_tooltip.c
index bd93fb2..6e3e5b9 100644 (file)
--- a/src/lib/elementary/els_tooltip.c
+++ b/src/lib/elementary/els_tooltip.c
@@ -504,7 +504,7 @@ _elm_tooltip_reconfigure(Elm_Tooltip *tt)
    /* win reports its screen position for x/y;
     * reset to 0 since we expect canvas coords here
     */
-   if (eo_isa(tt->eventarea, ELM_WIN_CLASS))
+   if (eo_isa(tt->eventarea, EFL_UI_WIN_CLASS))
      ox = oy = 0;
    TTDBG("EVENTAREA:  ox=%d,oy=%d,ow=%d,oh=%d\n", ox, oy, ow, oh);