X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fshell.c;h=0553f30217a1f9267aea834b0cf341cc5319db25;hb=c33644e558bc32dbfc8afb53e010325cc62c2858;hp=67f6d8807a97473e5cf5ada1909bf7670e1aba5f;hpb=2d7243208d3e455decd730e7e33ab2452b1a0508;p=src%2Fagl-compositor.git

diff --git a/src/shell.c b/src/shell.c
index 67f6d88..0553f30 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -33,13 +33,19 @@
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <libweston-6/compositor.h>
-#include <libweston-6/config-parser.h>
+#include <libweston/libweston.h>
+#include <libweston/config-parser.h>
 
 #include "shared/os-compatibility.h"
 
 #include "agl-shell-server-protocol.h"
 
+static void
+create_black_surface_view(struct ivi_output *output);
+
+static void
+insert_black_surface(struct ivi_output *output);
+
 void
 ivi_set_desktop_surface(struct ivi_surface *surface)
 {
@@ -49,6 +55,17 @@ ivi_set_desktop_surface(struct ivi_surface *surface)
 	wl_list_insert(&surface->ivi->surfaces, &surface->link);
 }
 
+void
+ivi_shell_init_black_fs(struct ivi_compositor *ivi)
+{
+	struct ivi_output *out;
+
+	wl_list_for_each(out, &ivi->outputs, link) {
+		create_black_surface_view(out);
+		insert_black_surface(out);
+	}
+}
+
 int
 ivi_shell_init(struct ivi_compositor *ivi)
 {
@@ -167,6 +184,87 @@ ivi_launch_shell_client(struct ivi_compositor *ivi)
 	return 0;
 }
 
+static void
+destroy_black_view(struct wl_listener *listener, void *data)
+{
+	struct fullscreen_view *fs =
+		wl_container_of(listener, fs, fs_destroy);
+
+
+	if (fs && fs->fs) {
+		if (fs->fs->view && fs->fs->view->surface) {
+			weston_surface_destroy(fs->fs->view->surface);
+			fs->fs->view = NULL;
+		}
+
+		free(fs->fs);
+		wl_list_remove(&fs->fs_destroy.link);
+	}
+}
+
+
+static void
+create_black_surface_view(struct ivi_output *output)
+{
+	struct weston_surface *surface = NULL;
+	struct weston_view *view;
+	struct ivi_compositor *ivi = output->ivi;
+	struct weston_compositor *wc= ivi->compositor;
+	struct weston_output *woutput = output->output;
+
+	surface = weston_surface_create(wc);
+	view = weston_view_create(surface);
+
+	assert(view || surface);
+
+	weston_surface_set_color(surface, 0.0, 0.0, 0.0, 1);
+	weston_surface_set_size(surface, woutput->width, woutput->height);
+	weston_view_set_position(view, woutput->x, woutput->y);
+
+	output->fullscreen_view.fs = zalloc(sizeof(struct ivi_surface));
+	output->fullscreen_view.fs->view = view;
+
+	output->fullscreen_view.fs_destroy.notify = destroy_black_view;
+	wl_signal_add(&woutput->destroy_signal,
+		      &output->fullscreen_view.fs_destroy);
+}
+
+static void
+remove_black_surface(struct ivi_output *output)
+{
+	struct weston_view *view = output->fullscreen_view.fs->view;
+
+	assert(view->is_mapped == true ||
+	       view->surface->is_mapped == true);
+
+	view->is_mapped = false;
+	view->surface->is_mapped = false;
+
+	weston_layer_entry_remove(&view->layer_link);
+	weston_view_update_transform(view);
+
+	weston_output_damage(output->output);
+}
+
+static void
+insert_black_surface(struct ivi_output *output)
+{
+	struct weston_view *view = output->fullscreen_view.fs->view;
+
+	if (view->is_mapped || view->surface->is_mapped)
+		return;
+
+	weston_layer_entry_remove(&view->layer_link);
+	weston_layer_entry_insert(&output->ivi->fullscreen.view_list,
+				  &view->layer_link);
+
+	view->is_mapped = true;
+	view->surface->is_mapped = true;
+
+	weston_view_update_transform(view);
+	weston_output_damage(output->output);
+}
+
 static void
 shell_ready(struct wl_client *client, struct wl_resource *shell_res)
 {
@@ -179,9 +277,9 @@ shell_ready(struct wl_client *client, struct wl_resource *shell_res)
 		return;
 
 	ivi->shell_client.ready = true;
-	/* TODO: Create a black screen and remove it here */
 
 	wl_list_for_each(output, &ivi->outputs, link) {
+		remove_black_surface(output);
 		ivi_layout_init(ivi, output);
 	}
 
@@ -344,6 +442,55 @@ static const struct agl_shell_interface agl_shell_implementation = {
 static void
 unbind_agl_shell(struct wl_resource *resource)
 {
+	struct ivi_compositor *ivi;
+	struct ivi_output *output;
+	struct ivi_surface *surf, *surf_tmp;
+
+	ivi = wl_resource_get_user_data(resource);
+	wl_list_for_each(output, &ivi->outputs, link) {
+		free(output->background);
+		output->background = NULL;
+
+		free(output->top);
+		output->top = NULL;
+
+		free(output->bottom);
+		output->bottom = NULL;
+
+		free(output->left);
+		output->left = NULL;
+
+		free(output->right);
+		output->right = NULL;
+
+		/* reset the active surf if there's one present */
+		if (output->active) {
+			output->active->view->is_mapped = false;
+			output->active->view->surface->is_mapped = false;
+
+			weston_layer_entry_remove(&output->active->view->layer_link);
+			output->active = NULL;
+		}
+
+		insert_black_surface(output);
+	}
+
+	wl_list_for_each_safe(surf, surf_tmp, &ivi->surfaces, link) {
+		wl_list_remove(&surf->link);
+		wl_list_init(&surf->link);
+	}
+
+	wl_list_for_each_safe(surf, surf_tmp, &ivi->pending_surfaces, link) {
+		wl_list_remove(&surf->link);
+		wl_list_init(&surf->link);
+	}
+
+	wl_list_init(&ivi->surfaces);
+	wl_list_init(&ivi->pending_surfaces);
+
+	ivi->shell_client.ready = false;
+	ivi->shell_client.resource = NULL;
+	ivi->shell_client.client = NULL;
 }
 
 static void