// |_| |___/
display::display()
: d(std::unique_ptr<struct wl_display, void (*)(struct wl_display *)>(
- wl_display_connect(nullptr),
-#ifdef DEBUG_OUTPUT
- [](struct wl_display *d) {
- logdebug("wl::display ~display @ %p", d);
- wl_display_disconnect(d);
- })),
-#else
- &wl_display_disconnect)),
-#endif
- r(d.get()) {
-}
-
-display::~display() = default;
+ wl_display_connect(nullptr), &wl_display_disconnect)),
+ r(d.get()) {}
bool display::ok() const { return d && wl_display_get_error(d.get()) == 0; }
registry::registry(struct wl_display *d)
: wayland_proxy(d == nullptr ? nullptr : wl_display_get_registry(d)) {
if (this->proxy != nullptr) {
- wl_registry_add_listener(this->proxy, ®istry_listener, this);
+ wl_registry_add_listener(this->proxy.get(), ®istry_listener, this);
}
}
-registry::~registry() {
- logdebug("wl::registry %s @ %p", __func__, this->proxy);
-}
-
void registry::add_global_handler(char const *iface, binder bind) {
this->bindings[iface] = std::move(bind);
}
void registry::global(uint32_t name, char const *iface, uint32_t v) {
auto b = this->bindings.find(iface);
if (b != this->bindings.end()) {
- b->second(this->proxy, name, v);
+ b->second(this->proxy.get(), name, v);
}
- logdebug("wl::registry @ %p global n %u i %s v %u", this->proxy, name, iface,
- v);
+ logdebug("wl::registry @ %p global n %u i %s v %u", this->proxy.get(), name,
+ iface, v);
}
void registry::global_remove(uint32_t /*name*/) {}
output::output(struct wl_registry *r, uint32_t name, uint32_t v)
: wayland_proxy(wl_registry_bind(r, name, &wl_output_interface, v)) {
- wl_output_add_listener(this->proxy, &output_listener, this);
+ wl_output_add_listener(this->proxy.get(), &output_listener, this);
}
void output::geometry(int32_t x, int32_t y, int32_t pw, int32_t ph,
int32_t tx) {
logdebug(
"wl::output %s @ %p x %i y %i w %i h %i spel %x make %s model %s tx %i",
- __func__, this->proxy, x, y, pw, ph, subpel, make, model, tx);
+ __func__, this->proxy.get(), x, y, pw, ph, subpel, make, model, tx);
}
void output::mode(uint32_t flags, int32_t w, int32_t h, int32_t r) {
- logdebug("wl::output %s @ %p f %x w %i h %i r %i", __func__, this->proxy,
- flags, w, h, r);
+ logdebug("wl::output %s @ %p f %x w %i h %i r %i", __func__,
+ this->proxy.get(), flags, w, h, r);
if ((flags & WL_OUTPUT_MODE_CURRENT) != 0u) {
this->width = w;
this->height = h;
}
void output::done() {
- logdebug("wl::output %s @ %p done", __func__, this->proxy);
+ logdebug("wl::output %s @ %p done", __func__, this->proxy.get());
}
void output::scale(int32_t factor) {
- logdebug("wl::output %s @ %p f %i", __func__, this->proxy, factor);
+ logdebug("wl::output %s @ %p f %i", __func__, this->proxy.get(), factor);
}
} // namespace wl
screens{},
pending{},
output_size{} {
- ivi_controller_add_listener(this->proxy, &listener, this);
+ ivi_controller_add_listener(this->proxy.get(), &listener, this);
}
-controller::~controller() = default;
-
void controller::layer_create(uint32_t id, int32_t w, int32_t h) {
- this->layers[id] = std::make_unique<layer>(id, w, h, this);
+ this->layers[id] = std::make_unique<struct layer>(id, w, h, this);
}
void controller::surface_create(uint32_t id) {
- this->surfaces[id] = std::make_unique<surface>(id, this);
+ this->surfaces[id] = std::make_unique<struct surface>(id, this);
}
void controller::controller_screen(uint32_t id,
struct ivi_controller_screen *screen) {
- logdebug("genivi::controller @ %p screen %u (%x) @ %p", this->proxy, id, id,
- screen);
+ logdebug("genivi::controller @ %p screen %u (%x) @ %p", this->proxy.get(),
+ id, id, screen);
this->screens[id] = std::make_unique<struct screen>(id, this, screen);
}
void controller::controller_layer(uint32_t id) {
- logdebug("genivi::controller @ %p layer %u (%x)", this->proxy, id, id);
+ logdebug("genivi::controller @ %p layer %u (%x)", this->proxy.get(), id, id);
auto &l = this->layers[id] = std::make_unique<struct layer>(id, this);
l->clear_surfaces();
}
void controller::controller_surface(uint32_t id) {
- logdebug("genivi::controller @ %p surface %u (%x)", this->proxy, id, id);
+ logdebug("genivi::controller @ %p surface %u (%x)", this->proxy.get(), id,
+ id);
this->surfaces[id] = std::make_unique<struct surface>(id, this);
add_task("fullscreen surface", [id](struct controller *c) {
void controller::controller_error(int32_t object_id, int32_t object_type,
int32_t error_code, const char *error_text) {
- logdebug("genivi::controller @ %p error o %i t %i c %i text %s", this->proxy,
- object_id, object_type, error_code, error_text);
+ logdebug("genivi::controller @ %p error o %i t %i c %i text %s",
+ this->proxy.get(), object_id, object_type, error_code, error_text);
}
// _
struct ivi_controller_layer * /*ivi_controller_layer*/,
int32_t visibility) {
auto l = static_cast<struct layer *>(data);
- l->parent->layer_visibility(l->id, visibility);
+ l->parent->layer_visibility(l, visibility);
}
void layer_opacity(void *data,
struct ivi_controller_layer * /*ivi_controller_layer*/,
wl_fixed_t opacity) {
auto l = static_cast<struct layer *>(data);
- l->parent->layer_opacity(l->id, float(wl_fixed_to_double(opacity)));
+ l->parent->layer_opacity(l, float(wl_fixed_to_double(opacity)));
}
void layer_source_rectangle(
void *data, struct ivi_controller_layer * /*ivi_controller_layer*/,
int32_t x, int32_t y, int32_t width, int32_t height) {
auto l = static_cast<struct layer *>(data);
- l->parent->layer_source_rectangle(l->id, x, y, width, height);
+ l->parent->layer_source_rectangle(l, x, y, width, height);
}
void layer_destination_rectangle(
void *data, struct ivi_controller_layer * /*ivi_controller_layer*/,
int32_t x, int32_t y, int32_t width, int32_t height) {
auto l = static_cast<struct layer *>(data);
- l->parent->layer_destination_rectangle(l->id, x, y, width, height);
+ l->parent->layer_destination_rectangle(l, x, y, width, height);
}
void layer_configuration(void *data,
struct ivi_controller_layer * /*ivi_controller_layer*/,
int32_t width, int32_t height) {
auto l = static_cast<struct layer *>(data);
- l->parent->layer_configuration(l->id, width, height);
+ l->parent->layer_configuration(l, width, height);
}
void layer_orientation(void *data,
struct ivi_controller_layer * /*ivi_controller_layer*/,
int32_t orientation) {
auto l = static_cast<struct layer *>(data);
- l->parent->layer_orientation(l->id, orientation);
+ l->parent->layer_orientation(l, orientation);
}
void layer_screen(void *data,
struct ivi_controller_layer * /*ivi_controller_layer*/,
struct wl_output *screen) {
auto l = static_cast<struct layer *>(data);
- l->parent->layer_screen(l->id, screen);
+ l->parent->layer_screen(l, screen);
}
void layer_destroyed(void *data,
struct ivi_controller_layer * /*ivi_controller_layer*/) {
auto l = static_cast<struct layer *>(data);
- l->parent->layer_destroyed(l->id);
+ l->parent->layer_destroyed(l);
}
constexpr struct ivi_controller_layer_listener layer_listener = {
layer::layer(uint32_t i, struct controller *c) : layer(i, 0, 0, c) {}
layer::layer(uint32_t i, int32_t w, int32_t h, struct controller *c)
- : wayland_proxy(ivi_controller_layer_create(c->proxy, i, w, h)),
+ : wayland_proxy(ivi_controller_layer_create(c->proxy.get(), i, w, h),
+ [c, i](ivi_controller_layer *l) {
+ logdebug("~layer layer %i @ %p", i, l);
+ c->remove_proxy_to_id_mapping(l);
+ ivi_controller_layer_destroy(l, 1);
+ }),
controller_child(c, i),
dst_rect{},
src_rect{},
orientation{},
visibility{},
opacity{} {
- this->parent->add_proxy_to_id_mapping(this->proxy, i);
- ivi_controller_layer_add_listener(this->proxy, &layer_listener, this);
-}
-
-layer::~layer() {
- logdebug("%s layer %i @ %p", __func__, this->id, this->proxy);
- this->parent->remove_proxy_to_id_mapping(this->proxy);
- ivi_controller_layer_destroy(this->proxy, 1);
- this->proxy = nullptr;
+ this->parent->add_proxy_to_id_mapping(this->proxy.get(), i);
+ ivi_controller_layer_add_listener(this->proxy.get(), &layer_listener, this);
}
void layer::set_visibility(uint32_t visibility) {
- ivi_controller_layer_set_visibility(this->proxy, visibility);
+ ivi_controller_layer_set_visibility(this->proxy.get(), visibility);
}
void layer::set_opacity(wl_fixed_t opacity) {
- ivi_controller_layer_set_opacity(this->proxy, opacity);
+ ivi_controller_layer_set_opacity(this->proxy.get(), opacity);
}
void layer::set_source_rectangle(int32_t x, int32_t y, int32_t width,
int32_t height) {
- ivi_controller_layer_set_source_rectangle(this->proxy, x, y, width, height);
+ ivi_controller_layer_set_source_rectangle(this->proxy.get(), x, y, width,
+ height);
}
void layer::set_destination_rectangle(int32_t x, int32_t y, int32_t width,
int32_t height) {
- ivi_controller_layer_set_destination_rectangle(this->proxy, x, y, width,
- height);
+ ivi_controller_layer_set_destination_rectangle(this->proxy.get(), x, y,
+ width, height);
}
void layer::set_configuration(int32_t width, int32_t height) {
- ivi_controller_layer_set_configuration(this->proxy, width, height);
+ ivi_controller_layer_set_configuration(this->proxy.get(), width, height);
}
void layer::set_orientation(int32_t orientation) {
- ivi_controller_layer_set_orientation(this->proxy, orientation);
+ ivi_controller_layer_set_orientation(this->proxy.get(), orientation);
}
void layer::screenshot(const char *filename) {
- ivi_controller_layer_screenshot(this->proxy, filename);
+ ivi_controller_layer_screenshot(this->proxy.get(), filename);
}
void layer::clear_surfaces() {
- ivi_controller_layer_clear_surfaces(this->proxy);
+ ivi_controller_layer_clear_surfaces(this->proxy.get());
}
void layer::add_surface(struct surface *surface) {
- ivi_controller_layer_add_surface(this->proxy, surface->proxy);
+ ivi_controller_layer_add_surface(this->proxy.get(), surface->proxy.get());
}
void layer::remove_surface(struct surface *surface) {
- ivi_controller_layer_remove_surface(this->proxy, surface->proxy);
+ ivi_controller_layer_remove_surface(this->proxy.get(), surface->proxy.get());
}
void layer::set_render_order(std::vector<uint32_t> const &ro) {
.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);
+ ivi_controller_layer_set_render_order(this->proxy.get(), &wlro);
}
-void controller::layer_visibility(uint32_t id, int32_t visibility) {
- logdebug("genivi::layer %s @ %p v %i", __func__, this->proxy, visibility);
- this->layers[id]->visibility = visibility;
+void controller::layer_visibility(struct layer *l, int32_t visibility) {
+ logdebug("genivi::layer %s @ %p v %i", __func__, this->proxy.get(),
+ visibility);
+ l->visibility = visibility;
}
-void controller::layer_opacity(uint32_t id, float opacity) {
- logdebug("genivi::layer %s @ %p o %f", __func__, this->proxy, opacity);
- this->layers[id]->opacity = opacity;
+void controller::layer_opacity(struct layer *l, float opacity) {
+ logdebug("genivi::layer %s @ %p o %f", __func__, this->proxy.get(), opacity);
+ l->opacity = opacity;
}
-void controller::layer_source_rectangle(uint32_t id, int32_t x, int32_t y,
+void controller::layer_source_rectangle(struct layer *l, int32_t x, int32_t y,
int32_t width, int32_t height) {
- logdebug("genivi::layer %s @ %p x %i y %i w %i h %i", __func__, this->proxy,
- x, y, width, height);
- this->layers[id]->src_rect = rect{uint32_t(width), uint32_t(height), x, y};
+ logdebug("genivi::layer %s @ %p x %i y %i w %i h %i", __func__,
+ this->proxy.get(), x, y, width, height);
+ l->src_rect = rect{uint32_t(width), uint32_t(height), x, y};
}
-void controller::layer_destination_rectangle(uint32_t id, int32_t x, int32_t y,
- int32_t width, int32_t height) {
- logdebug("genivi::layer %s @ %p x %i y %i w %i h %i", __func__, this->proxy,
- x, y, width, height);
- this->layers[id]->dst_rect = rect{uint32_t(width), uint32_t(height), x, y};
+void controller::layer_destination_rectangle(struct layer *l, int32_t x,
+ int32_t y, int32_t width,
+ int32_t height) {
+ logdebug("genivi::layer %s @ %p x %i y %i w %i h %i", __func__,
+ this->proxy.get(), x, y, width, height);
+ l->dst_rect = rect{uint32_t(width), uint32_t(height), x, y};
}
-void controller::layer_configuration(uint32_t id, int32_t width,
+void controller::layer_configuration(struct layer *l, int32_t width,
int32_t height) {
- logdebug("genivi::layer %s @ %p w %i h %i", __func__, this->proxy, width,
- height);
- this->layers[id]->size = size{uint32_t(width), uint32_t(height)};
+ logdebug("genivi::layer %s @ %p w %i h %i", __func__, this->proxy.get(),
+ width, height);
+ l->size = size{uint32_t(width), uint32_t(height)};
}
-void controller::layer_orientation(uint32_t id, int32_t orientation) {
- logdebug("genivi::layer %s @ %p o %i", __func__, this->proxy, orientation);
- this->layers[id]->orientation = orientation;
+void controller::layer_orientation(struct layer *l, int32_t orientation) {
+ logdebug("genivi::layer %s @ %p o %i", __func__, this->proxy.get(),
+ orientation);
+ l->orientation = orientation;
}
-void controller::layer_screen(uint32_t /*id*/, struct wl_output *screen) {
- logdebug("genivi::layer %s @ %p s %p", __func__, this->proxy, screen);
+void controller::layer_screen(struct layer * /*l*/, struct wl_output *screen) {
+ logdebug("genivi::layer %s @ %p s %p", __func__, this->proxy.get(), screen);
}
-void controller::layer_destroyed(uint32_t id) {
- logdebug("genivi::layer %s @ %p", __func__, this->proxy);
+void controller::layer_destroyed(struct layer *l) {
+ logdebug("genivi::layer %s @ %p", __func__, this->proxy.get());
add_task("remove layer",
- [id](struct controller *c) { c->layers.erase(id); });
+ [l](struct controller *c) { c->layers.erase(l->id); });
}
// __
void *data, struct ivi_controller_surface * /*ivi_controller_surface*/,
int32_t visibility) {
auto s = static_cast<struct surface *>(data);
- s->parent->surface_visibility(s->id, visibility);
+ s->parent->surface_visibility(s, visibility);
}
void surface_opacity(void *data,
struct ivi_controller_surface * /*ivi_controller_surface*/,
wl_fixed_t opacity) {
auto s = static_cast<struct surface *>(data);
- s->parent->surface_opacity(s->id, float(wl_fixed_to_double(opacity)));
+ s->parent->surface_opacity(s, float(wl_fixed_to_double(opacity)));
}
void surface_source_rectangle(
void *data, struct ivi_controller_surface * /*ivi_controller_surface*/,
int32_t x, int32_t y, int32_t width, int32_t height) {
auto s = static_cast<struct surface *>(data);
- s->parent->surface_source_rectangle(s->id, x, y, width, height);
+ s->parent->surface_source_rectangle(s, x, y, width, height);
}
void surface_destination_rectangle(
void *data, struct ivi_controller_surface * /*ivi_controller_surface*/,
int32_t x, int32_t y, int32_t width, int32_t height) {
auto s = static_cast<struct surface *>(data);
- s->parent->surface_destination_rectangle(s->id, x, y, width, height);
+ s->parent->surface_destination_rectangle(s, x, y, width, height);
}
void surface_configuration(
void *data, struct ivi_controller_surface * /*ivi_controller_surface*/,
int32_t width, int32_t height) {
auto s = static_cast<struct surface *>(data);
- s->parent->surface_configuration(s->id, width, height);
+ s->parent->surface_configuration(s, width, height);
}
void surface_orientation(
void *data, struct ivi_controller_surface * /*ivi_controller_surface*/,
int32_t orientation) {
auto s = static_cast<struct surface *>(data);
- s->parent->surface_orientation(s->id, orientation);
+ s->parent->surface_orientation(s, orientation);
}
void surface_pixelformat(
void *data, struct ivi_controller_surface * /*ivi_controller_surface*/,
int32_t pixelformat) {
auto s = static_cast<struct surface *>(data);
- s->parent->surface_pixelformat(s->id, pixelformat);
+ s->parent->surface_pixelformat(s, pixelformat);
}
void surface_layer(void *data,
struct ivi_controller_surface * /*ivi_controller_surface*/,
struct ivi_controller_layer *layer) {
auto s = static_cast<struct surface *>(data);
- s->parent->surface_layer(s->id, layer);
+ s->parent->surface_layer(s, layer);
}
void surface_stats(void *data,
uint32_t update_count, uint32_t pid,
const char *process_name) {
auto s = static_cast<struct surface *>(data);
- s->parent->surface_stats(s->id, redraw_count, frame_count,
- update_count, pid, process_name);
+ s->parent->surface_stats(s, redraw_count, frame_count, update_count, pid,
+ process_name);
}
void surface_destroyed(
void *data, struct ivi_controller_surface * /*ivi_controller_surface*/) {
auto s = static_cast<struct surface *>(data);
- s->parent->surface_destroyed(s->id);
+ s->parent->surface_destroyed(s);
}
void surface_content(void *data,
struct ivi_controller_surface * /*ivi_controller_surface*/,
int32_t content_state) {
auto s = static_cast<struct surface *>(data);
- s->parent->surface_content(s->id, content_state);
+ s->parent->surface_content(s, content_state);
}
constexpr struct ivi_controller_surface_listener surface_listener = {
} // namespace
surface::surface(uint32_t i, struct controller *c)
- : wayland_proxy(ivi_controller_surface_create(c->proxy, i)),
+ : wayland_proxy(ivi_controller_surface_create(c->proxy.get(), i),
+ [c, i](ivi_controller_surface *s) {
+ logdebug("~surface surface %i @ %p", i, s);
+ c->remove_proxy_to_id_mapping(s);
+ ivi_controller_surface_destroy(s, 1);
+ }),
controller_child(c, i),
dst_rect{},
src_rect{},
orientation{},
visibility{},
opacity{1.f} {
- this->parent->add_proxy_to_id_mapping(this->proxy, i);
- ivi_controller_surface_add_listener(this->proxy, &surface_listener, this);
-}
-
-surface::~surface() {
- logdebug("%s surface %i @ %p", __func__, this->id, this->proxy);
- this->parent->remove_proxy_to_id_mapping(this->proxy);
- ivi_controller_surface_destroy(this->proxy, 1);
- this->proxy = nullptr;
+ this->parent->add_proxy_to_id_mapping(this->proxy.get(), i);
+ ivi_controller_surface_add_listener(this->proxy.get(), &surface_listener,
+ this);
}
void surface::set_visibility(uint32_t visibility) {
- ivi_controller_surface_set_visibility(this->proxy, visibility);
+ ivi_controller_surface_set_visibility(this->proxy.get(), visibility);
}
void surface::set_opacity(wl_fixed_t opacity) {
- ivi_controller_surface_set_opacity(this->proxy, opacity);
+ ivi_controller_surface_set_opacity(this->proxy.get(), opacity);
}
void surface::set_source_rectangle(int32_t x, int32_t y, int32_t width,
int32_t height) {
- ivi_controller_surface_set_source_rectangle(this->proxy, x, y, width,
+ ivi_controller_surface_set_source_rectangle(this->proxy.get(), x, y, width,
height);
}
void surface::set_destination_rectangle(int32_t x, int32_t y, int32_t width,
int32_t height) {
- ivi_controller_surface_set_destination_rectangle(this->proxy, x, y, width,
- height);
+ ivi_controller_surface_set_destination_rectangle(this->proxy.get(), x, y,
+ width, height);
}
void surface::set_configuration(int32_t width, int32_t height) {
- ivi_controller_surface_set_configuration(this->proxy, width, height);
+ ivi_controller_surface_set_configuration(this->proxy.get(), width, height);
}
void surface::set_orientation(int32_t orientation) {
- ivi_controller_surface_set_orientation(this->proxy, orientation);
+ ivi_controller_surface_set_orientation(this->proxy.get(), orientation);
}
void surface::screenshot(const char *filename) {
- ivi_controller_surface_screenshot(this->proxy, filename);
+ ivi_controller_surface_screenshot(this->proxy.get(), filename);
}
-void surface::send_stats() { ivi_controller_surface_send_stats(this->proxy); }
+void surface::send_stats() {
+ ivi_controller_surface_send_stats(this->proxy.get());
+}
void surface::destroy(int32_t destroy_scene_object) {
- ivi_controller_surface_destroy(this->proxy, destroy_scene_object);
+ ivi_controller_surface_destroy(this->proxy.get(), destroy_scene_object);
}
-void controller::surface_visibility(uint32_t id, int32_t visibility) {
- logdebug("genivi::surface %s @ %p v %i", __func__, this->proxy, visibility);
- this->surfaces[id]->visibility = visibility;
+void controller::surface_visibility(struct surface *s, int32_t visibility) {
+ logdebug("genivi::surface %s @ %p v %i", __func__, this->proxy.get(),
+ visibility);
+ s->visibility = visibility;
}
-void controller::surface_opacity(uint32_t id, float opacity) {
- logdebug("genivi::surface %s @ %p o %f", __func__, this->proxy, opacity);
- this->surfaces[id]->opacity = opacity;
+void controller::surface_opacity(struct surface *s, float opacity) {
+ logdebug("genivi::surface %s @ %p o %f", __func__, this->proxy.get(),
+ opacity);
+ s->opacity = opacity;
}
-void controller::surface_source_rectangle(uint32_t id, int32_t x, int32_t y,
- int32_t width, int32_t height) {
+void controller::surface_source_rectangle(struct surface *s, int32_t x,
+ int32_t y, int32_t width,
+ int32_t height) {
logdebug("genivi::surface %s @ %p x %i y %i w %i h %i", __func__,
- this->proxy, x, y, width, height);
- this->surfaces[id]->src_rect = rect{uint32_t(width), uint32_t(height), x, y};
+ this->proxy.get(), x, y, width, height);
+ s->src_rect = rect{uint32_t(width), uint32_t(height), x, y};
}
-void controller::surface_destination_rectangle(uint32_t id, int32_t x,
+void controller::surface_destination_rectangle(struct surface *s, int32_t x,
int32_t y, int32_t width,
int32_t height) {
logdebug("genivi::surface %s @ %p x %i y %i w %i h %i", __func__,
- this->proxy, x, y, width, height);
- this->surfaces[id]->dst_rect = rect{uint32_t(width), uint32_t(height), x, y};
+ this->proxy.get(), x, y, width, height);
+ s->dst_rect = rect{uint32_t(width), uint32_t(height), x, y};
}
-void controller::surface_configuration(uint32_t id, int32_t width,
+void controller::surface_configuration(struct surface *s, int32_t width,
int32_t height) {
- logdebug("genivi::surface %s @ %p w %i h %i", __func__, this->proxy, width,
- height);
- this->surfaces[id]->size = size{uint32_t(width), uint32_t(height)};
+ logdebug("genivi::surface %s @ %p w %i h %i", __func__, this->proxy.get(),
+ width, height);
+ s->size = size{uint32_t(width), uint32_t(height)};
}
-void controller::surface_orientation(uint32_t id, int32_t orientation) {
- logdebug("genivi::surface %s @ %p o %i", __func__, this->proxy, orientation);
- this->surfaces[id]->orientation = orientation;
+void controller::surface_orientation(struct surface *s, int32_t orientation) {
+ logdebug("genivi::surface %s @ %p o %i", __func__, this->proxy.get(),
+ orientation);
+ s->orientation = orientation;
}
-void controller::surface_pixelformat(uint32_t /*id*/, int32_t pixelformat) {
- logdebug("genivi::surface %s @ %p f %i", __func__, this->proxy, pixelformat);
+void controller::surface_pixelformat(struct surface * /*s*/,
+ int32_t pixelformat) {
+ logdebug("genivi::surface %s @ %p f %i", __func__, this->proxy.get(),
+ pixelformat);
}
-void controller::surface_layer(uint32_t /*id*/,
+void controller::surface_layer(struct surface * /*s*/,
struct ivi_controller_layer *layer) {
- logdebug("genivi::surface %s @ %p l %u @ %p", __func__, this->proxy,
+ logdebug("genivi::surface %s @ %p l %u @ %p", __func__, this->proxy.get(),
this->layer_proxy_to_id[uintptr_t(layer)], layer);
}
-void controller::surface_stats(uint32_t /*id*/, uint32_t redraw_count,
+void controller::surface_stats(struct surface * /*s*/, uint32_t redraw_count,
uint32_t frame_count, uint32_t update_count,
uint32_t pid, const char *process_name) {
logdebug("genivi::surface %s @ %p r %u f %u u %u pid %u p %s", __func__,
- this->proxy, redraw_count, frame_count, update_count, pid,
+ this->proxy.get(), redraw_count, frame_count, update_count, pid,
process_name);
}
-void controller::surface_destroyed(uint32_t id) {
- logdebug("genivi::surface %s @ %p", __func__, this->proxy);
- this->surfaces.erase(id);
+void controller::surface_destroyed(struct surface *s) {
+ logdebug("genivi::surface %s @ %p", __func__, this->proxy.get());
+ this->surfaces.erase(s->id);
}
-void controller::surface_content(uint32_t id, int32_t content_state) {
- logdebug("genivi::surface %s @ %p s %i", __func__, this->proxy,
+void controller::surface_content(struct surface *s, int32_t content_state) {
+ logdebug("genivi::surface %s @ %p s %i", __func__, this->proxy.get(),
content_state);
if (content_state == IVI_CONTROLLER_SURFACE_CONTENT_STATE_CONTENT_REMOVED) {
add_task("remove surface",
- [id](struct controller *c) { c->surfaces.erase(id); });
+ [s](struct controller *c) { c->surfaces.erase(s->id); });
}
}
-void controller::add_proxy_to_id_mapping(struct ivi_controller_surface *p, uint32_t id) {
+void controller::add_proxy_to_id_mapping(struct ivi_controller_surface *p,
+ uint32_t id) {
this->surface_proxy_to_id[uintptr_t(p)] = id;
logdebug("Add surface proxy mapping for %p (%u)", p, id);
}
this->surface_proxy_to_id.erase(uintptr_t(p));
}
-void controller::add_proxy_to_id_mapping(struct ivi_controller_layer *p, uint32_t id) {
+void controller::add_proxy_to_id_mapping(struct ivi_controller_layer *p,
+ uint32_t id) {
logdebug("Add layer proxy mapping for %p (%u)", p, id);
this->layer_proxy_to_id[uintptr_t(p)] = id;
}
this->screen_proxy_to_id.erase(uintptr_t(p));
}
-void controller::add_task(char const *name, std::function<void(struct controller *)> &&f) {
+void controller::add_task(char const *name,
+ std::function<void(struct controller *)> &&f) {
this->pending.emplace_back(std::make_pair(name, f));
}
t.second(this);
}
this->pending.clear();
- ivi_controller_commit_changes(this->proxy);
+ ivi_controller_commit_changes(this->proxy.get());
// XXX: No flush here...
}
}
+void controller::debug_dump_current_status() {
+ if (!this->surfaces.empty()) {
+ puts("Surfaces:");
+ for (auto const &i : this->surfaces) {
+ auto const &r = i.second->dst_rect;
+ auto const &s = i.second->size;
+ printf("%d [%ux%u] (%ux%u@%dx%d), ", i.first, s.w, s.h, r.w, r.h, r.x,
+ r.y);
+ }
+ puts("\b\b ");
+ }
+
+ if (!this->layers.empty()) {
+ puts("Layers:");
+ for (auto const &i : this->layers) {
+ auto const &r = i.second->dst_rect;
+ auto const &s = i.second->size;
+ printf("%d [%ux%u] (%ux%u@%dx%d), ", i.first, s.w, s.h, r.w, r.h, r.x,
+ r.y);
+ }
+ puts("\b\b ");
+ }
+}
//
// ___ ___ _ __ ___ ___ _ __
// / __|/ __| '__/ _ \/ _ \ '_ \
logdebug("genivi::screen @ %p id %u", p, i);
}
-void screen::clear() { ivi_controller_screen_clear(this->proxy); }
+void screen::clear() { ivi_controller_screen_clear(this->proxy.get()); }
void screen::add_layer(layer *l) {
- ivi_controller_screen_add_layer(this->proxy, l->proxy);
+ ivi_controller_screen_add_layer(this->proxy.get(), l->proxy.get());
}
void screen::set_render_order(std::vector<uint32_t> const &ro) {
.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);
+ ivi_controller_screen_set_render_order(this->proxy.get(), &wlro);
}
} // namespace genivi
Code Review / staging / windowmanager.git / blobdiff