X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fivi-compositor.h;h=91b53405d3fd7a7f3c31013d57bc321415228a99;hb=1956bd3bfb0c85e3eb3413dd465a1a2fb1ae78bb;hp=65e06adca286704805aa853f5ab66a5f84ab8a6c;hpb=aa4ba5d283d641da25722af7a966c31d61a9686b;p=src%2Fagl-compositor.git

diff --git a/src/ivi-compositor.h b/src/ivi-compositor.h
index 65e06ad..91b5340 100644
--- a/src/ivi-compositor.h
+++ b/src/ivi-compositor.h
@@ -27,15 +27,22 @@
 #define IVI_COMPOSITOR_H
 
 #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 ivi_compositor;
+
+struct desktop_client {
+	struct wl_resource *resource;
+	struct ivi_compositor *ivi;
+	struct wl_list link;	/* ivi_compositor::desktop_clients */
+};
 
 struct ivi_compositor {
 	struct weston_compositor *compositor;
@@ -61,25 +68,34 @@ struct ivi_compositor {
 	const struct weston_drm_output_api *drm_api;
 
 	struct wl_global *agl_shell;
+	struct wl_global *agl_shell_desktop;
+	struct {
+		bool 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_desktop_surface.link */
+	struct wl_list surfaces; /* ivi_surface.link */
 
 	struct weston_desktop *desktop;
+	struct ivi_policy *policy;
 
 	struct wl_list pending_surfaces;
+	struct wl_list popup_pending_apps;
 
+	struct weston_layer hidden;
 	struct weston_layer background;
 	struct weston_layer normal;
 	struct weston_layer panel;
+	struct weston_layer popup;
 	struct weston_layer fullscreen;
-
-	struct wl_list shell_clients; /* ivi_shell_client.link */
 };
 
 struct ivi_surface;
@@ -99,6 +115,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;
 
 	/*
@@ -107,8 +129,8 @@ struct ivi_output {
 	 */
 	struct weston_geometry area;
 
-	//int32_t width;
-	//int32_t height;
+	struct ivi_surface *active;
+	struct ivi_surface *previous_active;
 
 	/* Temporary: only used during configuration */
 	size_t add_len;
@@ -120,21 +142,35 @@ enum ivi_surface_role {
 	IVI_SURFACE_ROLE_DESKTOP,
 	IVI_SURFACE_ROLE_BACKGROUND,
 	IVI_SURFACE_ROLE_PANEL,
+	IVI_SURFACE_ROLE_POPUP,
+};
+
+struct pending_popup {
+	struct ivi_output *ioutput;
+	char *app_id;
+	int x; int y;
+
+	struct wl_list link;	/** ivi_compositor::popup_pending_surfaces */
 };
 
 struct ivi_desktop_surface {
-	struct weston_view *view;
+	struct ivi_output *pending_output;
+	struct ivi_output *last_output;
 };
 
 struct ivi_background_surface {
 	struct ivi_output *output;
-	struct weston_view *view;
+};
+
+struct ivi_popup_surface {
+	struct ivi_output *output;
+	int x;
+	int y;
 };
 
 struct ivi_panel_surface {
 	struct ivi_output *output;
 	enum agl_shell_edge edge;
-	struct weston_view *view;
 };
 
 enum ivi_surface_flags {
@@ -146,6 +182,7 @@ enum ivi_surface_flags {
 struct ivi_surface {
 	struct ivi_compositor *ivi;
 	struct weston_desktop_surface *dsurface;
+	struct weston_view *view;
 
 	struct wl_list link;
 
@@ -154,14 +191,14 @@ struct ivi_surface {
 		int32_t x, y;
 		int32_t width, height;
 	} pending;
-
-	struct weston_geometry old_geom;
+	bool activated_by_default;
 
 	enum ivi_surface_role role;
 	union {
 		struct ivi_desktop_surface desktop;
 		struct ivi_background_surface bg;
 		struct ivi_panel_surface panel;
+		struct ivi_popup_surface popup;
 	};
 };
 
@@ -179,9 +216,22 @@ struct ivi_shell_client {
 struct ivi_compositor *
 to_ivi_compositor(struct weston_compositor *ec);
 
+#ifdef HAVE_SYSTEMD
+int
+ivi_agl_systemd_notify(struct ivi_compositor *ivi);
+#else
+static int
+ivi_agl_systemd_notify(struct ivi_compositor *ivi)
+{
+}
+#endif
+
 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);
 
@@ -200,6 +250,15 @@ to_ivi_output(struct weston_output *o);
 void
 ivi_set_desktop_surface(struct ivi_surface *surface);
 
+/*
+ * removes the pending popup one
+ */
+bool
+ivi_check_pending_desktop_surface_popup(struct ivi_surface *surface);
+
+void
+ivi_set_desktop_surface_popup(struct ivi_surface *surface);
+
 void
 ivi_reflow_outputs(struct ivi_compositor *ivi);
 
@@ -214,7 +273,28 @@ ivi_layout_set_position(struct ivi_surface *surface,
 			int32_t x, int32_t y,
 			int32_t width, int32_t height);
 
+struct ivi_surface *
+ivi_find_app(struct ivi_compositor *ivi, const char *app_id);
+
 void
 ivi_layout_commit(struct ivi_compositor *ivi);
 
+void
+ivi_layout_init(struct ivi_compositor *ivi, struct ivi_output *output);
+
+void
+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);
+
+void
+ivi_layout_popup_committed(struct ivi_surface *surface);
+
+void
+ivi_layout_deactivate(struct ivi_compositor *ivi, const char *app_id);
+
 #endif