X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fivi-compositor.h;h=3d853e2609bd9770239659db37a1627c78ee0213;hb=b4a52c732dbf3863bd22535077a2506538f9a8ce;hp=4708b5d89bf8e006a09619f581add392b1bca0b9;hpb=3ba840cd3a5a2fa1966b01ef286de0347e64aa46;p=src%2Fagl-compositor.git

diff --git a/src/ivi-compositor.h b/src/ivi-compositor.h
index 4708b5d..3d853e2 100644
--- a/src/ivi-compositor.h
+++ b/src/ivi-compositor.h
@@ -54,6 +54,8 @@ struct ivi_compositor {
 
 	bool init_failed;
 	bool hide_cursor;
+	bool activate_by_default;
+	bool keep_pending_surfaces;
 
 	/*
 	 * Options parsed from command line arugments.
@@ -70,6 +72,7 @@ struct ivi_compositor {
 	const struct weston_windowed_output_api *window_api;
 	const struct weston_drm_output_api *drm_api;
 	const struct weston_remoting_api *remoting_api;
+	const struct weston_transmitter_api *waltham_transmitter_api;
 
 	struct wl_global *agl_shell;
 	struct wl_global *agl_shell_desktop;
@@ -95,6 +98,8 @@ struct ivi_compositor {
 	struct wl_list split_pending_apps;
 	struct wl_list remote_pending_apps;
 
+	struct wl_listener destroy_listener;
+
 	struct weston_layer hidden;
 	struct weston_layer background;
 	struct weston_layer normal;
@@ -105,6 +110,14 @@ struct ivi_compositor {
 
 struct ivi_surface;
 
+enum ivi_output_type {
+	OUTPUT_LOCAL,
+	OUTPUT_REMOTE,
+	/* same as remote but we need to signal the transmitter plug-in
+	 * for the surfaces to have to be forwarded to those remoted outputs */
+	OUTPUT_WALTHAM,
+};
+
 struct ivi_output {
 	struct wl_list link; /* ivi_compositor.outputs */
 	struct ivi_compositor *ivi;
@@ -143,6 +156,7 @@ struct ivi_output {
 	struct weston_head *add[8];
 
 	char *app_id;
+	enum ivi_output_type type;
 };
 
 enum ivi_surface_role {
@@ -229,6 +243,14 @@ enum ivi_surface_flags {
 	IVI_SURFACE_PROP_POSITION = (1 << 1),
 };
 
+/* the waltham surface is a pointer type as well and
+ * in order to avoid adding ifdef for waltham use a
+ * generic pointer, which will be only be valid when the
+ * surface is a remote out on a waltham type of output */
+struct ivi_surface_waltham {
+	void *transmitter_surface;
+};
+
 struct ivi_surface {
 	struct ivi_compositor *ivi;
 	struct weston_desktop_surface *dsurface;
@@ -242,7 +264,14 @@ struct ivi_surface {
 		int32_t x, y;
 		int32_t width, height;
 	} pending;
-	bool activated_by_default;
+	bool mapped;
+	bool advertised_on_launch;
+	bool checked_pending;
+	enum {
+		NORMAL,
+		RESIZING,
+		FULLSCREEN,
+	} state;
 
 	enum ivi_surface_role role;
 	union {
@@ -254,6 +283,10 @@ struct ivi_surface {
 		struct ivi_split_surface split;
 		struct ivi_remote_surface remote;
 	};
+
+	struct ivi_surface_waltham waltham_surface;
+	struct wl_listener listener_advertise_app;
+	struct wl_signal signal_advertise_app;
 };
 
 struct ivi_shell_client {
@@ -389,4 +422,22 @@ ivi_seat_init(struct ivi_compositor *ivi);
 void
 ivi_seat_reset_caps_sent(struct ivi_compositor *ivi);
 
+void
+agl_shell_desktop_advertise_application_id(struct ivi_compositor *ivi,
+					   struct ivi_surface *surface);
+void
+ivi_destroy_waltham_destroy(struct ivi_surface *surface);
+
+void
+ivi_check_pending_surface_desktop(struct ivi_surface *surface,
+				  enum ivi_surface_role *role);
+
+struct ivi_output *
+ivi_layout_find_bg_output(struct ivi_compositor *ivi);
+void
+ivi_compositor_destroy_pending_surfaces(struct ivi_compositor *ivi);
+
+void
+ivi_shell_finalize(struct ivi_compositor *ivi);
+
 #endif