#include "util.h"
#include <functional>
-#include <map>
#include <memory>
+#include <unordered_map>
#include <vector>
// _ _
// custom wayland dtor
if (this->proxy) {
logdebug("%s %p @ %p", __func__, this, this->proxy);
- wl_proxy_destroy(reinterpret_cast<struct wl_proxy *>(proxy));
+ wl_proxy_destroy(reinterpret_cast<struct wl_proxy *>(this->proxy));
}
}
};
// |_| |_|\__,_|_| |_| |_|\___||___/ .__/ \__,_|\___\___| \_/\_/ |_|
// |_|
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();
-};
-
// _ _
// _ __ ___ __ _(_)___| |_ _ __ _ _
// | '__/ _ \/ _` | / __| __| '__| | | |
// |___/ |___/
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;
+
output(struct wl_registry *registry, uint32_t name, uint32_t version);
// Events
// |___/
namespace genivi {
-//
-// _ __ __ _ _ __ ___ ___ ___ _ __ __ _ ___ ___
-// | '_ \ / _` | '_ ` _ \ / _ \/ __| '_ \ / _` |/ __/ _ \
-// | | | | (_| | | | | | | __/\__ \ |_) | (_| | (_| __/
-// |_| |_|\__,_|_| |_| |_|\___||___/ .__/ \__,_|\___\___|
-// |_|
-// _ _ __
-// _ __ ___ | |_(_)/ _|_ _
-// | '_ \ / _ \| __| | |_| | | |
-// | | | | (_) | |_| | _| |_| |
-// |_| |_|\___/ \__|_|_| \__, |
-// |___/
-namespace notify {
-enum property {
- Dimensions, // i.e. configure
- DestRect,
- SrcRect,
- ZOrder,
- Vibility,
- Opacity,
- Layer,
- Surface,
- Content,
- Orientation,
- Screen,
+struct size {
+ uint32_t w, h;
};
-template <typename ObjectT>
-struct notifier {
- typedef std::function<void(enum property, ObjectT *)> ReceiverT;
+struct rect {
+ uint32_t w, h;
+ int32_t x, y;
+};
- std::vector<ReceiverT> receivers;
+struct controller;
- virtual ~notifier() {}
+struct controlled_entity {
+ struct controller *parent;
+ uint32_t id;
- void add_receiver(ReceiverT);
- void notify(enum property) const;
+ controlled_entity(struct controller *c, uint32_t i) : parent(c), id(i) {}
+ virtual ~controlled_entity() {}
};
-}
// __
// ___ _ _ _ __ / _| __ _ ___ ___
// |___/\__,_|_| |_| \__,_|\___\___|
//
struct surface : public wayland_proxy<struct ivi_controller_surface>,
- notify::notifier<struct surface> {
- uint32_t id;
-
- surface(uint32_t i, struct ivi_controller *c);
+ 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;
- // Events
- void visibility(int32_t visibility);
- void opacity(float opacity);
- void source_rectangle(int32_t x, int32_t y, int32_t width, int32_t height);
- void destination_rectangle(int32_t x, int32_t y, int32_t width,
- int32_t height);
- void configuration(int32_t width, int32_t height);
- void orientation(int32_t orientation);
- void pixelformat(int32_t pixelformat);
- void layer(struct ivi_controller_layer *layer);
- void stats(uint32_t redraw_count, uint32_t frame_count,
- uint32_t update_count, uint32_t pid, const char *process_name);
- void destroyed();
- void content(int32_t content_state);
-
// Requests
inline void set_visibility(uint32_t visibility) {
ivi_controller_surface_set_visibility(this->proxy, visibility);
// |_|\__,_|\__, |\___|_|
// |___/
struct layer : public wayland_proxy<struct ivi_controller_layer>,
- notify::notifier<struct layer> {
- uint32_t id;
-
- layer(uint32_t i, struct ivi_controller *c);
+ 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;
- // Events
- void visibility(int32_t visibility);
- void opacity(float opacity);
- void source_rectangle(int32_t x, int32_t y, int32_t width, int32_t height);
- void destination_rectangle(int32_t x, int32_t y, int32_t width,
- int32_t height);
- void configuration(int32_t width, int32_t height);
- void orientation(int32_t orientation);
- void screen(struct wl_output *screen);
- void destroyed();
-
// Requests
inline void set_visibility(uint32_t visibility) {
ivi_controller_layer_set_visibility(this->proxy, visibility);
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> {
- uint32_t id;
+struct screen : public wayland_proxy<struct ivi_controller_screen>,
+ controlled_entity {
+ screen(uint32_t i, struct controller *c, struct ivi_controller_screen *p);
- screen(uint32_t i, 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
- void screen(uint32_t id, struct ivi_controller_screen *screen);
- void layer(uint32_t id);
- void surface(uint32_t id);
- void error(int32_t oid, int32_t otype, int32_t code, char const *text);
+ // 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);
+
+ // surface
+ void surface_visibility(uint32_t id, int32_t visibility);
+ void surface_opacity(uint32_t id, float opacity);
+ void surface_source_rectangle(uint32_t id, int32_t x, int32_t y,
+ int32_t width, int32_t height);
+ void surface_destination_rectangle(uint32_t id, int32_t x, int32_t y,
+ int32_t width, int32_t height);
+ void surface_configuration(uint32_t id, int32_t width, int32_t height);
+ void surface_orientation(uint32_t id, int32_t orientation);
+ void surface_pixelformat(uint32_t id, int32_t pixelformat);
+ void surface_layer(uint32_t id, struct ivi_controller_layer *layer);
+ void surface_stats(uint32_t id, uint32_t redraw_count, uint32_t frame_count,
+ uint32_t update_count, uint32_t pid,
+ const char *process_name);
+ void surface_destroyed(uint32_t id);
+ void surface_content(uint32_t id, int32_t content_state);
+
+ // layer
+ void layer_visibility(uint32_t id, int32_t visibility);
+ void layer_opacity(uint32_t id, float opacity);
+ void layer_source_rectangle(uint32_t id, int32_t x, int32_t y, int32_t width,
+ int32_t height);
+ void layer_destination_rectangle(uint32_t id, int32_t x, int32_t y,
+ int32_t width, int32_t height);
+ void layer_configuration(uint32_t id, int32_t width, int32_t height);
+ void layer_orientation(uint32_t id, int32_t orientation);
+ void layer_screen(uint32_t id, struct wl_output *screen);
+ void layer_destroyed(uint32_t id);
};
}
Code Review / staging / windowmanager.git / blobdiff