X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwayland.hpp;h=60a045bc3b91a81078d924b63d10ce3c20372df7;hb=88666c08dd76d09596aa9906f39d466c45d5979e;hp=f7f9ce5248bfd0da7ae680328ebe06515f70c234;hpb=df262c7d3049477a23cde85bdabdcdea7f7eebb0;p=staging%2Fwindowmanager.git

diff --git a/src/wayland.hpp b/src/wayland.hpp
index f7f9ce5..60a045b 100644
--- a/src/wayland.hpp
+++ b/src/wayland.hpp
@@ -151,43 +151,17 @@ struct surface : public wayland_proxy<struct ivi_controller_surface>,
    ~surface() override;
 
    // Requests
-   inline void set_visibility(uint32_t visibility) {
-      ivi_controller_surface_set_visibility(this->proxy, visibility);
-   }
-
-   inline void set_opacity(wl_fixed_t opacity) {
-      ivi_controller_surface_set_opacity(this->proxy, opacity);
-   }
-
-   inline void set_source_rectangle(int32_t x, int32_t y, int32_t width,
-                                    int32_t height) {
-      ivi_controller_surface_set_source_rectangle(this->proxy, x, y, width,
-                                                  height);
-   }
-
-   inline void set_destination_rectangle(int32_t x, int32_t y, int32_t width,
-                                         int32_t height) {
-      ivi_controller_surface_set_destination_rectangle(this->proxy, x, y, width,
-                                                       height);
-   }
-
-   inline void set_configuration(int32_t width, int32_t height) {
-      ivi_controller_surface_set_configuration(this->proxy, width, height);
-   }
-
-   inline void set_orientation(int32_t orientation) {
-      ivi_controller_surface_set_orientation(this->proxy, orientation);
-   }
-
-   inline void screenshot(const char *filename) {
-      ivi_controller_surface_screenshot(this->proxy, filename);
-   }
-
-   inline void send_stats() { ivi_controller_surface_send_stats(this->proxy); }
-
-   inline void destroy(int32_t destroy_scene_object) {
-      ivi_controller_surface_destroy(this->proxy, destroy_scene_object);
-   }
+   void set_visibility(uint32_t visibility);
+   void set_opacity(wl_fixed_t opacity);
+   void set_source_rectangle(int32_t x, int32_t y, int32_t width,
+                                    int32_t height);
+   void set_destination_rectangle(int32_t x, int32_t y, int32_t width,
+                                         int32_t height);
+   void set_configuration(int32_t width, int32_t height);
+   void set_orientation(int32_t orientation);
+   void screenshot(const char *filename);
+   void send_stats();
+   void destroy(int32_t destroy_scene_object);
 };
 
 //  _
@@ -210,58 +184,19 @@ struct layer : public wayland_proxy<struct ivi_controller_layer>,
    ~layer() override;
 
    // Requests
-   inline void set_visibility(uint32_t visibility) {
-      ivi_controller_layer_set_visibility(this->proxy, visibility);
-   }
-
-   inline void set_opacity(wl_fixed_t opacity) {
-      ivi_controller_layer_set_opacity(this->proxy, opacity);
-   }
-
-   inline void set_source_rectangle(int32_t x, int32_t y, int32_t width,
-                                    int32_t height) {
-      ivi_controller_layer_set_source_rectangle(this->proxy, x, y, width,
-                                                height);
-   }
-
-   inline void set_destination_rectangle(int32_t x, int32_t y, int32_t width,
-                                         int32_t height) {
-      ivi_controller_layer_set_destination_rectangle(this->proxy, x, y, width,
-                                                     height);
-   }
-
-   inline void set_configuration(int32_t width, int32_t height) {
-      ivi_controller_layer_set_configuration(this->proxy, width, height);
-   }
-
-   inline void set_orientation(int32_t orientation) {
-      ivi_controller_layer_set_orientation(this->proxy, orientation);
-   }
-
-   inline void screenshot(const char *filename) {
-      ivi_controller_layer_screenshot(this->proxy, filename);
-   }
-
-   inline void clear_surfaces() {
-      ivi_controller_layer_clear_surfaces(this->proxy);
-   }
-
-   inline void add_surface(struct surface *surface) {
-      ivi_controller_layer_add_surface(this->proxy, surface->proxy);
-   }
-
-   inline void remove_surface(struct surface *surface) {
-      ivi_controller_layer_remove_surface(this->proxy, surface->proxy);
-   }
-
-   void set_render_order(std::vector<uint32_t> const &ro) {
-      struct wl_array wlro {
-         .size = ro.size() * sizeof(ro[0]),
-         .alloc = ro.capacity() * sizeof(ro[0]),
-         .data = const_cast<void *>(static_cast<void const *>(ro.data()))
-      };
-      ivi_controller_layer_set_render_order(this->proxy, &wlro);
-   }
+   void set_visibility(uint32_t visibility);
+   void set_opacity(wl_fixed_t opacity);
+   void set_source_rectangle(int32_t x, int32_t y, int32_t width,
+                             int32_t height);
+   void set_destination_rectangle(int32_t x, int32_t y, int32_t width,
+                                  int32_t height);
+   void set_configuration(int32_t width, int32_t height);
+   void set_orientation(int32_t orientation);
+   void screenshot(const char *filename);
+   void clear_surfaces();
+   void add_surface(struct surface *surface);
+   void remove_surface(struct surface *surface);
+   void set_render_order(std::vector<uint32_t> const &ro);
 };
 
 //
@@ -273,19 +208,9 @@ struct layer : public wayland_proxy<struct ivi_controller_layer>,
 struct screen : public wayland_proxy<struct ivi_controller_screen>,
                 controller_child {
    screen(uint32_t i, struct controller *c, struct ivi_controller_screen *p);
-
-   void clear() { ivi_controller_screen_clear(this->proxy); }
-   void add_layer(layer *l) {
-      ivi_controller_screen_add_layer(this->proxy, l->proxy);
-   }
-   void set_render_order(std::vector<uint32_t> const &ro) {
-      struct wl_array wlro {
-         .size = ro.size() * sizeof(ro[0]),
-         .alloc = ro.capacity() * sizeof(ro[0]),
-         .data = const_cast<void *>(static_cast<void const *>(ro.data()))
-      };
-      ivi_controller_screen_set_render_order(this->proxy, &wlro);
-   }
+   void clear();
+   void add_layer(layer *l);
+   void set_render_order(std::vector<uint32_t> const &ro);
 };
 
 //                  _             _ _
@@ -296,10 +221,11 @@ struct screen : public wayland_proxy<struct ivi_controller_screen>,
 //
 struct controller : public wayland_proxy<struct ivi_controller> {
    std::unordered_map<uintptr_t, uint32_t> surface_proxy_to_id;
-   std::unordered_map<uint32_t, std::unique_ptr<struct surface>> surfaces;
    std::unordered_map<uintptr_t, uint32_t> layer_proxy_to_id;
-   std::unordered_map<uint32_t, std::unique_ptr<struct layer>> layers;
    std::unordered_map<uintptr_t, uint32_t> screen_proxy_to_id;
+
+   std::unordered_map<uint32_t, std::unique_ptr<struct surface>> surfaces;
+   std::unordered_map<uint32_t, std::unique_ptr<struct layer>> layers;
    std::unordered_map<uint32_t, std::unique_ptr<struct screen>> screens;
 
    typedef std::pair<char const *, std::function<void(struct controller *)>>
@@ -308,52 +234,15 @@ struct controller : public wayland_proxy<struct ivi_controller> {
 
    size output_size;
 
-   void add_proxy_to_id_mapping(struct ivi_controller_surface *p, uint32_t id) {
-      this->surface_proxy_to_id[uintptr_t(p)] = id;
-      logdebug("Add surface proxy mapping for %p (%u)", p, id);
-   }
-
-   void remove_proxy_to_id_mapping(struct ivi_controller_surface *p) {
-      logdebug("Remove surface proxy mapping for %p", p);
-      this->surface_proxy_to_id.erase(uintptr_t(p));
-   }
-
-   void add_proxy_to_id_mapping(struct ivi_controller_layer *p, uint32_t id) {
-      logdebug("Add layer proxy mapping for %p (%u)", p, id);
-      this->layer_proxy_to_id[uintptr_t(p)] = id;
-   }
-
-   void remove_proxy_to_id_mapping(struct ivi_controller_layer *p) {
-      logdebug("Remove layer proxy mapping for %p", p);
-      this->layer_proxy_to_id.erase(uintptr_t(p));
-   }
+   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);
+   void remove_proxy_to_id_mapping(struct ivi_controller_layer *p);
+   void add_proxy_to_id_mapping(struct wl_output *p, uint32_t id);
+   void remove_proxy_to_id_mapping(struct wl_output *p);
 
-   void add_proxy_to_id_mapping(struct wl_output *p, uint32_t id) {
-      logdebug("Add screen proxy mapping for %p (%u)", p, id);
-      this->screen_proxy_to_id[uintptr_t(p)] = id;
-   }
-
-   void remove_proxy_to_id_mapping(struct wl_output *p) {
-      logdebug("Remove screen proxy mapping for %p", p);
-      this->screen_proxy_to_id.erase(uintptr_t(p));
-   }
-
-   void add_task(char const *name,
-                 std::function<void(struct controller *)> &&f) {
-      this->pending.emplace_back(std::make_pair(name, f));
-   }
-
-   void execute_pending() {
-      if (!this->pending.empty()) {
-         for (auto &t : this->pending) {
-            logdebug("executing task '%s'", t.first);
-            t.second(this);
-         }
-         this->pending.clear();
-         ivi_controller_commit_changes(this->proxy);
-         // XXX: No flush here...
-      }
-   }
+   void add_task(char const *name, std::function<void(struct controller *)> &&f);
+   void execute_pending();
 
    controller(struct wl_registry *r, uint32_t name, uint32_t version);
    ~controller() override;