e_comp: remove nocomp_ec

nocomp_ec is deprecated and delete the code to related it

Change-Id: I0e22620dc72f10de2f7b0d1a5efa0bdabb434c14

diff --git a/src/bin/compmgr/e_comp.c b/src/bin/compmgr/e_comp.c
index baa8b5e916f98cd4a664ec3961b5143ecf7fe9fd..ee6ee532f68556856089b4dc77ae651bc38d77e5 100644 (file)
--- a/src/bin/compmgr/e_comp.c
+++ b/src/bin/compmgr/e_comp.c
@@ -676,32 +676,6 @@ e_comp_screen_set(E_Comp_Screen *comp_screen)
    e_comp->e_comp_screen = comp_screen;
 }
 
-EINTERN Eina_Bool
-e_comp_util_object_is_above_nocomp(Evas_Object *obj)
-{
-   Evas_Object *o;
-   int cl, ol;
-
-   EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EINA_FALSE);
-   if (!evas_object_visible_get(obj)) return EINA_FALSE;
-   if (!e_comp->nocomp_ec) return EINA_FALSE;
-   cl = evas_object_layer_get(e_comp->nocomp_ec->frame);
-   ol = evas_object_layer_get(obj);
-   if (cl > ol) return EINA_FALSE;
-   o = evas_object_above_get(e_comp->nocomp_ec->frame);
-   if ((cl == ol) && (evas_object_layer_get(o) == cl))
-     {
-        do {
-           if (o == obj)
-             return EINA_TRUE;
-           o = evas_object_above_get(o);
-        } while (o && (evas_object_layer_get(o) == cl));
-     }
-   else
-     return EINA_TRUE;
-   return EINA_FALSE;
-}
-
 E_API E_Comp_Hook *
 e_comp_hook_add(E_Comp_Hook_Point hookpoint, E_Comp_Hook_Cb func, const void *data)
 {

diff --git a/src/bin/compmgr/e_comp_intern.h b/src/bin/compmgr/e_comp_intern.h
index 161a4ff839e5cd07ec7c8bd7ee497fbdafefd8a1..5c9fac86a10c6c8b8d6ea2df29cda0fad9faef12 100644 (file)
--- a/src/bin/compmgr/e_comp_intern.h
+++ b/src/bin/compmgr/e_comp_intern.h
@@ -26,8 +26,6 @@ EINTERN void          e_comp_gl_set(Eina_Bool set);
 EINTERN Eina_Bool     e_comp_gl_get(void);
 EINTERN void          e_comp_screen_set(E_Comp_Screen *comp_screen);
 
-EINTERN Eina_Bool     e_comp_util_object_is_above_nocomp(Evas_Object *obj);
-
 EINTERN Eina_Bool     e_comp_util_kbd_grabbed(void);
 EINTERN Eina_Bool     e_comp_util_mouse_grabbed(void);
 

diff --git a/src/bin/core/e_view_edje.c b/src/bin/core/e_view_edje.c
index 6ff93c2962cb7334e7763d4e9c12222ff5cddfc5..fac16c311d8c1fb93c20c117b5e0d6d36d76a80b 100644 (file)
--- a/src/bin/core/e_view_edje.c
+++ b/src/bin/core/e_view_edje.c
@@ -27,7 +27,6 @@ struct _E_View_Edje
    struct wl_list swallows;
 
    struct wl_listener destroy;
-   struct wl_listener restack;
 };
 
 typedef struct _E_View_Edje_Signal
@@ -65,8 +64,6 @@ _view_edje_handle_destroy(E_View *view)
    E_View_Edje_Signal *signal, *signal_tmp;
    E_View_Edje_Swallow *swallow, *swallow_tmp;
 
-   if (edje->restack.notify != NULL)
-     e_view_event_listener_del(view, E_VIEW_RESTACK, &edje->restack);
    if (edje->destroy.notify != NULL)
      e_view_event_listener_del(view, E_VIEW_DESTROY, &edje->destroy);
 
@@ -431,11 +428,6 @@ _e_view_edje_util_show(void *data EINA_UNUSED, Evas_Object *obj)
      }
    edje_object_signal_emit(obj, "e,state,visible", "e");
    evas_object_data_set(obj, "comp_showing", (void*)1);
-   if (e_comp_util_object_is_above_nocomp(obj))
-     {
-        evas_object_data_set(obj, "comp_override", (void*)1);
-        e_comp_override_add();
-     }
 }
 
 static void
@@ -493,8 +485,6 @@ _e_view_edje_util_del(struct wl_listener *listener, void *data)
 
    wl_list_remove(&edje->destroy.link);
    edje->destroy.notify = NULL;
-   e_view_event_listener_del(edje_view, E_VIEW_RESTACK, &edje->restack);
-   edje->restack.notify = NULL;
 
    comp_object = !!e_view_data_get(edje_view, "comp_object");
    if (comp_object)
@@ -514,23 +504,6 @@ _e_view_edje_util_del(struct wl_listener *listener, void *data)
    E_FREE_LIST(l, evas_object_del);
 }
 
-static void
-_e_view_edje_util_restack(struct wl_listener *listener, void *data)
-{
-   E_View_Edje *edje;
-   E_View *edje_view;
-
-   edje = wl_container_of(listener, edje, restack);
-   edje_view = e_view_edje_view_get(edje);
-
-   if (e_comp_util_object_is_above_nocomp(edje_view->eo) &&
-       (!e_view_data_get(edje_view, "comp_override")))
-     {
-        e_view_data_set(edje_view, "comp_override", (void*)1);
-        e_comp_override_add();
-     }
-}
-
 static void
 _e_view_edje_event_free(void *d EINA_UNUSED, void *event)
 {
@@ -614,9 +587,6 @@ e_view_edje_util_add(E_View *view)
    edje->destroy.notify = _e_view_edje_util_del;
    e_view_event_listener_add(edje_view, E_VIEW_DESTROY, &edje->destroy);
 
-   edje->restack.notify = _e_view_edje_util_restack;
-   e_view_event_listener_add(edje_view, E_VIEW_RESTACK, &edje->restack);
-
    e_view_edje_signal_emit(edje, "e,state,hidden", "e");
 
    e_view_edje_part_swallow(edje, "e.swallow.content", view);

diff --git a/src/include/e_comp.h b/src/include/e_comp.h
index 69b797f628f80ab556829e0b4684ceb87c3909d2..dfbb0deeeb6d0577cdf355ab182cdf1abc86c49e 100644 (file)
--- a/src/include/e_comp.h
+++ b/src/include/e_comp.h
@@ -107,7 +107,7 @@ struct _E_Comp
    E_View         *fps_fg;
    int             animating;
 
-   E_Client       *nocomp_ec;
+   E_DEPRECATED E_Client       *nocomp_ec;
 
    Ecore_Timer    *nocomp_override_timer;
    int             nocomp_override; //number of times hwc override has been requested