elementary: oops revert.
[framework/uifw/elementary.git] / src / lib / elm_win.c
index ac287d1..37ae0a0 100644 (file)
@@ -1,20 +1,13 @@
 #include <Elementary.h>
 #include "elm_priv.h"
 
-/**
- * @defgroup Win Win
- *
- * The window class of Elementary.  Contains functions to manipulate
- * windows.
- */
-
 typedef struct _Elm_Win Elm_Win;
 
 struct _Elm_Win
 {
    Ecore_Evas *ee;
    Evas *evas;
-   Evas_Object *parent, *win_obj;
+   Evas_Object *parent, *win_obj, *img_obj, *frame_obj;
    Eina_List *subobjs;
 #ifdef HAVE_ELEMENTARY_X
    Ecore_X_Window xwin;
@@ -25,12 +18,28 @@ struct _Elm_Win
 
    Elm_Win_Type type;
    Elm_Win_Keyboard_Mode kbdmode;
+   struct {
+      const char *info;
+      Ecore_Timer *timer;
+      int repeat_count;
+      int shot_counter;
+   } shot;
    Eina_Bool autodel : 1;
+   Eina_Bool constrain : 1;
+   Eina_Bool resizing : 1;
+   int resize_location;
    int *autodel_clear, rot;
+   int show_count;
    struct {
       int x, y;
    } screen;
-
+   struct 
+     {
+        Ecore_Evas *ee;
+        Evas *evas;
+        Evas_Object *obj, *hot_obj;
+        int hot_x, hot_y;
+     } pointer;
    struct {
       Evas_Object *top;
 
@@ -52,7 +61,9 @@ struct _Elm_Win
 
 static const char *widtype = NULL;
 static void _elm_win_obj_callback_del(void *data, Evas *e, Evas_Object *obj, void *event_info);
+static void _elm_win_obj_callback_img_obj_del(void *data, Evas *e, Evas_Object *obj, void *event_info);
 static void _elm_win_obj_callback_parent_del(void *data, Evas *e, Evas_Object *obj, void *event_info);
+static void _elm_win_obj_intercept_move(void *data, Evas_Object *obj, Evas_Coord x, Evas_Coord y);
 static void _elm_win_obj_intercept_show(void *data, Evas_Object *obj);
 static void _elm_win_move(Ecore_Evas *ee);
 static void _elm_win_resize(Ecore_Evas *ee);
@@ -72,7 +83,209 @@ static void _elm_win_focus_highlight_reconfigure_job_stop(Elm_Win *win);
 static void _elm_win_focus_highlight_anim_end(void *data, Evas_Object *obj, const char *emission, const char *source);
 static void _elm_win_focus_highlight_reconfigure(Elm_Win *win);
 
+static void _elm_win_frame_add(Elm_Win *win, const char *style);
+static void _elm_win_frame_cb_move_start(void *data, Evas_Object *obj __UNUSED__, const char *sig __UNUSED__, const char *source __UNUSED__);
+static void _elm_win_frame_cb_resize_start(void *data, Evas_Object *obj __UNUSED__, const char *sig __UNUSED__, const char *source);
+static void _elm_win_frame_cb_minimize(void *data, Evas_Object *obj __UNUSED__, const char *sig __UNUSED__, const char *source __UNUSED__);
+static void _elm_win_frame_cb_maximize(void *data, Evas_Object *obj __UNUSED__, const char *sig __UNUSED__, const char *source __UNUSED__);
+static void _elm_win_frame_cb_close(void *data, Evas_Object *obj __UNUSED__, const char *sig __UNUSED__, const char *source __UNUSED__);
+
+static void _elm_win_pointer_add(Elm_Win *win, const char *style);
+
+static const char SIG_DELETE_REQUEST[] = "delete,request";
+static const char SIG_FOCUS_OUT[] = "focus,out";
+static const char SIG_FOCUS_IN[] = "focus,in";
+static const char SIG_MOVED[] = "moved";
+static const char SIG_THEME_CHANGED[] = "theme,changed";
+
+static const Evas_Smart_Cb_Description _signals[] = {
+   {SIG_DELETE_REQUEST, ""},
+   {SIG_FOCUS_OUT, ""},
+   {SIG_FOCUS_IN, ""},
+   {SIG_MOVED, ""},
+   {NULL, NULL}
+};
+
+
+
 Eina_List *_elm_win_list = NULL;
+int _elm_win_deferred_free = 0;
+
+// exmaple shot spec (wait 0.1 sec then save as my-window.png):
+// ELM_ENGINE="shot:delay=0.1:file=my-window.png"
+
+static double
+_shot_delay_get(Elm_Win *win)
+{
+   char *p, *pd;
+   char *d = strdup(win->shot.info);
+
+   if (!d) return 0.5;
+   for (p = (char *)win->shot.info; *p; p++)
+     {
+        if (!strncmp(p, "delay=", 6))
+          {
+             double v;
+
+             for (pd = d, p += 6; (*p) && (*p != ':'); p++, pd++)
+               {
+                  *pd = *p;
+               }
+             *pd = 0;
+             v = atof(d);
+             free(d);
+             return v;
+          }
+     }
+   free(d);
+   return 0.5;
+}
+
+static char *
+_shot_file_get(Elm_Win *win)
+{
+   char *p;
+   char *tmp = strdup(win->shot.info);
+   char *repname = NULL;
+
+   if (!tmp) return NULL;
+
+   for (p = (char *)win->shot.info; *p; p++)
+     {
+        if (!strncmp(p, "file=", 5))
+          {
+             strcpy(tmp, p + 5);
+             if (!win->shot.repeat_count) return tmp;
+             else
+               {
+                  char *dotptr = strrchr(tmp, '.');
+                  if (dotptr)
+                    {
+                       size_t size = sizeof(char)*(strlen(tmp) + 16);
+                       repname = malloc(size);
+                       strncpy(repname, tmp, dotptr - tmp);
+                       snprintf(repname + (dotptr - tmp), size - (dotptr - tmp), "%03i",
+                               win->shot.shot_counter + 1);
+                       strcat(repname, dotptr);
+                       free(tmp);
+                       return repname;
+                    }
+               }
+          }
+     }
+   free(tmp);
+   if (!win->shot.repeat_count) return strdup("out.png");
+
+   repname = malloc(sizeof(char) * 24);
+   snprintf(repname, sizeof(char) * 24, "out%03i.png", win->shot.shot_counter + 1);
+   return repname;
+}
+
+static int
+_shot_repeat_count_get(Elm_Win *win)
+{
+   char *p, *pd;
+   char *d = strdup(win->shot.info);
+
+   if (!d) return 0;
+   for (p = (char *)win->shot.info; *p; p++)
+     {
+        if (!strncmp(p, "repeat=", 7))
+          {
+             int v;
+
+             for (pd = d, p += 7; (*p) && (*p != ':'); p++, pd++)
+               {
+                  *pd = *p;
+               }
+             *pd = 0;
+             v = atoi(d);
+             if (v < 0) v = 0;
+             if (v > 1000) v = 999;
+             free(d);
+             return v;
+          }
+     }
+   free(d);
+   return 0;
+}
+
+static char *
+_shot_key_get(Elm_Win *win __UNUSED__)
+{
+   return NULL;
+}
+
+static char *
+_shot_flags_get(Elm_Win *win __UNUSED__)
+{
+   return NULL;
+}
+
+static void
+_shot_do(Elm_Win *win)
+{
+   Ecore_Evas *ee;
+   Evas_Object *o;
+   unsigned int *pixels;
+   int w, h;
+   char *file, *key, *flags;
+
+   ecore_evas_manual_render(win->ee);
+   pixels = (void *)ecore_evas_buffer_pixels_get(win->ee);
+   if (!pixels) return;
+   ecore_evas_geometry_get(win->ee, NULL, NULL, &w, &h);
+   if ((w < 1) || (h < 1)) return;
+   file = _shot_file_get(win);
+   if (!file) return;
+   key = _shot_key_get(win);
+   flags = _shot_flags_get(win);
+   ee = ecore_evas_buffer_new(1, 1);
+   o = evas_object_image_add(ecore_evas_get(ee));
+   evas_object_image_alpha_set(o, ecore_evas_alpha_get(win->ee));
+   evas_object_image_size_set(o, w, h);
+   evas_object_image_data_set(o, pixels);
+   if (!evas_object_image_save(o, file, key, flags))
+     {
+        ERR("Cannot save window to '%s' (key '%s', flags '%s')",
+            file, key, flags);
+     }
+   free(file);
+   if (key) free(key);
+   if (flags) free(flags);
+   ecore_evas_free(ee);
+   if (win->shot.repeat_count) win->shot.shot_counter++;
+}
+
+static Eina_Bool
+_shot_delay(void *data)
+{
+   Elm_Win *win = data;
+   _shot_do(win);
+   if (win->shot.repeat_count)
+     {
+        int remainshot = (win->shot.repeat_count - win->shot.shot_counter);
+        if (remainshot > 0) return EINA_TRUE;
+     }
+   win->shot.timer = NULL;
+   elm_exit();
+   return EINA_FALSE;
+}
+
+static void
+_shot_init(Elm_Win *win)
+{
+   if (!win->shot.info) return;
+   win->shot.repeat_count = _shot_repeat_count_get(win);
+   win->shot.shot_counter = 0;
+}
+
+static void
+_shot_handle(Elm_Win *win)
+{
+   if (!win->shot.info) return;
+   win->shot.timer = ecore_timer_add(_shot_delay_get(win), _shot_delay, win);
+}
 
 static void
 _elm_win_move(Ecore_Evas *ee)
@@ -87,7 +300,7 @@ _elm_win_move(Ecore_Evas *ee)
    ecore_evas_geometry_get(ee, &x, &y, NULL, NULL);
    win->screen.x = x;
    win->screen.y = y;
-   evas_object_smart_callback_call(win->win_obj, "moved", NULL);
+   evas_object_smart_callback_call(win->win_obj, SIG_MOVED, NULL);
 }
 
 static void
@@ -103,6 +316,17 @@ _elm_win_resize(Ecore_Evas *ee)
    win->deferred_resize_job = ecore_job_add(_elm_win_resize_job, win);
 }
 
+static void 
+_elm_win_mouse_in(Ecore_Evas *ee)
+{
+   Evas_Object *obj;
+   Elm_Win *win;
+
+   if (!(obj = ecore_evas_object_associate_get(ee))) return;
+   if (!(win = elm_widget_data_get(obj))) return;
+   if (win->resizing) win->resizing = EINA_FALSE;
+}
+
 static void
 _elm_win_focus_in(Ecore_Evas *ee)
 {
@@ -112,11 +336,25 @@ _elm_win_focus_in(Ecore_Evas *ee)
    if (!obj) return;
    win = elm_widget_data_get(obj);
    if (!win) return;
-   /*NB: Why two different "focus signals" here ??? */
-   evas_object_smart_callback_call(win->win_obj, "focus-in", NULL); // FIXME: remove me
-   evas_object_smart_callback_call(win->win_obj, "focus,in", NULL);
+   _elm_widget_top_win_focused_set(win->win_obj, EINA_TRUE);
+   if (!elm_widget_focus_order_get(obj))
+     {
+        elm_widget_focus_steal(win->win_obj);
+        win->show_count++;
+     }
+   else
+     elm_widget_focus_restore(win->win_obj);
+   evas_object_smart_callback_call(win->win_obj, SIG_FOCUS_IN, NULL);
    win->focus_highlight.cur.visible = EINA_TRUE;
    _elm_win_focus_highlight_reconfigure_job_start(win);
+   if (win->frame_obj)
+     {
+        edje_object_signal_emit(win->frame_obj, "elm,action,focus", "elm");
+     }
+   else if (win->img_obj)
+     {
+        /* do nothing */
+     }
 }
 
 static void
@@ -128,10 +366,19 @@ _elm_win_focus_out(Ecore_Evas *ee)
    if (!obj) return;
    win = elm_widget_data_get(obj);
    if (!win) return;
-   evas_object_smart_callback_call(win->win_obj, "focus-out", NULL); // FIXME: remove me
-   evas_object_smart_callback_call(win->win_obj, "focus,out", NULL);
+   elm_object_focus_set(win->win_obj, EINA_FALSE);
+   _elm_widget_top_win_focused_set(win->win_obj, EINA_FALSE);
+   evas_object_smart_callback_call(win->win_obj, SIG_FOCUS_OUT, NULL);
    win->focus_highlight.cur.visible = EINA_FALSE;
    _elm_win_focus_highlight_reconfigure_job_start(win);
+   if (win->frame_obj)
+     {
+        edje_object_signal_emit(win->frame_obj, "elm,action,unfocus", "elm");
+     }
+   else if (win->img_obj)
+     {
+        /* do nothing */
+     }
 }
 
 static Eina_Bool
@@ -168,10 +415,13 @@ _elm_win_focus_next_hook(const Evas_Object *obj, Elm_Focus_Direction dir, Evas_O
 static void
 _elm_win_on_focus_hook(void *data __UNUSED__, Evas_Object *obj)
 {
-   if (elm_widget_focus_get(obj))
-     evas_object_focus_set(obj, EINA_TRUE);
+   Elm_Win *win = elm_widget_data_get(obj);
+   if (!win) return;
+
+   if (win->img_obj)
+      evas_object_focus_set(win->img_obj, elm_widget_focus_get(obj));
    else
-     evas_object_focus_set(obj, EINA_FALSE);
+      evas_object_focus_set(obj, elm_widget_focus_get(obj));
 }
 
 static Eina_Bool
@@ -182,13 +432,33 @@ _elm_win_event_cb(Evas_Object *obj, Evas_Object *src __UNUSED__, Evas_Callback_T
         Evas_Event_Key_Down *ev = event_info;
         if (!strcmp(ev->keyname, "Tab"))
           {
-             if(evas_key_modifier_is_set(ev->modifiers, "Shift"))
+             if (evas_key_modifier_is_set(ev->modifiers, "Shift"))
                elm_widget_focus_cycle(obj, ELM_FOCUS_PREVIOUS);
              else
                elm_widget_focus_cycle(obj, ELM_FOCUS_NEXT);
              ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
              return EINA_TRUE;
           }
+        else if ((!strcmp(ev->keyname, "Left")) ||
+                 (!strcmp(ev->keyname, "KP_Left")))
+          {
+             //TODO : woohyun jung
+          }
+        else if ((!strcmp(ev->keyname, "Right")) ||
+                 (!strcmp(ev->keyname, "KP_Right")))
+          {
+             //TODO : woohyun jung
+          }
+        else if ((!strcmp(ev->keyname, "Up")) ||
+                 (!strcmp(ev->keyname, "KP_Up")))
+          {
+             //TODO : woohyun jung
+          }
+        else if ((!strcmp(ev->keyname, "Down")) ||
+                 (!strcmp(ev->keyname, "KP_Down")))
+          {
+             //TODO : woohyun jung
+          }
      }
 
    return EINA_FALSE;
@@ -198,16 +468,40 @@ static void
 _deferred_ecore_evas_free(void *data)
 {
    ecore_evas_free(data);
+   _elm_win_deferred_free--;
 }
 
 static void
-_elm_win_obj_callback_show(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
+_elm_win_obj_callback_show(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
-   elm_object_focus(obj);
+   Elm_Win *win = data;
+
+   if (!win->show_count) win->show_count++;
+   if (win->shot.info) _shot_handle(win);
+}
+
+static void
+_elm_win_obj_callback_hide(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+{
+   Elm_Win *win = data;
+
+   if (win->frame_obj)
+     {
+        evas_object_hide(win->frame_obj);
+     }
+   else if (win->img_obj)
+     {
+        evas_object_hide(win->img_obj);
+     }
+   if (win->pointer.obj)
+     {
+        evas_object_hide(win->pointer.obj);
+        ecore_evas_hide(win->pointer.ee);
+     }
 }
 
 static void
-_elm_win_obj_callback_del(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
+_elm_win_obj_callback_del(void *data, Evas *e, Evas_Object *obj, void *event_info __UNUSED__)
 {
    Elm_Win *win = data;
    Evas_Object *child;
@@ -221,33 +515,51 @@ _elm_win_obj_callback_del(void *data, Evas *e __UNUSED__, Evas_Object *obj, void
    if (win->autodel_clear) *(win->autodel_clear) = -1;
    _elm_win_list = eina_list_remove(_elm_win_list, win->win_obj);
    while (win->subobjs) elm_win_resize_object_del(obj, win->subobjs->data);
-   ecore_evas_callback_delete_request_set(win->ee, NULL);
-   ecore_evas_callback_resize_set(win->ee, NULL);
+   if (win->ee)
+     {
+        ecore_evas_callback_delete_request_set(win->ee, NULL);
+        ecore_evas_callback_resize_set(win->ee, NULL);
+     }
    if (win->deferred_resize_job) ecore_job_del(win->deferred_resize_job);
    if (win->deferred_child_eval_job) ecore_job_del(win->deferred_child_eval_job);
+   if (win->shot.info) eina_stringshare_del(win->shot.info);
+   if (win->shot.timer) ecore_timer_del(win->shot.timer);
+   evas_object_event_callback_del_full(win->win_obj, EVAS_CALLBACK_DEL,
+                                       _elm_win_obj_callback_del, win);
    while (((child = evas_object_bottom_get(win->evas))) &&
-         (child != obj))
+          (child != obj))
      {
-       evas_object_del(child);
+        evas_object_del(child);
      }
    while (((child = evas_object_top_get(win->evas))) &&
-         (child != obj))
+          (child != obj))
      {
-       evas_object_del(child);
+        evas_object_del(child);
      }
 #ifdef HAVE_ELEMENTARY_X
    if (win->client_message_handler)
      ecore_event_handler_del(win->client_message_handler);
 #endif
-// FIXME: Why are we flushing edje on every window destroy ??
-//   edje_file_cache_flush();
-//   edje_collection_cache_flush();
-//   evas_image_cache_flush(win->evas);
-//   evas_font_cache_flush(win->evas);
-// FIXME: we are in the del handler for the object and delete the canvas
-// that lives under it from the handler... nasty. deferring doesn't help either
-   ecore_job_add(_deferred_ecore_evas_free, win->ee);
-//   ecore_evas_free(win->ee);
+   // FIXME: Why are we flushing edje on every window destroy ??
+   //   edje_file_cache_flush();
+   //   edje_collection_cache_flush();
+   //   evas_image_cache_flush(win->evas);
+   //   evas_font_cache_flush(win->evas);
+   // FIXME: we are in the del handler for the object and delete the canvas
+   // that lives under it from the handler... nasty. deferring doesn't help either
+
+   if (win->img_obj)
+     {
+        win->img_obj = NULL;
+     }
+   else
+     {
+        if (win->ee)
+          {
+             ecore_job_add(_deferred_ecore_evas_free, win->ee);
+             _elm_win_deferred_free++;
+          }
+     }
 
    _elm_win_focus_highlight_shutdown(win);
    eina_stringshare_del(win->focus_highlight.style);
@@ -261,11 +573,21 @@ _elm_win_obj_callback_del(void *data, Evas *e __UNUSED__, Evas_Object *obj, void
         edje_collection_cache_flush();
         evas_image_cache_flush(e);
         evas_font_cache_flush(e);
-       elm_exit();
+        elm_exit();
      }
 }
 
 static void
+_elm_win_obj_callback_img_obj_del(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+{
+   Elm_Win *win = data;
+   if (!win->img_obj) return;
+   evas_object_event_callback_del_full
+      (win->img_obj, EVAS_CALLBACK_DEL, _elm_win_obj_callback_img_obj_del, win);
+   evas_object_del(win->img_obj);
+}
+
+static void
 _elm_win_obj_callback_parent_del(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
 {
    Elm_Win *win = data;
@@ -273,16 +595,110 @@ _elm_win_obj_callback_parent_del(void *data, Evas *e __UNUSED__, Evas_Object *ob
 }
 
 static void
-_elm_win_obj_intercept_show(void *data __UNUSED__, Evas_Object *obj)
+_elm_win_obj_intercept_move(void *data, Evas_Object *obj, Evas_Coord x, Evas_Coord y)
 {
+   Elm_Win *win = data;
+
+   if (win->img_obj)
+     {
+        if ((x != win->screen.x) || (y != win->screen.y))
+          {
+             win->screen.x = x;
+             win->screen.y = y;
+             evas_object_smart_callback_call(win->win_obj, SIG_MOVED, NULL);
+          }
+     }
+   else
+     {
+        evas_object_move(obj, x, y);
+     }
+}
+
+static void
+_elm_win_obj_intercept_show(void *data, Evas_Object *obj)
+{
+   Elm_Win *win = data;
    // this is called to make sure all smart containers have calculated their
    // sizes BEFORE we show the window to make sure it initially appears at
    // our desired size (ie min size is known first)
    evas_smart_objects_calculate(evas_object_evas_get(obj));
+   if (win->frame_obj)
+     {
+        evas_object_show(win->frame_obj);
+     }
+   else if (win->img_obj)
+     {
+        evas_object_show(win->img_obj);
+     }
+   if (win->pointer.obj)
+     {
+        ecore_evas_show(win->pointer.ee);
+        evas_object_show(win->pointer.obj);
+        ecore_evas_wayland_pointer_set(win->pointer.ee, 10, 10);
+     }
    evas_object_show(obj);
 }
 
 static void
+_elm_win_obj_callback_move(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
+{
+   Elm_Win *win = data;
+
+   if (ecore_evas_override_get(win->ee))
+     {
+        Evas_Coord x, y;
+
+        evas_object_geometry_get(obj, &x, &y, NULL, NULL);
+        win->screen.x = x;
+        win->screen.y = y;
+        evas_object_smart_callback_call(win->win_obj, SIG_MOVED, NULL);
+     }
+   if (win->frame_obj)
+     {
+        Evas_Coord x, y;
+
+        evas_object_geometry_get(obj, &x, &y, NULL, NULL);
+        win->screen.x = x;
+        win->screen.y = y;
+     }
+   else if (win->img_obj)
+     {
+        Evas_Coord x, y;
+
+        evas_object_geometry_get(obj, &x, &y, NULL, NULL);
+        win->screen.x = x;
+        win->screen.y = y;
+//        evas_object_move(win->img_obj, x, y);
+     }
+}
+
+static void
+_elm_win_obj_callback_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
+{
+   Elm_Win *win = data;
+
+   if (win->frame_obj)
+     {
+     }
+   else if (win->img_obj)
+     {
+        Evas_Coord w = 1, h = 1;
+
+        evas_object_geometry_get(obj, NULL, NULL, &w, &h);
+        if (win->constrain)
+          {
+             int sw, sh;
+             ecore_evas_screen_geometry_get(win->ee, NULL, NULL, &sw, &sh);
+             w = MIN(w, sw);
+             h = MIN(h, sh);
+          }
+        if (w < 1) w = 1;
+        if (h < 1) h = 1;
+        evas_object_image_size_set(win->img_obj, w, h);
+     }
+}
+
+static void
 _elm_win_delete_request(Ecore_Evas *ee)
 {
    Evas_Object *obj = ecore_evas_object_associate_get(ee);
@@ -293,11 +709,12 @@ _elm_win_delete_request(Ecore_Evas *ee)
    if (!win) return;
    int autodel = win->autodel;
    win->autodel_clear = &autodel;
-   evas_object_smart_callback_call(win->win_obj, "delete-request", NULL); // FIXME: remove me
-   evas_object_smart_callback_call(win->win_obj, "delete,request", NULL);
+   evas_object_ref(win->win_obj);
+   evas_object_smart_callback_call(win->win_obj, SIG_DELETE_REQUEST, NULL);
    // FIXME: if above callback deletes - then the below will be invalid
    if (autodel) evas_object_del(win->win_obj);
    else win->autodel_clear = NULL;
+   evas_object_unref(win->win_obj);
 }
 
 static void
@@ -309,12 +726,26 @@ _elm_win_resize_job(void *data)
    int w, h;
 
    win->deferred_resize_job = NULL;
-   ecore_evas_geometry_get(win->ee, NULL, NULL, &w, &h);
+   ecore_evas_request_geometry_get(win->ee, NULL, NULL, &w, &h);
+   if (win->constrain)
+     {
+        int sw, sh;
+        ecore_evas_screen_geometry_get(win->ee, NULL, NULL, &sw, &sh);
+        w = MIN(w, sw);
+        h = MIN(h, sh);
+     }
+   if (win->frame_obj)
+     {
+        evas_object_resize(win->frame_obj, w, h);
+     }
+   else if (win->img_obj)
+     {
+     }
    evas_object_resize(win->win_obj, w, h);
    EINA_LIST_FOREACH(win->subobjs, l, obj)
      {
-       evas_object_move(obj, 0, 0);
-       evas_object_resize(obj, w, h);
+        evas_object_move(obj, 0, 0);
+        evas_object_resize(obj, w, h);
      }
 }
 
@@ -334,28 +765,31 @@ _elm_win_xwindow_get(Elm_Win *win)
             ENGINE_COMPARE(ELM_SOFTWARE_16_WINCE) ||
             ENGINE_COMPARE(ELM_SOFTWARE_SDL) ||
             ENGINE_COMPARE(ELM_SOFTWARE_16_SDL) ||
-            ENGINE_COMPARE(ELM_OPENGL_SDL))
+            ENGINE_COMPARE(ELM_OPENGL_SDL) ||
+           ENGINE_COMPARE(ELM_OPENGL_COCOA))
      {
      }
    else if (ENGINE_COMPARE(ELM_SOFTWARE_16_X11))
      {
-       if (win->ee) win->xwin = ecore_evas_software_x11_16_window_get(win->ee);
+        if (win->ee) win->xwin = ecore_evas_software_x11_16_window_get(win->ee);
      }
    else if (ENGINE_COMPARE(ELM_SOFTWARE_8_X11))
      {
-       if (win->ee) win->xwin = ecore_evas_software_x11_8_window_get(win->ee);
+        if (win->ee) win->xwin = ecore_evas_software_x11_8_window_get(win->ee);
      }
+/* killed
    else if (ENGINE_COMPARE(ELM_XRENDER_X11))
      {
-       if (win->ee) win->xwin = ecore_evas_xrender_x11_window_get(win->ee);
+        if (win->ee) win->xwin = ecore_evas_xrender_x11_window_get(win->ee);
      }
+ */
    else if (ENGINE_COMPARE(ELM_OPENGL_X11))
      {
-       if (win->ee) win->xwin = ecore_evas_gl_x11_window_get(win->ee);
+        if (win->ee) win->xwin = ecore_evas_gl_x11_window_get(win->ee);
      }
    else if (ENGINE_COMPARE(ELM_SOFTWARE_WIN32))
      {
-       if (win->ee) win->xwin = (long)ecore_evas_win32_window_get(win->ee);
+        if (win->ee) win->xwin = (long)ecore_evas_win32_window_get(win->ee);
      }
 #undef ENGINE_COMPARE
 }
@@ -368,14 +802,14 @@ _elm_win_xwin_update(Elm_Win *win)
    _elm_win_xwindow_get(win);
    if (win->parent)
      {
-       Elm_Win *win2;
+        Elm_Win *win2;
 
-       win2 = elm_widget_data_get(win->parent);
-       if (win2)
-         {
-            if (win->xwin)
-              ecore_x_icccm_transient_for_set(win->xwin, win2->xwin);
-         }
+        win2 = elm_widget_data_get(win->parent);
+        if (win2)
+          {
+             if (win->xwin)
+               ecore_x_icccm_transient_for_set(win->xwin, win2->xwin);
+          }
      }
 
    if (!win->xwin) return; /* nothing more to do */
@@ -383,34 +817,52 @@ _elm_win_xwin_update(Elm_Win *win)
    switch (win->type)
      {
       case ELM_WIN_BASIC:
-        ecore_x_netwm_window_type_set(win->xwin, ECORE_X_WINDOW_TYPE_NORMAL);
-        break;
+         ecore_x_netwm_window_type_set(win->xwin, ECORE_X_WINDOW_TYPE_NORMAL);
+         break;
       case ELM_WIN_DIALOG_BASIC:
-        ecore_x_netwm_window_type_set(win->xwin, ECORE_X_WINDOW_TYPE_DIALOG);
-        break;
+         ecore_x_netwm_window_type_set(win->xwin, ECORE_X_WINDOW_TYPE_DIALOG);
+         break;
       case ELM_WIN_DESKTOP:
-        ecore_x_netwm_window_type_set(win->xwin, ECORE_X_WINDOW_TYPE_DESKTOP);
-        break;
+         ecore_x_netwm_window_type_set(win->xwin, ECORE_X_WINDOW_TYPE_DESKTOP);
+         break;
       case ELM_WIN_DOCK:
-        ecore_x_netwm_window_type_set(win->xwin, ECORE_X_WINDOW_TYPE_DOCK);
-        break;
+         ecore_x_netwm_window_type_set(win->xwin, ECORE_X_WINDOW_TYPE_DOCK);
+         break;
       case ELM_WIN_TOOLBAR:
-        ecore_x_netwm_window_type_set(win->xwin, ECORE_X_WINDOW_TYPE_TOOLBAR);
-        break;
+         ecore_x_netwm_window_type_set(win->xwin, ECORE_X_WINDOW_TYPE_TOOLBAR);
+         break;
       case ELM_WIN_MENU:
-        ecore_x_netwm_window_type_set(win->xwin, ECORE_X_WINDOW_TYPE_MENU);
-        break;
+         ecore_x_netwm_window_type_set(win->xwin, ECORE_X_WINDOW_TYPE_MENU);
+         break;
       case ELM_WIN_UTILITY:
-        ecore_x_netwm_window_type_set(win->xwin, ECORE_X_WINDOW_TYPE_UTILITY);
-        break;
+         ecore_x_netwm_window_type_set(win->xwin, ECORE_X_WINDOW_TYPE_UTILITY);
+         break;
       case ELM_WIN_SPLASH:
-        ecore_x_netwm_window_type_set(win->xwin, ECORE_X_WINDOW_TYPE_SPLASH);
-        break;
+         ecore_x_netwm_window_type_set(win->xwin, ECORE_X_WINDOW_TYPE_SPLASH);
+         break;
+      case ELM_WIN_DROPDOWN_MENU:
+         ecore_x_netwm_window_type_set(win->xwin, ECORE_X_WINDOW_TYPE_DROPDOWN_MENU);
+         break;
+      case ELM_WIN_POPUP_MENU:
+         ecore_x_netwm_window_type_set(win->xwin, ECORE_X_WINDOW_TYPE_POPUP_MENU);
+         break;
+      case ELM_WIN_TOOLTIP:
+         ecore_x_netwm_window_type_set(win->xwin, ECORE_X_WINDOW_TYPE_TOOLTIP);
+         break;
+      case ELM_WIN_NOTIFICATION:
+         ecore_x_netwm_window_type_set(win->xwin, ECORE_X_WINDOW_TYPE_NOTIFICATION);
+         break;
+      case ELM_WIN_COMBO:
+         ecore_x_netwm_window_type_set(win->xwin, ECORE_X_WINDOW_TYPE_COMBO);
+         break;
+      case ELM_WIN_DND:
+         ecore_x_netwm_window_type_set(win->xwin, ECORE_X_WINDOW_TYPE_DND);
+         break;
       default:
-        break;
+         break;
      }
    ecore_x_e_virtual_keyboard_state_set
-     (win->xwin, (Ecore_X_Virtual_Keyboard_State)win->kbdmode);
+      (win->xwin, (Ecore_X_Virtual_Keyboard_State)win->kbdmode);
 }
 #endif
 
@@ -427,23 +879,23 @@ _elm_win_eval_subobjs(Evas_Object *obj)
 
    EINA_LIST_FOREACH(win->subobjs, l, child)
      {
-       evas_object_size_hint_weight_get(child, &wx, &wy);
-       if (wx == 0.0) xx = 0;
-       if (wy == 0.0) xy = 0;
-
-       evas_object_size_hint_min_get(child, &w, &h);
-       if (w < 1) w = -1;
-       if (h < 1) h = -1;
-       if (w > minw) minw = w;
-       if (h > minh) minh = h;
-
-       evas_object_size_hint_max_get(child, &w, &h);
-       if (w < 1) w = -1;
-       if (h < 1) h = -1;
-       if (maxw == -1) maxw = w;
-       else if ((w > 0) && (w < maxw)) maxw = w;
-       if (maxh == -1) maxh = h;
-       else if ((h > 0) && (h < maxh)) maxh = h;
+        evas_object_size_hint_weight_get(child, &wx, &wy);
+        if (wx == 0.0) xx = 0;
+        if (wy == 0.0) xy = 0;
+
+        evas_object_size_hint_min_get(child, &w, &h);
+        if (w < 1) w = 1;
+        if (h < 1) h = 1;
+        if (w > minw) minw = w;
+        if (h > minh) minh = h;
+
+        evas_object_size_hint_max_get(child, &w, &h);
+        if (w < 1) w = -1;
+        if (h < 1) h = -1;
+        if (maxw == -1) maxw = w;
+        else if ((w > 0) && (w < maxw)) maxw = w;
+        if (maxh == -1) maxh = h;
+        else if ((h > 0) && (h < maxh)) maxh = h;
      }
    if (!xx) maxw = minw;
    else maxw = 32767;
@@ -498,6 +950,16 @@ _elm_win_rescale(Elm_Theme *th, Eina_Bool use_theme)
      }
 }
 
+void
+_elm_win_translate(void)
+{
+   const Eina_List *l;
+   Evas_Object *obj;
+
+   EINA_LIST_FOREACH(_elm_win_list, l, obj)
+      elm_widget_translate(obj);
+}
+
 #ifdef HAVE_ELEMENTARY_X
 static Eina_Bool
 _elm_win_client_message(void *data, int type __UNUSED__, void *event)
@@ -573,11 +1035,11 @@ _elm_win_focus_target_callbacks_add(Elm_Win *win)
    Evas_Object *obj = win->focus_highlight.cur.target;
 
    evas_object_event_callback_add(obj, EVAS_CALLBACK_MOVE,
-                                 _elm_win_focus_target_move, win);
+                                  _elm_win_focus_target_move, win);
    evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE,
-                                 _elm_win_focus_target_resize, win);
+                                  _elm_win_focus_target_resize, win);
    evas_object_event_callback_add(obj, EVAS_CALLBACK_DEL,
-                                 _elm_win_focus_target_del, win);
+                                  _elm_win_focus_target_del, win);
 }
 
 static void
@@ -586,11 +1048,11 @@ _elm_win_focus_target_callbacks_del(Elm_Win *win)
    Evas_Object *obj = win->focus_highlight.cur.target;
 
    evas_object_event_callback_del_full(obj, EVAS_CALLBACK_MOVE,
-                                      _elm_win_focus_target_move, win);
+                                       _elm_win_focus_target_move, win);
    evas_object_event_callback_del_full(obj, EVAS_CALLBACK_RESIZE,
-                                      _elm_win_focus_target_resize, win);
+                                       _elm_win_focus_target_resize, win);
    evas_object_event_callback_del_full(obj, EVAS_CALLBACK_DEL,
-                                      _elm_win_focus_target_del, win);
+                                       _elm_win_focus_target_del, win);
 }
 
 static Evas_Object *
@@ -698,12 +1160,12 @@ _elm_win_focus_highlight_shutdown(Elm_Win *win)
         win->focus_highlight.top = NULL;
      }
 
-     evas_event_callback_del_full(win->evas,
-                                  EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_IN,
-                                  _elm_win_object_focus_in, win);
-     evas_event_callback_del_full(win->evas,
-                                  EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_OUT,
-                                  _elm_win_object_focus_out, win);
+   evas_event_callback_del_full(win->evas,
+                                EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_IN,
+                                _elm_win_object_focus_in, win);
+   evas_event_callback_del_full(win->evas,
+                                EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_OUT,
+                                _elm_win_object_focus_out, win);
 }
 
 static void
@@ -872,6 +1334,121 @@ the_end:
    win->focus_highlight.prev = win->focus_highlight.cur;
 }
 
+static void 
+_elm_win_frame_add(Elm_Win *win, const char *style)
+{
+   evas_output_framespace_set(win->evas, 0, 22, 0, 26);
+
+   win->frame_obj = edje_object_add(win->evas);
+   _elm_theme_set(NULL, win->frame_obj, "border", "base", style);
+   evas_object_is_frame_object_set(win->frame_obj, EINA_TRUE);
+   evas_object_move(win->frame_obj, 0, 0);
+   evas_object_resize(win->frame_obj, 1, 1);
+
+   edje_object_signal_callback_add(win->frame_obj, "elm,action,move,start", 
+                                   "elm", _elm_win_frame_cb_move_start, win);
+   edje_object_signal_callback_add(win->frame_obj, "elm,action,resize,start", 
+                                   "*", _elm_win_frame_cb_resize_start, win);
+   edje_object_signal_callback_add(win->frame_obj, "elm,action,minimize", 
+                                   "elm", _elm_win_frame_cb_minimize, win);
+   edje_object_signal_callback_add(win->frame_obj, "elm,action,maximize", 
+                                   "elm", _elm_win_frame_cb_maximize, win);
+   edje_object_signal_callback_add(win->frame_obj, "elm,action,close", 
+                                   "elm", _elm_win_frame_cb_close, win);
+}
+
+static void 
+_elm_win_frame_cb_move_start(void *data, Evas_Object *obj __UNUSED__, const char *sig __UNUSED__, const char *source __UNUSED__)
+{
+   Elm_Win *win;
+
+   if (!(win = data)) return;
+   /* FIXME: Change mouse pointer */
+
+   /* NB: 0,0 are dummy values. Wayland handles the move by itself */
+   ecore_evas_move(win->ee, 0, 0);
+}
+
+static void 
+_elm_win_frame_cb_resize_start(void *data, Evas_Object *obj __UNUSED__, const char *sig __UNUSED__, const char *source)
+{
+   Elm_Win *win;
+
+   if (!(win = data)) return;
+   if (win->resizing) return;
+   win->resizing = EINA_TRUE;
+
+   /* FIXME: Change mouse pointer */
+
+   if (!strcmp(source, "elm.event.resize.t"))
+     win->resize_location = 1;
+   else if (!strcmp(source, "elm.event.resize.b"))
+     win->resize_location = 2;
+   else if (!strcmp(source, "elm.event.resize.l"))
+     win->resize_location = 4;
+   else if (!strcmp(source, "elm.event.resize.r"))
+     win->resize_location = 8;
+   else if (!strcmp(source, "elm.event.resize.tl"))
+     win->resize_location = 5;
+   else if (!strcmp(source, "elm.event.resize.tr"))
+     win->resize_location = 9;
+   else if (!strcmp(source, "elm.event.resize.bl"))
+     win->resize_location = 6;
+   else if (!strcmp(source, "elm.event.resize.br"))
+     win->resize_location = 10;
+   else
+     win->resize_location = 0;
+
+   if (win->resize_location > 0)
+     ecore_evas_wayland_resize(win->ee, win->resize_location);
+}
+
+static void 
+_elm_win_frame_cb_minimize(void *data, Evas_Object *obj __UNUSED__, const char *sig __UNUSED__, const char *source __UNUSED__)
+{
+   Elm_Win *win;
+
+   if (!(win = data)) return;
+   ecore_evas_iconified_set(win->ee, EINA_TRUE);
+}
+
+static void 
+_elm_win_frame_cb_maximize(void *data, Evas_Object *obj __UNUSED__, const char *sig __UNUSED__, const char *source __UNUSED__)
+{
+   Elm_Win *win;
+
+   if (!(win = data)) return;
+   ecore_evas_maximized_set(win->ee, EINA_TRUE);
+}
+
+static void 
+_elm_win_frame_cb_close(void *data, Evas_Object *obj __UNUSED__, const char *sig __UNUSED__, const char *source __UNUSED__)
+{
+   Elm_Win *win;
+
+   if (!(win = data)) return;
+   evas_object_del(win->win_obj);
+}
+
+static void 
+_elm_win_pointer_add(Elm_Win *win, const char *style)
+{
+   int mw, mh;
+
+   win->pointer.ee = ecore_evas_wayland_shm_new(NULL, 0, 0, 32, 32, 0);
+   ecore_evas_resize(win->pointer.ee, 32, 32);
+
+   win->pointer.evas = ecore_evas_get(win->ee);
+
+   win->pointer.obj = edje_object_add(win->pointer.evas);
+   _elm_theme_set(NULL, win->pointer.obj, "pointer", "base", style);
+   edje_object_size_min_calc(win->pointer.obj, &mw, &mh);
+   printf("ELM Win Pointer Size: %d %d\n", mw, mh);
+   evas_object_move(win->pointer.obj, 0, 0);
+   evas_object_resize(win->pointer.obj, 32, 32);
+   evas_object_show(win->pointer.obj);
+}
+
 #ifdef ELM_DEBUG
 static void
 _debug_key_down(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info)
@@ -879,8 +1456,7 @@ _debug_key_down(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, voi
    Evas_Event_Key_Down *ev = event_info;
 
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD)
-      return;
-
+     return;
 
    if ((strcmp(ev->keyname, "F12")) ||
        (!evas_key_modifier_is_set(ev->modifiers, "Control")))
@@ -891,26 +1467,80 @@ _debug_key_down(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, voi
 }
 #endif
 
-/**
- * Adds a window object. If this is the first window created, pass NULL as
- * @p parent.
- *
- * @param parent Parent object to add the window to, or NULL
- * @param name The name of the window
- * @param type The window type, one of the following:
- * ELM_WIN_BASIC
- * ELM_WIN_DIALOG_BASIC
- * ELM_WIN_DESKTOP
- * ELM_WIN_DOCK
- * ELM_WIN_TOOLBAR
- * ELM_WIN_MENU
- * ELM_WIN_UTILITY
- * ELM_WIN_SPLASH
- *
- * @return The created object, or NULL on failure
- *
- * @ingroup Win
- */
+static void
+_win_img_hide(void        *data,
+              Evas        *e __UNUSED__,
+              Evas_Object *obj __UNUSED__,
+              void        *event_info __UNUSED__)
+{
+   Elm_Win *win = data;
+
+   elm_widget_focus_hide_handle(win->win_obj);
+}
+
+static void
+_win_img_mouse_up(void        *data,
+                  Evas        *e __UNUSED__,
+                  Evas_Object *obj __UNUSED__,
+                  void        *event_info)
+{
+   Elm_Win *win = data;
+   Evas_Event_Mouse_Up *ev = event_info;
+   if (!(ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD))
+      elm_widget_focus_mouse_up_handle(win->win_obj);
+}
+
+static void
+_win_img_focus_in(void        *data,
+                  Evas        *e __UNUSED__,
+                  Evas_Object *obj __UNUSED__,
+                  void        *event_info __UNUSED__)
+{
+   Elm_Win *win = data;
+   elm_widget_focus_steal(win->win_obj);
+}
+
+static void
+_win_img_focus_out(void        *data,
+                   Evas        *e __UNUSED__,
+                   Evas_Object *obj __UNUSED__,
+                   void        *event_info __UNUSED__)
+{
+   Elm_Win *win = data;
+   elm_widget_focused_object_clear(win->win_obj);
+}
+
+static void
+_win_inlined_image_set(Elm_Win *win)
+{
+   evas_object_image_alpha_set(win->img_obj, EINA_FALSE);
+   evas_object_image_filled_set(win->img_obj, EINA_TRUE);
+   evas_object_event_callback_add(win->img_obj, EVAS_CALLBACK_DEL,
+                                  _elm_win_obj_callback_img_obj_del, win);
+
+   evas_object_event_callback_add(win->img_obj, EVAS_CALLBACK_HIDE,
+                                  _win_img_hide, win);
+   evas_object_event_callback_add(win->img_obj, EVAS_CALLBACK_MOUSE_UP,
+                                  _win_img_mouse_up, win);
+   evas_object_event_callback_add(win->img_obj, EVAS_CALLBACK_FOCUS_IN,
+                                  _win_img_focus_in, win);
+   evas_object_event_callback_add(win->img_obj, EVAS_CALLBACK_FOCUS_OUT,
+                                  _win_img_focus_out, win);
+}
+
+static void
+_subobj_del(Elm_Win *win, Evas_Object *obj, Evas_Object *subobj)
+{
+   evas_object_event_callback_del_full(subobj,
+                                       EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+                                       _elm_win_subobj_callback_changed_size_hints,
+                                       obj);
+   evas_object_event_callback_del_full(subobj, EVAS_CALLBACK_DEL,
+                                       _elm_win_subobj_callback_del, obj);
+   win->subobjs = eina_list_remove(win->subobjs, subobj);
+   _elm_win_eval_subobjs(obj);
+}
+
 EAPI Evas_Object *
 elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type)
 {
@@ -922,107 +1552,196 @@ elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type)
 
 #define FALLBACK_TRY(engine)                                            \
    if (!win->ee)                                                        \
-     do {                                                               \
-       CRITICAL(engine " engine creation failed. Trying software X11."); \
-       win->ee = ecore_evas_software_x11_new(NULL, 0, 0, 0, 1, 1);      \
-     } while (0)
-
-#define ENGINE_COMPARE(name) (!strcmp(_elm_config->engine, name))
-   if (ENGINE_COMPARE(ELM_SOFTWARE_X11))
+      do {                                                              \
+         CRITICAL(engine " engine creation failed. Trying default.");   \
+         win->ee = ecore_evas_new(NULL, 0, 0, 1, 1, NULL);              \
+         if (win->ee)                                                   \
+            elm_engine_set(ecore_evas_engine_name_get(win->ee));        \
+   } while (0)
+#define ENGINE_COMPARE(name) (_elm_config->engine && !strcmp(_elm_config->engine, name))
+
+   switch (type)
      {
-       win->ee = ecore_evas_software_x11_new(NULL, 0, 0, 0, 1, 1);
+      case ELM_WIN_INLINED_IMAGE:
+        if (!parent) break;
+        {
+           Evas *e = evas_object_evas_get(parent);
+           Ecore_Evas *ee;
+           if (!e) break;
+           ee = ecore_evas_ecore_evas_get(e);
+           if (!ee) break;
+           win->img_obj = ecore_evas_object_image_new(ee);
+           if (!win->img_obj) break;
+           win->ee = ecore_evas_object_ecore_evas_get(win->img_obj);
+           if (win->ee)
+             {
+                _win_inlined_image_set(win);
+                break;
+             }
+           evas_object_del(win->img_obj);
+           win->img_obj = NULL;
+        }
+        break;
+
+      case ELM_WIN_SOCKET_IMAGE:
+        win->ee = ecore_evas_extn_socket_new(1, 1);
+        break;
+
+      default:
+        if (ENGINE_COMPARE(ELM_SOFTWARE_X11))
+          {
+             win->ee = ecore_evas_software_x11_new(NULL, 0, 0, 0, 1, 1);
 #ifdef HAVE_ELEMENTARY_X
-        win->client_message_handler = ecore_event_handler_add
-          (ECORE_X_EVENT_CLIENT_MESSAGE, _elm_win_client_message, win);
+             win->client_message_handler = ecore_event_handler_add
+                (ECORE_X_EVENT_CLIENT_MESSAGE, _elm_win_client_message, win);
 #endif
-     }
-   else if (ENGINE_COMPARE(ELM_SOFTWARE_FB))
-     {
-       win->ee = ecore_evas_fb_new(NULL, 0, 1, 1);
-        FALLBACK_TRY("Sofware FB");
-     }
-   else if (ENGINE_COMPARE(ELM_SOFTWARE_DIRECTFB))
-     {
-        win->ee = ecore_evas_directfb_new(NULL, 1, 0, 0, 1, 1);
-        FALLBACK_TRY("Sofware DirectFB");
-     }
-   else if (ENGINE_COMPARE(ELM_SOFTWARE_16_X11))
-     {
-       win->ee = ecore_evas_software_x11_16_new(NULL, 0, 0, 0, 1, 1);
-        FALLBACK_TRY("Sofware-16");
+             FALLBACK_TRY("Sofware X11");
+          }
+        else if (ENGINE_COMPARE(ELM_SOFTWARE_FB))
+          {
+             win->ee = ecore_evas_fb_new(NULL, 0, 1, 1);
+             FALLBACK_TRY("Sofware FB");
+          }
+        else if (ENGINE_COMPARE(ELM_SOFTWARE_DIRECTFB))
+          {
+             win->ee = ecore_evas_directfb_new(NULL, 1, 0, 0, 1, 1);
+             FALLBACK_TRY("Sofware DirectFB");
+          }
+        else if (ENGINE_COMPARE(ELM_SOFTWARE_16_X11))
+          {
+             win->ee = ecore_evas_software_x11_16_new(NULL, 0, 0, 0, 1, 1);
+             FALLBACK_TRY("Sofware-16");
 #ifdef HAVE_ELEMENTARY_X
-        win->client_message_handler = ecore_event_handler_add
-          (ECORE_X_EVENT_CLIENT_MESSAGE, _elm_win_client_message, win);
+             win->client_message_handler = ecore_event_handler_add
+                (ECORE_X_EVENT_CLIENT_MESSAGE, _elm_win_client_message, win);
 #endif
      }
-   else if (ENGINE_COMPARE(ELM_SOFTWARE_8_X11))
-     {
-       win->ee = ecore_evas_software_x11_8_new(NULL, 0, 0, 0, 1, 1);
-        FALLBACK_TRY("Sofware-8");
+        else if (ENGINE_COMPARE(ELM_SOFTWARE_8_X11))
+          {
+             win->ee = ecore_evas_software_x11_8_new(NULL, 0, 0, 0, 1, 1);
+             FALLBACK_TRY("Sofware-8");
 #ifdef HAVE_ELEMENTARY_X
-        win->client_message_handler = ecore_event_handler_add
-          (ECORE_X_EVENT_CLIENT_MESSAGE, _elm_win_client_message, win);
+             win->client_message_handler = ecore_event_handler_add
+                (ECORE_X_EVENT_CLIENT_MESSAGE, _elm_win_client_message, win);
 #endif
-     }
-   else if (ENGINE_COMPARE(ELM_XRENDER_X11))
-     {
-       win->ee = ecore_evas_xrender_x11_new(NULL, 0, 0, 0, 1, 1);
-        FALLBACK_TRY("XRender");
+          }
+/* killed
+        else if (ENGINE_COMPARE(ELM_XRENDER_X11))
+          {
+             win->ee = ecore_evas_xrender_x11_new(NULL, 0, 0, 0, 1, 1);
+             FALLBACK_TRY("XRender");
 #ifdef HAVE_ELEMENTARY_X
-        win->client_message_handler = ecore_event_handler_add
-          (ECORE_X_EVENT_CLIENT_MESSAGE, _elm_win_client_message, win);
+             win->client_message_handler = ecore_event_handler_add
+                (ECORE_X_EVENT_CLIENT_MESSAGE, _elm_win_client_message, win);
 #endif
-     }
-   else if (ENGINE_COMPARE(ELM_OPENGL_X11))
-     {
-       win->ee = ecore_evas_gl_x11_new(NULL, 0, 0, 0, 1, 1);
-        FALLBACK_TRY("OpenGL");
+          }
+ */
+        else if (ENGINE_COMPARE(ELM_OPENGL_X11))
+          {
+             int opt[10];
+             int opt_i = 0;
+
+             if (_elm_config->vsync)
+               {
+                  opt[opt_i] = ECORE_EVAS_GL_X11_OPT_VSYNC;
+                  opt_i++;
+                  opt[opt_i] = 1;
+                  opt_i++;
+               }
+             if (opt_i > 0)
+                win->ee = ecore_evas_gl_x11_options_new(NULL, 0, 0, 0, 1, 1, opt);
+             else
+                win->ee = ecore_evas_gl_x11_new(NULL, 0, 0, 0, 1, 1);
+             FALLBACK_TRY("OpenGL");
 #ifdef HAVE_ELEMENTARY_X
-        win->client_message_handler = ecore_event_handler_add
-          (ECORE_X_EVENT_CLIENT_MESSAGE, _elm_win_client_message, win);
+             win->client_message_handler = ecore_event_handler_add
+                (ECORE_X_EVENT_CLIENT_MESSAGE, _elm_win_client_message, win);
 #endif
-     }
-   else if (ENGINE_COMPARE(ELM_SOFTWARE_WIN32))
-     {
-       win->ee = ecore_evas_software_gdi_new(NULL, 0, 0, 1, 1);
-        FALLBACK_TRY("Sofware Win32");
-     }
-   else if (ENGINE_COMPARE(ELM_SOFTWARE_16_WINCE))
-     {
-       win->ee = ecore_evas_software_wince_gdi_new(NULL, 0, 0, 1, 1);
-        FALLBACK_TRY("Sofware-16-WinCE");
-     }
-   else if (ENGINE_COMPARE(ELM_SOFTWARE_SDL))
-     {
-       win->ee = ecore_evas_sdl_new(NULL, 0, 0, 0, 0, 0, 1);
-        FALLBACK_TRY("Sofware SDL");
-     }
-   else if (ENGINE_COMPARE(ELM_SOFTWARE_16_SDL))
-     {
-       win->ee = ecore_evas_sdl16_new(NULL, 0, 0, 0, 0, 0, 1);
-        FALLBACK_TRY("Sofware-16-SDL");
-     }
-   else if (ENGINE_COMPARE(ELM_OPENGL_SDL))
-     {
-       win->ee = ecore_evas_gl_sdl_new(NULL, 1, 1, 0, 0);
-        FALLBACK_TRY("OpenGL SDL");
-     }
+          }
+        else if (ENGINE_COMPARE(ELM_SOFTWARE_WIN32))
+          {
+             win->ee = ecore_evas_software_gdi_new(NULL, 0, 0, 1, 1);
+             FALLBACK_TRY("Sofware Win32");
+          }
+        else if (ENGINE_COMPARE(ELM_SOFTWARE_16_WINCE))
+          {
+             win->ee = ecore_evas_software_wince_gdi_new(NULL, 0, 0, 1, 1);
+             FALLBACK_TRY("Sofware-16-WinCE");
+          }
+        else if (ENGINE_COMPARE(ELM_SOFTWARE_PSL1GHT))
+          {
+             win->ee = ecore_evas_psl1ght_new(NULL, 1, 1);
+             FALLBACK_TRY("PSL1GHT");
+          }
+        else if (ENGINE_COMPARE(ELM_SOFTWARE_SDL))
+          {
+             win->ee = ecore_evas_sdl_new(NULL, 0, 0, 0, 0, 0, 1);
+             FALLBACK_TRY("Sofware SDL");
+          }
+        else if (ENGINE_COMPARE(ELM_SOFTWARE_16_SDL))
+          {
+             win->ee = ecore_evas_sdl16_new(NULL, 0, 0, 0, 0, 0, 1);
+             FALLBACK_TRY("Sofware-16-SDL");
+          }
+        else if (ENGINE_COMPARE(ELM_OPENGL_SDL))
+          {
+             win->ee = ecore_evas_gl_sdl_new(NULL, 1, 1, 0, 0);
+             FALLBACK_TRY("OpenGL SDL");
+          }
+        else if (ENGINE_COMPARE(ELM_OPENGL_COCOA))
+          {
+             win->ee = ecore_evas_cocoa_new(NULL, 1, 1, 0, 0);
+             FALLBACK_TRY("OpenGL Cocoa");
+          }
+        else if (ENGINE_COMPARE(ELM_BUFFER))
+          {
+             win->ee = ecore_evas_buffer_new(1, 1);
+          }
+        else if (ENGINE_COMPARE(ELM_EWS))
+          {
+             win->ee = ecore_evas_ews_new(0, 0, 1, 1);
+          }
+        else if (ENGINE_COMPARE(ELM_WAYLAND_SHM)) 
+          {
+             win->ee = ecore_evas_wayland_shm_new(NULL, 0, 0, 1, 1, 0);
+            win->evas = ecore_evas_get(win->ee);
+
+             _elm_win_frame_add(win, "default");
+             _elm_win_pointer_add(win, "default");
+          }
+        else if (ENGINE_COMPARE(ELM_WAYLAND_EGL)) 
+          {
+             win->ee = ecore_evas_wayland_egl_new(NULL, 0, 0, 1, 1, 0);
+            win->evas = ecore_evas_get(win->ee);
+
+             _elm_win_frame_add(win, "default");
+             _elm_win_pointer_add(win, "default");
+          }
+        else if (!strncmp(_elm_config->engine, "shot:", 5))
+          {
+             win->ee = ecore_evas_buffer_new(1, 1);
+             ecore_evas_manual_render_set(win->ee, EINA_TRUE);
+             win->shot.info = eina_stringshare_add(_elm_config->engine + 5);
+             _shot_init(win);
+          }
 #undef FALLBACK_TRY
+        break;
+     }
 
    if (!win->ee)
      {
-       ERR("Cannot create window.");
-       free(win);
-       return NULL;
+        ERR("Cannot create window.");
+        free(win);
+        return NULL;
      }
 #ifdef HAVE_ELEMENTARY_X
    _elm_win_xwindow_get(win);
 #endif
    if ((_elm_config->bgpixmap) && (!_elm_config->compositing))
      ecore_evas_avoid_damage_set(win->ee, ECORE_EVAS_AVOID_DAMAGE_EXPOSE);
-// bg pixmap done by x - has other issues like can be redrawn by x before it
-// is filled/ready by app
-//     ecore_evas_avoid_damage_set(win->ee, ECORE_EVAS_AVOID_DAMAGE_BUILT_IN);
+   // bg pixmap done by x - has other issues like can be redrawn by x before it
+   // is filled/ready by app
+   //     ecore_evas_avoid_damage_set(win->ee, ECORE_EVAS_AVOID_DAMAGE_BUILT_IN);
 
    win->type = type;
    win->parent = parent;
@@ -1046,20 +1765,39 @@ elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type)
    evas_object_layer_set(win->win_obj, 50);
    evas_object_pass_events_set(win->win_obj, EINA_TRUE);
 
-   evas_object_intercept_show_callback_add(win->win_obj,
-                                           _elm_win_obj_intercept_show, win);
+   if (win->frame_obj) 
+     {
+//        evas_object_clip_set(win->win_obj, win->frame_obj);
+        evas_object_stack_below(win->frame_obj, win->win_obj);
+     }
+
+   if (type == ELM_WIN_INLINED_IMAGE)
+     elm_widget_parent2_set(win->win_obj, parent);
    ecore_evas_object_associate(win->ee, win->win_obj,
-                              ECORE_EVAS_OBJECT_ASSOCIATE_BASE |
-                              ECORE_EVAS_OBJECT_ASSOCIATE_STACK |
-                              ECORE_EVAS_OBJECT_ASSOCIATE_LAYER);
+                               ECORE_EVAS_OBJECT_ASSOCIATE_BASE |
+                               ECORE_EVAS_OBJECT_ASSOCIATE_STACK |
+                               ECORE_EVAS_OBJECT_ASSOCIATE_LAYER);
    evas_object_event_callback_add(win->win_obj, EVAS_CALLBACK_SHOW,
-                                 _elm_win_obj_callback_show, win);
+                                  _elm_win_obj_callback_show, win);
+   evas_object_event_callback_add(win->win_obj, EVAS_CALLBACK_HIDE,
+                                  _elm_win_obj_callback_hide, win);
    evas_object_event_callback_add(win->win_obj, EVAS_CALLBACK_DEL,
-                                 _elm_win_obj_callback_del, win);
+                                  _elm_win_obj_callback_del, win);
+   evas_object_event_callback_add(win->win_obj, EVAS_CALLBACK_MOVE,
+                                  _elm_win_obj_callback_move, win);
+   evas_object_event_callback_add(win->win_obj, EVAS_CALLBACK_RESIZE,
+                                  _elm_win_obj_callback_resize, win);
+   if (win->img_obj)
+     evas_object_intercept_move_callback_add(win->win_obj,
+                                             _elm_win_obj_intercept_move, win);
+   evas_object_intercept_show_callback_add(win->win_obj,
+                                           _elm_win_obj_intercept_show, win);
 
+   evas_object_smart_callback_add(win->win_obj, "sub-object-del", (Evas_Smart_Cb)_subobj_del, win);
    ecore_evas_name_class_set(win->ee, name, _elm_appname);
    ecore_evas_callback_delete_request_set(win->ee, _elm_win_delete_request);
    ecore_evas_callback_resize_set(win->ee, _elm_win_resize);
+   ecore_evas_callback_mouse_in_set(win->ee, _elm_win_mouse_in);
    ecore_evas_callback_focus_in_set(win->ee, _elm_win_focus_in);
    ecore_evas_callback_focus_out_set(win->ee, _elm_win_focus_out);
    ecore_evas_callback_move_set(win->ee, _elm_win_move);
@@ -1082,7 +1820,7 @@ elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type)
 
    if (ENGINE_COMPARE(ELM_SOFTWARE_FB))
      {
-       ecore_evas_fullscreen_set(win->ee, 1);
+        ecore_evas_fullscreen_set(win->ee, 1);
      }
 #undef ENGINE_COMPARE
 
@@ -1093,20 +1831,37 @@ elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type)
    Evas_Modifier_Mask mask = evas_key_modifier_mask_get(win->evas, "Control");
    evas_object_event_callback_add(win->win_obj, EVAS_CALLBACK_KEY_DOWN,
                                   _debug_key_down, win);
-   Eina_Bool ret = evas_object_key_grab(win->win_obj, "F12", mask, 0, EINA_TRUE);
-   printf("Key F12 exclusive for dot tree generation. (%d)\n", ret);
+
+   Eina_Bool ret = evas_object_key_grab(win->win_obj, "F12", mask, 0,
+                                        EINA_TRUE);
+   printf("Ctrl+F12 key combination exclusive for dot tree generation\n");
 #endif
+
+   evas_object_smart_callbacks_descriptions_set(win->win_obj, _signals);
+
    return win->win_obj;
 }
 
-/**
- * Add @p subobj as a resize object of window @p obj.
- *
- * @param obj The window object
- * @param subobj The resize object to add
- *
- * @ingroup Win
- */
+EAPI Evas_Object *
+elm_win_util_standard_add(const char *name, const char *title)
+{
+   Evas_Object *win, *bg;
+
+   win = elm_win_add(NULL, name, ELM_WIN_BASIC);
+   if (!win) return NULL;
+   elm_win_title_set(win, title);
+   bg = elm_bg_add(win);
+   if (!bg)
+     {
+        evas_object_del(win);
+        return NULL;
+     }
+   evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   elm_win_resize_object_add(win, bg);
+   evas_object_show(bg);
+   return win;
+}
+
 EAPI void
 elm_win_resize_object_add(Evas_Object *obj, Evas_Object *subobj)
 {
@@ -1115,6 +1870,7 @@ elm_win_resize_object_add(Evas_Object *obj, Evas_Object *subobj)
    ELM_CHECK_WIDTYPE(obj, widtype);
    win = elm_widget_data_get(obj);
    if (!win) return;
+   if (eina_list_data_find(win->subobjs, subobj)) return;
    win->subobjs = eina_list_append(win->subobjs, subobj);
    elm_widget_sub_object_add(obj, subobj);
    evas_object_event_callback_add(subobj, EVAS_CALLBACK_DEL,
@@ -1122,20 +1878,12 @@ elm_win_resize_object_add(Evas_Object *obj, Evas_Object *subobj)
    evas_object_event_callback_add(subobj, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
                                   _elm_win_subobj_callback_changed_size_hints,
                                   obj);
-   ecore_evas_geometry_get(win->ee, NULL, NULL, &w, &h);
+   evas_object_geometry_get(obj, NULL, NULL, &w, &h);
    evas_object_move(subobj, 0, 0);
    evas_object_resize(subobj, w, h);
    _elm_win_eval_subobjs(obj);
 }
 
-/**
- * Delete @p subobj as a resize object of window @p obj.
- *
- * @param obj The window object
- * @param subobj The resize object to add
- *
- * @ingroup Win
- */
 EAPI void
 elm_win_resize_object_del(Evas_Object *obj, Evas_Object *subobj)
 {
@@ -1154,32 +1902,18 @@ elm_win_resize_object_del(Evas_Object *obj, Evas_Object *subobj)
    _elm_win_eval_subobjs(obj);
 }
 
-/**
- * Set the title of the window
- *
- * @param obj The window object
- * @param title The title to set
- *
- * @ingroup Win
- */
 EAPI void
 elm_win_title_set(Evas_Object *obj, const char *title)
 {
    Elm_Win *win;
    ELM_CHECK_WIDTYPE(obj, widtype);
    win = elm_widget_data_get(obj);
-   if (!win) return;
+   if (!win || !title) return;
    ecore_evas_title_set(win->ee, title);
+   if (win->frame_obj)
+     edje_object_part_text_set(win->frame_obj, "elm.text.title", title);
 }
 
-/**
- * Get the title of the window
- *
- * @param obj The window object
- * @return The title
- *
- * @ingroup Win
- */
 EAPI const char *
 elm_win_title_get(const Evas_Object *obj)
 {
@@ -1190,14 +1924,6 @@ elm_win_title_get(const Evas_Object *obj)
    return ecore_evas_title_get(win->ee);
 }
 
-/**
- * Set the window's autodel state.
- *
- * @param obj The window object
- * @param autodel If true, the window will automatically delete itself when closed
- *
- * @ingroup Win
- */
 EAPI void
 elm_win_autodel_set(Evas_Object *obj, Eina_Bool autodel)
 {
@@ -1208,14 +1934,6 @@ elm_win_autodel_set(Evas_Object *obj, Eina_Bool autodel)
    win->autodel = autodel;
 }
 
-/**
- * Get the window's autodel state.
- *
- * @param obj The window object
- * @return If the window will automatically delete itself when closed
- *
- * @ingroup Win
- */
 EAPI Eina_Bool
 elm_win_autodel_get(const Evas_Object *obj)
 {
@@ -1226,13 +1944,6 @@ elm_win_autodel_get(const Evas_Object *obj)
    return win->autodel;
 }
 
-/**
- * Activate a window object.
- *
- * @param obj The window object
- *
- * @ingroup Win
- */
 EAPI void
 elm_win_activate(Evas_Object *obj)
 {
@@ -1243,13 +1954,6 @@ elm_win_activate(Evas_Object *obj)
    ecore_evas_activate(win->ee);
 }
 
-/**
- * Lower a window object.
- *
- * @param obj The window object
- *
- * @ingroup Win
- */
 EAPI void
 elm_win_lower(Evas_Object *obj)
 {
@@ -1260,13 +1964,6 @@ elm_win_lower(Evas_Object *obj)
    ecore_evas_lower(win->ee);
 }
 
-/**
- * Raise a window object.
- *
- * @param obj The window object
- *
- * @ingroup Win
- */
 EAPI void
 elm_win_raise(Evas_Object *obj)
 {
@@ -1277,14 +1974,27 @@ elm_win_raise(Evas_Object *obj)
    ecore_evas_raise(win->ee);
 }
 
-/**
- * Set the borderless state of a window.
- *
- * @param obj The window object
- * @param borderless If true, the window is borderless
- *
- * @ingroup Win
- */
+EAPI void
+elm_win_center(Evas_Object *obj, Eina_Bool h, Eina_Bool v)
+{
+   Elm_Win *win;
+   int win_w, win_h, screen_w, screen_h, nx, ny;
+   ELM_CHECK_WIDTYPE(obj, widtype);
+   win = elm_widget_data_get(obj);
+   if (!win) return;
+   ecore_evas_screen_geometry_get(win->ee, NULL, NULL, &screen_w, &screen_h);
+   if ((!screen_w) || (!screen_h)) return;
+   evas_object_geometry_get(obj, NULL, NULL, &win_w, &win_h);
+   if ((!win_w) || (!win_h)) return;
+   if (h) nx = win_w >= screen_w ? 0 : (screen_w / 2) - (win_w / 2);
+   else nx = win->screen.x;
+   if (v) ny = win_h >= screen_h ? 0 : (screen_h / 2) - (win_h / 2);
+   else ny = win->screen.y;
+   if (nx < 0) nx = 0;
+   if (ny < 0) ny = 0;
+   evas_object_move(obj, nx, ny);
+}
+
 EAPI void
 elm_win_borderless_set(Evas_Object *obj, Eina_Bool borderless)
 {
@@ -1298,14 +2008,6 @@ elm_win_borderless_set(Evas_Object *obj, Eina_Bool borderless)
 #endif
 }
 
-/**
- * Get the borderless state of a window.
- *
- * @param obj The window object
- * @return If true, the window is borderless
- *
- * @ingroup Win
- */
 EAPI Eina_Bool
 elm_win_borderless_get(const Evas_Object *obj)
 {
@@ -1316,14 +2018,6 @@ elm_win_borderless_get(const Evas_Object *obj)
    return ecore_evas_borderless_get(win->ee);
 }
 
-/**
- * Set the shaped state of a window.
- *
- * @param obj The window object
- * @param shaped If true, the window is shaped
- *
- * @ingroup Win
- */
 EAPI void
 elm_win_shaped_set(Evas_Object *obj, Eina_Bool shaped)
 {
@@ -1337,14 +2031,6 @@ elm_win_shaped_set(Evas_Object *obj, Eina_Bool shaped)
 #endif
 }
 
-/**
- * Get the shaped state of a window.
- *
- * @param obj The window object
- * @return If true, the window is shaped
- *
- * @ingroup Win
- */
 EAPI Eina_Bool
 elm_win_shaped_get(const Evas_Object *obj)
 {
@@ -1355,14 +2041,6 @@ elm_win_shaped_get(const Evas_Object *obj)
    return ecore_evas_shaped_get(win->ee);
 }
 
-/**
- * Set the alpha channel state of a window.
- *
- * @param obj The window object
- * @param alpha If true, the window has an alpha channel
- *
- * @ingroup Win
- */
 EAPI void
 elm_win_alpha_set(Evas_Object *obj, Eina_Bool alpha)
 {
@@ -1370,33 +2048,36 @@ elm_win_alpha_set(Evas_Object *obj, Eina_Bool alpha)
    ELM_CHECK_WIDTYPE(obj, widtype);
    win = elm_widget_data_get(obj);
    if (!win) return;
-#ifdef HAVE_ELEMENTARY_X
-   if (win->xwin)
+   if (win->frame_obj)
+     {
+     }
+   else if (win->img_obj)
      {
-       if (alpha)
-         {
-            if (!_elm_config->compositing)
-              elm_win_shaped_set(obj, alpha);
-            else
-              ecore_evas_alpha_set(win->ee, alpha);
-         }
-       else
-         ecore_evas_alpha_set(win->ee, alpha);
-       _elm_win_xwin_update(win);
+        evas_object_image_alpha_set(win->img_obj, alpha);
+        ecore_evas_alpha_set(win->ee, alpha);
      }
    else
+     {
+#ifdef HAVE_ELEMENTARY_X
+        if (win->xwin)
+          {
+             if (alpha)
+               {
+                  if (!_elm_config->compositing)
+                     elm_win_shaped_set(obj, alpha);
+                  else
+                     ecore_evas_alpha_set(win->ee, alpha);
+               }
+             else
+                ecore_evas_alpha_set(win->ee, alpha);
+             _elm_win_xwin_update(win);
+          }
+        else
 #endif
-     ecore_evas_alpha_set(win->ee, alpha);
+           ecore_evas_alpha_set(win->ee, alpha);
+     }
 }
 
-/**
- * Get the alpha channel state of a window.
- *
- * @param obj The window object
- * @return If true, the window has an alpha channel
- *
- * @ingroup Win
- */
 EAPI Eina_Bool
 elm_win_alpha_get(const Evas_Object *obj)
 {
@@ -1404,17 +2085,16 @@ elm_win_alpha_get(const Evas_Object *obj)
    ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
    win = elm_widget_data_get(obj);
    if (!win) return EINA_FALSE;
+   if (win->frame_obj)
+     {
+     }
+   else if (win->img_obj)
+     {
+        return evas_object_image_alpha_get(win->img_obj);
+     }
    return ecore_evas_alpha_get(win->ee);
 }
 
-/**
- * Set the transparency state of a window.
- *
- * @param obj The window object
- * @param transparent If true, the window is transparent
- *
- * @ingroup Win
- */
 EAPI void
 elm_win_transparent_set(Evas_Object *obj, Eina_Bool transparent)
 {
@@ -1423,25 +2103,27 @@ elm_win_transparent_set(Evas_Object *obj, Eina_Bool transparent)
    win = elm_widget_data_get(obj);
    if (!win) return;
 
-#ifdef HAVE_ELEMENTARY_X
-   if (win->xwin)
+   if (win->frame_obj)
+     {
+     }
+   else if (win->img_obj)
      {
-       ecore_evas_transparent_set(win->ee, transparent);
-       _elm_win_xwin_update(win);
+        evas_object_image_alpha_set(win->img_obj, transparent);
      }
    else
+     {
+#ifdef HAVE_ELEMENTARY_X
+        if (win->xwin)
+          {
+             ecore_evas_transparent_set(win->ee, transparent);
+             _elm_win_xwin_update(win);
+          }
+        else
 #endif
-     ecore_evas_transparent_set(win->ee, transparent);
+           ecore_evas_transparent_set(win->ee, transparent);
+     }
 }
 
-/**
- * Get the transparency state of a window.
- *
- * @param obj The window object
- * @return If true, the window is transparent
- *
- * @ingroup Win
- */
 EAPI Eina_Bool
 elm_win_transparent_get(const Evas_Object *obj)
 {
@@ -1453,14 +2135,6 @@ elm_win_transparent_get(const Evas_Object *obj)
    return ecore_evas_transparent_get(win->ee);
 }
 
-/**
- * Set the override state of a window.
- *
- * @param obj The window object
- * @param override If true, the window is overridden
- *
- * @ingroup Win
- */
 EAPI void
 elm_win_override_set(Evas_Object *obj, Eina_Bool override)
 {
@@ -1474,14 +2148,6 @@ elm_win_override_set(Evas_Object *obj, Eina_Bool override)
 #endif
 }
 
-/**
- * Get the override state of a window.
- *
- * @param obj The window object
- * @return If true, the window is overridden
- *
- * @ingroup Win
- */
 EAPI Eina_Bool
 elm_win_override_get(const Evas_Object *obj)
 {
@@ -1492,14 +2158,6 @@ elm_win_override_get(const Evas_Object *obj)
    return ecore_evas_override_get(win->ee);
 }
 
-/**
- * Set the fullscreen state of a window.
- *
- * @param obj The window object
- * @param fullscreen If true, the window is fullscreen
- *
- * @ingroup Win
- */
 EAPI void
 elm_win_fullscreen_set(Evas_Object *obj, Eina_Bool fullscreen)
 {
@@ -1508,31 +2166,24 @@ elm_win_fullscreen_set(Evas_Object *obj, Eina_Bool fullscreen)
    win = elm_widget_data_get(obj);
    if (!win) return;
 
+   // YYY: handle if win->img_obj
 #define ENGINE_COMPARE(name) (!strcmp(_elm_config->engine, name))
    if (ENGINE_COMPARE(ELM_SOFTWARE_FB) ||
        ENGINE_COMPARE(ELM_SOFTWARE_16_WINCE))
      {
-       // these engines... can ONLY be fullscreen
-       return;
+        // these engines... can ONLY be fullscreen
+        return;
      }
    else
      {
-       ecore_evas_fullscreen_set(win->ee, fullscreen);
+        ecore_evas_fullscreen_set(win->ee, fullscreen);
 #ifdef HAVE_ELEMENTARY_X
-       _elm_win_xwin_update(win);
+        _elm_win_xwin_update(win);
 #endif
      }
 #undef ENGINE_COMPARE
 }
 
-/**
- * Get the fullscreen state of a window.
- *
- * @param obj The window object
- * @return If true, the window is fullscreen
- *
- * @ingroup Win
- */
 EAPI Eina_Bool
 elm_win_fullscreen_get(const Evas_Object *obj)
 {
@@ -1545,24 +2196,16 @@ elm_win_fullscreen_get(const Evas_Object *obj)
    if (ENGINE_COMPARE(ELM_SOFTWARE_FB) ||
        ENGINE_COMPARE(ELM_SOFTWARE_16_WINCE))
      {
-       // these engines... can ONLY be fullscreen
-       return EINA_TRUE;
+        // these engines... can ONLY be fullscreen
+        return EINA_TRUE;
      }
    else
      {
-       return ecore_evas_fullscreen_get(win->ee);
+        return ecore_evas_fullscreen_get(win->ee);
      }
 #undef ENGINE_COMPARE
 }
 
-/**
- * Set the maximized state of a window.
- *
- * @param obj The window object
- * @param maximized If true, the window is maximized
- *
- * @ingroup Win
- */
 EAPI void
 elm_win_maximized_set(Evas_Object *obj, Eina_Bool maximized)
 {
@@ -1570,20 +2213,13 @@ elm_win_maximized_set(Evas_Object *obj, Eina_Bool maximized)
    ELM_CHECK_WIDTYPE(obj, widtype);
    win = elm_widget_data_get(obj);
    if (!win) return;
+   // YYY: handle if win->img_obj
    ecore_evas_maximized_set(win->ee, maximized);
 #ifdef HAVE_ELEMENTARY_X
    _elm_win_xwin_update(win);
 #endif
 }
 
-/**
- * Get the maximized state of a window.
- *
- * @param obj The window object
- * @return If true, the window is maximized
- *
- * @ingroup Win
- */
 EAPI Eina_Bool
 elm_win_maximized_get(const Evas_Object *obj)
 {
@@ -1594,14 +2230,6 @@ elm_win_maximized_get(const Evas_Object *obj)
    return ecore_evas_maximized_get(win->ee);
 }
 
-/**
- * Set the iconified state of a window.
- *
- * @param obj The window object
- * @param iconified If true, the window is iconified
- *
- * @ingroup Win
- */
 EAPI void
 elm_win_iconified_set(Evas_Object *obj, Eina_Bool iconified)
 {
@@ -1615,14 +2243,6 @@ elm_win_iconified_set(Evas_Object *obj, Eina_Bool iconified)
 #endif
 }
 
-/**
- * Get the iconified state of a window.
- *
- * @param obj The window object
- * @return If true, the window is iconified
- *
- * @ingroup Win
- */
 EAPI Eina_Bool
 elm_win_iconified_get(const Evas_Object *obj)
 {
@@ -1633,14 +2253,6 @@ elm_win_iconified_get(const Evas_Object *obj)
    return ecore_evas_iconified_get(win->ee);
 }
 
-/**
- * Set the layer of the window.
- *
- * @param obj The window object
- * @param layer The layer of the window
- *
- * @ingroup Win
- */
 EAPI void
 elm_win_layer_set(Evas_Object *obj, int layer)
 {
@@ -1654,14 +2266,6 @@ elm_win_layer_set(Evas_Object *obj, int layer)
 #endif
 }
 
-/**
- * Get the layer of the window.
- *
- * @param obj The window object
- * @return The layer of the window
- *
- * @ingroup Win
- */
 EAPI int
 elm_win_layer_get(const Evas_Object *obj)
 {
@@ -1672,14 +2276,6 @@ elm_win_layer_get(const Evas_Object *obj)
    return ecore_evas_layer_get(win->ee);
 }
 
-/**
- * Set the rotation of the window.
- *
- * @param obj The window object
- * @param rotation The rotation of the window, in degrees (0-360)
- *
- * @ingroup Win
- */
 EAPI void
 elm_win_rotation_set(Evas_Object *obj, int rotation)
 {
@@ -1698,14 +2294,6 @@ elm_win_rotation_set(Evas_Object *obj, int rotation)
 #endif
 }
 
-/**
- * Rotates the window and resizes it
- *
- * @param obj The window object
- * @param layer The rotation of the window in degrees (0-360)
- *
- * @ingroup Win
- */
 EAPI void
 elm_win_rotation_with_resize_set(Evas_Object *obj, int rotation)
 {
@@ -1724,14 +2312,6 @@ elm_win_rotation_with_resize_set(Evas_Object *obj, int rotation)
 #endif
 }
 
-/**
- * Get the rotation of the window.
- *
- * @param obj The window object
- * @return The rotation of the window in degrees (0-360)
- *
- * @ingroup Win
- */
 EAPI int
 elm_win_rotation_get(const Evas_Object *obj)
 {
@@ -1742,14 +2322,6 @@ elm_win_rotation_get(const Evas_Object *obj)
    return win->rot;
 }
 
-/**
- * Set the sticky state of the window.
- *
- * @param obj The window object
- * @param sticky If true, the window's sticky state is enabled
- *
- * @ingroup Win
- */
 EAPI void
 elm_win_sticky_set(Evas_Object *obj, Eina_Bool sticky)
 {
@@ -1763,14 +2335,6 @@ elm_win_sticky_set(Evas_Object *obj, Eina_Bool sticky)
 #endif
 }
 
-/**
- * Get the sticky state of the window.
- *
- * @param obj The window object
- * @return If true, the window's sticky state is enabled
- *
- * @ingroup Win
- */
 EAPI Eina_Bool
 elm_win_sticky_get(const Evas_Object *obj)
 {
@@ -1781,30 +2345,6 @@ elm_win_sticky_get(const Evas_Object *obj)
    return ecore_evas_sticky_get(win->ee);
 }
 
-/**
- * Sets the keyboard mode of the window.
- *
- * @param obj The window object
- * @param mode The mode to set; one of:
- * ELM_WIN_KEYBOARD_UNKNOWN
- * ELM_WIN_KEYBOARD_OFF
- * ELM_WIN_KEYBOARD_ON
- * ELM_WIN_KEYBOARD_ALPHA
- * ELM_WIN_KEYBOARD_NUMERIC
- * ELM_WIN_KEYBOARD_PIN
- * ELM_WIN_KEYBOARD_PHONE_NUMBER
- * ELM_WIN_KEYBOARD_HEX
- * ELM_WIN_KEYBOARD_TERMINAL
- * ELM_WIN_KEYBOARD_PASSWORD
- * ELM_WIN_KEYBOARD_IP
- * ELM_WIN_KEYBOARD_HOST
- * ELM_WIN_KEYBOARD_FILE
- * ELM_WIN_KEYBOARD_URL
- * ELM_WIN_KEYBOARD_KEYPAD
- * ELM_WIN_KEYBOARD_J2ME
- *
- * @ingroup Win
- */
 EAPI void
 elm_win_keyboard_mode_set(Evas_Object *obj, Elm_Win_Keyboard_Mode mode)
 {
@@ -1820,34 +2360,10 @@ elm_win_keyboard_mode_set(Evas_Object *obj, Elm_Win_Keyboard_Mode mode)
 #ifdef HAVE_ELEMENTARY_X
    if (win->xwin)
      ecore_x_e_virtual_keyboard_state_set
-     (win->xwin, (Ecore_X_Virtual_Keyboard_State)win->kbdmode);
+        (win->xwin, (Ecore_X_Virtual_Keyboard_State)win->kbdmode);
 #endif
 }
 
-/**
- * Gets the keyboard mode of the window.
- *
- * @param obj The window object
- * @return The mode; one of:
- * ELM_WIN_KEYBOARD_UNKNOWN
- * ELM_WIN_KEYBOARD_OFF
- * ELM_WIN_KEYBOARD_ON
- * ELM_WIN_KEYBOARD_ALPHA
- * ELM_WIN_KEYBOARD_NUMERIC
- * ELM_WIN_KEYBOARD_PIN
- * ELM_WIN_KEYBOARD_PHONE_NUMBER
- * ELM_WIN_KEYBOARD_HEX
- * ELM_WIN_KEYBOARD_TERMINAL
- * ELM_WIN_KEYBOARD_PASSWORD
- * ELM_WIN_KEYBOARD_IP
- * ELM_WIN_KEYBOARD_HOST
- * ELM_WIN_KEYBOARD_FILE
- * ELM_WIN_KEYBOARD_URL
- * ELM_WIN_KEYBOARD_KEYPAD
- * ELM_WIN_KEYBOARD_J2ME
- *
- * @ingroup Win
- */
 EAPI Elm_Win_Keyboard_Mode
 elm_win_keyboard_mode_get(const Evas_Object *obj)
 {
@@ -1858,14 +2374,6 @@ elm_win_keyboard_mode_get(const Evas_Object *obj)
    return win->kbdmode;
 }
 
-/**
- * Sets whether the window is a keyboard.
- *
- * @param obj The window object
- * @param is_keyboard If true, the window is a virtual keyboard
- *
- * @ingroup Win
- */
 EAPI void
 elm_win_keyboard_win_set(Evas_Object *obj, Eina_Bool is_keyboard)
 {
@@ -1877,17 +2385,11 @@ elm_win_keyboard_win_set(Evas_Object *obj, Eina_Bool is_keyboard)
    _elm_win_xwindow_get(win);
    if (win->xwin)
      ecore_x_e_virtual_keyboard_set(win->xwin, is_keyboard);
+#else
+   (void) is_keyboard;
 #endif
 }
 
-/**
- * Gets whether the window is a keyboard.
- *
- * @param obj The window object
- * @return If the window is a virtual keyboard
- *
- * @ingroup Win
- */
 EAPI Eina_Bool
 elm_win_keyboard_win_get(const Evas_Object *obj)
 {
@@ -1903,15 +2405,6 @@ elm_win_keyboard_win_get(const Evas_Object *obj)
    return EINA_FALSE;
 }
 
-/**
- * Get the screen position of a window.
- *
- * @param obj The window object
- * @param x The int to store the x coordinate to
- * @param y The int to store the y coordinate to
- *
- * @ingroup Win
- */
 EAPI void
 elm_win_screen_position_get(const Evas_Object *obj, int *x, int *y)
 {
@@ -1923,14 +2416,46 @@ elm_win_screen_position_get(const Evas_Object *obj, int *x, int *y)
    if (y) *y = win->screen.y;
 }
 
-/**
- * Set if this window is an illume conformant window
- *
- * @param obj The window object
- * @param conformant The conformant flag (1 = conformant, 0 = non-conformant)
- *
- * @ingroup Win
- */
+EAPI Eina_Bool
+elm_win_focus_get(const Evas_Object *obj)
+{
+   Elm_Win *win;
+   ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
+   win = elm_widget_data_get(obj);
+   if (!win) return EINA_FALSE;
+   return ecore_evas_focus_get(win->ee);
+}
+
+EAPI void
+elm_win_screen_constrain_set(Evas_Object *obj, Eina_Bool constrain)
+{
+   Elm_Win *win;
+   ELM_CHECK_WIDTYPE(obj, widtype);
+   win = elm_widget_data_get(obj);
+   if (!win) return;
+   win->constrain = !!constrain;
+}
+
+EAPI Eina_Bool
+elm_win_screen_constrain_get(Evas_Object *obj)
+{
+   Elm_Win *win;
+   ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
+   win = elm_widget_data_get(obj);
+   if (!win) return EINA_FALSE;
+   return win->constrain;
+}
+
+EAPI void
+elm_win_screen_size_get(const Evas_Object *obj, int *x, int *y, int *w, int *h)
+{
+   Elm_Win *win;
+   ELM_CHECK_WIDTYPE(obj, widtype);
+   win = elm_widget_data_get(obj);
+   if (!win) return;
+   ecore_evas_screen_geometry_get(win->ee, x, y, w, h);
+}
+
 EAPI void
 elm_win_conformant_set(Evas_Object *obj, Eina_Bool conformant)
 {
@@ -1942,17 +2467,11 @@ elm_win_conformant_set(Evas_Object *obj, Eina_Bool conformant)
    _elm_win_xwindow_get(win);
    if (win->xwin)
      ecore_x_e_illume_conformant_set(win->xwin, conformant);
+#else
+   (void) conformant;
 #endif
 }
 
-/**
- * Get if this window is an illume conformant window
- *
- * @param obj The window object
- * @return A boolean if this window is illume conformant or not
- *
- * @ingroup Win
- */
 EAPI Eina_Bool
 elm_win_conformant_get(const Evas_Object *obj)
 {
@@ -1968,16 +2487,6 @@ elm_win_conformant_get(const Evas_Object *obj)
    return EINA_FALSE;
 }
 
-/**
- * Set a window to be an illume quickpanel window
- *
- * By default window objects are not quickpanel windows.
- *
- * @param obj The window object
- * @param quickpanel The quickpanel flag (1 = quickpanel, 0 = normal window)
- *
- * @ingroup Win
- */
 EAPI void
 elm_win_quickpanel_set(Evas_Object *obj, Eina_Bool quickpanel)
 {
@@ -2000,17 +2509,11 @@ elm_win_quickpanel_set(Evas_Object *obj, Eina_Bool quickpanel)
              ecore_x_icccm_hints_set(win->xwin, 0, 0, 0, 0, 0, 0, 0);
           }
      }
+#else
+   (void) quickpanel;
 #endif
 }
 
-/**
- * Get if this window is a quickpanel or not
- *
- * @param obj The window object
- * @return A boolean if this window is a quickpanel or not
- *
- * @ingroup Win
- */
 EAPI Eina_Bool
 elm_win_quickpanel_get(const Evas_Object *obj)
 {
@@ -2026,14 +2529,6 @@ elm_win_quickpanel_get(const Evas_Object *obj)
    return EINA_FALSE;
 }
 
-/**
- * Set the major priority of a quickpanel window
- *
- * @param obj The window object
- * @param priority The major priority for this quickpanel
- *
- * @ingroup Win
- */
 EAPI void
 elm_win_quickpanel_priority_major_set(Evas_Object *obj, int priority)
 {
@@ -2045,17 +2540,11 @@ elm_win_quickpanel_priority_major_set(Evas_Object *obj, int priority)
    _elm_win_xwindow_get(win);
    if (win->xwin)
      ecore_x_e_illume_quickpanel_priority_major_set(win->xwin, priority);
+#else
+   (void) priority;
 #endif
 }
 
-/**
- * Get the major priority of a quickpanel window
- *
- * @param obj The window object
- * @return The major priority of this quickpanel
- *
- * @ingroup Win
- */
 EAPI int
 elm_win_quickpanel_priority_major_get(const Evas_Object *obj)
 {
@@ -2071,14 +2560,6 @@ elm_win_quickpanel_priority_major_get(const Evas_Object *obj)
    return -1;
 }
 
-/**
- * Set the minor priority of a quickpanel window
- *
- * @param obj The window object
- * @param priority The minor priority for this quickpanel
- *
- * @ingroup Win
- */
 EAPI void
 elm_win_quickpanel_priority_minor_set(Evas_Object *obj, int priority)
 {
@@ -2090,17 +2571,11 @@ elm_win_quickpanel_priority_minor_set(Evas_Object *obj, int priority)
    _elm_win_xwindow_get(win);
    if (win->xwin)
      ecore_x_e_illume_quickpanel_priority_minor_set(win->xwin, priority);
+#else
+   (void) priority;
 #endif
 }
 
-/**
- * Get the minor priority of a quickpanel window
- *
- * @param obj The window object
- * @return The minor priority of this quickpanel
- *
- * @ingroup Win
- */
 EAPI int
 elm_win_quickpanel_priority_minor_get(const Evas_Object *obj)
 {
@@ -2116,14 +2591,6 @@ elm_win_quickpanel_priority_minor_get(const Evas_Object *obj)
    return -1;
 }
 
-/**
- * Set which zone this quickpanel should appear in
- *
- * @param obj The window object
- * @param zone The requested zone for this quickpanel
- *
- * @ingroup Win
- */
 EAPI void
 elm_win_quickpanel_zone_set(Evas_Object *obj, int zone)
 {
@@ -2135,17 +2602,11 @@ elm_win_quickpanel_zone_set(Evas_Object *obj, int zone)
    _elm_win_xwindow_get(win);
    if (win->xwin)
      ecore_x_e_illume_quickpanel_zone_set(win->xwin, zone);
+#else
+   (void) zone;
 #endif
 }
 
-/**
- * Get which zone this quickpanel should appear in
- *
- * @param obj The window object
- * @return The requested zone for this quickpanel
- *
- * @ingroup Win
- */
 EAPI int
 elm_win_quickpanel_zone_get(const Evas_Object *obj)
 {
@@ -2161,27 +2622,6 @@ elm_win_quickpanel_zone_get(const Evas_Object *obj)
    return 0;
 }
 
-/**
- * Set the window to be skipped by keyboard focus
- * 
- * This sets the window to be skipped by normal keyboard input. This means
- * a window manager will be asked to not focus this window as well as omit
- * it from things like the taskbar, pager, "alt-tab" list etc. etc.
- * 
- * Call this and enable it on a window BEFORE you show it for the first time,
- * otherwise it may have no effect.
- * 
- * Use this for windows that have only output information or might only be
- * interacted with by the mouse or fingers, and never for typing input.
- * Be careful that this may have side-effects like making the window
- * non-accessible in some cases unless the window is specially handled. Use
- * this with care.
- * 
- * @param obj The window object
- * @param skip The skip flag state (EINA_TRUE if it is to be skipped)
- * 
- * @ingroup Win
- */
 EAPI void
 elm_win_prop_focus_skip_set(Evas_Object *obj, Eina_Bool skip)
 {
@@ -2196,31 +2636,18 @@ elm_win_prop_focus_skip_set(Evas_Object *obj, Eina_Bool skip)
         if (win->xwin)
           {
              Ecore_X_Window_State states[2];
-             
+
              ecore_x_icccm_hints_set(win->xwin, 0, 0, 0, 0, 0, 0, 0);
              states[0] = ECORE_X_WINDOW_STATE_SKIP_TASKBAR;
              states[1] = ECORE_X_WINDOW_STATE_SKIP_PAGER;
              ecore_x_netwm_window_state_set(win->xwin, states, 2);
           }
      }
+#else
+   (void) skip;
 #endif
 }
 
-/**
- * Send a command to the windowing environment
- * 
- * This is intended to work in touchscreen or small screen device environments
- * where there is a more simplistic window management policy in place. This
- * uses the window object indicated to select which part of the environment
- * to control (the part that this window lives in), and provides a command
- * and an optional parameter structure (use NULL for this if not needed).
- * 
- * @param obj The window object that lives in the environment to control
- * @param command The command to send
- * @param params Optional parameters for the command
- * 
- * @ingroup Win
- */
 EAPI void
 elm_win_illume_command_send(Evas_Object *obj, Elm_Illume_Command command, void *params __UNUSED__)
 {
@@ -2235,35 +2662,36 @@ elm_win_illume_command_send(Evas_Object *obj, Elm_Illume_Command command, void *
         switch (command)
           {
            case ELM_ILLUME_COMMAND_FOCUS_BACK:
-             ecore_x_e_illume_focus_back_send(win->xwin);
-             break;
+              ecore_x_e_illume_focus_back_send(win->xwin);
+              break;
            case ELM_ILLUME_COMMAND_FOCUS_FORWARD:
-             ecore_x_e_illume_focus_forward_send(win->xwin);
-             break;
+              ecore_x_e_illume_focus_forward_send(win->xwin);
+              break;
            case ELM_ILLUME_COMMAND_FOCUS_HOME:
-             ecore_x_e_illume_focus_home_send(win->xwin);
-             break;
+              ecore_x_e_illume_focus_home_send(win->xwin);
+              break;
            case ELM_ILLUME_COMMAND_CLOSE:
-             ecore_x_e_illume_close_send(win->xwin);
-             break;
+              ecore_x_e_illume_close_send(win->xwin);
+              break;
            default:
-             break;
+              break;
           }
      }
+#else
+   (void) command;
 #endif
 }
 
-/**
- * Set the enabled status for the focus highlight in a window
- *
- * This function will enable or disable the focus highlight only for the
- * given window, regardless of the global setting for it
- *
- * @param obj The window where to enable the highlight
- * @param enabled The enabled value for the highlight
- *
- * @ingroup Win
- */
+EAPI Evas_Object *
+elm_win_inlined_image_object_get(Evas_Object *obj)
+{
+   Elm_Win *win;
+   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+   win = elm_widget_data_get(obj);
+   if (!win) return NULL;
+   return win->img_obj;
+}
+
 EAPI void
 elm_win_focus_highlight_enabled_set(Evas_Object *obj, Eina_Bool enabled)
 {
@@ -2284,15 +2712,6 @@ elm_win_focus_highlight_enabled_set(Evas_Object *obj, Eina_Bool enabled)
      _elm_win_focus_highlight_shutdown(win);
 }
 
-/**
- * Get the enabled value of the focus highlight for this window
- *
- * @param obj The window in which to check if the focus highlight is enabled
- *
- * @return EINA_TRUE if enabled, EINA_FALSE otherwise
- *
- * @ingroup Win
- */
 EAPI Eina_Bool
 elm_win_focus_highlight_enabled_get(const Evas_Object *obj)
 {
@@ -2304,17 +2723,6 @@ elm_win_focus_highlight_enabled_get(const Evas_Object *obj)
    return win->focus_highlight.enabled;
 }
 
-/**
- * Set the style for the focus highlight on this window
- *
- * Sets the style to use for theming the highlight of focused objects on
- * the given window. If @p style is NULL, the default will be used.
- *
- * @param obj The window where to set the style
- * @param style The style to set
- *
- * @ingroup Win
- */
 EAPI void
 elm_win_focus_highlight_style_set(Evas_Object *obj, const char *style)
 {
@@ -2328,18 +2736,6 @@ elm_win_focus_highlight_style_set(Evas_Object *obj, const char *style)
    _elm_win_focus_highlight_reconfigure_job_start(win);
 }
 
-/**
- * Get the style set for the focus highlight object
- *
- * Gets the style set for this windows highilght object, or NULL if none
- * is set.
- *
- * @param obj The window to retrieve the highlights style from
- *
- * @return The style set or NULL if none was. Default is used in that case.
- *
- * @ingroup Win
- */
 EAPI const char *
 elm_win_focus_highlight_style_get(const Evas_Object *obj)
 {
@@ -2383,6 +2779,8 @@ _theme_hook(Evas_Object *obj)
    if (wd->content)
      edje_object_part_swallow(wd->frm, "elm.swallow.content", wd->content);
    _sizing_eval(obj);
+
+   evas_object_smart_callback_call(obj, SIG_THEME_CHANGED, NULL);
 }
 
 static Eina_Bool
@@ -2406,6 +2804,25 @@ _elm_inwin_focus_next_hook(const Evas_Object *obj, Elm_Focus_Direction dir, Evas
 }
 
 static void
+_elm_inwin_text_set_hook(Evas_Object *obj, const char *item, const char *text)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+
+   if (!wd || !item) return;
+   edje_object_part_text_set(wd->frm, item, text);
+   _sizing_eval(obj);
+}
+
+static const char *
+_elm_inwin_text_get_hook(const Evas_Object *obj, const char *item)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+
+   if (!item || !wd || !wd->frm) return NULL;
+   return edje_object_part_text_get(wd->frm, item);
+}
+
+static void
 _sizing_eval(Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
@@ -2430,18 +2847,13 @@ _sub_del(void *data __UNUSED__, Evas_Object *obj, void *event_info)
    Evas_Object *sub = event_info;
    if (sub == wd->content)
      {
-       evas_object_event_callback_del_full
-          (sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, obj);
-       wd->content = NULL;
-       _sizing_eval(obj);
+        evas_object_event_callback_del_full
+           (sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, obj);
+        wd->content = NULL;
+        _sizing_eval(obj);
      }
 }
 
-/**
- * @defgroup Inwin Inwin
- *
- * An inwin is a window inside a window that is useful for a quick popup.  It does not hover.
- */
 EAPI Evas_Object *
 elm_win_inwin_add(Evas_Object *obj)
 {
@@ -2465,6 +2877,8 @@ elm_win_inwin_add(Evas_Object *obj)
    elm_widget_del_hook_set(obj2, _del_hook);
    elm_widget_theme_hook_set(obj2, _theme_hook);
    elm_widget_focus_next_hook_set(obj2, _elm_inwin_focus_next_hook);
+   elm_widget_text_set_hook_set(obj2, _elm_inwin_text_set_hook);
+   elm_widget_text_get_hook_set(obj2, _elm_inwin_text_get_hook);
    elm_widget_can_focus_set(obj2, EINA_TRUE);
    elm_widget_highlight_ignore_set(obj2, EINA_TRUE);
 
@@ -2478,13 +2892,6 @@ elm_win_inwin_add(Evas_Object *obj)
    return obj2;
 }
 
-/**
- * Activates an inwin object
- *
- * @param obj The inwin to activate
- *
- * @ingroup Inwin
- */
 EAPI void
 elm_win_inwin_activate(Evas_Object *obj)
 {
@@ -2494,21 +2901,9 @@ elm_win_inwin_activate(Evas_Object *obj)
    evas_object_raise(obj);
    evas_object_show(obj);
    edje_object_signal_emit(wd->frm, "elm,action,show", "elm");
-   elm_object_focus(obj);
-}
-
-/**
- * Set the content of an inwin object.
- *
- * Once the content object is set, a previously set one will be deleted.
- * If you want to keep that old content object, use the
- * elm_win_inwin_content_unset() function.
- *
- * @param obj The inwin object
- * @param content The object to set as content
- *
- * @ingroup Inwin
- */
+   elm_object_focus_set(obj, EINA_TRUE);
+}
+
 EAPI void
 elm_win_inwin_content_set(Evas_Object *obj, Evas_Object *content)
 {
@@ -2520,24 +2915,14 @@ elm_win_inwin_content_set(Evas_Object *obj, Evas_Object *content)
    wd->content = content;
    if (content)
      {
-       elm_widget_sub_object_add(obj, content);
-       evas_object_event_callback_add(content, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
-                                      _changed_size_hints, obj);
-       edje_object_part_swallow(wd->frm, "elm.swallow.content", content);
+        elm_widget_sub_object_add(obj, content);
+        evas_object_event_callback_add(content, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+                                       _changed_size_hints, obj);
+        edje_object_part_swallow(wd->frm, "elm.swallow.content", content);
      }
    _sizing_eval(obj);
 }
 
-/**
- * Get the content of an inwin object.
- *
- * Return the content object which is set for this widget.
- *
- * @param obj The inwin object
- * @return The content that is being used
- *
- * @ingroup Inwin
- */
 EAPI Evas_Object *
 elm_win_inwin_content_get(const Evas_Object *obj)
 {
@@ -2547,16 +2932,6 @@ elm_win_inwin_content_get(const Evas_Object *obj)
    return wd->content;
 }
 
-/**
- * Unset the content of an inwin object.
- *
- * Unparent and return the content object which was set for this widget.
- *
- * @param obj The inwin object
- * @return The content that was being used
- *
- * @ingroup Inwin
- */
 EAPI Evas_Object *
 elm_win_inwin_content_unset(Evas_Object *obj)
 {
@@ -2566,32 +2941,58 @@ elm_win_inwin_content_unset(Evas_Object *obj)
    if (!wd->content) return NULL;
    Evas_Object *content = wd->content;
    elm_widget_sub_object_del(obj, wd->content);
+   evas_object_event_callback_del_full(wd->content,
+                                       EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+                                       _changed_size_hints, obj);
    edje_object_part_unswallow(wd->frm, wd->content);
    wd->content = NULL;
    return content;
 }
 
+EAPI Eina_Bool
+elm_win_socket_listen(Evas_Object *obj, const char *svcname, int svcnum, Eina_Bool svcsys)
+{
+
+   Elm_Win *win;
+
+   ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
+   win = elm_widget_data_get(obj);
+   if (!win) return EINA_FALSE;
+   if (!win->ee) return EINA_FALSE;
+
+   if(!ecore_evas_extn_socket_listen(win->ee, svcname, svcnum, svcsys))
+     return EINA_FALSE;
+
+   return EINA_TRUE;
+}
+
 /* windowing spcific calls - shall we do this differently? */
-/**
- * Get the Ecore_X_Window of an Evas_Object
- *
- * @param obj The object
- *
- * @return The Ecore_X_Window of @p obj
- *
- * @ingroup Win
- */
+
+static Ecore_X_Window
+_elm_ee_win_get(const Evas_Object *obj)
+{
+   if (!obj) return 0;
+#ifdef HAVE_ELEMENTARY_X
+   Ecore_Evas *ee = ecore_evas_ecore_evas_get(evas_object_evas_get(obj));
+   if (ee) return (Ecore_X_Window)ecore_evas_window_get(ee);
+#endif
+   return 0;
+}
+
 EAPI Ecore_X_Window
 elm_win_xwindow_get(const Evas_Object *obj)
 {
-   Ecore_X_Window xwin = 0;
-   Ecore_Evas *ee = NULL;
+   Elm_Win *win;
+   const char *type;
+
    if (!obj) return 0;
+   type = elm_widget_type_get(obj);
+   if ((!type) || (type != widtype)) return _elm_ee_win_get(obj);
+   win = elm_widget_data_get(obj);
+   if (!win) return 0;
 #ifdef HAVE_ELEMENTARY_X
-   ee = ecore_evas_ecore_evas_get(evas_object_evas_get(obj));
-   if (ee) xwin = (Ecore_X_Window)ecore_evas_window_get(ee);
-   return xwin;
-#else
-   return 0;
+   if (win->xwin) return win->xwin;
+   if (win->parent) return elm_win_xwindow_get(win->parent);
 #endif
+   return 0;
 }