From ac5350e948b0ac44fd8055f5c88d8e4dc85435bb Mon Sep 17 00:00:00 2001 From: Marcus Fritzsch Date: Tue, 27 Jun 2017 08:21:05 +0200 Subject: [PATCH] wayland: moved inline methods to .cpp Signed-off-by: Marcus Fritzsch --- src/wayland.cpp | 134 +++++++++++++++++++++++++++++++++++++++++++++ src/wayland.hpp | 166 +++++++++++--------------------------------------------- 2 files changed, 166 insertions(+), 134 deletions(-) diff --git a/src/wayland.cpp b/src/wayland.cpp index c7287b3..71dca0f 100644 --- a/src/wayland.cpp +++ b/src/wayland.cpp @@ -350,6 +350,57 @@ layer::~layer() { this->proxy = nullptr; } +void layer::set_visibility(uint32_t visibility) { + ivi_controller_layer_set_visibility(this->proxy, visibility); +} + +void layer::set_opacity(wl_fixed_t opacity) { + ivi_controller_layer_set_opacity(this->proxy, opacity); +} + +void layer::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); +} + +void layer::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); +} + +void layer::set_configuration(int32_t width, int32_t height) { + ivi_controller_layer_set_configuration(this->proxy, width, height); +} + +void layer::set_orientation(int32_t orientation) { + ivi_controller_layer_set_orientation(this->proxy, orientation); +} + +void layer::screenshot(const char *filename) { + ivi_controller_layer_screenshot(this->proxy, filename); +} + +void layer::clear_surfaces() { + ivi_controller_layer_clear_surfaces(this->proxy); +} + +void layer::add_surface(struct surface *surface) { + ivi_controller_layer_add_surface(this->proxy, surface->proxy); +} + +void layer::remove_surface(struct surface *surface) { + ivi_controller_layer_remove_surface(this->proxy, surface->proxy); +} + +void layer::set_render_order(std::vector const &ro) { + struct wl_array wlro { + .size = ro.size() * sizeof(ro[0]), .alloc = ro.capacity() * sizeof(ro[0]), + .data = const_cast(static_cast(ro.data())) + }; + ivi_controller_layer_set_render_order(this->proxy, &wlro); +} + void controller::layer_visibility(uint32_t id, int32_t visibility) { logdebug("genivi::layer %s @ %p v %i", __func__, this->proxy, visibility); this->layers[id]->visibility = visibility; @@ -518,6 +569,44 @@ surface::~surface() { this->proxy = nullptr; } +void surface::set_visibility(uint32_t visibility) { + ivi_controller_surface_set_visibility(this->proxy, visibility); +} + +void surface::set_opacity(wl_fixed_t opacity) { + ivi_controller_surface_set_opacity(this->proxy, opacity); +} + +void surface::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); +} + +void surface::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); +} + +void surface::set_configuration(int32_t width, int32_t height) { + ivi_controller_surface_set_configuration(this->proxy, width, height); +} + +void surface::set_orientation(int32_t orientation) { + ivi_controller_surface_set_orientation(this->proxy, orientation); +} + +void surface::screenshot(const char *filename) { + ivi_controller_surface_screenshot(this->proxy, filename); +} + +void surface::send_stats() { ivi_controller_surface_send_stats(this->proxy); } + +void surface::destroy(int32_t destroy_scene_object) { + ivi_controller_surface_destroy(this->proxy, destroy_scene_object); +} + void controller::surface_visibility(uint32_t id, int32_t visibility) { logdebug("genivi::surface %s @ %p v %i", __func__, this->proxy, visibility); this->surfaces[id]->visibility = visibility; @@ -587,6 +676,51 @@ void controller::surface_content(uint32_t id, int32_t content_state) { } } +void controller::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 controller::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 controller::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 controller::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 controller::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 controller::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 controller::add_task(char const *name, std::function &&f) { + this->pending.emplace_back(std::make_pair(name, f)); +} + +void controller::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... + } +} // // ___ ___ _ __ ___ ___ _ __ // / __|/ __| '__/ _ \/ _ \ '_ \ diff --git a/src/wayland.hpp b/src/wayland.hpp index f7f9ce5..9a5541d 100644 --- a/src/wayland.hpp +++ b/src/wayland.hpp @@ -151,43 +151,17 @@ struct surface : public wayland_proxy, ~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, ~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 const &ro) { - struct wl_array wlro { - .size = ro.size() * sizeof(ro[0]), - .alloc = ro.capacity() * sizeof(ro[0]), - .data = const_cast(static_cast(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 const &ro); }; // @@ -308,52 +243,15 @@ struct controller : public wayland_proxy { 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 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 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 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 &&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 &&f); + void execute_pending(); controller(struct wl_registry *r, uint32_t name, uint32_t version); ~controller() override; -- 2.16.6