elm_win: added signal 'effect,started' and 'effect,done'

Signals 'effect,started' and 'effect,done' are added. Registered callbacks by
client for those signals are called directly by ecore-wayland events
ECORE_WL_EVENT_EFFECT_START/ECORE_WL_EVENT_EFFECT_END.

Change-Id: I67b6776ab1f6f3938c9beda8e903d6e76c15db86
Signed-off-by: MinJeong Kim <minjjj.kim@samsung.com>

diff --git a/src/bin/test_win_state.c b/src/bin/test_win_state.c
index 562ae93629d5d788a5ae9b602b06000682ccf90b..4de27a71cf16a3899af732769f90f40e38a8ae6e 100644 (file)
--- a/src/bin/test_win_state.c
+++ b/src/bin/test_win_state.c
@@ -240,6 +240,31 @@ _win_state_visibility_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_i
    printf("WIN: %s %d\n", (char *)data, visibility);
 }
 
+static void
+_win_effect_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
+{
+   const char *type_name;
+   Elm_Win_Effect_Type type = (Elm_Win_Effect_Type)(event_info);
+
+   switch (type)
+     {
+      case ELM_WIN_EFFECT_TYPE_SHOW:
+         type_name = eina_stringshare_add("SHOW");
+         break;
+      case ELM_WIN_EFFECT_TYPE_HIDE:
+         type_name = eina_stringshare_add("HIDE");
+         break;
+      case ELM_WIN_EFFECT_TYPE_RESTACK:
+         type_name = eina_stringshare_add("RESTACK");
+         break;
+      default:
+         type_name = eina_stringshare_add("UNKNOWN");
+     }
+
+   printf("EFFECT: %s %s\n", type_name, (char *)data);
+   eina_stringshare_del(type_name);
+}
+
 static void
 _win_show(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
@@ -285,6 +310,8 @@ test_win_state(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
    evas_object_smart_callback_add(win, "delete,request", _win_state_print_cb, "delete,request");
    evas_object_smart_callback_add(win, "wm,rotation,changed", _win_state_print_cb, "wm,rotation,changed");
    evas_object_smart_callback_add(win, "visibility,changed", _win_state_visibility_cb, "visibility,changed");
+   evas_object_smart_callback_add(win, "effect,started", _win_effect_cb, "effect,started");
+   evas_object_smart_callback_add(win, "effect,done", _win_effect_cb, "effect,done");
    elm_win_autodel_set(win, EINA_TRUE);
 
    bg = elm_bg_add(win);

diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 306db90f9b9cb6c7e1aea141130d111c9ac2a9c0..8b2f1cc8be09f1279d5ab39325a32993ec3f2acc 100644 (file)
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -116,6 +116,8 @@ struct _Elm_Win_Data
    {
       Ecore_Wl_Window *win;
       Eina_Bool opaque_dirty : 1;
+      Ecore_Event_Handler *effect_start_handler;
+      Ecore_Event_Handler *effect_end_handler;
    } wl;
 #endif
 
@@ -252,6 +254,8 @@ static const char SIG_WM_ROTATION_CHANGED[] = "wm,rotation,changed";
 static const char SIG_CONFORMANT_CHANGED[] = "conformant,changed";
 static const char SIG_AUX_HINT_ALLOWED[] = "aux,hint,allowed";
 static const char SIG_VISIBILITY_CHANGED[] = "visibility,changed";
+static const char SIG_EFFECT_STARTED[] = "effect,started";
+static const char SIG_EFFECT_DONE[] = "effect,done";
 
 static const Evas_Smart_Cb_Description _smart_callbacks[] = {
    {SIG_DELETE_REQUEST, ""},
@@ -277,6 +281,8 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
    {SIG_CONFORMANT_CHANGED, ""},
    {SIG_AUX_HINT_ALLOWED, ""},
    {SIG_VISIBILITY_CHANGED, ""},
+   {SIG_EFFECT_STARTED, ""},
+   {SIG_EFFECT_DONE, ""},
    {NULL, NULL}
 };
 
@@ -2259,6 +2265,39 @@ _elm_win_wlwindow_get(Elm_Win_Data *sd)
 {
    sd->wl.win = _elm_ee_wlwin_get(sd->ee);
 }
+
+static Eina_Bool
+_elm_win_wl_effect_start(void *data, int type EINA_UNUSED, void *event)
+{
+   ELM_WIN_DATA_GET(data, sd);
+   Ecore_Wl_Event_Effect_Start *e = event;
+
+   if (!sd->wl.win) return ECORE_CALLBACK_PASS_ON;
+
+   if ((ecore_wl_window_id_get(sd->wl.win) != e->win))
+     return ECORE_CALLBACK_PASS_ON;
+
+   evas_object_smart_callback_call(data, SIG_EFFECT_STARTED, (void*)e->type);
+
+   return ECORE_CALLBACK_PASS_ON;
+}
+
+static Eina_Bool
+_elm_win_wl_effect_end(void *data, int type EINA_UNUSED, void *event)
+{
+   ELM_WIN_DATA_GET(data, sd);
+   Ecore_Wl_Event_Effect_End *e = event;
+
+   if (!sd->wl.win) return ECORE_CALLBACK_PASS_ON;
+
+   if ((ecore_wl_window_id_get(sd->wl.win) != e->win))
+     return ECORE_CALLBACK_PASS_ON;
+
+   evas_object_smart_callback_call(data, SIG_EFFECT_DONE, (void*)e->type);
+
+   return ECORE_CALLBACK_PASS_ON;
+}
+
 #endif
 
 #ifdef HAVE_ELEMENTARY_X
@@ -3895,6 +3934,17 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_
         sd->x.property_handler = ecore_event_handler_add
             (ECORE_X_EVENT_WINDOW_PROPERTY, _elm_win_property_change, obj);
      }
+#endif
+#ifdef HAVE_ELEMENTARY_WAYLAND
+   else if ((engine) &&
+            ((!strcmp(engine, ELM_WAYLAND_SHM)) ||
+             (!strcmp(engine, ELM_WAYLAND_EGL))))
+     {
+        sd->wl.effect_start_handler = ecore_event_handler_add
+           (ECORE_WL_EVENT_EFFECT_START, _elm_win_wl_effect_start, obj);
+        sd->wl.effect_end_handler = ecore_event_handler_add
+           (ECORE_WL_EVENT_EFFECT_END, _elm_win_wl_effect_end, obj);
+     }
 #endif
    else if ((engine) && (!strncmp(engine, "shot:", 5)))
      _shot_init(sd);

diff --git a/src/lib/elm_win.eo b/src/lib/elm_win.eo
index 6d0a0f8005259d6f0e09e1483779a8a3da2abe23..f2a93b578cb7a4b25d744f391683c32d69d71a65 100644 (file)
--- a/src/lib/elm_win.eo
+++ b/src/lib/elm_win.eo
@@ -140,6 +140,22 @@ enum Elm.Win.Keygrab_Mode
                                     window]]
 }
 
+enum Elm.Win.Effect.Type
+{
+   [[List of window effect.
+
+     These list indicates types of window effect. When the effect started or
+     done, the Elm_Win is notified with type information of window effect.
+   ]]
+
+   legacy: elm_win_effect_type;
+
+   unknown = 0,
+   show,
+   hide,
+   restack
+}
+
 enum Elm.Illume_Command
 {
    [[Available commands that can be sent to the Illume manager.

diff --git a/src/lib/elm_win.h b/src/lib/elm_win.h
index a7c92dd4b8bdf0b59e38c9cb61efa27c2da1b656..2ce35f344574d67af95dbf82c094ff9672b9cff8 100644 (file)
--- a/src/lib/elm_win.h
+++ b/src/lib/elm_win.h
@@ -92,6 +92,8 @@
  * @li "unfocused" : When the win has lost focus. (since 1.8)
  * @li "theme,changed" - The theme was changed. (since 1.13)
  * @li "visibility,changed" - visibility of the window has been changed.
+ * @li "effect,started" - window effect has been started.
+ * @li "effect,done" - window effect has been done.
  *
  * Note that calling evas_object_show() after window contents creation is
  * recommended. It will trigger evas_smart_objects_calculate() and some backend