#include "util.h"
#include <functional>
-#include <map>
+#include <unordered_map>
#include <memory>
+#include <vector>
// _ _
// __ ____ _ _ _| | __ _ _ __ __| | _ __ _ __ _____ ___ _
// custom wayland dtor
if (this->proxy) {
logdebug("%s %p @ %p", __func__, this, this->proxy);
- wl_proxy_destroy(reinterpret_cast<wl_proxy *>(proxy));
+ wl_proxy_destroy(reinterpret_cast<struct wl_proxy *>(this->proxy));
}
}
};
// |_| |_|\__,_|_| |_| |_|\___||___/ .__/ \__,_|\___\___| \_/\_/ |_|
// |_|
namespace wl {
-struct registry;
-
-// _ _ _
-// __| (_)___ _ __ | | __ _ _ _
-// / _` | / __| '_ \| |/ _` | | | |
-// | (_| | \__ \ |_) | | (_| | |_| |
-// \__,_|_|___/ .__/|_|\__,_|\__, |
-// |_| |___/
-struct display {
- std::unique_ptr<wl_display, void (*)(wl_display *)> d;
- std::unique_ptr<registry> r;
-
- display();
- bool ok() const;
- void roundtrip();
-};
-
// _ _
// _ __ ___ __ _(_)___| |_ _ __ _ _
// | '__/ _ \/ _` | / __| __| '__| | | |
// | | | __/ (_| | \__ \ |_| | | |_| |
// |_| \___|\__, |_|___/\__|_| \__, |
// |___/ |___/
-struct registry : public wayland_proxy<wl_registry> {
- typedef std::function<void(wl_registry *, uint32_t, uint32_t)> binder;
- std::map<std::string, binder> bindings;
+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(wl_display *d);
+ registry(struct wl_display *d);
~registry();
void add_global_handler(char const *iface, binder bind);
- void event_global(uint32_t name, char const *iface, uint32_t v);
- void event_global_remove(uint32_t name);
-
- static void s_global(void *data, struct wl_registry *r, uint32_t name,
- char const *iface, uint32_t v);
+ // Events
+ void global(uint32_t name, char const *iface, uint32_t v);
+ void global_remove(uint32_t name);
+};
- static void s_global_remove(void *data, struct wl_registry *r,
- uint32_t name);
+// _ _ _
+// __| (_)___ _ __ | | __ _ _ _
+// / _` | / __| '_ \| |/ _` | | | |
+// | (_| | \__ \ |_) | | (_| | |_| |
+// \__,_|_|___/ .__/|_|\__,_|\__, |
+// |_| |___/
+struct display {
+ std::unique_ptr<struct wl_display, void (*)(struct wl_display *)> d;
+ struct registry r;
- static constexpr wl_registry_listener listener = {s_global, s_global_remove};
+ display();
+ ~display();
+ bool ok() const;
+ void roundtrip();
+ int dispatch();
+ void flush();
+ int get_fd() const;
};
// _ _
// | (_) | |_| | |_| |_) | |_| | |_
// \___/ \__,_|\__| .__/ \__,_|\__|
// |_|
-struct output : wayland_proxy<wl_output> {
- output(wl_registry *registry, uint32_t name, uint32_t version);
-
- void event_geometry(int32_t x, int32_t y, int32_t pw, int32_t ph,
- int32_t subpel, char const *make, char const *model,
- int32_t tx);
- void event_mode(uint32_t flags, int32_t w, int32_t h, int32_t r);
- void event_done();
- void event_scale(int32_t factor);
-
- static void s_geometry(void *data, struct wl_output *wl_output, int32_t x,
- int32_t y, int32_t physical_width,
- int32_t physical_height, int32_t subpixel,
- const char *make, const char *model,
- int32_t transform);
-
- static void s_mode(void *data, struct wl_output *wl_output, uint32_t flags,
- int32_t width, int32_t height, int32_t refresh);
-
- static void s_done(void *data, struct wl_output *wl_output);
-
- static void s_scale(void *data, struct wl_output *wl_output, int32_t factor);
-
- static constexpr wl_output_listener listener = {s_geometry, s_mode, s_done,
- s_scale};
+struct output : wayland_proxy<struct wl_output> {
+ int width{};
+ int height{};
+ int refresh{};
+
+ 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,
+ char const *make, char const *model, int32_t tx);
+ void mode(uint32_t flags, int32_t w, int32_t h, int32_t r);
+ void done();
+ void scale(int32_t factor);
};
}
// |___/
namespace genivi {
+struct size {
+ uint32_t w, h;
+};
+
+struct rect {
+ uint32_t w, h;
+ int32_t x, y;
+};
+
+struct controller;
+
+struct controller_child {
+ struct controller *parent;
+ uint32_t id;
+
+ controller_child(struct controller *c, uint32_t i) : parent(c), id(i) {}
+ virtual ~controller_child() {}
+};
+
// __
// ___ _ _ _ __ / _| __ _ ___ ___
// / __| | | | '__| |_ / _` |/ __/ _ \
// \__ \ |_| | | | _| (_| | (_| __/
// |___/\__,_|_| |_| \__,_|\___\___|
//
-struct surface : public wayland_proxy<ivi_controller_surface> {
- uint32_t id;
-
- surface(uint32_t i, ivi_controller *c);
+struct surface : public wayland_proxy<struct ivi_controller_surface>,
+ controller_child {
+ 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;
- void event_visibility(int32_t visibility);
- void event_opacity(wl_fixed_t opacity);
- void event_source_rectangle(int32_t x, int32_t y, int32_t width,
- int32_t height);
- void event_destination_rectangle(int32_t x, int32_t y, int32_t width,
+ // 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);
- void event_configuration(int32_t width, int32_t height);
- void event_orientation(int32_t orientation);
- void event_pixelformat(int32_t pixelformat);
- void event_layer(struct ivi_controller_layer *layer);
- void event_stats(uint32_t redraw_count, uint32_t frame_count,
- uint32_t update_count, uint32_t pid,
- const char *process_name);
- void event_destroyed();
- void event_content(int32_t content_state);
-
- static void s_visibility(
- void *data, struct ivi_controller_surface *ivi_controller_surface,
- int32_t visibility);
- static void s_opacity(void *data,
- struct ivi_controller_surface *ivi_controller_surface,
- wl_fixed_t opacity);
- static void s_source_rectangle(
- void *data, struct ivi_controller_surface *ivi_controller_surface,
- int32_t x, int32_t y, int32_t width, int32_t height);
- static void s_destination_rectangle(
- void *data, struct ivi_controller_surface *ivi_controller_surface,
- int32_t x, int32_t y, int32_t width, int32_t height);
- static void s_configuration(
- void *data, struct ivi_controller_surface *ivi_controller_surface,
- int32_t width, int32_t height);
- static void s_orientation(
- void *data, struct ivi_controller_surface *ivi_controller_surface,
- int32_t orientation);
- static void s_pixelformat(
- void *data, struct ivi_controller_surface *ivi_controller_surface,
- int32_t pixelformat);
- static void s_layer(void *data,
- struct ivi_controller_surface *ivi_controller_surface,
- struct ivi_controller_layer *layer);
- static void s_stats(void *data,
- struct ivi_controller_surface *ivi_controller_surface,
- uint32_t redraw_count, uint32_t frame_count,
- uint32_t update_count, uint32_t pid,
- const char *process_name);
- static void s_destroyed(
- void *data, struct ivi_controller_surface *ivi_controller_surface);
- static void s_content(void *data,
- struct ivi_controller_surface *ivi_controller_surface,
- int32_t content_state);
-
- static constexpr ivi_controller_surface_listener listener = {
- s_visibility,
- s_opacity,
- s_source_rectangle,
- s_destination_rectangle,
- s_configuration,
- s_orientation,
- s_pixelformat,
- s_layer,
- s_stats,
- s_destroyed,
- s_content,
- };
+ void set_destination_rectangle(int32_t x, int32_t y, int32_t width,
+ int32_t height);
+ void set_configuration(int32_t width, int32_t height);
+ void set_orientation(int32_t orientation);
+ void screenshot(const char *filename);
+ void send_stats();
+ void destroy(int32_t destroy_scene_object);
};
// _
// | | (_| | |_| | __/ |
// |_|\__,_|\__, |\___|_|
// |___/
-struct layer : public wayland_proxy<ivi_controller_layer> {
- uint32_t id;
-
- layer(uint32_t i, ivi_controller *c);
+struct layer : public wayland_proxy<struct ivi_controller_layer>,
+ 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;
- void event_visibility(int32_t visibility);
- void event_opacity(wl_fixed_t opacity);
- void event_source_rectangle(int32_t x, int32_t y, int32_t width,
- int32_t height);
- void event_destination_rectangle(int32_t x, int32_t y, int32_t width,
- int32_t height);
- void event_configuration(int32_t width, int32_t height);
- void event_orientation(int32_t orientation);
- void event_screen(struct wl_output *screen);
- void event_destroyed();
-
- static void s_visibility(void *data,
- struct ivi_controller_layer *ivi_controller_layer,
- int32_t visibility);
- static void s_opacity(void *data,
- struct ivi_controller_layer *ivi_controller_layer,
- wl_fixed_t opacity);
- static void s_source_rectangle(
- void *data, struct ivi_controller_layer *ivi_controller_layer, int32_t x,
- int32_t y, int32_t width, int32_t height);
- static void s_destination_rectangle(
- void *data, struct ivi_controller_layer *ivi_controller_layer, int32_t x,
- int32_t y, int32_t width, int32_t height);
- static void s_configuration(
- void *data, struct ivi_controller_layer *ivi_controller_layer,
- int32_t width, int32_t height);
- static void s_orientation(void *data,
- struct ivi_controller_layer *ivi_controller_layer,
- int32_t orientation);
- static void s_screen(void *data,
- struct ivi_controller_layer *ivi_controller_layer,
- struct wl_output *screen);
- static void s_destroyed(void *data,
- struct ivi_controller_layer *ivi_controller_layer);
-
- static constexpr ivi_controller_layer_listener listener = {
- s_visibility, s_opacity,
- s_source_rectangle, s_destination_rectangle,
- s_configuration, s_orientation,
- s_screen, s_destroyed,
- };
+ // 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);
+ void set_destination_rectangle(int32_t x, int32_t y, int32_t width,
+ int32_t height);
+ void set_configuration(int32_t width, int32_t height);
+ void set_orientation(int32_t orientation);
+ void screenshot(const char *filename);
+ void clear_surfaces();
+ void add_surface(struct surface *surface);
+ void remove_surface(struct surface *surface);
+ void set_render_order(std::vector<uint32_t> const &ro);
};
//
-// ___ ___ _ __ ___ ___ _ __
-/// __|/ __| '__/ _ \/ _ \ '_ \
-//\__ \ (__| | | __/ __/ | | |
-//|___/\___|_| \___|\___|_| |_|
+// ___ ___ _ __ ___ ___ _ __
+// / __|/ __| '__/ _ \/ _ \ '_ \
+// \__ \ (__| | | __/ __/ | | |
+// |___/\___|_| \___|\___|_| |_|
//
-struct screen : public wayland_proxy<ivi_controller_screen> {
- uint32_t id;
-
- screen(uint32_t i, ivi_controller_screen *p);
+struct screen : public wayland_proxy<struct ivi_controller_screen>,
+ controller_child {
+ screen(uint32_t i, struct controller *c, struct ivi_controller_screen *p);
+ void clear();
+ void add_layer(layer *l);
+ void set_render_order(std::vector<uint32_t> const &ro);
};
// _ _ _
// | (_| (_) | | | | |_| | | (_) | | | __/ |
// \___\___/|_| |_|\__|_| \___/|_|_|\___|_|
//
-struct controller : public wayland_proxy<ivi_controller> {
- std::map<uint32_t, std::unique_ptr<surface>> surfaces;
- std::map<uint32_t, std::unique_ptr<layer>> layers;
- std::map<uint32_t, std::unique_ptr<screen>> screens;
+struct controller : public wayland_proxy<struct ivi_controller> {
+ 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;
- controller(wl_registry *r, uint32_t name, uint32_t version);
- ~controller() override;
+ 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;
- void event_screen(uint32_t id, ivi_controller_screen *screen);
- void event_layer(uint32_t id);
- void event_surface(uint32_t id);
- void event_error(int32_t oid, int32_t otype, int32_t code, char const *text);
+ typedef std::pair<char const *, std::function<void(struct controller *)>>
+ name_task_pair;
+ std::vector<name_task_pair> pending;
- // thunks...
- static void s_screen(void *data, struct ivi_controller *ivi_controller,
- uint32_t id_screen,
- struct ivi_controller_screen *screen);
+ size output_size;
- static void s_layer(void *data, struct ivi_controller *ivi_controller,
- uint32_t id_layer);
+ 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 remove_proxy_to_id_mapping(struct ivi_controller_layer *p);
+ void add_proxy_to_id_mapping(struct wl_output *p, uint32_t id);
+ void remove_proxy_to_id_mapping(struct wl_output *p);
- static void s_surface(void *data, struct ivi_controller *ivi_controller,
- uint32_t id_surface);
+ void add_task(char const *name, std::function<void(struct controller *)> &&f);
+ void execute_pending();
- static void s_error(void *data, struct ivi_controller *ivi_controller,
- int32_t object_id, int32_t object_type,
- int32_t error_code, const char *error_text);
+ controller(struct wl_registry *r, uint32_t name, uint32_t version);
+ ~controller() override;
- static constexpr ivi_controller_listener listener = {s_screen, s_layer,
- s_surface, s_error};
+ // 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 object_id, int32_t object_type,
+ 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,
+ 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