layout: Address all other callsites w/ dirty+surface damage

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

diff --git a/src/ivi-compositor.h b/src/ivi-compositor.h
index 50e516b..e89d215 100644 (file)
--- a/src/ivi-compositor.h
+++ b/src/ivi-compositor.h
@@ -54,6 +54,8 @@ struct ivi_compositor {
 
        bool init_failed;
        bool hide_cursor;
+       bool activate_by_default;
+       bool keep_pending_surfaces;
 
        /*
         * Options parsed from command line arugments.
@@ -96,6 +98,8 @@ struct ivi_compositor {
        struct wl_list split_pending_apps;
        struct wl_list remote_pending_apps;
 
+       struct wl_listener destroy_listener;
+
        struct weston_layer hidden;
        struct weston_layer background;
        struct weston_layer normal;
@@ -106,6 +110,14 @@ struct ivi_compositor {
 
 struct ivi_surface;
 
+enum ivi_output_type {
+       OUTPUT_LOCAL,
+       OUTPUT_REMOTE,
+       /* same as remote but we need to signal the transmitter plug-in
+        * for the surfaces to have to be forwarded to those remoted outputs */
+       OUTPUT_WALTHAM,
+};
+
 struct ivi_output {
        struct wl_list link; /* ivi_compositor.outputs */
        struct ivi_compositor *ivi;
@@ -144,6 +156,7 @@ struct ivi_output {
        struct weston_head *add[8];
 
        char *app_id;
+       enum ivi_output_type type;
 };
 
 enum ivi_surface_role {
@@ -230,6 +243,14 @@ enum ivi_surface_flags {
        IVI_SURFACE_PROP_POSITION = (1 << 1),
 };
 
+/* the waltham surface is a pointer type as well and
+ * in order to avoid adding ifdef for waltham use a
+ * generic pointer, which will be only be valid when the
+ * surface is a remote out on a waltham type of output */
+struct ivi_surface_waltham {
+       void *transmitter_surface;
+};
+
 struct ivi_surface {
        struct ivi_compositor *ivi;
        struct weston_desktop_surface *dsurface;
@@ -245,6 +266,7 @@ struct ivi_surface {
        } pending;
        bool activated_by_default;
        bool advertised_on_launch;
+       bool checked_pending;
 
        enum ivi_surface_role role;
        union {
@@ -257,6 +279,7 @@ struct ivi_surface {
                struct ivi_remote_surface remote;
        };
 
+       struct ivi_surface_waltham waltham_surface;
        struct wl_listener listener_advertise_app;
        struct wl_signal signal_advertise_app;
 };
@@ -397,4 +420,13 @@ ivi_seat_reset_caps_sent(struct ivi_compositor *ivi);
 void
 agl_shell_desktop_advertise_application_id(struct ivi_compositor *ivi,
                                           struct ivi_surface *surface);
+void
+ivi_destroy_waltham_destroy(struct ivi_surface *surface);
+
+bool
+ivi_check_pending_surface(struct ivi_surface *surface);
+
+void
+ivi_compositor_destroy_pending_surfaces(struct ivi_compositor *ivi);
+
 #endif