ivi-compositor: Use the helpers for array length

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

diff --git a/src/ivi-compositor.h b/src/ivi-compositor.h
index 5d210fb..446390d 100644 (file)
--- a/src/ivi-compositor.h
+++ b/src/ivi-compositor.h
@@ -29,14 +29,17 @@
 #include <stdbool.h>
 #include "config.h"
 
-#include <libweston-6/compositor-drm.h>
-#include <libweston-6/compositor.h>
-#include <libweston-6/windowed-output-api.h>
-#include <libweston-6/libweston-desktop.h>
+#include <libweston/backend-drm.h>
+#include <libweston/libweston.h>
+#include <libweston/windowed-output-api.h>
+#include <libweston-desktop/libweston-desktop.h>
 
 #include "agl-shell-server-protocol.h"
 
-#define ARRAY_LENGTH(x) (sizeof(x) / sizeof((x)[0]))
+struct desktop_client {
+       struct wl_resource *resource;
+       struct wl_list link;    /* ivi_compositor::desktop_clients */
+};
 
 struct ivi_compositor {
        struct weston_compositor *compositor;
@@ -62,6 +65,7 @@ struct ivi_compositor {
        const struct weston_drm_output_api *drm_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;
@@ -72,6 +76,8 @@ struct ivi_compositor {
                bool ready;
        } shell_client;
 
+       struct wl_list desktop_clients; /* desktop_client::link */
+
        struct wl_list outputs; /* ivi_output.link */
        struct wl_list surfaces; /* ivi_surface.link */