X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fivi-compositor.h;h=f755e672e1269397b2b86af97c784807773b44df;hb=refs%2Fchanges%2F73%2F28573%2F1;hp=dff11b9ac9195a349363a89670c3e75fa1b8d615;hpb=3e72564852a6f34120311091d1208f61bcd641f4;p=src%2Fagl-compositor.git

diff --git a/src/ivi-compositor.h b/src/ivi-compositor.h
index dff11b9..f755e67 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;
@@ -112,6 +125,9 @@ struct ivi_compositor {
 	struct weston_layer panel;
 	struct weston_layer popup;
 	struct weston_layer fullscreen;
+
+	bool need_ivi_output_relayout;
+	struct wl_list child_process_list;
 };
 
 struct ivi_surface;
@@ -153,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;
@@ -161,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;
 };
 
@@ -261,6 +281,8 @@ struct ivi_surface {
 	struct ivi_compositor *ivi;
 	struct weston_desktop_surface *dsurface;
 	struct weston_view *view;
+	struct ivi_output *hidden_layer_output;
+	struct ivi_output *current_completed_output;
 
 	struct wl_list link;
 	int focus_count;
@@ -300,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;
@@ -343,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);
@@ -415,10 +437,13 @@ struct ivi_output *
 ivi_layout_get_output_from_surface(struct ivi_surface *surf);
 
 void
-insert_black_surface(struct ivi_output *output);
+insert_black_curtain(struct ivi_output *output);
 
 void
-remove_black_surface(struct ivi_output *output);
+remove_black_curtain(struct ivi_output *output);
+
+bool
+output_has_black_curtain(struct ivi_output *output);
 
 const char *
 ivi_layout_get_surface_role_name(struct ivi_surface *surf);
@@ -473,5 +498,19 @@ void
 ivi_shell_activate_surface(struct ivi_surface *ivi_surf,
                           struct ivi_shell_seat *ivi_seat,
                           uint32_t flags);
+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);
 
 #endif