X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwayland.hpp;h=2321fffa9c078ae0262c3a81387a499f0e625392;hb=112a585f5d172592e5b1da895d3fd85b9b852e08;hp=da3cc29647bdee8ad0f4e3b537e43791ef5da37b;hpb=b2dac46f817dcb12c180925a52dae5494ea584a3;p=staging%2Fwindowmanager.git diff --git a/src/wayland.hpp b/src/wayland.hpp index da3cc29..2321fff 100644 --- a/src/wayland.hpp +++ b/src/wayland.hpp @@ -6,8 +6,8 @@ #include "util.h" #include -#include #include +#include #include // _ _ @@ -18,18 +18,14 @@ // |___/ |_____|_| |___/ template struct wayland_proxy { - ProxyT *proxy; - - wayland_proxy(void *p) : proxy(static_cast(p)) {} - - virtual ~wayland_proxy() { - // If this is the nullptr, then it means it already was destroyed by a - // custom wayland dtor - if (this->proxy) { - logdebug("%s %p @ %p", __func__, this, this->proxy); - wl_proxy_destroy(reinterpret_cast(this->proxy)); - } - } + std::unique_ptr> proxy; + wayland_proxy(void *p) + : wayland_proxy(p, [](ProxyT *p) { + wl_proxy_destroy(reinterpret_cast(p)); + }) {} + wayland_proxy(void *p, std::function p_del) + : proxy(std::unique_ptr>( + static_cast(p), p_del)) {} }; // _ @@ -39,28 +35,6 @@ struct wayland_proxy { // |_| |_|\__,_|_| |_| |_|\___||___/ .__/ \__,_|\___\___| \_/\_/ |_| // |_| namespace wl { -struct registry; - -// _ _ _ -// __| (_)___ _ __ | | __ _ _ _ -// / _` | / __| '_ \| |/ _` | | | | -// | (_| | \__ \ |_) | | (_| | |_| | -// \__,_|_|___/ .__/|_|\__,_|\__, | -// |_| |___/ -struct display { - std::unique_ptr> - d; - std::unique_ptr r; - - display(); - ~display(); - bool ok() const; - void roundtrip(); - int dispatch(); - void flush(); - int get_fd() const; -}; - // _ _ // _ __ ___ __ _(_)___| |_ _ __ _ _ // | '__/ _ \/ _` | / __| __| '__| | | | @@ -69,10 +43,9 @@ struct display { // |___/ |___/ struct registry : public wayland_proxy { typedef std::function binder; - std::map bindings; + std::unordered_map bindings; registry(struct wl_display *d); - ~registry(); void add_global_handler(char const *iface, binder bind); @@ -81,6 +54,24 @@ struct registry : public wayland_proxy { void global_remove(uint32_t name); }; +// _ _ _ +// __| (_)___ _ __ | | __ _ _ _ +// / _` | / __| '_ \| |/ _` | | | | +// | (_| | \__ \ |_) | | (_| | |_| | +// \__,_|_|___/ .__/|_|\__,_|\__, | +// |_| |___/ +struct display { + std::unique_ptr d; + struct registry r; + + display(); + bool ok() const; + void roundtrip(); + int dispatch(); + void flush(); + int get_fd() const; +}; + // _ _ // ___ _ _| |_ _ __ _ _| |_ // / _ \| | | | __| '_ \| | | | __| @@ -88,11 +79,11 @@ struct registry : public wayland_proxy { // \___/ \__,_|\__| .__/ \__,_|\__| // |_| struct output : wayland_proxy { - int width; - int height; - int refresh; + int width{}; + int height{}; + int refresh{}; - output(struct wl_registry *registry, uint32_t name, uint32_t version); + output(struct wl_registry *r, uint32_t name, uint32_t v); // Events void geometry(int32_t x, int32_t y, int32_t pw, int32_t ph, int32_t subpel, @@ -127,12 +118,12 @@ struct rect { struct controller; -struct controlled_entity { +struct controller_child { struct controller *parent; uint32_t id; - controlled_entity(struct controller *c, uint32_t i) : parent(c), id(i) {} - virtual ~controlled_entity() {} + controller_child(struct controller *c, uint32_t i) : parent(c), id(i) {} + virtual ~controller_child() {} }; // __ @@ -142,7 +133,7 @@ struct controlled_entity { // |___/\__,_|_| |_| \__,_|\___\___| // struct surface : public wayland_proxy, - controlled_entity { + controller_child { struct rect dst_rect; struct rect src_rect; struct size size; @@ -151,46 +142,19 @@ struct surface : public wayland_proxy, float opacity; surface(uint32_t i, struct controller *c); - ~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); }; // _ @@ -200,7 +164,7 @@ struct surface : public wayland_proxy, // |_|\__,_|\__, |\___|_| // |___/ struct layer : public wayland_proxy, - controlled_entity { + controller_child { struct rect dst_rect; struct rect src_rect; struct size size; @@ -210,61 +174,21 @@ struct layer : public wayland_proxy, layer(uint32_t i, struct controller *c); layer(uint32_t i, int32_t w, int32_t h, struct controller *c); - ~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); }; // @@ -274,21 +198,11 @@ struct layer : public wayland_proxy, // |___/\___|_| \___|\___|_| |_| // struct screen : public wayland_proxy, - controlled_entity { + 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 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_screen_set_render_order(this->proxy, &wlro); - } + void clear(); + void add_layer(layer *l); + void set_render_order(std::vector const &ro); }; // _ _ _ @@ -298,9 +212,13 @@ struct screen : public wayland_proxy, // \___\___/|_| |_|\__|_| \___/|_|_|\___|_| // struct controller : public wayland_proxy { - std::map> surfaces; - std::map> layers; - std::map> screens; + std::unordered_map surface_proxy_to_id; + std::unordered_map layer_proxy_to_id; + std::unordered_map screen_proxy_to_id; + + std::unordered_map> surfaces; + std::unordered_map> layers; + std::unordered_map> screens; typedef std::pair> name_task_pair; @@ -308,28 +226,23 @@ struct controller : public wayland_proxy { size output_size; - void add_task(char const *name, - std::function &&f) { - this->pending.emplace_back(std::make_pair(name, f)); - } + 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 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; // Requests - void commit_changes() const { ivi_controller_commit_changes(this->proxy); } + void commit_changes() const { + ivi_controller_commit_changes(this->proxy.get()); + } void layer_create(uint32_t id, int32_t w, int32_t h); void surface_create(uint32_t id); @@ -338,8 +251,8 @@ struct controller : public wayland_proxy { void controller_screen(uint32_t id, struct ivi_controller_screen *screen); void controller_layer(uint32_t id); void controller_surface(uint32_t id); - void controller_error(int32_t oid, int32_t otype, int32_t code, - char const *text); + void controller_error(int32_t object_id, int32_t object_type, + int32_t error_code, char const *error_text); // surface void surface_visibility(uint32_t id, int32_t visibility);