e_comp: remove autoclose

autoclose is not used in enlightenment.

Change-Id: Id3f482d0d279f3919de106d952b028cdee844d51

diff --git a/src/bin/compmgr/e_comp_canvas.c b/src/bin/compmgr/e_comp_canvas.c
index 957afa9aad696d4dafadb50a1f19d6277a1a0ed8..fe6557bf8a0a5f24fd64fcd98fa801c3853e58ee 100644 (file)
--- a/src/bin/compmgr/e_comp_canvas.c
+++ b/src/bin/compmgr/e_comp_canvas.c
@@ -375,7 +375,6 @@ e_comp_canvas_clear(void)
 
    E_FREE_FUNC(comp->fps_fg, e_view_destroy);
    E_FREE_FUNC(comp->fps_bg, e_view_destroy);
-   E_FREE_FUNC(comp->autoclose.rect, evas_object_del);
    E_FREE_FUNC(comp->pointer, e_object_del);
 
    e_view_destroy(comp->bg_blank_view);

diff --git a/src/bin/compmgr/e_comp_object.c b/src/bin/compmgr/e_comp_object.c
index e29db44cdd63b2fd2d7a6e9cbadcf449e4e50717..ed90121bb600550de4592a278c67a7cbd01061cc 100644 (file)
--- a/src/bin/compmgr/e_comp_object.c
+++ b/src/bin/compmgr/e_comp_object.c
@@ -3961,113 +3961,6 @@ e_comp_object_effect_hiding_set(Evas_Object *obj, Eina_Bool set)
 
 ////////////////////////////////////
 
-static void
-_e_comp_object_autoclose_cleanup(Eina_Bool already_del)
-{
-   E_Comp *comp = e_comp_get();
-
-   if (comp->autoclose.obj)
-     {
-        e_comp_ungrab_input(0, 1);
-        if (comp->autoclose.del_cb)
-          comp->autoclose.del_cb(comp->autoclose.data, comp->autoclose.obj);
-        else if (!already_del)
-          {
-             evas_object_hide(comp->autoclose.obj);
-             E_FREE_FUNC(comp->autoclose.obj, evas_object_del);
-          }
-        E_FREE_FUNC(comp->autoclose.rect, evas_object_del);
-     }
-   comp->autoclose.obj = NULL;
-   comp->autoclose.data = NULL;
-   comp->autoclose.del_cb = NULL;
-   comp->autoclose.key_cb = NULL;
-   E_FREE_FUNC(comp->autoclose.key_handler, ecore_event_handler_del);
-}
-
-static void
-_e_comp_object_autoclose_mouse_up_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
-{
-   Evas_Event_Mouse_Up *ev = event_info;
-   if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
-   _e_comp_object_autoclose_cleanup(0);
-}
-
-static void
-_e_comp_object_autoclose_setup(Evas_Object *obj)
-{
-   E_Comp *comp = e_comp_get();
-
-   if (!comp->autoclose.rect)
-     {
-        /* create rect just below autoclose object to catch mouse events */
-        comp->autoclose.rect = evas_object_rectangle_add(comp->evas);
-        evas_object_move(comp->autoclose.rect, 0, 0);
-        evas_object_resize(comp->autoclose.rect, comp->w, comp->h);
-        evas_object_show(comp->autoclose.rect);
-        evas_object_name_set(comp->autoclose.rect, "e_comp->autoclose.rect");
-        evas_object_color_set(comp->autoclose.rect, 0, 0, 0, 0);
-        evas_object_event_callback_add(comp->autoclose.rect, EVAS_CALLBACK_MOUSE_UP, _e_comp_object_autoclose_mouse_up_cb, comp);
-        e_comp_grab_input(0, 1);
-     }
-   evas_object_layer_set(comp->autoclose.rect, evas_object_layer_get(obj) - 1);
-   evas_object_focus_set(obj, 1);
-}
-
-static void
-_e_comp_object_autoclose_show(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
-{
-   _e_comp_object_autoclose_setup(obj);
-   evas_object_event_callback_del(obj, EVAS_CALLBACK_SHOW, _e_comp_object_autoclose_show);
-}
-
-static void
-_e_comp_object_autoclose_del(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
-{
-   evas_object_event_callback_del(obj, EVAS_CALLBACK_SHOW, _e_comp_object_autoclose_show);
-   _e_comp_object_autoclose_cleanup(1);
-   if (e_client_focused_get()) return;
-
-   E_Zone *zone = e_zone_current_get();
-   if (!zone) return;
-
-   E_Policy_Zone *policy_zone = e_comp_screen_policy_zone_get(zone);
-   e_policy_zone_focus_reset(policy_zone);
-}
-
-EINTERN void
-e_comp_object_util_autoclose(Evas_Object *obj, E_Comp_Object_Autoclose_Cb del_cb, E_Comp_Object_Key_Cb cb, const void *data)
-{
-   E_Comp *comp;
-   SOFT_ENTRY();
-
-   comp = e_comp_get();
-   if (comp->autoclose.obj)
-     {
-        if (comp->autoclose.obj == obj) return;
-        evas_object_event_callback_del_full(comp->autoclose.obj, EVAS_CALLBACK_DEL, _e_comp_object_autoclose_del, comp);
-        comp->autoclose.obj = obj;
-        comp->autoclose.del_cb = del_cb;
-        comp->autoclose.key_cb = cb;
-        comp->autoclose.data = (void*)data;
-        if (evas_object_visible_get(obj))
-          _e_comp_object_autoclose_setup(obj);
-        else
-          evas_object_event_callback_add(obj, EVAS_CALLBACK_SHOW, _e_comp_object_autoclose_show, comp);
-        evas_object_event_callback_add(obj, EVAS_CALLBACK_DEL, _e_comp_object_autoclose_del, comp);
-        return;
-     }
-   comp->autoclose.obj = obj;
-   comp->autoclose.del_cb = del_cb;
-   comp->autoclose.key_cb = cb;
-   comp->autoclose.data = (void*)data;
-   if (evas_object_visible_get(obj))
-     _e_comp_object_autoclose_setup(obj);
-   else
-     evas_object_event_callback_add(obj, EVAS_CALLBACK_SHOW, _e_comp_object_autoclose_show, comp);
-   evas_object_event_callback_add(obj, EVAS_CALLBACK_DEL, _e_comp_object_autoclose_del, comp);
-}
-
 E_API unsigned int
 e_comp_object_is_animating(Evas_Object *obj)
 {

diff --git a/src/bin/compmgr/e_comp_object_intern.h b/src/bin/compmgr/e_comp_object_intern.h
index 4a6b46727a9fa5287484244a1483689f5f0fa0aa..7ad0589bbafecad3cebcc90618e16b7ae15a3199 100644 (file)
--- a/src/bin/compmgr/e_comp_object_intern.h
+++ b/src/bin/compmgr/e_comp_object_intern.h
@@ -196,7 +196,6 @@ EINTERN Eina_Bool e_comp_object_frame_theme_set(Evas_Object *obj, const char *na
 EINTERN E_Zone   *e_comp_object_util_zone_get(Evas_Object *obj);
 EINTERN void      e_comp_object_util_del_list_append(Evas_Object *obj, Evas_Object *to_del);
 EINTERN void      e_comp_object_util_del_list_remove(Evas_Object *obj, Evas_Object *to_del);
-EINTERN void      e_comp_object_util_autoclose(Evas_Object *obj, E_Comp_Object_Autoclose_Cb del_cb, E_Comp_Object_Key_Cb cb, const void *data);
 
 EINTERN Eina_Bool e_comp_object_damage_exists(Evas_Object *obj);
 EINTERN void      e_comp_object_shape_apply(Evas_Object *obj);

diff --git a/src/include/e_comp.h b/src/include/e_comp.h
index 5f141da73c3e085e41c7a8653173d5a4b6a6852f..c0d4ad4ca23b6000e2cb2963b9e28fafa010499a 100644 (file)
--- a/src/include/e_comp.h
+++ b/src/include/e_comp.h
@@ -94,16 +94,6 @@ struct _E_Comp
 
    Eina_Stringshare *name;
 
-   struct
-   {
-      Evas_Object *rect;
-      Evas_Object *obj;
-      Ecore_Event_Handler *key_handler;
-      E_Comp_Object_Autoclose_Cb del_cb;
-      E_Comp_Object_Key_Cb key_cb;
-      void *data;
-   } autoclose;
-
    E_Comp_Screen *comp_screen;
 
    Eina_List      *updates;

diff --git a/src/include/e_comp_object.h b/src/include/e_comp_object.h
index f719cee1a870511ba4769304269ce77f204056bb..94f5accc620dc1e336e8d7d1e81efd46b40fa631 100644 (file)
--- a/src/include/e_comp_object.h
+++ b/src/include/e_comp_object.h
@@ -18,7 +18,6 @@ typedef struct E_Comp_Object_Mover E_Comp_Object_Mover;
 
 typedef struct _E_Comp_Object_Hook E_Comp_Object_Hook;
 
-typedef void (*E_Comp_Object_Autoclose_Cb)(void *, Evas_Object *);
 typedef Eina_Bool (*E_Comp_Object_Key_Cb)(void *, Ecore_Event_Key *);
 typedef Eina_Bool (*E_Comp_Object_Mover_Cb) (void *data, Evas_Object *comp_object, const char *signal);