X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fivi-compositor.h;h=c9258d1750396c7b20119acd0c6593744c1e0720;hb=17f92b23b99d6c34793b6b636dc4d508113f0489;hp=50e516b5dd5c2c7b30f54b23d1c8ac58cb626e5a;hpb=a30af04e6f81514149ef589ecfe71ec80c34e10a;p=src%2Fagl-compositor.git

diff --git a/src/ivi-compositor.h b/src/ivi-compositor.h
index 50e516b..c9258d1 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.
@@ -96,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;
@@ -106,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;
@@ -135,6 +147,10 @@ struct ivi_output {
 	 */
 	struct weston_geometry area;
 	struct weston_geometry area_saved;
+	/*
+	 * Potential user-specified non-default activation area
+	 */
+	struct weston_geometry area_activation;
 
 	struct ivi_surface *active;
 	struct ivi_surface *previous_active;
@@ -144,6 +160,7 @@ struct ivi_output {
 	struct weston_head *add[8];
 
 	char *app_id;
+	enum ivi_output_type type;
 };
 
 enum ivi_surface_role {
@@ -230,6 +247,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;
@@ -243,8 +268,15 @@ 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,
+		HIDDEN,
+	} state;
 
 	enum ivi_surface_role role;
 	union {
@@ -257,10 +289,24 @@ struct ivi_surface {
 		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_seat {
+	struct weston_seat *seat;
+	struct weston_surface *focused_surface;
+
+	bool hide_cursor;
+	bool new_caps_sent;
+
+	struct wl_listener seat_destroy_listener;
+	struct wl_listener caps_changed_listener;
+	struct wl_listener keyboard_focus_listener;
+	struct wl_listener pointer_focus_listener;
+};
+
 struct ivi_shell_client {
 	struct wl_list link;
 	char *command;
@@ -397,4 +443,33 @@ 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);
+
+struct ivi_surface *
+get_ivi_shell_surface(struct weston_surface *surface);
+
+struct ivi_shell_seat *
+get_ivi_shell_seat(struct weston_seat *seat);
+
+struct weston_seat *
+get_ivi_shell_weston_first_seat(struct ivi_compositor *ivi);
+
+void
+ivi_shell_activate_surface(struct ivi_surface *ivi_surf,
+                          struct ivi_shell_seat *ivi_seat,
+                          uint32_t flags);
+
 #endif