X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fivi-compositor.h;h=41978eac8a1b58cbcfd6ef510f62847675a0bca7;hb=2551d6f12194a07955dca2a21f3af33bab39c11e;hp=bf96fc7d60bab92e377bc7c1a142aaef11230edc;hpb=924473ef016ba8dcfa863861740be2289421313d;p=src%2Fagl-compositor.git

diff --git a/src/ivi-compositor.h b/src/ivi-compositor.h
index bf96fc7..41978ea 100644
--- a/src/ivi-compositor.h
+++ b/src/ivi-compositor.h
@@ -58,7 +58,7 @@ struct ivi_compositor {
 	struct wl_listener heads_changed;
 
 	bool init_failed;
-	bool hide_cursor;
+	bool disable_cursor;
 	bool activate_by_default;
 	bool keep_pending_surfaces;
 
@@ -81,17 +81,30 @@ struct ivi_compositor {
 
 	struct wl_global *agl_shell;
 	struct wl_global *agl_shell_desktop;
+	struct wl_global *agl_shell_ext;
 
 	struct {
 		struct wl_client *client;
 		struct wl_resource *resource;
+
+		/* this is for another agl-shell client, potentially used by
+		 * the grpc-proxy */
+		struct wl_resource *resource_ext;
 		bool ready;
 		enum agl_shell_bound_status status;
 	} shell_client;
 
+	struct {
+		struct wl_client *client;
+		struct wl_resource *resource;
+		bool doas_requested;
+		enum agl_shell_bound_status status;
+	} shell_client_ext;
+
 	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;
@@ -105,6 +118,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;
@@ -113,6 +128,7 @@ struct ivi_compositor {
 	struct weston_layer popup;
 	struct weston_layer fullscreen;
 
+	bool need_ivi_output_relayout;
 	struct wl_list child_process_list;
 };
 
@@ -167,7 +183,7 @@ struct ivi_output {
 	size_t add_len;
 	struct weston_head *add[8];
 
-	char *app_id;
+	char *app_ids;
 	enum ivi_output_type type;
 };
 
@@ -302,13 +318,19 @@ struct ivi_surface {
 	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 {
 	struct weston_seat *seat;
 	struct weston_surface *focused_surface;
 
-	bool hide_cursor;
+	bool disable_cursor;
 	bool new_caps_sent;
 
 	struct wl_listener seat_destroy_listener;
@@ -351,7 +373,7 @@ int
 ivi_shell_create_global(struct ivi_compositor *ivi);
 
 int
-ivi_launch_shell_client(struct ivi_compositor *ivi);
+ivi_launch_shell_client(struct ivi_compositor *ivi, const char *cmd_section, struct wl_client **client);
 
 int
 ivi_desktop_init(struct ivi_compositor *ivi);
@@ -402,6 +424,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);
@@ -487,4 +511,23 @@ ivi_shell_activate_surface(struct ivi_surface *ivi_surf,
 int
 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);
+
 #endif