src: Mark surfaces with the 'remote' role if configuration file says so

[src/agl-compositor.git] / src / shell.c

diff --git a/src/shell.c b/src/shell.c
index 37ceb25..ac41e1f 100644 (file)
--- a/src/shell.c
+++ b/src/shell.c
@@ -45,9 +45,6 @@
 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)
 {
@@ -90,11 +87,22 @@ static void
 ivi_set_desktop_surface_remote(struct ivi_surface *surface)
 {
        struct ivi_compositor *ivi = surface->ivi;
+       struct weston_view *view;
+       struct ivi_output *output = surface->remote.output;
+
        assert(surface->role == IVI_SURFACE_ROLE_NONE);
 
        /* remote type are the same as desktop just that client can tell
         * the compositor to start on another output */
        surface->role = IVI_SURFACE_ROLE_REMOTE;
+
+       /* if thew black surface view is mapped on the mean we need
+        * to remove it in order to start showing the 'remote' surface
+        * just being added */
+       view = output->fullscreen_view.fs->view;
+       if (view->is_mapped || view->surface->is_mapped)
+               remove_black_surface(output);
+
        wl_list_insert(&ivi->surfaces, &surface->link);
 }
 
@@ -178,7 +186,7 @@ ivi_set_pending_desktop_surface_split(struct ivi_output *ioutput,
        wl_list_insert(&ivi->split_pending_apps, &split->link);
 }
 
-static void
+void
 ivi_set_pending_desktop_surface_remote(struct ivi_output *ioutput,
                const char *app_id)
 {
@@ -548,11 +556,19 @@ create_black_surface_view(struct ivi_output *output)
                      &output->fullscreen_view.fs_destroy);
 }
 
-static void
+void
 remove_black_surface(struct ivi_output *output)
 {
-       struct weston_view *view = output->fullscreen_view.fs->view;
+       struct weston_view *view;
+
+       if (!output &&
+           !output->fullscreen_view.fs &&
+           !output->fullscreen_view.fs->view) {
+               weston_log("Output %s doesn't have a surface installed!\n", output->name);
+               return;
+       }
 
+       view = output->fullscreen_view.fs->view;
        assert(view->is_mapped == true ||
               view->surface->is_mapped == true);
 
@@ -565,11 +581,19 @@ remove_black_surface(struct ivi_output *output)
        weston_output_damage(output->output);
 }
 
-static void
+void
 insert_black_surface(struct ivi_output *output)
 {
-       struct weston_view *view = output->fullscreen_view.fs->view;
+       struct weston_view *view;
 
+       if (!output &&
+           !output->fullscreen_view.fs &&
+           !output->fullscreen_view.fs->view) {
+               weston_log("Output %s doesn't have a surface installed!\n", output->name);
+               return;
+       }
+
+       view = output->fullscreen_view.fs->view;
        if (view->is_mapped || view->surface->is_mapped)
                return;
 
@@ -598,7 +622,8 @@ shell_ready(struct wl_client *client, struct wl_resource *shell_res)
        ivi->shell_client.ready = true;
 
        wl_list_for_each(output, &ivi->outputs, link) {
-               remove_black_surface(output);
+               if (output->background)
+                       remove_black_surface(output);
                ivi_layout_init(ivi, output);
        }