#include "util.h"
#include <functional>
-#include <map>
#include <memory>
+#include <unordered_map>
#include <vector>
// _ _
// |_| |_|\__,_|_| |_| |_|\___||___/ .__/ \__,_|\___\___| \_/\_/ |_|
// |_|
namespace wl {
-struct registry;
+// _ _
+// _ __ ___ __ _(_)___| |_ _ __ _ _
+// | '__/ _ \/ _` | / __| __| '__| | | |
+// | | | __/ (_| | \__ \ |_| | | |_| |
+// |_| \___|\__, |_|___/\__|_| \__, |
+// |___/ |___/
+struct registry : public wayland_proxy<struct wl_registry> {
+ typedef std::function<void(struct wl_registry *, uint32_t, uint32_t)> binder;
+ std::unordered_map<std::string, binder> bindings;
+
+ registry(struct wl_display *d);
+ ~registry();
+
+ void add_global_handler(char const *iface, binder bind);
+
+ // Events
+ void global(uint32_t name, char const *iface, uint32_t v);
+ void global_remove(uint32_t name);
+};
// _ _ _
// __| (_)___ _ __ | | __ _ _ _
struct display {
std::unique_ptr<struct wl_display, std::function<void(struct wl_display *)>>
d;
- std::unique_ptr<struct registry> r;
+ struct registry r;
display();
~display();
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;
-
- registry(struct wl_display *d);
- ~registry();
-
- void add_global_handler(char const *iface, binder bind);
-
- // Events
- void global(uint32_t name, char const *iface, uint32_t v);
- void global_remove(uint32_t name);
-};
-
// _ _
// ___ _ _| |_ _ __ _ _| |_
// / _ \| | | | __| '_ \| | | | __|
// \___/ \__,_|\__| .__/ \__,_|\__|
// |_|
struct output : wayland_proxy<struct wl_output> {
+ int width;
+ int height;
+ int refresh;
+
output(struct wl_registry *registry, uint32_t name, uint32_t version);
// Events
// |___/
namespace genivi {
+struct size {
+ uint32_t w, h;
+};
+
+struct rect {
+ uint32_t w, h;
+ int32_t x, y;
+};
+
struct controller;
struct controlled_entity {
//
struct surface : public wayland_proxy<struct ivi_controller_surface>,
controlled_entity {
+ struct rect dst_rect;
+ struct rect src_rect;
+ struct size size;
+ int32_t orientation;
+ int32_t visibility;
+ float opacity;
+
surface(uint32_t i, struct controller *c);
~surface() override;
// |___/
struct layer : public wayland_proxy<struct ivi_controller_layer>,
controlled_entity {
+ 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 {
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<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 *)>>
+ name_task_pair;
+ std::vector<name_task_pair> pending;
+
+ size output_size;
+
+ 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...
+ }
+ }
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);