X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fdesktop.c;h=9c1dfaee70dfc63f2b37fd33b0dc820a75f9d1ca;hb=65361f9f797905679c6c58c58733036911d54f7e;hp=f7d11b1d3a6ce9b8bd94d473e67f3b47c512c8dc;hpb=47d79bb6a1f1f31c538c5b98326c34d6af4fb12d;p=src%2Fagl-compositor.git

diff --git a/src/desktop.c b/src/desktop.c
index f7d11b1..9c1dfae 100644
--- a/src/desktop.c
+++ b/src/desktop.c
@@ -27,9 +27,12 @@
 #include "ivi-compositor.h"
 #include "policy.h"
 
+#include "shared/helpers.h"
 #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)
@@ -64,6 +67,43 @@ desktop_pong(struct weston_desktop_client *dclient, void *userdata)
 	/* not supported */
 }
 
+struct weston_output *
+get_default_output(struct weston_compositor *compositor)
+{
+	if (wl_list_empty(&compositor->output_list))
+		return NULL;
+
+	return container_of(compositor->output_list.next,
+			struct weston_output, link);
+}
+
+struct weston_output *
+get_focused_output(struct weston_compositor *compositor)
+{
+	struct weston_seat *seat;
+	struct weston_output *output = NULL;
+
+	wl_list_for_each(seat, &compositor->seat_list, link) {
+		struct weston_touch *touch = weston_seat_get_touch(seat);
+		struct weston_pointer *pointer = weston_seat_get_pointer(seat);
+		struct weston_keyboard *keyboard =
+			weston_seat_get_keyboard(seat);
+
+		if (touch && touch->focus)
+			output = touch->focus->output;
+		else if (pointer && pointer->focus)
+			output = pointer->focus->output;
+		else if (keyboard && keyboard->focus)
+			output = keyboard->focus->output;
+
+		if (output)
+			break;
+	}
+
+	return output;
+}
+
+
 static void
 desktop_surface_added(struct weston_desktop_surface *dsurface, void *userdata)
 {
@@ -72,6 +112,7 @@ desktop_surface_added(struct weston_desktop_surface *dsurface, void *userdata)
 	struct wl_client *client;
 	struct ivi_surface *surface;
 	struct ivi_output *active_output = NULL;
+	struct weston_output *output = NULL;
 	const char *app_id = NULL;
 
 	dclient = weston_desktop_surface_get_client(dsurface);
@@ -96,6 +137,7 @@ desktop_surface_added(struct weston_desktop_surface *dsurface, void *userdata)
 	surface->activated_by_default = false;
 	surface->advertised_on_launch = false;
 	surface->checked_pending = false;
+	wl_list_init(&surface->link);
 
 	wl_signal_init(&surface->signal_advertise_app);
 
@@ -120,6 +162,19 @@ desktop_surface_added(struct weston_desktop_surface *dsurface, void *userdata)
 	/* reset any caps to make sure we apply the new caps */
 	ivi_seat_reset_caps_sent(ivi);
 
+	output =  get_focused_output(ivi->compositor);
+	if (!output)
+		output = get_default_output(ivi->compositor);
+
+	if (output && ivi->shell_client.ready) {
+		struct ivi_output *ivi_output = to_ivi_output(output);
+
+		weston_log("Setting surface to initial size of surface to %dx%d\n",
+				ivi_output->area.width, ivi_output->area.height);
+		weston_desktop_surface_set_maximized(dsurface, true);
+		weston_desktop_surface_set_size(dsurface,
+				ivi_output->area.width, ivi_output->area.height);
+	}
 	/*
 	 * We delay creating "normal" desktop surfaces until later, to
 	 * give the shell-client an oppurtunity to set the surface as a
@@ -153,12 +208,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;
 	 *
@@ -235,12 +293,13 @@ 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));
 
-	/* we weren't added to any list if we are still with 'none' as role */
-	if (surface->role != IVI_SURFACE_ROLE_NONE)
-		wl_list_remove(&surface->link);
+	if (app_id && output)
+		shell_advertise_app_state(output->ivi, app_id,
+					  NULL, AGL_SHELL_DESKTOP_APP_STATE_DESTROYED);
+
+	wl_list_remove(&surface->link);
 
 	free(surface);
 }