X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fivi-compositor.h;h=189cd8cc443c7caff4895f065ab60beba149bc06;hb=681f5df234921e989606eefc6e293f37883bb22e;hp=53e09a3ac2b9442e38c091ec48a2e14188b3fcce;hpb=168261297ce8d6e17ca69eb1de4d0e98de52eedc;p=src%2Fagl-compositor.git

diff --git a/src/ivi-compositor.h b/src/ivi-compositor.h
index 53e09a3..189cd8c 100644
--- a/src/ivi-compositor.h
+++ b/src/ivi-compositor.h
@@ -53,6 +53,7 @@ struct ivi_compositor {
 	struct wl_listener heads_changed;
 
 	bool init_failed;
+	bool hide_cursor;
 
 	/*
 	 * Options parsed from command line arugments.
@@ -69,6 +70,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;
@@ -85,6 +87,7 @@ struct ivi_compositor {
 	struct wl_list surfaces; /* ivi_surface.link */
 
 	struct weston_desktop *desktop;
+	struct wl_listener seat_created_listener;
 	struct ivi_policy *policy;
 
 	struct wl_list pending_surfaces;
@@ -103,6 +106,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;
@@ -141,6 +152,7 @@ struct ivi_output {
 	struct weston_head *add[8];
 
 	char *app_id;
+	enum ivi_output_type type;
 };
 
 enum ivi_surface_role {
@@ -155,10 +167,16 @@ enum ivi_surface_role {
 	IVI_SURFACE_ROLE_REMOTE,
 };
 
+struct ivi_bounding_box {
+	int x; int y;
+	int width; int height;
+};
+
 struct pending_popup {
 	struct ivi_output *ioutput;
 	char *app_id;
 	int x; int y;
+	struct ivi_bounding_box bb;
 
 	struct wl_list link;	/** ivi_compositor::popup_pending_surfaces */
 };
@@ -193,8 +211,8 @@ struct ivi_background_surface {
 
 struct ivi_popup_surface {
 	struct ivi_output *output;
-	int x;
-	int y;
+	int x; int y; /* initial position */
+	struct ivi_bounding_box bb;	/* bounding box */
 };
 
 struct ivi_fullscreen_surface {
@@ -221,12 +239,21 @@ 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;
 	struct weston_view *view;
 
 	struct wl_list link;
+	int focus_count;
 
 	struct {
 		enum ivi_surface_flags flags;
@@ -234,6 +261,7 @@ struct ivi_surface {
 		int32_t width, height;
 	} pending;
 	bool activated_by_default;
+	bool advertised_on_launch;
 
 	enum ivi_surface_role role;
 	union {
@@ -245,6 +273,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 {
@@ -327,6 +359,9 @@ 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_activate_by_surf(struct ivi_output *output, struct ivi_surface *surf);
+
 void
 ivi_layout_desktop_committed(struct ivi_surface *surf);
 
@@ -365,4 +400,21 @@ ivi_set_pending_desktop_surface_remote(struct ivi_output *ioutput,
 struct ivi_output *
 ivi_layout_find_with_app_id(const char *app_id, struct ivi_compositor *ivi);
 
+void
+shell_advertise_app_state(struct ivi_compositor *ivi, const char *app_id,
+			  const char *data, uint32_t app_state);
+void
+ivi_screenshooter_create(struct ivi_compositor *ivi);
+
+void
+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);
 #endif