X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fdesktop.c;h=b2907fe69bf55b34954664c22c64bb40b02a8a22;hb=17f92b23b99d6c34793b6b636dc4d508113f0489;hp=efebfc167dbaf1c231b04358871fa378c934b103;hpb=7ecc8c2ee8a776bb1d57df22cb74493633c6f6e1;p=src%2Fagl-compositor.git

diff --git a/src/desktop.c b/src/desktop.c
index efebfc1..b2907fe 100644
--- a/src/desktop.c
+++ b/src/desktop.c
@@ -33,18 +33,6 @@
 
 #include "agl-shell-desktop-server-protocol.h"
 
-#if 0
-static struct weston_output *
-get_default_output(struct weston_compositor *compositor)
-{
-	if (wl_list_empty(&compositor->output_list))
-		return NULL;
-
-	return wl_container_of(compositor->output_list.next,
-			       struct weston_output, link);
-}
-#endif
-
 static void
 desktop_advertise_app(struct wl_listener *listener, void *data)
 {
@@ -103,6 +91,64 @@ get_focused_output(struct weston_compositor *compositor)
 	return output;
 }
 
+void
+ivi_shell_activate_surface(struct ivi_surface *ivi_surf,
+                          struct ivi_shell_seat *ivi_seat,
+                          uint32_t flags)
+{
+       struct weston_desktop_surface *dsurface = ivi_surf->dsurface;
+       struct weston_surface *surface =
+               weston_desktop_surface_get_surface(dsurface);
+
+       weston_view_activate_input(ivi_surf->view, ivi_seat->seat, flags);
+
+       if (ivi_seat->focused_surface) {
+               struct ivi_surface *current_focus =
+                       get_ivi_shell_surface(ivi_seat->focused_surface);
+               struct weston_desktop_surface *dsurface_focus;
+               assert(current_focus);
+
+               dsurface_focus = current_focus->dsurface;
+               if (--current_focus->focus_count == 0)
+                       weston_desktop_surface_set_activated(dsurface_focus, false);
+       }
+
+       ivi_seat->focused_surface = surface;
+       if (ivi_surf->focus_count++ == 0)
+               weston_desktop_surface_set_activated(dsurface, true);
+}
+
+
+static void
+desktop_surface_added_configure(struct ivi_surface *surface,
+				struct ivi_output *ivi_output)
+{
+	enum ivi_surface_role role = IVI_SURFACE_ROLE_NONE;
+	struct weston_desktop_surface *dsurface = surface->dsurface;
+
+	ivi_check_pending_surface_desktop(surface, &role);
+	if ((role != IVI_SURFACE_ROLE_DESKTOP &&
+	     role != IVI_SURFACE_ROLE_FULLSCREEN) ||
+	     role == IVI_SURFACE_ROLE_NONE)
+		return;
+
+	if (role == IVI_SURFACE_ROLE_FULLSCREEN) {
+		struct ivi_output *bg_output =
+			ivi_layout_find_bg_output(surface->ivi);
+		assert(bg_output);
+		weston_desktop_surface_set_fullscreen(dsurface, true);
+		weston_desktop_surface_set_size(dsurface,
+						bg_output->output->width,
+						bg_output->output->height);
+		return;
+	}
+
+	weston_desktop_surface_set_maximized(dsurface, true);
+	weston_desktop_surface_set_size(dsurface,
+					ivi_output->area.width,
+					ivi_output->area.height);
+}
+
 
 static void
 desktop_surface_added(struct weston_desktop_surface *dsurface, void *userdata)
@@ -168,16 +214,7 @@ desktop_surface_added(struct weston_desktop_surface *dsurface, void *userdata)
 
 	if (output && ivi->shell_client.ready) {
 		struct ivi_output *ivi_output = to_ivi_output(output);
-
-		/* verify if by any chance this surfaces hasn't been assigned a
-		 * different role before sending the maximized state */
-		if (!ivi_check_pending_surface(surface)) {
-			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);
-		}
+		desktop_surface_added_configure(surface, ivi_output);
 	}
 	/*
 	 * We delay creating "normal" desktop surfaces until later, to
@@ -213,6 +250,8 @@ desktop_surface_removed(struct weston_desktop_surface *dsurface, void *userdata)
 	struct weston_surface *wsurface =
 		weston_desktop_surface_get_surface(dsurface);
 	const char *app_id = NULL;
+	struct weston_seat *wseat = get_ivi_shell_weston_first_seat(surface->ivi);
+	struct ivi_shell_seat *ivi_seat = get_ivi_shell_seat(wseat);
 
 	struct ivi_output *output = ivi_layout_get_output_from_surface(surface);
 
@@ -252,6 +291,13 @@ desktop_surface_removed(struct weston_desktop_surface *dsurface, void *userdata)
 		output->active = NULL;
 	}
 
+	/* clear out focused_surface to avoid a stale focused_surface. the
+	 * client shell is responsible for keeping track and switch back to the
+	 * last active surface so we don't get do anything at removal, just
+	 * reset it */
+	if (ivi_seat && ivi_seat->focused_surface == wsurface)
+		ivi_seat->focused_surface = NULL;
+
 	if (surface->role == IVI_SURFACE_ROLE_REMOTE &&
 	    output->type == OUTPUT_REMOTE)
 		ivi_destroy_waltham_destroy(surface);
@@ -335,6 +381,17 @@ desktop_committed(struct weston_desktop_surface *dsurface,
 	    !wl_list_empty(&surface->ivi->desktop_clients))
 		wl_signal_emit(&surface->signal_advertise_app, surface);
 
+	/* this repaint schedule is needed to allow resizing to work with the
+	 * help of the hidden layer:
+	 *
+	 * 1. add the view in the hidden layer and send out correct dimensions
+	 * 2. clients changes its dimensions
+	 * 3. client commits with the new dimensions
+	 *
+	 * For desktop and fullscreen, desktop_surface_added() sends the
+	 * dimensions from the beginning so applications no need to resize, but
+	 * if that weren't the case we still need this in.
+	 */
 	weston_compositor_schedule_repaint(surface->ivi->compositor);
 
 	switch (surface->role) {
@@ -442,8 +499,10 @@ ivi_shell_destroy(struct wl_listener *listener, void *data)
 	struct ivi_compositor *ivi = container_of(listener,
 				struct ivi_compositor, destroy_listener);
 
-	weston_desktop_destroy(ivi->desktop);
+	ivi_shell_finalize(ivi);
 	ivi_compositor_destroy_pending_surfaces(ivi);
+
+	weston_desktop_destroy(ivi->desktop);
 	wl_list_remove(&listener->link);
 }