X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fivi-compositor.h;h=d6b6c8040ddd448aa397ad0618a21521dcaf5cf8;hb=7af3d3760c29157282348648d893af285b7efb34;hp=91b53405d3fd7a7f3c31013d57bc321415228a99;hpb=401773a463992f926086b178caff14dd55dbd148;p=src%2Fagl-compositor.git

diff --git a/src/ivi-compositor.h b/src/ivi-compositor.h
index 91b5340..d6b6c80 100644
--- a/src/ivi-compositor.h
+++ b/src/ivi-compositor.h
@@ -69,9 +69,6 @@ struct ivi_compositor {
 
 	struct wl_global *agl_shell;
 	struct wl_global *agl_shell_desktop;
-	struct {
-		bool activate_apps_by_default;	/* switches once xdg top level has been 'created' */
-	} quirks;
 
 	struct {
 		struct wl_client *client;
@@ -89,6 +86,9 @@ struct ivi_compositor {
 
 	struct wl_list pending_surfaces;
 	struct wl_list popup_pending_apps;
+	struct wl_list fullscreen_pending_apps;
+	struct wl_list split_pending_apps;
+	struct wl_list remote_pending_apps;
 
 	struct weston_layer hidden;
 	struct weston_layer background;
@@ -128,6 +128,7 @@ struct ivi_output {
 	 * In output-coorrdinate space.
 	 */
 	struct weston_geometry area;
+	struct weston_geometry area_saved;
 
 	struct ivi_surface *active;
 	struct ivi_surface *previous_active;
@@ -135,6 +136,8 @@ struct ivi_output {
 	/* Temporary: only used during configuration */
 	size_t add_len;
 	struct weston_head *add[8];
+
+	char *app_id;
 };
 
 enum ivi_surface_role {
@@ -143,6 +146,10 @@ enum ivi_surface_role {
 	IVI_SURFACE_ROLE_BACKGROUND,
 	IVI_SURFACE_ROLE_PANEL,
 	IVI_SURFACE_ROLE_POPUP,
+	IVI_SURFACE_ROLE_FULLSCREEN,
+	IVI_SURFACE_ROLE_SPLIT_V,
+	IVI_SURFACE_ROLE_SPLIT_H,
+	IVI_SURFACE_ROLE_REMOTE,
 };
 
 struct pending_popup {
@@ -153,6 +160,25 @@ struct pending_popup {
 	struct wl_list link;	/** ivi_compositor::popup_pending_surfaces */
 };
 
+struct pending_fullscreen {
+	struct ivi_output *ioutput;
+	char *app_id;
+	struct wl_list link;	/** ivi_compositor::fullscreen_pending_apps */
+};
+
+struct pending_split {
+	struct ivi_output *ioutput;
+	char *app_id;
+	uint32_t orientation;
+	struct wl_list link;	/** ivi_compositor::split_pending_apps */
+};
+
+struct pending_remote {
+	struct ivi_output *ioutput;
+	char *app_id;
+	struct wl_list link;    /** ivi_compositor::remote_pending_apps */
+};
+
 struct ivi_desktop_surface {
 	struct ivi_output *pending_output;
 	struct ivi_output *last_output;
@@ -168,6 +194,19 @@ struct ivi_popup_surface {
 	int y;
 };
 
+struct ivi_fullscreen_surface {
+	struct ivi_output *output;
+};
+
+struct ivi_split_surface {
+	struct ivi_output *output;
+	uint32_t orientation;
+};
+
+struct ivi_remote_surface {
+	struct ivi_output *output;
+};
+
 struct ivi_panel_surface {
 	struct ivi_output *output;
 	enum agl_shell_edge edge;
@@ -199,6 +238,9 @@ struct ivi_surface {
 		struct ivi_background_surface bg;
 		struct ivi_panel_surface panel;
 		struct ivi_popup_surface popup;
+		struct ivi_fullscreen_surface fullscreen;
+		struct ivi_split_surface split;
+		struct ivi_remote_surface remote;
 	};
 };
 
@@ -253,11 +295,8 @@ ivi_set_desktop_surface(struct ivi_surface *surface);
 /*
  * removes the pending popup one
  */
-bool
-ivi_check_pending_desktop_surface_popup(struct ivi_surface *surface);
-
 void
-ivi_set_desktop_surface_popup(struct ivi_surface *surface);
+ivi_check_pending_desktop_surface(struct ivi_surface *surface);
 
 void
 ivi_reflow_outputs(struct ivi_compositor *ivi);
@@ -289,12 +328,31 @@ void
 ivi_layout_desktop_committed(struct ivi_surface *surf);
 
 void
-ivi_layout_panel_committed(struct ivi_surface *surface);
+ivi_layout_popup_committed(struct ivi_surface *surface);
 
 void
-ivi_layout_popup_committed(struct ivi_surface *surface);
+ivi_layout_fullscreen_committed(struct ivi_surface *surface);
+
+void
+ivi_layout_split_committed(struct ivi_surface *surface);
 
 void
 ivi_layout_deactivate(struct ivi_compositor *ivi, const char *app_id);
 
+void
+ivi_layout_desktop_resize(struct ivi_surface *surface,
+			  struct weston_geometry area);
+
+struct ivi_output *
+ivi_layout_get_output_from_surface(struct ivi_surface *surf);
+
+void
+insert_black_surface(struct ivi_output *output);
+
+void
+remove_black_surface(struct ivi_output *output);
+
+const char *
+ivi_layout_get_surface_role_name(struct ivi_surface *surf);
+
 #endif