From: Walter Lozano <walter.lozano@collabora.com>
Date: Wed, 17 Feb 2021 14:00:44 +0000 (-0300)
Subject: Notify about application destruction
X-Git-Tag: 11.91.0~9
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=d85915199c8a3213ad827ca2dfb3bbc34c5f3da3;p=src%2Fagl-compositor.git

Notify about application destruction

Currently agl-compositor notifies about application ids which can be
activated/deactivated, as well as the application state. However, when
an application is destroyed this information is not communicated to desktop
making it out of sync with the actual list of available applications.

To overcome this limitation extend the protocol and the logic to notify
about application destruction on surface remove.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>
Change-Id: Ib766cf3f3fbd10f55b85212480dc4717ab1bec22
---

diff --git a/protocol/agl-shell-desktop.xml b/protocol/agl-shell-desktop.xml
index e8ae153..b90cc1d 100644
--- a/protocol/agl-shell-desktop.xml
+++ b/protocol/agl-shell-desktop.xml
@@ -43,6 +43,7 @@
     <enum name="app_state">
       <entry name="activated" value="0"/>
       <entry name="deactivated" value="1"/>
+      <entry name="destroyed" value="2"/>
     </enum>
 
     <event name="application">
diff --git a/src/desktop.c b/src/desktop.c
index 7127c2d..f32097e 100644
--- a/src/desktop.c
+++ b/src/desktop.c
@@ -30,6 +30,8 @@
 #include <libweston/libweston.h>
 #include <libweston-desktop/libweston-desktop.h>
 
+#include "agl-shell-desktop-server-protocol.h"
+
 #if 0
 static struct weston_output *
 get_default_output(struct weston_compositor *compositor)
@@ -154,12 +156,15 @@ desktop_surface_removed(struct weston_desktop_surface *dsurface, void *userdata)
 		weston_desktop_surface_get_user_data(dsurface);
 	struct weston_surface *wsurface =
 		weston_desktop_surface_get_surface(dsurface);
+	const char *app_id = NULL;
 
 	struct ivi_output *output = ivi_layout_get_output_from_surface(surface);
 
 	wl_list_remove(&surface->listener_advertise_app.link);
 	surface->listener_advertise_app.notify = NULL;
 
+	app_id = weston_desktop_surface_get_app_id(dsurface);
+
 	/* special corner-case, pending_surfaces which are never activated or
 	 * being assigned an output might land here so just remove the surface;
 	 *
@@ -236,8 +241,10 @@ desktop_surface_removed(struct weston_desktop_surface *dsurface, void *userdata)
 
 skip_output_asignment:
 	weston_log("Removed surface %p, app_id %s, role %s\n", surface,
-			weston_desktop_surface_get_app_id(dsurface),
-			ivi_layout_get_surface_role_name(surface));
+			app_id, ivi_layout_get_surface_role_name(surface));
+
+	shell_advertise_app_state(output->ivi, app_id,
+				  NULL, AGL_SHELL_DESKTOP_APP_STATE_DESTROYED);
 
 	wl_list_remove(&surface->link);