elementary: Properly swallow wayland clients

This patch fixes an issue where wayland windows would not swallow
clients properly. Basically, we should be swallowing the elm window
layout directly rather than use a rectangle (as was previous). This
commit also waits until the internal elm theme has been applied to the
sd->edje object before adding the wayland window frame.

This commit has the added benefit of being able to remove an additional
Evas_Object from the internal data structure.

@fix

Signed-off-by: Chris Michael <cp.michael@samsung.com>

diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index de74762..d93b40b 100644 (file)
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -96,7 +96,6 @@ struct _Efl_Ui_Win_Data
    Evas                 *evas;
    Evas_Object          *parent; /* parent *window* object*/
    Evas_Object          *img_obj, *frame_obj;
-   Evas_Object          *client_obj; /* rect representing the client */
    Eo                   *edje; /**< edje object for a window layout */
    Eo                   *box;
    Evas_Object          *obj; /* The object itself */
@@ -1351,7 +1350,7 @@ _elm_win_frame_obj_update(Efl_Ui_Win_Data *sd)
      }
 
    evas_object_geometry_get(sd->frame_obj, &fx, &fy, &fw, &fh);
-   evas_object_geometry_get(sd->client_obj, &ox, &oy, &ow, &oh);
+   evas_object_geometry_get(sd->edje, &ox, &oy, &ow, &oh);
 
    evas_output_framespace_set(sd->evas, (ox - fx), (oy - fy), (fw - ow), (fh - oh));
 }
@@ -3372,7 +3371,7 @@ _elm_win_frame_obj_move(void *data,
    Efl_Ui_Win_Data *sd;
 
    if (!(sd = data)) return;
-   if (!sd->client_obj) return;
+   if (!sd->edje) return;
 
    _elm_win_frame_obj_update(sd);
 }
@@ -3386,7 +3385,7 @@ _elm_win_frame_obj_resize(void *data,
    Efl_Ui_Win_Data *sd;
 
    if (!(sd = data)) return;
-   if (!sd->client_obj) return;
+   if (!sd->edje) return;
 
    _elm_win_frame_obj_update(sd);
 }
@@ -3589,12 +3588,12 @@ _elm_win_frame_add(Efl_Ui_Win_Data *sd, const char *style)
 {
    Evas_Object *obj = sd->obj;
    int w, h, mw, mh;
-   short layer;
+   /* short layer; */
 
    if (sd->frame_obj) return;
    sd->frame_obj = edje_object_add(sd->evas);
-   layer = evas_object_layer_get(obj);
-   evas_object_layer_set(sd->frame_obj, layer + 1);
+   /* layer = evas_object_layer_get(obj); */
+   /* evas_object_layer_set(sd->frame_obj, layer + 1); */
    if (!elm_widget_theme_object_set
        (sd->obj, sd->frame_obj, "border", "base", style))
      {
@@ -3602,12 +3601,7 @@ _elm_win_frame_add(Efl_Ui_Win_Data *sd, const char *style)
         return;
      }
 
-   sd->client_obj = evas_object_rectangle_add(sd->evas);
-   evas_object_color_set(sd->client_obj, 0, 0, 0, 0);
-   /* NB: Tried pass_events here, but that fails to send events */
-   evas_object_repeat_events_set(sd->client_obj, EINA_TRUE);
-   edje_object_part_swallow(sd->frame_obj, "elm.swallow.client",
-                            sd->client_obj);
+   edje_object_part_swallow(sd->frame_obj, "elm.swallow.client", sd->edje);
 
    evas_object_is_frame_object_set(sd->frame_obj, EINA_TRUE);
 
@@ -3693,8 +3687,6 @@ _elm_win_frame_del(Efl_Ui_Win_Data *sd)
 {
    int w, h;
 
-   ELM_SAFE_FREE(sd->client_obj, evas_object_del);
-
    if (sd->frame_obj)
      {
         evas_object_event_callback_del_full
@@ -4449,28 +4441,6 @@ _elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Elm_W
      evas_event_callback_add(sd->evas, EVAS_CALLBACK_RENDER_FLUSH_PRE, _elm_win_frame_pre_render, sd);
 #endif
 
-   /* do not append to list; all windows render as black rects */
-   if (type != ELM_WIN_FAKE)
-     {
-        _elm_win_list = eina_list_append(_elm_win_list, obj);
-        _elm_win_count++;
-
-        if ((engine) && ((!strcmp(engine, ELM_SOFTWARE_FB)) || (!strcmp(engine, ELM_DRM))))
-          {
-             TRAP(sd, fullscreen_set, 1);
-          }
-        else if ((type != ELM_WIN_INLINED_IMAGE) &&
-                 ((engine) &&
-                  ((!strcmp(engine, ELM_WAYLAND_SHM) ||
-                   (!strcmp(engine, ELM_WAYLAND_EGL))))))
-          _elm_win_frame_add(sd, "default");
-
-        if (_elm_config->focus_highlight_enable)
-          elm_win_focus_highlight_enabled_set(obj, EINA_TRUE);
-        if (_elm_config->focus_highlight_animate)
-          elm_win_focus_highlight_animate_set(obj, EINA_TRUE);
-     }
-
    //Prohibiting auto-rendering, until elm_win is shown.
    if (_elm_config->auto_norender_withdrawn)
      {
@@ -4537,6 +4507,29 @@ _elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Elm_W
                                        _elm_win_on_resize_obj_changed_size_hints, obj);
      }
 
+   /* do not append to list; all windows render as black rects */
+   if (type != ELM_WIN_FAKE)
+     {
+        _elm_win_list = eina_list_append(_elm_win_list, obj);
+        _elm_win_count++;
+
+        if ((engine) &&
+            ((!strcmp(engine, ELM_SOFTWARE_FB)) || (!strcmp(engine, ELM_DRM))))
+          {
+             TRAP(sd, fullscreen_set, 1);
+          }
+        else if ((type != ELM_WIN_INLINED_IMAGE) &&
+                 ((engine) &&
+                  ((!strcmp(engine, ELM_WAYLAND_SHM) ||
+                   (!strcmp(engine, ELM_WAYLAND_EGL))))))
+          _elm_win_frame_add(sd, "default");
+
+        if (_elm_config->focus_highlight_enable)
+          elm_win_focus_highlight_enabled_set(obj, EINA_TRUE);
+        if (_elm_config->focus_highlight_animate)
+          elm_win_focus_highlight_animate_set(obj, EINA_TRUE);
+     }
+
    elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_WINDOW);
    if (_elm_config->atspi_mode)
      elm_interface_atspi_window_created_signal_emit(obj);