elementary: oops revert.
[framework/uifw/elementary.git] / src / lib / elm_win.c
index fa8a83d..37ae0a0 100644 (file)
@@ -25,11 +25,21 @@ struct _Elm_Win
       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;
 
@@ -73,10 +83,20 @@ 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, ""},
@@ -141,11 +161,13 @@ _shot_file_get(Elm_Win *win)
                   char *dotptr = strrchr(tmp, '.');
                   if (dotptr)
                     {
-                       repname = malloc(sizeof(char)*(strlen(tmp) + 16));
+                       size_t size = sizeof(char)*(strlen(tmp) + 16);
+                       repname = malloc(size);
                        strncpy(repname, tmp, dotptr - tmp);
-                       sprintf(repname + (dotptr - tmp), "%03i",
+                       snprintf(repname + (dotptr - tmp), size - (dotptr - tmp), "%03i",
                                win->shot.shot_counter + 1);
                        strcat(repname, dotptr);
+                       free(tmp);
                        return repname;
                     }
                }
@@ -153,18 +175,15 @@ _shot_file_get(Elm_Win *win)
      }
    free(tmp);
    if (!win->shot.repeat_count) return strdup("out.png");
-   else
-     {
-        repname = malloc(sizeof(char) * 24);
-        sprintf(repname, "out%03i.png", win->shot.shot_counter + 1);
-        return repname;
-     }
+
+   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);
 
@@ -297,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)
 {
@@ -306,11 +336,20 @@ _elm_win_focus_in(Ecore_Evas *ee)
    if (!obj) return;
    win = elm_widget_data_get(obj);
    if (!win) return;
+   _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)
      {
@@ -327,11 +366,14 @@ _elm_win_focus_out(Ecore_Evas *ee)
    if (!obj) return;
    win = elm_widget_data_get(obj);
    if (!win) return;
+   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)
      {
@@ -397,6 +439,26 @@ _elm_win_event_cb(Evas_Object *obj, Evas_Object *src __UNUSED__, Evas_Callback_T
              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;
@@ -410,11 +472,11 @@ _deferred_ecore_evas_free(void *data)
 }
 
 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_Win *win = data;
 
-   elm_object_focus_set(obj, EINA_TRUE);
+   if (!win->show_count) win->show_count++;
    if (win->shot.info) _shot_handle(win);
 }
 
@@ -425,11 +487,17 @@ _elm_win_obj_callback_hide(void *data, Evas *e __UNUSED__, Evas_Object *obj __UN
 
    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
@@ -456,6 +524,8 @@ _elm_win_obj_callback_del(void *data, Evas *e, Evas_Object *obj, void *event_inf
    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))
      {
@@ -552,14 +622,21 @@ _elm_win_obj_intercept_show(void *data, Evas_Object *obj)
    // 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));
-   evas_object_show(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
@@ -578,6 +655,11 @@ _elm_win_obj_callback_move(void *data, Evas *e __UNUSED__, Evas_Object *obj, voi
      }
    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)
      {
@@ -603,6 +685,13 @@ _elm_win_obj_callback_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj, v
         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);
@@ -637,14 +726,22 @@ _elm_win_resize_job(void *data)
    int w, h;
 
    win->deferred_resize_job = NULL;
-   ecore_evas_geometry_get(win->ee, NULL, NULL, &w, &h);
-   evas_object_resize(win->win_obj, 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);
@@ -668,7 +765,8 @@ _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))
@@ -852,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)
@@ -1226,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)
@@ -1235,7 +1458,6 @@ _debug_key_down(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, voi
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD)
      return;
 
-
    if ((strcmp(ev->keyname, "F12")) ||
        (!evas_key_modifier_is_set(ev->modifiers, "Control")))
      return;
@@ -1257,13 +1479,15 @@ _win_img_hide(void        *data,
 }
 
 static void
-_win_img_mouse_down(void        *data,
-                    Evas        *e __UNUSED__,
-                    Evas_Object *obj __UNUSED__,
-                    void        *event_info __UNUSED__)
+_win_img_mouse_up(void        *data,
+                  Evas        *e __UNUSED__,
+                  Evas_Object *obj __UNUSED__,
+                  void        *event_info)
 {
    Elm_Win *win = data;
-   elm_widget_focus_mouse_down_handle(win->win_obj);
+   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
@@ -1296,14 +1520,27 @@ _win_inlined_image_set(Elm_Win *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_DOWN,
-                                  _win_img_mouse_down, 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)
 {
@@ -1313,14 +1550,15 @@ elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type)
 
    win = ELM_NEW(Elm_Win);
 
-#define FALLBACK_TRY(engine)                                              \
-   if (!win->ee)                                                          \
-   do {                                                                   \
-        CRITICAL(engine " engine creation failed. Trying software X11."); \
-        elm_engine_set(ELM_SOFTWARE_X11);                                 \
-        win->ee = ecore_evas_software_x11_new(NULL, 0, 0, 0, 1, 1);       \
+#define FALLBACK_TRY(engine)                                            \
+   if (!win->ee)                                                        \
+      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) (!strcmp(_elm_config->engine, name))
+#define ENGINE_COMPARE(name) (_elm_config->engine && !strcmp(_elm_config->engine, name))
 
    switch (type)
      {
@@ -1344,6 +1582,11 @@ elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type)
            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))
           {
@@ -1352,6 +1595,7 @@ elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type)
              win->client_message_handler = ecore_event_handler_add
                 (ECORE_X_EVENT_CLIENT_MESSAGE, _elm_win_client_message, win);
 #endif
+             FALLBACK_TRY("Sofware X11");
           }
         else if (ENGINE_COMPARE(ELM_SOFTWARE_FB))
           {
@@ -1424,6 +1668,11 @@ elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type)
              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);
@@ -1439,10 +1688,35 @@ elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type)
              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);
@@ -1491,8 +1765,14 @@ 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);
 
+   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);
+     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 |
@@ -1508,21 +1788,23 @@ elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type)
    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_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);
    evas_image_cache_set(win->evas, (_elm_config->image_cache * 1024));
    evas_font_cache_set(win->evas, (_elm_config->font_cache * 1024));
    EINA_LIST_FOREACH(_elm_config->font_dirs, l, fontpath)
-      evas_font_path_append(win->evas, fontpath);
+     evas_font_path_append(win->evas, fontpath);
    if (!_elm_config->font_hinting)
      evas_font_hinting_set(win->evas, EVAS_FONT_HINTING_NONE);
    else if (_elm_config->font_hinting == 1)
@@ -1552,7 +1834,7 @@ elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type)
 
    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);
+   printf("Ctrl+F12 key combination exclusive for dot tree generation\n");
 #endif
 
    evas_object_smart_callbacks_descriptions_set(win->win_obj, _signals);
@@ -1560,6 +1842,26 @@ elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type)
    return win->win_obj;
 }
 
+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)
 {
@@ -1576,7 +1878,7 @@ 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);
@@ -1606,8 +1908,10 @@ 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);
 }
 
 EAPI const char *
@@ -1671,6 +1975,27 @@ elm_win_raise(Evas_Object *obj)
 }
 
 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)
 {
    Elm_Win *win;
@@ -1729,6 +2054,7 @@ elm_win_alpha_set(Evas_Object *obj, Eina_Bool alpha)
    else if (win->img_obj)
      {
         evas_object_image_alpha_set(win->img_obj, alpha);
+        ecore_evas_alpha_set(win->ee, alpha);
      }
    else
      {
@@ -1759,6 +2085,13 @@ 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);
 }
 
@@ -2052,6 +2385,8 @@ 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
 }
 
@@ -2081,6 +2416,46 @@ elm_win_screen_position_get(const Evas_Object *obj, int *x, int *y)
    if (y) *y = win->screen.y;
 }
 
+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)
 {
@@ -2092,6 +2467,8 @@ 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
 }
 
@@ -2132,6 +2509,8 @@ 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
 }
 
@@ -2161,6 +2540,8 @@ 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
 }
 
@@ -2190,6 +2571,8 @@ 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
 }
 
@@ -2219,6 +2602,8 @@ 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
 }
 
@@ -2258,6 +2643,8 @@ elm_win_prop_focus_skip_set(Evas_Object *obj, Eina_Bool skip)
              ecore_x_netwm_window_state_set(win->xwin, states, 2);
           }
      }
+#else
+   (void) skip;
 #endif
 }
 
@@ -2290,6 +2677,8 @@ elm_win_illume_command_send(Evas_Object *obj, Elm_Illume_Command command, void *
               break;
           }
      }
+#else
+   (void) command;
 #endif
 }
 
@@ -2390,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
@@ -2413,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);
@@ -2467,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);
 
@@ -2529,11 +2941,31 @@ 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? */
 
 static Ecore_X_Window
@@ -2547,15 +2979,6 @@ _elm_ee_win_get(const Evas_Object *obj)
    return 0;
 }
 
-/**
- * Get the Ecore_X_Window of an Evas_Object
- *
- * @param obj The object
- *
- * @return The Ecore_X_Window of @p obj
- *
- * @ingroup Win
- */
 EAPI Ecore_X_Window
 elm_win_xwindow_get(const Evas_Object *obj)
 {
@@ -2564,14 +2987,12 @@ elm_win_xwindow_get(const Evas_Object *obj)
 
    if (!obj) return 0;
    type = elm_widget_type_get(obj);
-   if (!type) return 0;
-   if (type != widtype) return _elm_ee_win_get(obj);
-#ifdef HAVE_ELEMENTARY_X
+   if ((!type) || (type != widtype)) return _elm_ee_win_get(obj);
    win = elm_widget_data_get(obj);
    if (!win) return 0;
+#ifdef HAVE_ELEMENTARY_X
    if (win->xwin) return win->xwin;
    if (win->parent) return elm_win_xwindow_get(win->parent);
 #endif
    return 0;
-   win = NULL;
 }