X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fivi-compositor.h;h=cd7cbdd6330500117a6d902dbac15595c643aae4;hb=79dacfa4f3d3093df3155ee0633837a5836899c9;hp=5d210fb0b4179fc7aeb0fbbd7239560b3e1999dd;hpb=b43a012824af0165f3716c7986888213420885aa;p=src%2Fagl-compositor.git

diff --git a/src/ivi-compositor.h b/src/ivi-compositor.h
index 5d210fb..cd7cbdd 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,8 +65,9 @@ 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' */
+		bool activate_apps_by_default;	/* switches once xdg top level has been 'created' */
 	} quirks;
 
 	struct {
@@ -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;
 
@@ -163,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 {