e_compositor: Remove e_comp_wl_subsurface_resource

The e_comp_wl_subsurface_resource are replaced by e_subsurface.

Change-Id: Ie457d9a24cdd5428afa39044aa72b86007797bde

diff --git a/src/bin/server/e_comp_wl_subsurface_intern.h b/src/bin/server/e_comp_wl_subsurface_intern.h
index 4b77a271c38d242f3c632f19099e164eda6e2747..6c462e3752d44768f1684a630f0ebc123e1535aa 100644 (file)
--- a/src/bin/server/e_comp_wl_subsurface_intern.h
+++ b/src/bin/server/e_comp_wl_subsurface_intern.h
@@ -12,12 +12,6 @@
 EINTERN Eina_Bool     e_comp_wl_subsurfaces_init(void);
 EINTERN void          e_comp_wl_subsurfaces_shutdown(void);
 
-/* To support tizen_policy interface related to wl_subsurface.
- * tizen_policy.place_subsurface_below_parent
- * tizen_policy.set_subsurface_stand_alone */
-EINTERN void          e_comp_wl_subsurface_resource_stand_alone_mode_set(struct wl_resource *subsurface_resource);
-EINTERN void          e_comp_wl_subsurface_resource_place_below_parent(struct wl_resource *subsurface_resource);
-
 EINTERN void e_comp_wl_subsurface_data_init(E_Comp_Wl_Subsurf_Data *sdata, E_Client *ec, E_Client *parent, E_Client *offscreen_parent);
 EINTERN void e_comp_wl_subsurface_data_finish(E_Comp_Wl_Subsurf_Data *sdata);
 EINTERN void e_comp_wl_subsurface_data_parent_unset(E_Comp_Wl_Subsurf_Data *sdata);

diff --git a/src/bin/server/e_compositor.c b/src/bin/server/e_compositor.c
index d1d9f9960b51a2a7020400956eb808b28ac19445..9ec3d8c73ba8dc4cb5b84c80de1d980af30493b0 100644 (file)
--- a/src/bin/server/e_compositor.c
+++ b/src/bin/server/e_compositor.c
@@ -241,35 +241,10 @@ e_subsurface_stand_alone_mode_unset(E_Subsurface *sub)
 }
 
 EINTERN void
-e_comp_wl_subsurface_resource_stand_alone_mode_set(struct wl_resource *subsurface_resource)
+e_subsurface_place_below_parent(E_Subsurface *sub)
 {
-   E_Subsurface *sub;
-
-   sub = _e_subsurface_try_from_resource(subsurface_resource);
-   if (!sub)
-     {
-        INF("The given subsurface resource(%p) seems inert.", subsurface_resource);
-        return;
-     }
-
-   ELOGF("SUBSURFACE", "SUBSURF|STAND_ALONE", sub->surface->ec);
-
-   sub->base.stand_alone = EINA_TRUE;
-}
-
-EINTERN void
-e_comp_wl_subsurface_resource_place_below_parent(struct wl_resource *subsurface_resource)
-{
-   E_Subsurface *sub;
    E_Comp_Wl_Client_Data *epc_cdata;
 
-   sub = _e_subsurface_try_from_resource(subsurface_resource);
-   if (!sub)
-     {
-        INF("The given subsurface resource(%p) seems inert.", subsurface_resource);
-        return;
-     }
-
    EINA_SAFETY_ON_NULL_RETURN(sub->base.parent);
    epc_cdata = e_client_cdata_get(sub->base.parent);
    EINA_SAFETY_ON_NULL_RETURN(epc_cdata);
@@ -1790,6 +1765,12 @@ e_subsurface_from_resource(struct wl_resource *resource)
    return subsurface;
 }
 
+EINTERN E_Subsurface *
+e_subsurface_try_from_resource(struct wl_resource *resource)
+{
+   return _e_subsurface_try_from_resource(resource);
+}
+
 EINTERN void
 e_subsurface_destroy_listener_add(E_Subsurface *subsurface, struct wl_listener *listener)
 {

diff --git a/src/bin/server/e_compositor_intern.h b/src/bin/server/e_compositor_intern.h
index 67e28880b76ee7ba2bd3f62f10cea4b906b9a063..beb062e43698796cf1ca1a09446349ca8e4303c7 100644 (file)
--- a/src/bin/server/e_compositor_intern.h
+++ b/src/bin/server/e_compositor_intern.h
@@ -60,6 +60,7 @@ uint32_t e_surface_exported_id_get(E_Surface *surface);
 
 E_Subsurface *e_subsurface_create(struct wl_resource *factory_resource, uint32_t id, E_Surface *surface, E_Surface *parent);
 E_Subsurface *e_subsurface_from_resource(struct wl_resource *resource);
+E_Subsurface *e_subsurface_try_from_resource(struct wl_resource *resource);
 E_Subsurface *e_subsurface_try_from_surface(E_Surface *surface);
 E_Subsurface *e_subsurface_from_ec(E_Client *ec);
 void e_subsurface_position_get(E_Subsurface *subsurface, int *x, int *y);
@@ -68,6 +69,7 @@ void e_subsurface_destroy_listener_add(E_Subsurface *subsurface, struct wl_liste
 void e_subsurface_reposition_listener_add(E_Subsurface *subsurface, struct wl_listener *listener);
 void e_subsurface_stand_alone_mode_set(E_Subsurface *sub);
 void e_subsurface_stand_alone_mode_unset(E_Subsurface *sub);
+void e_subsurface_place_below_parent(E_Subsurface *sub);
 void e_subsurface_coord_get(E_Subsurface *subsurface, int *x, int *y);
 E_Surface *e_subsurface_surface_get(E_Subsurface *subsurface);
 E_Surface *e_subsurface_parent_try_get(E_Subsurface *subsurface);

diff --git a/src/bin/server/e_policy_wl.c b/src/bin/server/e_policy_wl.c
index 54efacc522760611f89ef59dc8629f26f497c89c..109de4e4b5831e67e87c7b9d8da0be12a2dc1847 100644 (file)
--- a/src/bin/server/e_policy_wl.c
+++ b/src/bin/server/e_policy_wl.c
@@ -2158,19 +2158,27 @@ static const struct wl_subsurface_interface _tzpol_subsurface_fake_impl;
 static void
 _tzpol_iface_cb_subsurf_place_below_parent(struct wl_client *client EINA_UNUSED, struct wl_resource *res_tzpol EINA_UNUSED, struct wl_resource *subsurf)
 {
+   E_Subsurface *sub;
+
    if (wl_resource_instance_of(subsurf, &wl_subsurface_interface, &_tzpol_subsurface_fake_impl))
      return;
 
-   e_comp_wl_subsurface_resource_place_below_parent(subsurf);
+   sub = e_subsurface_try_from_resource(subsurf);
+   if (sub)
+     e_subsurface_place_below_parent(sub);
 }
 
 static void
 _tzpol_iface_cb_subsurf_stand_alone_set(struct wl_client *client EINA_UNUSED, struct wl_resource *res_tzpol EINA_UNUSED, struct wl_resource *subsurf)
 {
+   E_Subsurface *sub;
+
    if (wl_resource_instance_of(subsurf, &wl_subsurface_interface, &_tzpol_subsurface_fake_impl))
      return;
 
-   e_comp_wl_subsurface_resource_stand_alone_mode_set(subsurf);
+   sub = e_subsurface_try_from_resource(subsurf);
+   if (sub)
+     e_subsurface_stand_alone_mode_set(sub);
 }
 
 static void