X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fivi-compositor.h;h=6b6204e6969e30a1351117a01cd7947ec72a716f;hb=26700fa20abefccb77bb586b49b1629bf102e131;hp=0ccbb52ce5227dcc0d24cadcd7700fa60d2236d1;hpb=53a039ff1c4b05aaacce118a04563620e676d7c6;p=src%2Fagl-compositor.git

diff --git a/src/ivi-compositor.h b/src/ivi-compositor.h
index 0ccbb52..6b6204e 100644
--- a/src/ivi-compositor.h
+++ b/src/ivi-compositor.h
@@ -77,7 +77,6 @@ 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;
@@ -104,6 +103,7 @@ struct ivi_compositor {
 	struct wl_list desktop_clients;	/* desktop_client::link */
 
 	struct wl_list outputs; /* ivi_output.link */
+	struct wl_list saved_outputs; /* ivi_output.link */
 	struct wl_list surfaces; /* ivi_surface.link */
 
 	struct weston_desktop *desktop;
@@ -117,6 +117,8 @@ struct ivi_compositor {
 	struct wl_list remote_pending_apps;
 
 	struct wl_listener destroy_listener;
+	struct wl_listener transform_listener;
+	const struct weston_xwayland_surface_api *xwayland_surface_api;
 
 	struct weston_layer hidden;
 	struct weston_layer background;
@@ -125,6 +127,7 @@ struct ivi_compositor {
 	struct weston_layer popup;
 	struct weston_layer fullscreen;
 
+	bool need_ivi_output_relayout;
 	struct wl_list child_process_list;
 };
 
@@ -133,9 +136,6 @@ 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 {
@@ -267,13 +267,6 @@ 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;
@@ -311,9 +304,14 @@ 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 {
+		bool is_set;
+		int32_t x;
+		int32_t y;
+	} xwayland;
 };
 
 struct ivi_shell_seat {
@@ -414,6 +412,8 @@ ivi_layout_activate_by_surf(struct ivi_output *output, struct ivi_surface *surf)
 
 void
 ivi_layout_desktop_committed(struct ivi_surface *surf);
+void
+ivi_layout_remote_committed(struct ivi_surface *surf);
 
 void
 ivi_layout_popup_committed(struct ivi_surface *surface);
@@ -468,9 +468,6 @@ 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);
@@ -502,5 +499,26 @@ sigchld_handler(int signal_number, void *data);
 void
 shell_send_app_state(struct ivi_compositor *ivi, const char *app_id,
 		     enum agl_shell_app_state state);
+void
+ivi_layout_destroy_saved_outputs(struct ivi_compositor *ivi);
+
+struct weston_output *
+get_default_output(struct weston_compositor *compositor);
+
+struct weston_output *
+get_focused_output(struct weston_compositor *compositor);
+
+void
+shell_send_app_on_output(struct ivi_compositor *ivi, const char *app_id,
+			 const char *output_name);
+bool
+ivi_surface_count_one(struct ivi_output *ivi_output,
+		      enum ivi_surface_role role);
+
+int
+parse_activation_area(const char *geometry, struct ivi_output *output);
+
+bool
+is_shell_surface_xwayland(struct ivi_surface *surf);
 
 #endif