X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fivi-compositor.h;h=446390dad368cbee3df2549630b3e7dbf4a7cd2c;hb=3b38187d416182306e0533f17a6129a45a168f14;hp=68cbbdfd0ab687f20d900a2b52f5b5677983d352;hpb=ffd00ab3a05351bac2124e5eba8a66f20a3b62da;p=src%2Fagl-compositor.git

diff --git a/src/ivi-compositor.h b/src/ivi-compositor.h
index 68cbbdf..446390d 100644
--- 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,12 +65,19 @@ 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;
+
 	struct {
 		struct wl_client *client;
 		struct wl_resource *resource;
 		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 */
 
@@ -99,6 +109,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;
 
 	/*
@@ -123,6 +139,7 @@ enum ivi_surface_role {
 
 struct ivi_desktop_surface {
 	struct ivi_output *pending_output;
+	struct ivi_output *last_output;
 };
 
 struct ivi_background_surface {
@@ -188,6 +205,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);
 
@@ -232,4 +252,7 @@ ivi_layout_activate(struct ivi_output *output, const char *app_id);
 void
 ivi_layout_desktop_committed(struct ivi_surface *surf);
 
+void
+ivi_layout_panel_committed(struct ivi_surface *surface);
+
 #endif