X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fivi-compositor.h;h=695cf95a8f8e6d8cfec3bbd7f535ecaa2d8cadea;hb=18e93caca8ad397d504215d673765871b2c88f25;hp=4c04ec79d10eae6be6b37072895466646f6b6389;hpb=ae3ef78cb1a01b690917eb8d93a3e68517a7a93d;p=src%2Fagl-compositor.git

diff --git a/src/ivi-compositor.h b/src/ivi-compositor.h
index 4c04ec7..695cf95 100644
--- a/src/ivi-compositor.h
+++ b/src/ivi-compositor.h
@@ -29,10 +29,11 @@
 #include <stdbool.h>
 #include "config.h"
 
+#include <weston.h>
 #include <libweston/backend-drm.h>
 #include <libweston/libweston.h>
 #include <libweston/windowed-output-api.h>
-#include <libweston-desktop/libweston-desktop.h>
+#include <libweston/desktop.h>
 
 #include "remote.h"
 
@@ -51,17 +52,29 @@ enum agl_shell_bound_status {
 	BOUND_FAILED,
 };
 
+struct ivi_output_config {
+	int width;
+	int height;
+	int32_t scale;
+	uint32_t transform;
+};
+
 struct ivi_compositor {
 	struct weston_compositor *compositor;
+	struct weston_backend *backend;
 	struct weston_config *config;
+	struct ivi_output_config *parsed_options;
 
 	struct wl_listener heads_changed;
+	int (*simple_output_configure)(struct weston_output *output);
 
 	bool init_failed;
 	bool disable_cursor;
 	bool activate_by_default;
 	bool keep_pending_surfaces;
 
+	struct wl_listener screenshot_auth;
+
 	/*
 	 * Options parsed from command line arugments.
 	 * Overrides what is found in the config file.
@@ -117,6 +130,8 @@ struct ivi_compositor {
 	struct wl_list split_pending_apps;
 	struct wl_list remote_pending_apps;
 
+	struct wl_list pending_apps;	/** pending_app::link */
+
 	struct wl_listener destroy_listener;
 	struct wl_listener transform_listener;
 	const struct weston_xwayland_surface_api *xwayland_surface_api;
@@ -158,6 +173,7 @@ struct ivi_output {
 	struct fullscreen_view {
 		struct ivi_surface *fs;
 		struct wl_listener fs_destroy;
+		struct weston_buffer_reference *buffer_ref;
 	} fullscreen_view;
 
 	struct wl_listener output_destroy;
@@ -194,6 +210,7 @@ enum ivi_surface_role {
 	IVI_SURFACE_ROLE_SPLIT_V,
 	IVI_SURFACE_ROLE_SPLIT_H,
 	IVI_SURFACE_ROLE_REMOTE,
+	IVI_SURFACE_ROLE_TILE,
 };
 
 struct ivi_bounding_box {
@@ -229,6 +246,20 @@ struct pending_remote {
 	struct wl_list link;    /** ivi_compositor::remote_pending_apps */
 };
 
+struct pending_app {
+	struct ivi_output *ioutput;
+	enum ivi_surface_role role;
+	char *app_id;
+	struct wl_list link;	/** ivi_compositor::pending_apps */
+};
+
+struct pending_app_tile {
+	struct pending_app base;
+	uint32_t orientation;
+	uint32_t width;
+	int32_t sticky;
+};
+
 struct ivi_desktop_surface {
 	struct ivi_output *pending_output;
 	struct ivi_output *last_output;
@@ -278,6 +309,8 @@ struct ivi_surface {
 
 	struct wl_list link;
 	int focus_count;
+	uint32_t orientation;
+	int32_t sticky;
 
 	struct {
 		enum ivi_surface_flags flags;
@@ -295,6 +328,7 @@ struct ivi_surface {
 	} state;
 
 	enum ivi_surface_role role;
+	enum ivi_surface_role prev_role;
 	union {
 		struct ivi_desktop_surface desktop;
 		struct ivi_background_surface bg;
@@ -501,7 +535,10 @@ 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);
+ivi_layout_restore(struct ivi_compositor *ivi, struct ivi_output *n_output);
+
+void
+ivi_layout_save(struct ivi_compositor *ivi, struct ivi_output *output);
 
 struct weston_output *
 get_default_output(struct weston_compositor *compositor);
@@ -522,4 +559,17 @@ parse_activation_area(const char *geometry, struct ivi_output *output);
 bool
 is_shell_surface_xwayland(struct ivi_surface *surf);
 
+void
+ivi_layout_reset_split_surfaces(struct ivi_compositor *ivi);
+
+void
+_ivi_set_shell_surface_split(struct ivi_surface *surface, struct ivi_output *output,
+			     uint32_t orientation, uint32_t width, int32_t sticky,
+			     bool to_activate);
+struct ivi_output_config *
+ivi_init_parsed_options(struct weston_compositor *compositor);
+
+void
+ivi_process_destroy(struct wet_process *process, int status, bool call_cleanup);
+
 #endif