#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);
-};
-
// _ _
// ___ _ _| |_ _ __ _ _| |_
// / _ \| | | | __| '_ \| | | | __|
}
void set_render_order(std::vector<uint32_t> const &ro) {
- struct wl_array wlro{
+ 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_add_layer(this->proxy, l->proxy);
}
void set_render_order(std::vector<uint32_t> const &ro) {
- struct wl_array wlro{
+ 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()))
// \___\___/|_| |_|\__|_| \___/|_|_|\___|_|
//
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;