#include "ivi-controller-client-protocol.h"
-#include "util.h"
+#include "util.hpp"
#include <functional>
-#include <unordered_map>
#include <memory>
+#include <unordered_map>
#include <vector>
// _ _
// |___/ |_____|_| |___/
template <typename ProxyT>
struct wayland_proxy {
- ProxyT *proxy;
-
- wayland_proxy(void *p) : proxy(static_cast<ProxyT *>(p)) {}
-
- virtual ~wayland_proxy() {
- // If this is the nullptr, then it means it already was destroyed by a
- // custom wayland dtor
- if (this->proxy) {
- logdebug("%s %p @ %p", __func__, this, this->proxy);
- wl_proxy_destroy(reinterpret_cast<struct wl_proxy *>(this->proxy));
- }
- }
+ std::unique_ptr<ProxyT, std::function<void(ProxyT *)>> proxy;
+ wayland_proxy(wayland_proxy const &) = delete;
+ wayland_proxy &operator=(wayland_proxy const &) = delete;
+ wayland_proxy(void *p)
+ : wayland_proxy(p,
+ reinterpret_cast<void (*)(ProxyT *)>(wl_proxy_destroy)) {}
+ wayland_proxy(void *p, std::function<void(ProxyT *)> &&p_del)
+ : proxy(std::unique_ptr<ProxyT, std::function<void(ProxyT *)>>(
+ static_cast<ProxyT *>(p), p_del)) {}
};
// _
typedef std::function<void(struct wl_registry *, uint32_t, uint32_t)> binder;
std::unordered_map<std::string, binder> bindings;
+ registry(registry const &) = delete;
+ registry &operator=(registry const &) = delete;
registry(struct wl_display *d);
- ~registry();
void add_global_handler(char const *iface, binder bind);
std::unique_ptr<struct wl_display, void (*)(struct wl_display *)> d;
struct registry r;
+ display(display const &) = delete;
+ display &operator=(display const &) = delete;
display();
- ~display();
bool ok() const;
void roundtrip();
int dispatch();
int height{};
int refresh{};
+ output(output const &) = delete;
+ output &operator=(output const &) = delete;
output(struct wl_registry *r, uint32_t name, uint32_t v);
// Events
void done();
void scale(int32_t factor);
};
-}
+} // namespace wl
// _ __ __ _ _ __ ___ ___ ___ _ __ __ _ ___ ___
// | '_ \ / _` | '_ ` _ \ / _ \/ __| '_ \ / _` |/ __/ _ \
struct controller *parent;
uint32_t id;
+ controller_child(controller_child const &) = delete;
+ controller_child &operator=(controller_child const &) = delete;
controller_child(struct controller *c, uint32_t i) : parent(c), id(i) {}
virtual ~controller_child() {}
};
int32_t visibility;
float opacity;
+ surface(surface const &) = delete;
+ surface &operator=(surface const &) = delete;
surface(uint32_t i, struct controller *c);
- ~surface() override;
// Requests
void set_visibility(uint32_t visibility);
void set_opacity(wl_fixed_t opacity);
void set_source_rectangle(int32_t x, int32_t y, int32_t width,
- int32_t height);
+ int32_t height);
void set_destination_rectangle(int32_t x, int32_t y, int32_t width,
- int32_t height);
+ int32_t height);
void set_configuration(int32_t width, int32_t height);
void set_orientation(int32_t orientation);
void screenshot(const char *filename);
int32_t visibility;
float opacity;
+ layer(layer const &) = delete;
+ layer &operator=(layer const &) = delete;
layer(uint32_t i, struct controller *c);
layer(uint32_t i, int32_t w, int32_t h, struct controller *c);
- ~layer() override;
// Requests
void set_visibility(uint32_t visibility);
//
struct screen : public wayland_proxy<struct ivi_controller_screen>,
controller_child {
+ screen(screen const &) = delete;
+ screen &operator=(screen const &) = delete;
screen(uint32_t i, struct controller *c, struct ivi_controller_screen *p);
void clear();
void add_layer(layer *l);
// \___\___/|_| |_|\__|_| \___/|_|_|\___|_|
//
struct controller : public wayland_proxy<struct ivi_controller> {
+ // HACK:
+ // The order of these member is mandatory, as when objects are destroyed
+ // they will call their parent (that's us right here!) and remove their
+ // proxy-to-id mapping. I.e. the *_proxy_to_id members need to be valid
+ // when the surfaces/layers/screens maps are destroyed. This sucks, but
+ // I cannot see a better solution w/o globals or some other horrible
+ // call-our-parent construct.
std::unordered_map<uintptr_t, uint32_t> surface_proxy_to_id;
std::unordered_map<uintptr_t, uint32_t> layer_proxy_to_id;
std::unordered_map<uintptr_t, uint32_t> screen_proxy_to_id;
size output_size;
+ void debug_dump_current_status();
+
void add_proxy_to_id_mapping(struct ivi_controller_surface *p, uint32_t id);
void remove_proxy_to_id_mapping(struct ivi_controller_surface *p);
void add_proxy_to_id_mapping(struct ivi_controller_layer *p, uint32_t id);
void add_proxy_to_id_mapping(struct wl_output *p, uint32_t id);
void remove_proxy_to_id_mapping(struct wl_output *p);
- void add_task(char const *name, std::function<void(struct controller *)> &&f);
+ void add_task(char const *name,
+ std::function<void(struct controller *)> &&f);
void execute_pending();
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 commit_changes() const {
+ ivi_controller_commit_changes(this->proxy.get());
+ }
void layer_create(uint32_t id, int32_t w, int32_t h);
void surface_create(uint32_t id);
int32_t error_code, char const *error_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,
+ void surface_visibility(struct surface *s, int32_t visibility);
+ void surface_opacity(struct surface *s, float opacity);
+ void surface_source_rectangle(struct surface *s, 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,
+ void surface_destination_rectangle(struct surface *s, 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,
+ void surface_configuration(struct surface *s, int32_t width, int32_t height);
+ void surface_orientation(struct surface *s, int32_t orientation);
+ void surface_pixelformat(struct surface *s, int32_t pixelformat);
+ void surface_layer(struct surface *s, struct ivi_controller_layer *layer);
+ void surface_stats(struct surface *s, 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);
+ void surface_destroyed(struct surface *s);
+ void surface_content(struct surface *s, 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,
+ void layer_visibility(struct layer *l, int32_t visibility);
+ void layer_opacity(struct layer *l, float opacity);
+ void layer_source_rectangle(struct layer *l, int32_t x, int32_t y,
+ int32_t width, int32_t height);
+ void layer_destination_rectangle(struct layer *l, 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);
+ void layer_configuration(struct layer *l, int32_t width, int32_t height);
+ void layer_orientation(struct layer *l, int32_t orientation);
+ void layer_screen(struct layer *l, struct wl_output *screen);
+ void layer_destroyed(struct layer *l);
};
-}
+} // namespace genivi
#endif // !WM_WAYLAND_HPP
Code Review / staging / windowmanager.git / blobdiff