X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fivi-compositor.h;h=cb76d8cdae2f6adfa3a8afb0cb5a9ca9056ca679;hb=e7ccf51adc37748d3ca000109d16d0495dc0a7e8;hp=30b05e3e4c77daf50c06d9f4d66415af00e3e463;hpb=0ed8064b0de235fa21fb961f0a8789e11ad7f1a4;p=src%2Fagl-compositor.git

diff --git a/src/ivi-compositor.h b/src/ivi-compositor.h
index 30b05e3..cb76d8c 100644
--- a/src/ivi-compositor.h
+++ b/src/ivi-compositor.h
@@ -51,11 +51,20 @@ enum agl_shell_bound_status {
 	BOUND_FAILED,
 };
 
+struct ivi_output_config {
+	int width;
+	int height;
+	int32_t scale;
+	uint32_t transform;
+};
+
 struct ivi_compositor {
 	struct weston_compositor *compositor;
 	struct weston_config *config;
+	struct ivi_output_config *parsed_options;
 
 	struct wl_listener heads_changed;
+	int (*simple_output_configure)(struct weston_output *output);
 
 	bool init_failed;
 	bool disable_cursor;
@@ -97,6 +106,7 @@ struct ivi_compositor {
 		struct wl_client *client;
 		struct wl_resource *resource;
 		bool doas_requested;
+		bool doas_requested_pending_bind;
 		enum agl_shell_bound_status status;
 	} shell_client_ext;
 
@@ -116,7 +126,11 @@ struct ivi_compositor {
 	struct wl_list split_pending_apps;
 	struct wl_list remote_pending_apps;
 
+	struct wl_list pending_apps;	/** pending_app::link */
+
 	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;
@@ -191,6 +205,7 @@ enum ivi_surface_role {
 	IVI_SURFACE_ROLE_SPLIT_V,
 	IVI_SURFACE_ROLE_SPLIT_H,
 	IVI_SURFACE_ROLE_REMOTE,
+	IVI_SURFACE_ROLE_TILE,
 };
 
 struct ivi_bounding_box {
@@ -226,6 +241,20 @@ struct pending_remote {
 	struct wl_list link;    /** ivi_compositor::remote_pending_apps */
 };
 
+struct pending_app {
+	struct ivi_output *ioutput;
+	enum ivi_surface_role role;
+	char *app_id;
+	struct wl_list link;	/** ivi_compositor::pending_apps */
+};
+
+struct pending_app_tile {
+	struct pending_app base;
+	uint32_t orientation;
+	uint32_t width;
+	int32_t sticky;
+};
+
 struct ivi_desktop_surface {
 	struct ivi_output *pending_output;
 	struct ivi_output *last_output;
@@ -275,6 +304,8 @@ struct ivi_surface {
 
 	struct wl_list link;
 	int focus_count;
+	uint32_t orientation;
+	int32_t sticky;
 
 	struct {
 		enum ivi_surface_flags flags;
@@ -292,6 +323,7 @@ struct ivi_surface {
 	} state;
 
 	enum ivi_surface_role role;
+	enum ivi_surface_role prev_role;
 	union {
 		struct ivi_desktop_surface desktop;
 		struct ivi_background_surface bg;
@@ -304,6 +336,12 @@ struct ivi_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 {
@@ -507,4 +545,18 @@ 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);
+
+void
+ivi_layout_reset_split_surfaces(struct ivi_compositor *ivi);
+
+void
+_ivi_set_shell_surface_split(struct ivi_surface *surface, struct ivi_output *output,
+			     uint32_t orientation, uint32_t width, int32_t sticky,
+			     bool to_activate);
+
 #endif