layout: Mark activated surface by default

[src/agl-compositor.git] / src / ivi-compositor.h

diff --git a/src/ivi-compositor.h b/src/ivi-compositor.h
index 47e20a3..dab9fa6 100644 (file)
--- a/src/ivi-compositor.h
+++ b/src/ivi-compositor.h
@@ -29,14 +29,17 @@
 #include <stdbool.h>
 #include "config.h"
 
-#include <libweston-6/compositor-drm.h>
-#include <libweston-6/compositor.h>
-#include <libweston-6/windowed-output-api.h>
-#include <libweston-6/libweston-desktop.h>
+#include <libweston/backend-drm.h>
+#include <libweston/libweston.h>
+#include <libweston/windowed-output-api.h>
+#include <libweston-desktop/libweston-desktop.h>
 
 #include "agl-shell-server-protocol.h"
 
-#define ARRAY_LENGTH(x) (sizeof(x) / sizeof((x)[0]))
+struct desktop_client {
+       struct wl_resource *resource;
+       struct wl_list link;    /* ivi_compositor::desktop_clients */
+};
 
 struct ivi_compositor {
        struct weston_compositor *compositor;
@@ -62,6 +65,7 @@ struct ivi_compositor {
        const struct weston_drm_output_api *drm_api;
 
        struct wl_global *agl_shell;
+       struct wl_global *agl_shell_desktop;
        struct {
                int activate_apps_by_default;   /* switches once xdg top level has been 'created' */
        } quirks;
@@ -72,10 +76,13 @@ struct ivi_compositor {
                bool ready;
        } shell_client;
 
+       struct wl_list desktop_clients; /* desktop_client::link */
+
        struct wl_list outputs; /* ivi_output.link */
        struct wl_list surfaces; /* ivi_surface.link */
 
        struct weston_desktop *desktop;
+       struct ivi_policy *policy;
 
        struct wl_list pending_surfaces;
 
@@ -103,6 +110,12 @@ struct ivi_output {
        struct ivi_surface *left;
        struct ivi_surface *right;
 
+       /* for the black surface */
+       struct fullscreen_view {
+               struct ivi_surface *fs;
+               struct wl_listener fs_destroy;
+       } fullscreen_view;
+
        struct wl_listener output_destroy;
 
        /*
@@ -127,6 +140,7 @@ enum ivi_surface_role {
 
 struct ivi_desktop_surface {
        struct ivi_output *pending_output;
+       struct ivi_output *last_output;
 };
 
 struct ivi_background_surface {
@@ -156,6 +170,7 @@ struct ivi_surface {
                int32_t x, y;
                int32_t width, height;
        } pending;
+       bool activated_by_default;
 
        enum ivi_surface_role role;
        union {
@@ -192,6 +207,9 @@ ivi_agl_systemd_notify(struct ivi_compositor *ivi)
 int
 ivi_shell_init(struct ivi_compositor *ivi);
 
+void
+ivi_shell_init_black_fs(struct ivi_compositor *ivi);
+
 int
 ivi_shell_create_global(struct ivi_compositor *ivi);