X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fivi-compositor.h;h=5a0f66cddfffc0bc0741f0beacfe99b85121c294;hb=14a1292a393774727fb85662d98d8cbe4bc6e5cd;hp=78d1acd0b6d96b02a6fe789479082e30bc3a7f29;hpb=89440e0ffdfea2568d49e95465464cfc5c1d92ff;p=src%2Fagl-compositor.git

diff --git a/src/ivi-compositor.h b/src/ivi-compositor.h
index 78d1acd..5a0f66c 100644
--- a/src/ivi-compositor.h
+++ b/src/ivi-compositor.h
@@ -46,6 +46,11 @@ struct desktop_client {
 	struct wl_list link;	/* ivi_compositor::desktop_clients */
 };
 
+enum agl_shell_bound_status {
+	BOUND_OK,
+	BOUND_FAILED,
+};
+
 struct ivi_compositor {
 	struct weston_compositor *compositor;
 	struct weston_config *config;
@@ -76,13 +81,24 @@ 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;
+
+		struct wl_client *client_ext;
+		struct wl_resource *resource_ext;
 		bool ready;
+		enum agl_shell_bound_status status;
 	} shell_client;
 
+	struct {
+		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 */
@@ -106,6 +122,8 @@ struct ivi_compositor {
 	struct weston_layer panel;
 	struct weston_layer popup;
 	struct weston_layer fullscreen;
+
+	struct wl_list child_process_list;
 };
 
 struct ivi_surface;
@@ -147,6 +165,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;
@@ -255,6 +277,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;
@@ -409,10 +433,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);
@@ -467,5 +494,7 @@ 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);
 
 #endif