X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fivi-compositor.h;h=ed56c7f5d94def2288ad1bbcecd81abfc1a11c21;hb=refs%2Fchanges%2F05%2F28505%2F1;hp=3cca0a01a9c23370ab9ca56e8e4ac291a6a8b593;hpb=e8761762fcd03d3f561c0a0b761d609ded41c8c3;p=src%2Fagl-compositor.git

diff --git a/src/ivi-compositor.h b/src/ivi-compositor.h
index 3cca0a0..ed56c7f 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;
@@ -113,6 +126,7 @@ struct ivi_compositor {
 	struct weston_layer popup;
 	struct weston_layer fullscreen;
 
+	bool need_ivi_output_relayout;
 	struct wl_list child_process_list;
 };
 
@@ -155,6 +169,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;
@@ -163,7 +181,7 @@ struct ivi_output {
 	size_t add_len;
 	struct weston_head *add[8];
 
-	char *app_id;
+	char *app_ids;
 	enum ivi_output_type type;
 };
 
@@ -304,7 +322,7 @@ 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;
@@ -347,7 +365,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);
@@ -483,4 +501,10 @@ 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);
+
 #endif