X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwayland.hpp;h=96b0199f4ee15b12ca1a640c9daa6da9c2547bfb;hb=8c712205657ceceb8644065735b5fff06bedfbb5;hp=c47e2182617774a2a73ecd98588d75a5ad87c3cf;hpb=4bfc9ea5a9a5598aceb4e3e43fd2ade99d789200;p=staging%2Fwindowmanager.git

diff --git a/src/wayland.hpp b/src/wayland.hpp
index c47e218..96b0199 100644
--- a/src/wayland.hpp
+++ b/src/wayland.hpp
@@ -22,10 +22,9 @@ struct wayland_proxy {
    wayland_proxy(wayland_proxy const &) = delete;
    wayland_proxy &operator=(wayland_proxy const &) = delete;
    wayland_proxy(void *p)
-      : wayland_proxy(p, [](ProxyT *p) {
-           wl_proxy_destroy(reinterpret_cast<struct wl_proxy *>(p));
-        }) {}
-   wayland_proxy(void *p, std::function<void(ProxyT *)> p_del)
+      : wayland_proxy(p,
+                      reinterpret_cast<void (*)(ProxyT *)>(wl_proxy_destroy)) {}
+   wayland_proxy(void *p, std::function<void(ProxyT *)> &&p_del)
       : proxy(std::unique_ptr<ProxyT, std::function<void(ProxyT *)>>(
            static_cast<ProxyT *>(p), p_del)) {}
 };
@@ -249,6 +248,8 @@ struct controller : public wayland_proxy<struct ivi_controller> {
 
    size output_size;
 
+   void debug_dump_current_status();
+
    void add_proxy_to_id_mapping(struct ivi_controller_surface *p, uint32_t id);
    void remove_proxy_to_id_mapping(struct ivi_controller_surface *p);
    void add_proxy_to_id_mapping(struct ivi_controller_layer *p, uint32_t id);
@@ -278,33 +279,33 @@ struct controller : public wayland_proxy<struct ivi_controller> {
                          int32_t error_code, char const *error_text);
 
    // surface
-   void surface_visibility(uint32_t id, int32_t visibility);
-   void surface_opacity(uint32_t id, float opacity);
-   void surface_source_rectangle(uint32_t id, int32_t x, int32_t y,
+   void surface_visibility(struct surface *s, int32_t visibility);
+   void surface_opacity(struct surface *s, float opacity);
+   void surface_source_rectangle(struct surface *s, int32_t x, int32_t y,
                                  int32_t width, int32_t height);
-   void surface_destination_rectangle(uint32_t id, int32_t x, int32_t y,
+   void surface_destination_rectangle(struct surface *s, int32_t x, int32_t y,
                                       int32_t width, int32_t height);
-   void surface_configuration(uint32_t id, int32_t width, int32_t height);
-   void surface_orientation(uint32_t id, int32_t orientation);
-   void surface_pixelformat(uint32_t id, int32_t pixelformat);
-   void surface_layer(uint32_t id, struct ivi_controller_layer *layer);
-   void surface_stats(uint32_t id, uint32_t redraw_count, uint32_t frame_count,
+   void surface_configuration(struct surface *s, int32_t width, int32_t height);
+   void surface_orientation(struct surface *s, int32_t orientation);
+   void surface_pixelformat(struct surface *s, int32_t pixelformat);
+   void surface_layer(struct surface *s, struct ivi_controller_layer *layer);
+   void surface_stats(struct surface *s, uint32_t redraw_count, uint32_t frame_count,
                       uint32_t update_count, uint32_t pid,
                       const char *process_name);
-   void surface_destroyed(uint32_t id);
-   void surface_content(uint32_t id, int32_t content_state);
+   void surface_destroyed(struct surface *s);
+   void surface_content(struct surface *s, int32_t content_state);
 
    // layer
-   void layer_visibility(uint32_t id, int32_t visibility);
-   void layer_opacity(uint32_t id, float opacity);
-   void layer_source_rectangle(uint32_t id, int32_t x, int32_t y, int32_t width,
+   void layer_visibility(struct layer *l, int32_t visibility);
+   void layer_opacity(struct layer *l, float opacity);
+   void layer_source_rectangle(struct layer *l, int32_t x, int32_t y, int32_t width,
                                int32_t height);
-   void layer_destination_rectangle(uint32_t id, int32_t x, int32_t y,
+   void layer_destination_rectangle(struct layer *l, int32_t x, int32_t y,
                                     int32_t width, int32_t height);
-   void layer_configuration(uint32_t id, int32_t width, int32_t height);
-   void layer_orientation(uint32_t id, int32_t orientation);
-   void layer_screen(uint32_t id, struct wl_output *screen);
-   void layer_destroyed(uint32_t id);
+   void layer_configuration(struct layer *l, int32_t width, int32_t height);
+   void layer_orientation(struct layer *l, int32_t orientation);
+   void layer_screen(struct layer *l, struct wl_output *screen);
+   void layer_destroyed(struct layer *l);
 };
 }