X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fivi-compositor.h;h=1303e44a608a4405663801c5a586f1bf520a46ea;hb=d2510f1e79e501a8e6aecb8058746a7456d1367e;hp=90ec4d92eb4e466b2971dd7afa9fa92149c6aafe;hpb=3d6199ee18b4807a82c4181d829052029d1ba350;p=src%2Fagl-compositor.git

diff --git a/src/ivi-compositor.h b/src/ivi-compositor.h
index 90ec4d9..1303e44 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,11 +52,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 +171,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;
@@ -243,6 +255,7 @@ struct pending_app_tile {
 	struct pending_app base;
 	uint32_t orientation;
 	uint32_t width;
+	int32_t sticky;
 };
 
 struct ivi_desktop_surface {
@@ -295,6 +308,7 @@ struct ivi_surface {
 	struct wl_list link;
 	int focus_count;
 	uint32_t orientation;
+	int32_t sticky;
 
 	struct {
 		enum ivi_surface_flags flags;
@@ -312,6 +326,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;
@@ -518,7 +533,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);
@@ -544,6 +562,12 @@ 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, 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);
+
+void
+ivi_process_destroy(struct wet_process *process, int status, bool call_cleanup);
 
 #endif