int display::dispatch() { return wl_display_dispatch(this->d.get()); }
+void display::flush() { wl_display_flush(this->d.get()); }
+
+int display::get_fd() const { return wl_display_get_fd(this->d.get()); }
+
// _ _
// _ __ ___ __ _(_)___| |_ _ __ _ _
// | '__/ _ \/ _` | / __| __| '__| | | |
}
registry::registry(struct wl_display *d)
- : wayland_proxy(wl_display_get_registry(d)) {
- wl_registry_add_listener(this->proxy, ®istry_listener, this);
+ : wayland_proxy(!d ? nullptr : wl_display_get_registry(d)) {
+ if (this->proxy)
+ wl_registry_add_listener(this->proxy, ®istry_listener, this);
}
registry::~registry() {
void controller_screen(void *data, struct ivi_controller *ivi_controller,
uint32_t id_screen,
struct ivi_controller_screen *screen) {
- static_cast<struct controller *>(data)->screen(id_screen, screen);
+ static_cast<struct controller *>(data)->controller_screen(id_screen, screen);
}
void controller_layer(void *data, struct ivi_controller *ivi_controller,
uint32_t id_layer) {
- static_cast<struct controller *>(data)->layer(id_layer);
+ static_cast<struct controller *>(data)->controller_layer(id_layer);
}
void controller_surface(void *data, struct ivi_controller *ivi_controller,
uint32_t id_surface) {
- static_cast<struct controller *>(data)->surface(id_surface);
+ static_cast<struct controller *>(data)->controller_surface(id_surface);
}
void controller_error(void *data, struct ivi_controller *ivi_controller,
int32_t object_id, int32_t object_type,
int32_t error_code, const char *error_text) {
- static_cast<struct controller *>(data)->error(object_id, object_type,
- error_code, error_text);
+ static_cast<struct controller *>(data)->controller_error(
+ object_id, object_type, error_code, error_text);
}
constexpr struct ivi_controller_listener listener = {
controller::~controller() {}
-void controller::screen(uint32_t id, struct ivi_controller_screen *screen) {
+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);
this->screens[id] = std::make_unique<struct screen>(id, this, screen);
}
-void controller::layer(uint32_t id) {
+void controller::controller_layer(uint32_t id) {
logdebug("genivi::controller @ %p layer %u (%x)", this->proxy, id, id);
this->layers[id] = std::make_unique<struct layer>(id, this);
}
-void controller::surface(uint32_t 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);
}
-void controller::error(int32_t object_id, int32_t object_type,
- int32_t error_code, const char *error_text) {
+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);
}
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);
+ }
}
//