: wayland_proxy(d == nullptr ? nullptr : wl_display_get_registry(d)) {
if (this->proxy != nullptr) {
wl_registry_add_listener(this->proxy, ®istry_listener, this);
-}
+ }
}
registry::~registry() {
: wayland_proxy(
wl_registry_bind(r, name, &ivi_controller_interface, version)),
surface_proxy_to_id{},
- surfaces{},
layer_proxy_to_id{},
- layers{},
screen_proxy_to_id{},
+ surfaces{},
+ layers{},
screens{},
pending{},
output_size{} {
void layer_visibility(void *data,
struct ivi_controller_layer * /*ivi_controller_layer*/,
int32_t visibility) {
- static_cast<struct layer *>(data)->parent->layer_visibility(
- static_cast<struct layer *>(data)->id, visibility);
+ auto l = static_cast<struct layer *>(data);
+ l->parent->layer_visibility(l->id, visibility);
}
void layer_opacity(void *data,
struct ivi_controller_layer * /*ivi_controller_layer*/,
wl_fixed_t opacity) {
- static_cast<struct layer *>(data)->parent->layer_opacity(
- static_cast<struct layer *>(data)->id,
- float(wl_fixed_to_double(opacity)));
+ auto l = static_cast<struct layer *>(data);
+ l->parent->layer_opacity(l->id, 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) {
- static_cast<struct layer *>(data)->parent->layer_source_rectangle(
- static_cast<struct layer *>(data)->id, x, y, width, height);
+ auto l = static_cast<struct layer *>(data);
+ l->parent->layer_source_rectangle(l->id, 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) {
- static_cast<struct layer *>(data)->parent->layer_destination_rectangle(
- static_cast<struct layer *>(data)->id, x, y, width, height);
+ auto l = static_cast<struct layer *>(data);
+ l->parent->layer_destination_rectangle(l->id, x, y, width, height);
}
void layer_configuration(void *data,
struct ivi_controller_layer * /*ivi_controller_layer*/,
int32_t width, int32_t height) {
- static_cast<struct layer *>(data)->parent->layer_configuration(
- static_cast<struct layer *>(data)->id, width, height);
+ auto l = static_cast<struct layer *>(data);
+ l->parent->layer_configuration(l->id, width, height);
}
void layer_orientation(void *data,
struct ivi_controller_layer * /*ivi_controller_layer*/,
int32_t orientation) {
- static_cast<struct layer *>(data)->parent->layer_orientation(
- static_cast<struct layer *>(data)->id, orientation);
+ auto l = static_cast<struct layer *>(data);
+ l->parent->layer_orientation(l->id, orientation);
}
void layer_screen(void *data,
struct ivi_controller_layer * /*ivi_controller_layer*/,
struct wl_output *screen) {
- static_cast<struct layer *>(data)->parent->layer_screen(
- static_cast<struct layer *>(data)->id, screen);
+ auto l = static_cast<struct layer *>(data);
+ l->parent->layer_screen(l->id, screen);
}
void layer_destroyed(void *data,
struct ivi_controller_layer * /*ivi_controller_layer*/) {
- static_cast<struct layer *>(data)->parent->layer_destroyed(
- static_cast<struct layer *>(data)->id);
+ auto l = static_cast<struct layer *>(data);
+ l->parent->layer_destroyed(l->id);
}
constexpr struct ivi_controller_layer_listener layer_listener = {
this->proxy = nullptr;
}
+void layer::set_visibility(uint32_t visibility) {
+ ivi_controller_layer_set_visibility(this->proxy, visibility);
+}
+
+void layer::set_opacity(wl_fixed_t opacity) {
+ ivi_controller_layer_set_opacity(this->proxy, 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);
+}
+
+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);
+}
+
+void layer::set_configuration(int32_t width, int32_t height) {
+ ivi_controller_layer_set_configuration(this->proxy, width, height);
+}
+
+void layer::set_orientation(int32_t orientation) {
+ ivi_controller_layer_set_orientation(this->proxy, orientation);
+}
+
+void layer::screenshot(const char *filename) {
+ ivi_controller_layer_screenshot(this->proxy, filename);
+}
+
+void layer::clear_surfaces() {
+ ivi_controller_layer_clear_surfaces(this->proxy);
+}
+
+void layer::add_surface(struct surface *surface) {
+ ivi_controller_layer_add_surface(this->proxy, surface->proxy);
+}
+
+void layer::remove_surface(struct surface *surface) {
+ ivi_controller_layer_remove_surface(this->proxy, surface->proxy);
+}
+
+void layer::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);
+}
+
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 surface_visibility(
void *data, struct ivi_controller_surface * /*ivi_controller_surface*/,
int32_t visibility) {
- static_cast<struct surface *>(data)->parent->surface_visibility(
- static_cast<struct surface *>(data)->id, visibility);
+ auto s = static_cast<struct surface *>(data);
+ s->parent->surface_visibility(s->id, visibility);
}
void surface_opacity(void *data,
struct ivi_controller_surface * /*ivi_controller_surface*/,
wl_fixed_t opacity) {
- static_cast<struct surface *>(data)->parent->surface_opacity(
- static_cast<struct surface *>(data)->id,
- float(wl_fixed_to_double(opacity)));
+ auto s = static_cast<struct surface *>(data);
+ s->parent->surface_opacity(s->id, 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) {
- static_cast<struct surface *>(data)->parent->surface_source_rectangle(
- static_cast<struct surface *>(data)->id, x, y, width, height);
+ auto s = static_cast<struct surface *>(data);
+ s->parent->surface_source_rectangle(s->id, 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) {
- static_cast<struct surface *>(data)->parent->surface_destination_rectangle(
- static_cast<struct surface *>(data)->id, x, y, width, height);
+ auto s = static_cast<struct surface *>(data);
+ s->parent->surface_destination_rectangle(s->id, x, y, width, height);
}
void surface_configuration(
void *data, struct ivi_controller_surface * /*ivi_controller_surface*/,
int32_t width, int32_t height) {
- static_cast<struct surface *>(data)->parent->surface_configuration(
- static_cast<struct surface *>(data)->id, width, height);
+ auto s = static_cast<struct surface *>(data);
+ s->parent->surface_configuration(s->id, width, height);
}
void surface_orientation(
void *data, struct ivi_controller_surface * /*ivi_controller_surface*/,
int32_t orientation) {
- static_cast<struct surface *>(data)->parent->surface_orientation(
- static_cast<struct surface *>(data)->id, orientation);
+ auto s = static_cast<struct surface *>(data);
+ s->parent->surface_orientation(s->id, orientation);
}
void surface_pixelformat(
void *data, struct ivi_controller_surface * /*ivi_controller_surface*/,
int32_t pixelformat) {
- static_cast<struct surface *>(data)->parent->surface_pixelformat(
- static_cast<struct surface *>(data)->id, pixelformat);
+ auto s = static_cast<struct surface *>(data);
+ s->parent->surface_pixelformat(s->id, pixelformat);
}
void surface_layer(void *data,
struct ivi_controller_surface * /*ivi_controller_surface*/,
struct ivi_controller_layer *layer) {
- static_cast<struct surface *>(data)->parent->surface_layer(
- static_cast<struct surface *>(data)->id, layer);
+ auto s = static_cast<struct surface *>(data);
+ s->parent->surface_layer(s->id, layer);
}
void surface_stats(void *data,
uint32_t redraw_count, uint32_t frame_count,
uint32_t update_count, uint32_t pid,
const char *process_name) {
- static_cast<struct surface *>(data)->parent->surface_stats(
- static_cast<struct surface *>(data)->id, redraw_count, frame_count,
+ auto s = static_cast<struct surface *>(data);
+ s->parent->surface_stats(s->id, redraw_count, frame_count,
update_count, pid, process_name);
}
void surface_destroyed(
void *data, struct ivi_controller_surface * /*ivi_controller_surface*/) {
- static_cast<struct surface *>(data)->parent->surface_destroyed(
- static_cast<struct surface *>(data)->id);
+ auto s = static_cast<struct surface *>(data);
+ s->parent->surface_destroyed(s->id);
}
void surface_content(void *data,
struct ivi_controller_surface * /*ivi_controller_surface*/,
int32_t content_state) {
- static_cast<struct surface *>(data)->parent->surface_content(
- static_cast<struct surface *>(data)->id, content_state);
+ auto s = static_cast<struct surface *>(data);
+ s->parent->surface_content(s->id, content_state);
}
constexpr struct ivi_controller_surface_listener surface_listener = {
this->proxy = nullptr;
}
+void surface::set_visibility(uint32_t visibility) {
+ ivi_controller_surface_set_visibility(this->proxy, visibility);
+}
+
+void surface::set_opacity(wl_fixed_t opacity) {
+ ivi_controller_surface_set_opacity(this->proxy, 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,
+ 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);
+}
+
+void surface::set_configuration(int32_t width, int32_t height) {
+ ivi_controller_surface_set_configuration(this->proxy, width, height);
+}
+
+void surface::set_orientation(int32_t orientation) {
+ ivi_controller_surface_set_orientation(this->proxy, orientation);
+}
+
+void surface::screenshot(const char *filename) {
+ ivi_controller_surface_screenshot(this->proxy, filename);
+}
+
+void surface::send_stats() { ivi_controller_surface_send_stats(this->proxy); }
+
+void surface::destroy(int32_t destroy_scene_object) {
+ ivi_controller_surface_destroy(this->proxy, 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::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);
+}
+
+void controller::remove_proxy_to_id_mapping(struct ivi_controller_surface *p) {
+ logdebug("Remove surface proxy mapping for %p", p);
+ this->surface_proxy_to_id.erase(uintptr_t(p));
+}
+
+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;
+}
+
+void controller::remove_proxy_to_id_mapping(struct ivi_controller_layer *p) {
+ logdebug("Remove layer proxy mapping for %p", p);
+ this->layer_proxy_to_id.erase(uintptr_t(p));
+}
+
+void controller::add_proxy_to_id_mapping(struct wl_output *p, uint32_t id) {
+ logdebug("Add screen proxy mapping for %p (%u)", p, id);
+ this->screen_proxy_to_id[uintptr_t(p)] = id;
+}
+
+void controller::remove_proxy_to_id_mapping(struct wl_output *p) {
+ logdebug("Remove screen proxy mapping for %p", p);
+ this->screen_proxy_to_id.erase(uintptr_t(p));
+}
+
+void controller::add_task(char const *name, std::function<void(struct controller *)> &&f) {
+ this->pending.emplace_back(std::make_pair(name, f));
+}
+
+void controller::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...
+ }
+}
+
//
// ___ ___ _ __ ___ ___ _ __
// / __|/ __| '__/ _ \/ _ \ '_ \
: wayland_proxy(p), controller_child(c, i) {
logdebug("genivi::screen @ %p id %u", p, i);
}
+
+void screen::clear() { ivi_controller_screen_clear(this->proxy); }
+
+void screen::add_layer(layer *l) {
+ ivi_controller_screen_add_layer(this->proxy, l->proxy);
+}
+
+void screen::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);
+}
+
} // namespace genivi
Code Review / staging / windowmanager.git / blobdiff