X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fivi-compositor.h;h=7afb0c991f22f749438a18570eb59b8735f32c40;hb=7ec377fb843d18ac29cd756b5833d94185706602;hp=9f3cc4755f6807851407ca595bb0a0c5fda71fda;hpb=083ee3d2b88f49612dfab230990e54c3edbf3aef;p=src%2Fagl-compositor.git

diff --git a/src/ivi-compositor.h b/src/ivi-compositor.h
index 9f3cc47..7afb0c9 100644
--- a/src/ivi-compositor.h
+++ b/src/ivi-compositor.h
@@ -32,7 +32,7 @@
 #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,11 +51,21 @@ 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;
@@ -160,6 +170,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;
@@ -242,6 +253,8 @@ struct pending_app {
 struct pending_app_tile {
 	struct pending_app base;
 	uint32_t orientation;
+	uint32_t width;
+	int32_t sticky;
 };
 
 struct ivi_desktop_surface {
@@ -294,6 +307,7 @@ struct ivi_surface {
 	struct wl_list link;
 	int focus_count;
 	uint32_t orientation;
+	int32_t sticky;
 
 	struct {
 		enum ivi_surface_flags flags;
@@ -311,6 +325,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;
@@ -517,7 +532,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);
@@ -543,6 +561,9 @@ 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, bool to_activate);
+			     uint32_t orientation, uint32_t width, int32_t sticky,
+			     bool to_activate);
+struct ivi_output_config *
+ivi_init_parsed_options(struct weston_compositor *compositor);
 
 #endif