X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fivi-compositor.h;h=463ae2b86b00d281ff1a84de6214ab0dbabe47f2;hb=refs%2Fchanges%2F69%2F28069%2F2;hp=3cca0a01a9c23370ab9ca56e8e4ac291a6a8b593;hpb=e8761762fcd03d3f561c0a0b761d609ded41c8c3;p=src%2Fagl-compositor.git

diff --git a/src/ivi-compositor.h b/src/ivi-compositor.h
index 3cca0a0..463ae2b 100644
--- a/src/ivi-compositor.h
+++ b/src/ivi-compositor.h
@@ -81,14 +81,26 @@ 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 */
@@ -155,6 +167,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;
@@ -347,7 +363,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 +499,8 @@ 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);
+
 #endif