#include "util.h"
#include <functional>
-#include <map>
+#include <unordered_map>
#include <memory>
#include <vector>
// |_| |_|\__,_|_| |_| |_|\___||___/ .__/ \__,_|\___\___| \_/\_/ |_|
// |_|
namespace wl {
-struct registry;
-
-// _ _ _
-// __| (_)___ _ __ | | __ _ _ _
-// / _` | / __| '_ \| |/ _` | | | |
-// | (_| | \__ \ |_) | | (_| | |_| |
-// \__,_|_|___/ .__/|_|\__,_|\__, |
-// |_| |___/
-struct display {
- std::unique_ptr<struct wl_display, std::function<void(struct wl_display *)>>
- d;
- std::unique_ptr<struct registry> r;
-
- display();
- ~display();
- bool ok() const;
- void roundtrip();
- int dispatch();
- void flush();
- int get_fd() const;
-};
-
// _ _
// _ __ ___ __ _(_)___| |_ _ __ _ _
// | '__/ _ \/ _` | / __| __| '__| | | |
// |___/ |___/
struct registry : public wayland_proxy<struct wl_registry> {
typedef std::function<void(struct wl_registry *, uint32_t, uint32_t)> binder;
- std::map<std::string, binder> bindings;
+ std::unordered_map<std::string, binder> bindings;
registry(struct wl_display *d);
~registry();
void global_remove(uint32_t name);
};
+// _ _ _
+// __| (_)___ _ __ | | __ _ _ _
+// / _` | / __| '_ \| |/ _` | | | |
+// | (_| | \__ \ |_) | | (_| | |_| |
+// \__,_|_|___/ .__/|_|\__,_|\__, |
+// |_| |___/
+struct display {
+ std::unique_ptr<struct wl_display, void (*)(struct wl_display *)> d;
+ struct registry r;
+
+ display();
+ ~display();
+ bool ok() const;
+ void roundtrip();
+ int dispatch();
+ void flush();
+ int get_fd() const;
+};
+
// _ _
// ___ _ _| |_ _ __ _ _| |_
// / _ \| | | | __| '_ \| | | | __|
// \___/ \__,_|\__| .__/ \__,_|\__|
// |_|
struct output : wayland_proxy<struct wl_output> {
- 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,
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() {}
};
// __
// |___/\__,_|_| |_| \__,_|\___\___|
//
struct surface : public wayland_proxy<struct ivi_controller_surface>,
- controlled_entity {
+ controller_child {
struct rect dst_rect;
struct rect src_rect;
struct size size;
// |_|\__,_|\__, |\___|_|
// |___/
struct layer : public wayland_proxy<struct ivi_controller_layer>,
- controlled_entity {
+ controller_child {
+ struct rect dst_rect;
+ struct rect src_rect;
+ struct size size;
+ int32_t orientation;
+ int32_t visibility;
+ float opacity;
+
layer(uint32_t i, struct controller *c);
+ layer(uint32_t i, int32_t w, int32_t h, struct controller *c);
~layer() override;
// Requests
ivi_controller_layer_remove_surface(this->proxy, surface->proxy);
}
- inline void set_render_order(struct wl_array *surfaces) {
- ivi_controller_layer_set_render_order(this->proxy, surfaces);
+ 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);
}
};
// |___/\___|_| \___|\___|_| |_|
//
struct screen : public wayland_proxy<struct ivi_controller_screen>,
- 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<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);
+ }
};
// _ _ _
// \___\___/|_| |_|\__|_| \___/|_|_|\___|_|
//
struct controller : public wayland_proxy<struct ivi_controller> {
- std::map<uint32_t, std::unique_ptr<struct surface>> surfaces;
- std::map<uint32_t, std::unique_ptr<struct layer>> layers;
- std::map<uint32_t, std::unique_ptr<struct screen>> screens;
+ 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 screen>> screens;
+
+ typedef std::pair<char const *, std::function<void(struct controller *)>>
+ name_task_pair;
+ std::vector<name_task_pair> pending;
+
+ 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 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;
+ }
- std::vector<std::function<void(struct controller *)>> pending;
+ 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(std::function<void(struct controller *)> &&f) {
- this->pending.emplace_back(f);
+ 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) {
- t(this);
+ logdebug("executing task '%s'", t.first);
+ t.second(this);
}
this->pending.clear();
ivi_controller_commit_changes(this->proxy);
+ // XXX: No flush here...
}
}
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);
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);
Code Review / staging / windowmanager.git / blobdiff