meson.build, src: update for weston 12

[src/agl-compositor.git] / src / ivi-compositor.h

diff --git a/src/ivi-compositor.h b/src/ivi-compositor.h
index 90ec4d9..693c6d1 100644 (file)
--- 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,20 @@ 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_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 +169,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 +253,7 @@ struct pending_app_tile {
        struct pending_app base;
        uint32_t orientation;
        uint32_t width;
+       int32_t sticky;
 };
 
 struct ivi_desktop_surface {
@@ -295,6 +306,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 +324,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;
@@ -544,6 +557,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, 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);
 
 #endif