X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwayland.hpp;h=cb4c8ed4e14c1c879007213b385747b116bffa05;hb=7a222198086e2c2ce7a19a989d1feee0cd31d8ab;hp=f58ada0abb40ba1dd226befb9b439cc883fa1f54;hpb=5e8b656af6c13323f91907f38f38863da873014c;p=staging%2Fwindowmanager.git diff --git a/src/wayland.hpp b/src/wayland.hpp index f58ada0..cb4c8ed 100644 --- a/src/wayland.hpp +++ b/src/wayland.hpp @@ -88,6 +88,10 @@ struct registry : public wayland_proxy { // \___/ \__,_|\__| .__/ \__,_|\__| // |_| struct output : wayland_proxy { + int width; + int height; + int refresh; + output(struct wl_registry *registry, uint32_t name, uint32_t version); // Events @@ -198,6 +202,7 @@ struct surface : public wayland_proxy, struct layer : public wayland_proxy, controlled_entity { layer(uint32_t i, struct controller *c); + layer(uint32_t i, int32_t w, int32_t h, struct controller *c); ~layer() override; // Requests @@ -259,6 +264,9 @@ struct layer : public wayland_proxy, struct screen : public wayland_proxy, controlled_entity { 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); } }; // _ _ _ @@ -272,9 +280,34 @@ struct controller : public wayland_proxy { std::map> layers; std::map> screens; + typedef std::pair> + name_task_pair; + std::vector pending; + + 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); + } + } + 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 layer_create(uint32_t id, int32_t w, int32_t h); + void surface_create(uint32_t id); + // Events // controller void controller_screen(uint32_t id, struct ivi_controller_screen *screen);