main: Retrieve the agl-shell-app-id from the config file

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

diff --git a/src/shell.c b/src/shell.c
index 687094a..6944f8a 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)
 {
@@ -86,6 +83,30 @@ ivi_set_desktop_surface_fullscreen(struct ivi_surface *surface)
        wl_list_insert(&ivi->surfaces, &surface->link);
 }
 
+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);
+}
+
+
 static void
 ivi_set_desktop_surface_split(struct ivi_surface *surface)
 {
@@ -165,6 +186,24 @@ ivi_set_pending_desktop_surface_split(struct ivi_output *ioutput,
        wl_list_insert(&ivi->split_pending_apps, &split->link);
 }
 
+static void
+ivi_set_pending_desktop_surface_remote(struct ivi_output *ioutput,
+               const char *app_id)
+{
+       struct ivi_compositor *ivi = ioutput->ivi;
+       size_t len_app_id = strlen(app_id);
+
+       struct pending_remote *remote = zalloc(sizeof(*remote));
+
+       remote->app_id = zalloc(sizeof(char) * (len_app_id + 1));
+       memcpy(remote->app_id, app_id, len_app_id);
+
+       remote->ioutput = ioutput;
+
+       wl_list_insert(&ivi->remote_pending_apps, &remote->link);
+}
+
+
 static void
 ivi_remove_pending_desktop_surface_split(struct pending_split *split)
 {
@@ -189,6 +228,14 @@ ivi_remove_pending_desktop_surface_popup(struct pending_popup *p_popup)
        free(p_popup);
 }
 
+static void
+ivi_remove_pending_desktop_surface_remote(struct pending_remote *remote)
+{
+       free(remote->app_id);
+       wl_list_remove(&remote->link);
+       free(remote);
+}
+
 static bool
 ivi_check_pending_desktop_surface_popup(struct ivi_surface *surface)
 {
@@ -261,6 +308,30 @@ ivi_check_pending_desktop_surface_fullscreen(struct ivi_surface *surface)
        return false;
 }
 
+static bool
+ivi_check_pending_desktop_surface_remote(struct ivi_surface *surface)
+{
+       struct pending_remote *remote_surf, *next_remote_surf;
+       struct ivi_compositor *ivi = surface->ivi;
+       const char *_app_id =
+               weston_desktop_surface_get_app_id(surface->dsurface);
+
+       if (wl_list_empty(&ivi->remote_pending_apps))
+               return false;
+
+       wl_list_for_each_safe(remote_surf, next_remote_surf,
+                             &ivi->remote_pending_apps, link) {
+               if (!strcmp(_app_id, remote_surf->app_id)) {
+                       surface->remote.output = remote_surf->ioutput;
+                       ivi_remove_pending_desktop_surface_remote(remote_surf);
+                       return true;
+               }
+       }
+
+       return false;
+}
+
+
 void
 ivi_check_pending_desktop_surface(struct ivi_surface *surface)
 {
@@ -284,6 +355,12 @@ ivi_check_pending_desktop_surface(struct ivi_surface *surface)
                return;
        }
 
+       ret = ivi_check_pending_desktop_surface_remote(surface);
+       if (ret) {
+               ivi_set_desktop_surface_remote(surface);
+               return;
+       }
+
        /* if we end up here means we have a regular desktop app and
         * try to activate it */
        ivi_set_desktop_surface(surface);
@@ -479,7 +556,7 @@ 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;
@@ -496,7 +573,7 @@ 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;
@@ -529,7 +606,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);
        }
 
@@ -767,6 +845,9 @@ shell_desktop_set_app_property(struct wl_client *client,
        case AGL_SHELL_DESKTOP_APP_ROLE_SPLIT_HORIZONTAL:
                ivi_set_pending_desktop_surface_split(output, app_id, role);
                break;
+       case AGL_SHELL_DESKTOP_APP_ROLE_REMOTE:
+               ivi_set_pending_desktop_surface_remote(output, app_id);
+               break;
        default:
                break;
        }