src: Hold a reference for remoting_api in the ivi_compositor

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

diff --git a/src/ivi-compositor.h b/src/ivi-compositor.h
index 8631477..3b25915 100644 (file)
--- a/src/ivi-compositor.h
+++ b/src/ivi-compositor.h
@@ -34,12 +34,15 @@
 #include <libweston/windowed-output-api.h>
 #include <libweston-desktop/libweston-desktop.h>
 
+#include "remote.h"
+
 #include "agl-shell-server-protocol.h"
 
-#define ARRAY_LENGTH(x) (sizeof(x) / sizeof((x)[0]))
+struct ivi_compositor;
 
 struct desktop_client {
        struct wl_resource *resource;
+       struct ivi_compositor *ivi;
        struct wl_list link;    /* ivi_compositor::desktop_clients */
 };
 
@@ -65,12 +68,10 @@ struct ivi_compositor {
        } cmdline;
        const struct weston_windowed_output_api *window_api;
        const struct weston_drm_output_api *drm_api;
+       const struct weston_remoting_api *remoting_api;
 
        struct wl_global *agl_shell;
        struct wl_global *agl_shell_desktop;
-       struct {
-               int activate_apps_by_default;   /* switches once xdg top level has been 'created' */
-       } quirks;
 
        struct {
                struct wl_client *client;
@@ -84,13 +85,19 @@ struct ivi_compositor {
        struct wl_list surfaces; /* ivi_surface.link */
 
        struct weston_desktop *desktop;
+       struct ivi_policy *policy;
 
        struct wl_list pending_surfaces;
+       struct wl_list popup_pending_apps;
+       struct wl_list fullscreen_pending_apps;
+       struct wl_list split_pending_apps;
+       struct wl_list remote_pending_apps;
 
        struct weston_layer hidden;
        struct weston_layer background;
        struct weston_layer normal;
        struct weston_layer panel;
+       struct weston_layer popup;
        struct weston_layer fullscreen;
 };
 
@@ -124,12 +131,16 @@ struct ivi_output {
         * In output-coorrdinate space.
         */
        struct weston_geometry area;
+       struct weston_geometry area_saved;
 
        struct ivi_surface *active;
+       struct ivi_surface *previous_active;
 
        /* Temporary: only used during configuration */
        size_t add_len;
        struct weston_head *add[8];
+
+       char *app_id;
 };
 
 enum ivi_surface_role {
@@ -137,6 +148,38 @@ enum ivi_surface_role {
        IVI_SURFACE_ROLE_DESKTOP,
        IVI_SURFACE_ROLE_BACKGROUND,
        IVI_SURFACE_ROLE_PANEL,
+       IVI_SURFACE_ROLE_POPUP,
+       IVI_SURFACE_ROLE_FULLSCREEN,
+       IVI_SURFACE_ROLE_SPLIT_V,
+       IVI_SURFACE_ROLE_SPLIT_H,
+       IVI_SURFACE_ROLE_REMOTE,
+};
+
+struct pending_popup {
+       struct ivi_output *ioutput;
+       char *app_id;
+       int x; int y;
+
+       struct wl_list link;    /** ivi_compositor::popup_pending_surfaces */
+};
+
+struct pending_fullscreen {
+       struct ivi_output *ioutput;
+       char *app_id;
+       struct wl_list link;    /** ivi_compositor::fullscreen_pending_apps */
+};
+
+struct pending_split {
+       struct ivi_output *ioutput;
+       char *app_id;
+       uint32_t orientation;
+       struct wl_list link;    /** ivi_compositor::split_pending_apps */
+};
+
+struct pending_remote {
+       struct ivi_output *ioutput;
+       char *app_id;
+       struct wl_list link;    /** ivi_compositor::remote_pending_apps */
 };
 
 struct ivi_desktop_surface {
@@ -148,6 +191,25 @@ struct ivi_background_surface {
        struct ivi_output *output;
 };
 
+struct ivi_popup_surface {
+       struct ivi_output *output;
+       int x;
+       int y;
+};
+
+struct ivi_fullscreen_surface {
+       struct ivi_output *output;
+};
+
+struct ivi_split_surface {
+       struct ivi_output *output;
+       uint32_t orientation;
+};
+
+struct ivi_remote_surface {
+       struct ivi_output *output;
+};
+
 struct ivi_panel_surface {
        struct ivi_output *output;
        enum agl_shell_edge edge;
@@ -171,12 +233,17 @@ struct ivi_surface {
                int32_t x, y;
                int32_t width, height;
        } pending;
+       bool activated_by_default;
 
        enum ivi_surface_role role;
        union {
                struct ivi_desktop_surface desktop;
                struct ivi_background_surface bg;
                struct ivi_panel_surface panel;
+               struct ivi_popup_surface popup;
+               struct ivi_fullscreen_surface fullscreen;
+               struct ivi_split_surface split;
+               struct ivi_remote_surface remote;
        };
 };
 
@@ -228,6 +295,12 @@ to_ivi_output(struct weston_output *o);
 void
 ivi_set_desktop_surface(struct ivi_surface *surface);
 
+/*
+ * removes the pending popup one
+ */
+void
+ivi_check_pending_desktop_surface(struct ivi_surface *surface);
+
 void
 ivi_reflow_outputs(struct ivi_compositor *ivi);
 
@@ -242,6 +315,9 @@ ivi_layout_set_position(struct ivi_surface *surface,
                        int32_t x, int32_t y,
                        int32_t width, int32_t height);
 
+struct ivi_surface *
+ivi_find_app(struct ivi_compositor *ivi, const char *app_id);
+
 void
 ivi_layout_commit(struct ivi_compositor *ivi);
 
@@ -255,6 +331,31 @@ void
 ivi_layout_desktop_committed(struct ivi_surface *surf);
 
 void
-ivi_layout_panel_committed(struct ivi_surface *surface);
+ivi_layout_popup_committed(struct ivi_surface *surface);
+
+void
+ivi_layout_fullscreen_committed(struct ivi_surface *surface);
+
+void
+ivi_layout_split_committed(struct ivi_surface *surface);
+
+void
+ivi_layout_deactivate(struct ivi_compositor *ivi, const char *app_id);
+
+void
+ivi_layout_desktop_resize(struct ivi_surface *surface,
+                         struct weston_geometry area);
+
+struct ivi_output *
+ivi_layout_get_output_from_surface(struct ivi_surface *surf);
+
+void
+insert_black_surface(struct ivi_output *output);
+
+void
+remove_black_surface(struct ivi_output *output);
+
+const char *
+ivi_layout_get_surface_role_name(struct ivi_surface *surf);
 
 #endif