src: weston_compositor_load_backend now returns backend

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

diff --git a/src/ivi-compositor.h b/src/ivi-compositor.h
index c5d9fc3..026df71 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,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;
@@ -97,6 +107,7 @@ struct ivi_compositor {
                struct wl_client *client;
                struct wl_resource *resource;
                bool doas_requested;
+               bool doas_requested_pending_bind;
                enum agl_shell_bound_status status;
        } shell_client_ext;
 
@@ -116,6 +127,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;
@@ -157,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;
@@ -193,6 +207,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 {
@@ -228,6 +243,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;
@@ -277,6 +306,8 @@ struct ivi_surface {
 
        struct wl_list link;
        int focus_count;
+       uint32_t orientation;
+       int32_t sticky;
 
        struct {
                enum ivi_surface_flags flags;
@@ -294,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;
@@ -518,4 +550,17 @@ ivi_surface_count_one(struct ivi_output *ivi_output,
 int
 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);
+
 #endif