auto b = this->bindings.find(iface);
if (b != this->bindings.end())
b->second(this->proxy, name, v);
- else
- 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, name,
+ iface, v);
}
void registry::global_remove(uint32_t name) {}
controller::controller(struct wl_registry *r, uint32_t name, uint32_t version)
: wayland_proxy(
- wl_registry_bind(r, name, &ivi_controller_interface, version)) {
+ wl_registry_bind(r, name, &ivi_controller_interface, version)),
+ surfaces{},
+ layers{},
+ screens{},
+ pending{},
+ output_size{} {
ivi_controller_add_listener(this->proxy, &listener, this);
}
controller::~controller() {}
+void controller::layer_create(uint32_t id, int32_t w, int32_t h) {
+ this->layers[id] = std::make_unique<layer>(id, w, h, this);
+}
+
+void controller::surface_create(uint32_t id) {
+ this->surfaces[id] = std::make_unique<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,
void controller::controller_surface(uint32_t id) {
logdebug("genivi::controller @ %p surface %u (%x)", this->proxy, id, id);
this->surfaces[id] = std::make_unique<struct surface>(id, this);
+
+ add_task("fullscreen surface", [id](struct controller *c) {
+ c->surfaces[id]->set_destination_rectangle(0, 0, c->output_size.w,
+ c->output_size.h);
+ c->surfaces[id]->set_visibility(1);
+ uint32_t lid = id == 0x16180 ? 1000 : 100;
+ c->layers[lid]->add_surface(c->surfaces[id].get());
+ c->layers[lid]->set_visibility(1);
+ logdebug("Surface %u now fullscreen on layer %u", id, lid);
+ });
}
void controller::controller_error(int32_t object_id, int32_t object_type,
};
}
-layer::layer(uint32_t i, struct controller *c)
- : wayland_proxy(ivi_controller_layer_create(c->proxy, i, 0, 0)),
- controlled_entity(c, i) {
+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))
+ , controlled_entity(c, i)
+ , dst_rect{}
+ , src_rect{}
+ , size{}
+ , orientation{}
+ , visibility{}
+ , opacity{} {
ivi_controller_layer_add_listener(this->proxy, &layer_listener, this);
}
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_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_source_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]->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_configuration(uint32_t id, 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)};
}
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_screen(uint32_t id, struct wl_output *screen) {
void controller::surface_visibility(uint32_t id, int32_t visibility) {
logdebug("genivi::surface %s @ %p v %i", __func__, this->proxy, visibility);
- struct surface *s = this->surfaces[id].get();
- s->visibility = visibility;
+ this->surfaces[id]->visibility = visibility;
}
void controller::surface_opacity(uint32_t id, float opacity) {
logdebug("genivi::surface %s @ %p o %f", __func__, this->proxy, opacity);
- struct surface *s = this->surfaces[id].get();
- s->opacity = opacity;
+ this->surfaces[id]->opacity = opacity;
}
void controller::surface_source_rectangle(uint32_t id, 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);
- struct surface *s = this->surfaces[id].get();
- s->src_rect = rect{uint32_t(width), uint32_t(height), x, y};
+ this->surfaces[id]->src_rect = rect{uint32_t(width), uint32_t(height), x, y};
}
void controller::surface_destination_rectangle(uint32_t id, int32_t x,
int32_t height) {
logdebug("genivi::surface %s @ %p x %i y %i w %i h %i", __func__,
this->proxy, x, y, width, height);
- struct surface *s = this->surfaces[id].get();
- s->dst_rect = rect{uint32_t(width), uint32_t(height), x, y};
+ this->surfaces[id]->dst_rect = rect{uint32_t(width), uint32_t(height), x, y};
}
void controller::surface_configuration(uint32_t id, int32_t width,
int32_t height) {
logdebug("genivi::surface %s @ %p w %i h %i", __func__, this->proxy, width,
height);
- struct surface *s = this->surfaces[id].get();
- bool center = s->size.w != width && s->size.h != height;
- s->size = size{uint32_t(width), uint32_t(height)};
- if (center)
- add_task([id, width, height](struct controller *c) {
- auto const s = c->surfaces.find(id);
- if (s != c->surfaces.end())
- s->second->set_destination_rectangle(
- 800 / 2 - width / 2, 600 / 2 - height / 2, width, height);
- });
+ this->surfaces[id]->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);
- struct surface *s = this->surfaces[id].get();
- s->orientation = orientation;
+ this->surfaces[id]->orientation = orientation;
}
void controller::surface_pixelformat(uint32_t id, int32_t pixelformat) {
void controller::surface_destroyed(uint32_t id) {
logdebug("genivi::surface %s @ %p", __func__, this->proxy);
+ this->surfaces.erase(id);
}
void controller::surface_content(uint32_t id, int32_t content_state) {
logdebug("genivi::surface %s @ %p s %i", __func__, this->proxy,
content_state);
-
if (content_state == IVI_CONTROLLER_SURFACE_CONTENT_STATE_CONTENT_REMOVED) {
- this->surfaces.erase(id);
+ add_task("remove surface",
+ [id](struct controller *c) { c->surfaces.erase(id); });
}
}
Code Review / staging / windowmanager.git / blobdiff