e_blur : change to use e_view_image(client)_resize_listener_add

 - E_VIEW_RESIZE event of e_view_event will be removed.
 - e_view_image and e_view_client has each listener_add API for resize event.

Change-Id: I44308239173267a47ba6de49be91501b5bfc2604
Signed-off-by: jinbong.lee <jinbong.lee@samsung.com>

diff --git a/src/bin/compmgr/e_blur_video_capture.c b/src/bin/compmgr/e_blur_video_capture.c
index 44ff2af8f252be40c10dbde16a4be39b8fc91c33..1d6cbf83a5afcc9d8be39c789756f94c78d384ca 100644 (file)
--- a/src/bin/compmgr/e_blur_video_capture.c
+++ b/src/bin/compmgr/e_blur_video_capture.c
@@ -4,7 +4,7 @@
 #include "e_blur_intern.h"
 #include "e_hwc_window_intern.h"
 #include "e_view.h"
-#include "e_view_image.h"
+#include "e_view_image_intern.h"
 #include "e_view_rect.h"
 #include "e_blur_video_capture.h"
 
@@ -249,8 +249,7 @@ _e_blur_video_capture_object_cb_resize(struct wl_listener *listener, void *data)
 {
    int w, h;
    E_Blur_Video_Capture_Object *object = wl_container_of(listener, object, listener.resize);
-   E_View *event_src_view = ((E_View_Event_Callback_Data *)data)->view;
-   E_View_Image *view_image = e_view_image_try_from_view(event_src_view);
+   E_View_Image *view_image = (E_View_Image *)data;
 
    if (!view_image) return;
 
@@ -359,15 +358,15 @@ _e_blur_video_capture_object_create(E_Blur_Video_Capture_Client *client, E_View_
    object->listener.hide.notify = _e_blur_video_capture_object_cb_hide;
    e_view_event_listener_add(blur_img_view, E_VIEW_HIDE, &object->listener.hide);
 
-   object->listener.resize.notify = _e_blur_video_capture_object_cb_resize;
-   e_view_event_listener_add(blur_img_view, E_VIEW_RESIZE, &object->listener.resize);
-
    object->listener.move.notify = _e_blur_video_capture_object_cb_move;
    e_view_event_listener_add(blur_img_view, E_VIEW_MOVE, &object->listener.move);
 
    object->listener.destroy.notify = _e_blur_video_capture_object_cb_del;
    e_view_event_listener_add(blur_img_view, E_VIEW_DESTROY, &object->listener.destroy);
 
+   object->listener.resize.notify = _e_blur_video_capture_object_cb_resize;
+   e_view_image_resize_listener_add(blur_img, &object->listener.resize);
+
    if (type == E_BLUR_VIDEO_CAPTURE_OBJECT_TYPE_BEHIND)
      {
         E_View_Client *view_client = e_client_view_get(client->ec);
@@ -821,8 +820,6 @@ _e_blur_video_capture_client_cb_show(struct wl_listener *listener, void *data)
    E_Blur_Video_Capture_Object *object;
    Eina_List *l;
 
-   if (!(client = data)) return;
-
    client->visible = EINA_TRUE;
    client->presentation_visible = e_comp_is_on_overlay(client->ec);
 
@@ -863,8 +860,6 @@ _e_blur_video_capture_client_cb_hide(struct wl_listener *listener, void *data)
    E_Blur_Video_Capture_Object *object;
    Eina_List *l;
 
-   if (!(client = data)) return;
-
    client->visible = EINA_FALSE;
    client->presentation_visible = EINA_FALSE;
 
@@ -900,8 +895,6 @@ _e_blur_video_capture_client_cb_resize(struct wl_listener *listener, void *data)
    Eina_List *l;
    E_Client *ec;
 
-   if (!(client = data)) return;
-
    ec = client->ec;
    if (!ec) return;
 
@@ -917,8 +910,6 @@ _e_blur_video_capture_client_cb_move(struct wl_listener *listener, void *data)
    Eina_List *l;
    E_Client *ec;
 
-   if (!(client = data)) return;
-
    ec = client->ec;
    if (!ec) return;
 
@@ -997,9 +988,9 @@ _e_blur_video_capture_client_cb_ec_free(void *data, void *obj)
              E_View *view = e_view_image_view_get(object->blur_img);
              e_view_event_listener_del(view, E_VIEW_SHOW, &object->listener.show);
              e_view_event_listener_del(view, E_VIEW_HIDE, &object->listener.hide);
-             e_view_event_listener_del(view, E_VIEW_RESIZE, &object->listener.resize);
              e_view_event_listener_del(view, E_VIEW_MOVE, &object->listener.move);
              e_view_event_listener_del(view, E_VIEW_DESTROY, &object->listener.destroy);
+             wl_list_remove(&object->listener.resize.link);
           }
         _e_blur_video_capture_object_destroy(object);
      }
@@ -1012,9 +1003,9 @@ _e_blur_video_capture_client_cb_ec_free(void *data, void *obj)
         E_View *view = e_view_client_view_get(view_client);
         e_view_event_listener_del(view, E_VIEW_SHOW, &client->listener.show);
         e_view_event_listener_del(view, E_VIEW_HIDE, &client->listener.hide);
-        e_view_event_listener_del(view, E_VIEW_RESIZE, &client->listener.resize);
         e_view_event_listener_del(view, E_VIEW_MOVE, &client->listener.move);
         e_view_event_listener_del(view, E_VIEW_RESTACK, &client->listener.restack);
+        wl_list_remove(&client->listener.resize.link);
      }
 
    video_capture->clients = eina_list_remove(video_capture->clients, client);
@@ -1091,15 +1082,15 @@ _e_blur_video_capture_cb_hwc_window_video_set(void *data, E_Hwc_Window *hwc_wind
    client->listener.hide.notify = _e_blur_video_capture_client_cb_hide;
    e_view_event_listener_add(view, E_VIEW_HIDE, &client->listener.hide);
 
-   client->listener.resize.notify = _e_blur_video_capture_client_cb_resize;
-   e_view_event_listener_add(view, E_VIEW_RESIZE, &client->listener.resize);
-
    client->listener.move.notify = _e_blur_video_capture_client_cb_move;
    e_view_event_listener_add(view, E_VIEW_MOVE, &client->listener.move);
 
    client->listener.restack.notify = _e_blur_video_capture_client_cb_restack;
    e_view_event_listener_add(view, E_VIEW_RESTACK, &client->listener.restack);
 
+   client->listener.resize.notify = _e_blur_video_capture_client_cb_resize;
+   e_view_client_resize_listener_add(view_client, &client->listener.resize);
+
    video_capture->clients = eina_list_append(video_capture->clients, client);
 
    ELOGF("E_BLUR", "Create Video_Capture_Client:%p", client->ec, client);

diff --git a/src/bin/server/e_blur.c b/src/bin/server/e_blur.c
index 0f6604338d00f18cb9ce30e4fef24beb93bd015c..fcf897c58637b5074851e7530b82fcd36a3afb4c 100644 (file)
--- a/src/bin/server/e_blur.c
+++ b/src/bin/server/e_blur.c
@@ -515,9 +515,9 @@ _e_blur_ec_set(E_Blur *blur, E_Client *ec)
 
         e_view_event_listener_del(view, E_VIEW_SHOW, &blur->listener.show);
         e_view_event_listener_del(view, E_VIEW_HIDE, &blur->listener.hide);
-        e_view_event_listener_del(view, E_VIEW_RESIZE, &blur->listener.resize);
         e_view_event_listener_del(view, E_VIEW_MOVE, &blur->listener.move);
         e_view_event_listener_del(view, E_VIEW_RESTACK, &blur->listener.restack);
+        wl_list_remove(&blur->listener.resize.link);
 
         if (blur->ec_delfn)
           {
@@ -538,15 +538,15 @@ _e_blur_ec_set(E_Blur *blur, E_Client *ec)
         blur->listener.hide.notify = _e_blur_cb_hide;
         e_view_event_listener_add(view, E_VIEW_HIDE, &blur->listener.hide);
 
-        blur->listener.resize.notify = _e_blur_cb_resize;
-        e_view_event_listener_add(view, E_VIEW_RESIZE, &blur->listener.resize);
-
         blur->listener.move.notify = _e_blur_cb_move;
         e_view_event_listener_add(view, E_VIEW_MOVE, &blur->listener.move);
 
         blur->listener.restack.notify = _e_blur_cb_restack;
         e_view_event_listener_add(view, E_VIEW_RESTACK, &blur->listener.restack);
 
+        blur->listener.resize.notify = _e_blur_cb_resize;
+        e_view_client_resize_listener_add(view_client, &blur->listener.resize);
+
         blur->ec_delfn = e_object_delfn_add(E_OBJECT(ec),
                                             _e_blur_cb_ec_free,
                                             blur);