desktop_shell: Add destroy signal for toplevel

Change-Id: I79347f5a8aa6afd1205c233906a874545caceca1

diff --git a/src/bin/server/e_desktop_shell.c b/src/bin/server/e_desktop_shell.c
index 341a5468c907e5ba4354291230975c9f90390d05..f18cb6dfa1b780b714b1258e9eea8e07ff73e68e 100644 (file)
--- a/src/bin/server/e_desktop_shell.c
+++ b/src/bin/server/e_desktop_shell.c
@@ -261,6 +261,8 @@ _toplevel_init(E_Desktop_Toplevel *toplevel, struct wl_resource *shell_surface_r
 EINTERN void
 e_desktop_toplevel_init(E_Desktop_Toplevel *toplevel, E_Desktop_Surface_Interface *iface, E_Surface *e_surface, struct wl_resource *shell_surface_resource)
 {
+   wl_signal_init(&toplevel->events.destroy);
+
    _surface_init(&toplevel->surface, e_surface, iface);
    _toplevel_init(toplevel, shell_surface_resource);
 
@@ -287,6 +289,12 @@ e_desktop_toplevel_try_from_surface(E_Surface *e_surface)
    return _toplevel_from_surface(surface);
 }
 
+EINTERN void
+e_desktop_toplevel_destroy_listener_add(E_Desktop_Toplevel *toplevel, struct wl_listener *listener)
+{
+   wl_signal_add(&toplevel->events.destroy, listener);
+}
+
 EINTERN void
 e_desktop_toplevel_title_set(E_Desktop_Toplevel *toplevel, const char *title)
 {

diff --git a/src/bin/server/e_desktop_shell_intern.h b/src/bin/server/e_desktop_shell_intern.h
index 16506f7c9f5b18f2ca5ff308e0f1683817e6cd60..f2b769b7578e820dba89b83aa98ac5752ef89574 100644 (file)
--- a/src/bin/server/e_desktop_shell_intern.h
+++ b/src/bin/server/e_desktop_shell_intern.h
@@ -73,6 +73,11 @@ void e_desktop_surface_unmap(E_Desktop_Surface *surface);
  */
 E_Desktop_Toplevel *e_desktop_toplevel_try_from_surface(E_Surface *e_surface);
 
+/**
+ * Add a listener to be called when given E_Desktop_Toplevel is destroyed
+ */
+void e_desktop_toplevel_destroy_listener_add(E_Desktop_Toplevel *toplevel, struct wl_listener *listener);
+
 /**
  * Get E_Client instance from E_Desktop_Toplevel
  */

diff --git a/src/bin/server/e_desktop_shell_private.h b/src/bin/server/e_desktop_shell_private.h
index 52880fb2c2496e2b37a3ed0524bd8492ec5eb6f3..808ab66f58161401a199914b664ae4076493561d 100644 (file)
--- a/src/bin/server/e_desktop_shell_private.h
+++ b/src/bin/server/e_desktop_shell_private.h
@@ -25,6 +25,11 @@ struct _E_Desktop_Surface
 struct _E_Desktop_Toplevel
 {
    E_Desktop_Surface surface;
+
+   struct
+     {
+        struct wl_signal destroy;
+     } events;
 };
 
 struct wl_display *e_desktop_shell_display_get(E_Desktop_Shell *shell);

diff --git a/src/bin/server/e_desktop_xdg_shell_v6.c b/src/bin/server/e_desktop_xdg_shell_v6.c
index dba3fd7a5e6fe3548cf25966b3707bc80d64d1ec..2c83a0ad40494d2e9f453bd2e4cc419fb977d6dd 100644 (file)
--- a/src/bin/server/e_desktop_xdg_shell_v6.c
+++ b/src/bin/server/e_desktop_xdg_shell_v6.c
@@ -510,7 +510,7 @@ _toplevel_cb_xdg_surface_destroy(struct wl_listener *listener, void *data)
 
    LOG("Destroy E_Desktop_Xdg_Toplevel_V6(%p)", toplevel);
 
-   _toplevel_listener_finish(toplevel);
    e_desktop_toplevel_finish(&toplevel->base);
+   _toplevel_listener_finish(toplevel);
    free(toplevel);
 }