compositor: Add support for subscribing to libweston scopes

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

diff --git a/src/shell.c b/src/shell.c
index ddb8981..07a7e98 100644 (file)
--- a/src/shell.c
+++ b/src/shell.c
@@ -38,7 +38,7 @@
 #include <libweston/libweston.h>
 #include <libweston/config-parser.h>
 
-#include <weston/weston.h>
+#include <weston.h>
 #include "shared/os-compatibility.h"
 #include "shared/helpers.h"
 #include "shared/process-util.h"
@@ -706,7 +706,7 @@ ivi_check_pending_desktop_surface(struct ivi_surface *surface)
        ret = ivi_check_pending_desktop_surface_remote(surface);
        if (ret) {
                ivi_set_desktop_surface_remote(surface);
-               ivi_layout_desktop_committed(surface);
+               ivi_layout_remote_committed(surface);
                return;
        }
 
@@ -1168,6 +1168,23 @@ shell_send_app_state(struct ivi_compositor *ivi, const char *app_id,
        }
 }
 
+void
+shell_send_app_on_output(struct ivi_compositor *ivi, const char *app_id,
+                        const char *output_name)
+{
+       if (app_id && ivi->shell_client.resource &&
+           wl_resource_get_version(ivi->shell_client.resource) >=
+           AGL_SHELL_APP_ON_OUTPUT_SINCE_VERSION) {
+
+               agl_shell_send_app_on_output(ivi->shell_client.resource,
+                                        app_id, output_name);
+
+               if (ivi->shell_client.resource_ext)
+                       agl_shell_send_app_on_output(ivi->shell_client.resource_ext,
+                                                app_id, output_name);
+       }
+}
+
 static void
 shell_ready(struct wl_client *client, struct wl_resource *shell_res)
 {
@@ -1685,6 +1702,57 @@ shell_set_activate_region(struct wl_client *client, struct wl_resource *res,
        ioutput->area_activation = area;
 }
 
+static void
+shell_set_app_output(struct wl_client *client, struct wl_resource *res,
+                   const char *app_id, struct wl_resource *output)
+{
+       struct ivi_compositor *ivi = wl_resource_get_user_data(res);
+       struct weston_head *head = weston_head_from_resource(output);
+       struct weston_output *woutput = weston_head_get_output(head);
+       struct ivi_output *ioutput = to_ivi_output(woutput);
+       struct ivi_surface *surf = ivi_find_app(ivi, app_id);
+       struct ivi_output *desktop_last_output = surf->desktop.last_output;
+       struct ivi_output *current_completed_output =
+               surf->current_completed_output;
+
+       if (!app_id || !ioutput)
+               return;
+
+       /* handle the case we're not mapped at all */
+       if (!surf) {
+               ivi_set_pending_desktop_surface_remote(ioutput, app_id);
+               shell_send_app_on_output(ivi, app_id, woutput->name);
+               return;
+       }
+
+       if (surf->remote.output)
+               surf->hidden_layer_output = surf->remote.output;
+       else
+               surf->hidden_layer_output = desktop_last_output;
+       assert(surf->hidden_layer_output);
+
+       if (ivi_surface_count_one(current_completed_output, IVI_SURFACE_ROLE_REMOTE) ||
+           ivi_surface_count_one(current_completed_output, IVI_SURFACE_ROLE_DESKTOP)) {
+               if (!current_completed_output->background)
+                       insert_black_curtain(current_completed_output);
+       } else {
+               ivi_layout_deactivate(ivi, app_id);
+       }
+
+       /* update the remote output */
+       surf->remote.output = ioutput;
+
+       if (surf->role != IVI_SURFACE_ROLE_REMOTE) {
+               wl_list_remove(&surf->link);
+               wl_list_init(&surf->link);
+
+               surf->role = IVI_SURFACE_ROLE_NONE;
+               ivi_set_desktop_surface_remote(surf);
+       }
+
+       shell_send_app_on_output(ivi, app_id, woutput->name);
+}
+
 static void
 shell_ext_destroy(struct wl_client *client, struct wl_resource *res)
 {
@@ -1712,6 +1780,7 @@ static const struct agl_shell_interface agl_shell_implementation = {
        .set_app_float = shell_set_app_float,
        .set_app_normal = shell_set_app_normal,
        .set_app_fullscreen = shell_set_app_fullscreen,
+       .set_app_output = shell_set_app_output,
 };
 
 static const struct agl_shell_ext_interface agl_shell_ext_implementation = {
@@ -2011,7 +2080,7 @@ int
 ivi_shell_create_global(struct ivi_compositor *ivi)
 {
        ivi->agl_shell = wl_global_create(ivi->compositor->wl_display,
-                                         &agl_shell_interface, 7,
+                                         &agl_shell_interface, 8,
                                          ivi, bind_agl_shell);
        if (!ivi->agl_shell) {
                weston_log("Failed to create wayland global.\n");