e_view: View event listener adjustment

Remove view_xxx_listener_add functions.
Instead have to use e_view_event_listener_add.

Change-Id: I65cf675344ff7bff6c248c5c824f091d35fa6360

diff --git a/src/bin/compmgr/e_alpha_mask_rect.c b/src/bin/compmgr/e_alpha_mask_rect.c
index 83b41ecb06b3f423f070117174815cf68aa88513..419626f76a77de75ea8dfcd51f94ec43d3590c37 100644 (file)
--- a/src/bin/compmgr/e_alpha_mask_rect.c
+++ b/src/bin/compmgr/e_alpha_mask_rect.c
@@ -227,13 +227,13 @@ e_alpha_mask_rect_create(E_Client *ec)
      e_view_show(e_view_rect_view_get(rect->view));
 
    rect->show.notify = _e_alpha_mask_rect_cb_view_client_show;
-   e_view_show_listener_add(e_view_client_view_get(view_client), &rect->show);
+   e_view_event_listener_add(e_view_client_view_get(view_client), E_VIEW_SHOW, &rect->show);
    rect->hide.notify = _e_alpha_mask_rect_cb_view_client_hide;
-   e_view_hide_listener_add(e_view_client_view_get(view_client), &rect->hide);
+   e_view_event_listener_add(e_view_client_view_get(view_client), E_VIEW_HIDE, &rect->hide);
    rect->reposition.notify = _e_alpha_mask_rect_cb_view_client_reposition;
-   e_view_reposition_listener_add(e_view_client_view_get(view_client), &rect->reposition);
+   e_view_event_listener_add(e_view_client_view_get(view_client), E_VIEW_MOVE, &rect->reposition);
    rect->resize.notify = _e_alpha_mask_rect_cb_view_client_resize;
-   e_view_client_resize_listener_add(view_client, &rect->resize);
+   e_view_event_listener_add(e_view_client_view_get(view_client), E_VIEW_RESIZE, &rect->resize);
 
    // TODO : view
    evas_object_smart_callback_add(ec->frame, "client_resize", _e_alpha_mask_rect_cb_client_resize, rect);

diff --git a/src/bin/core/e_view.c b/src/bin/core/e_view.c
index 5da2d1e8897d6a9688b173614635436d03b38dae..eecb078c3da59012cc284dc2ce64c59459f1102f 100644 (file)
--- a/src/bin/core/e_view.c
+++ b/src/bin/core/e_view.c
@@ -591,36 +591,12 @@ e_view_repeat_events_set(E_View *view, bool repeat)
    evas_object_repeat_events_set(view->eo, repeat);
 }
 
-E_API void
+EINTERN void
 e_view_destroy_listener_add(E_View *view, struct wl_listener *listener)
 {
    wl_signal_add(&view->events.destroy, listener);
 }
 
-E_API void
-e_view_show_listener_add(E_View *view, struct wl_listener *listener)
-{
-   wl_signal_add(&view->events.show, listener);
-}
-
-E_API void
-e_view_hide_listener_add(E_View *view, struct wl_listener *listener)
-{
-   wl_signal_add(&view->events.hide, listener);
-}
-
-E_API void
-e_view_reposition_listener_add(E_View *view, struct wl_listener *listener)
-{
-   wl_signal_add(&view->events.reposition, listener);
-}
-
-E_API void
-e_view_restack_listener_add(E_View *view, struct wl_listener *listener)
-{
-   wl_signal_add(&view->events.restack, listener);
-}
-
 E_API void
 e_view_name_set(E_View *view, const char *name)
 {

diff --git a/src/bin/core/e_view_client.c b/src/bin/core/e_view_client.c
index b34be52243d514e1bc1fdc85c5e510b9bc2143fc..4acf7fb9179cd1a5024428570458e7550c290c14 100644 (file)
--- a/src/bin/core/e_view_client.c
+++ b/src/bin/core/e_view_client.c
@@ -885,14 +885,6 @@ e_view_client_tree_get(E_View_Client *client)
    return &client->tree;
 }
 
-E_API void
-e_view_client_resize_listener_add(E_View_Client *client, struct wl_listener *listener)
-{
-   if (client == NULL) return;
-
-   wl_signal_add(&client->events.resize, listener);
-}
-
 E_API void
 e_view_client_signal_emit(E_View_Client *client, const char *sig, const char *src)
 {

diff --git a/src/bin/core/e_view_intern.h b/src/bin/core/e_view_intern.h
index 7b4bac62c6c74c3e1abfdca8059f24117551e12b..ed81d1f3d6acc9c1e8a246b87b5ab90178fc143d 100644 (file)
--- a/src/bin/core/e_view_intern.h
+++ b/src/bin/core/e_view_intern.h
@@ -203,6 +203,8 @@ void e_view_client_layer_set(E_View_Client *client, E_Canvas_Layer layer);
 void e_view_client_show(E_View_Client *client);
 void e_view_client_hide(E_View_Client *client);
 
+void e_view_destroy_listener_add(E_View *view, struct wl_listener *listener);
+
 #ifdef E_VIEW_TEST
 extern Evas_Object_Event_Cb e_view_event_callback_get(E_View_Event_Type type);
 

diff --git a/src/bin/windowmgr/e_policy_conformant.c b/src/bin/windowmgr/e_policy_conformant.c
index 00eba3c15eb2ac28e5019da088a04213605e4fd1..55576d61d2815d44193e2667715c538b18013397 100644 (file)
--- a/src/bin/windowmgr/e_policy_conformant.c
+++ b/src/bin/windowmgr/e_policy_conformant.c
@@ -666,7 +666,7 @@ _conf_part_register(E_Client *ec, Conformant_Type type)
 
    view = e_view_client_view_get(e_client_view_get(ec));
    g_conf->part[type].del_listener.notify = _conf_cb_part_del;
-   e_view_destroy_listener_add(view, &g_conf->part[type].del_listener);
+   e_view_event_listener_add(view, E_VIEW_DESTROY, &g_conf->part[type].del_listener);
 
    g_conf->part[type].show_listener.notify = _conf_cb_part_show;
    e_view_event_listener_add(view, E_VIEW_SHOW, &g_conf->part[type].show_listener);

diff --git a/src/include/e_view.h b/src/include/e_view.h
index 6997a5e5e4edd8fae59f89f22f3a7eac7d105652..41a3a7f09c361f1103aa0630c94499473943205c 100644 (file)
--- a/src/include/e_view.h
+++ b/src/include/e_view.h
@@ -278,31 +278,6 @@ void e_view_freeze_events_set(E_View *view, bool freeze);
 */
 void e_view_repeat_events_set(E_View *view, bool repeat);
 
-/**
- * Set the wl_listener to be called when view is destroyed.
- */
-void e_view_destroy_listener_add(E_View *view, struct wl_listener *listener);
-
-/**
- * Set the listener function to be called when show event occurs.
-*/
-void e_view_show_listener_add(E_View *view, struct wl_listener *listener);
-
-/**
- * Set the listener function to be called when hide event occurs.
-*/
-void e_view_hide_listener_add(E_View *view, struct wl_listener *listener);
-
-/**
- * Set the listener function to be called when move event occurs.
-*/
-void e_view_reposition_listener_add(E_View *view, struct wl_listener *listener);
-
-/**
- * Set the listener function to be called when restack event occurs.
-*/
-void e_view_restack_listener_add(E_View *view, struct wl_listener *listener);
-
 /**
  * Set the name of the given E_View object
  *

diff --git a/src/include/e_view_client.h b/src/include/e_view_client.h
index cebcd2a20d0615acceeae6835d9f7281dca84413..737549ab4c763b860fb99d37826fea366b98cdda 100644 (file)
--- a/src/include/e_view_client.h
+++ b/src/include/e_view_client.h
@@ -53,8 +53,6 @@ void e_view_client_frame_xy_unadjust(E_View_Client *client, int x, int y, int *a
 void e_view_client_frame_wh_adjust(E_View_Client *client, int width, int height, int *aw, int *ah);
 void e_view_client_frame_wh_unadjust(E_View_Client *client, int width, int height, int *aw, int *ah);
 
-void e_view_client_resize_listener_add(E_View_Client *client, struct wl_listener *listener);
-
 void e_view_client_signal_emit(E_View_Client *client, const char *sig, const char *src);
 void e_view_client_input_area_set(E_View_Client *client, int x, int y, int w, int h);
 void e_view_client_input_rect_get(E_View_Client *client, Eina_List **list);