// \__,_|_|___/ .__/|_|\__,_|\__, |
// |_| |___/
display::display()
- : d(std::unique_ptr<wl_display, void (*)(wl_display *)>(
+ : d(std::unique_ptr<struct wl_display,
+ std::function<void(struct wl_display *)>>(
wl_display_connect(NULL),
- [](wl_display *d) {
- logdebug("wl::display %s @ %p", __func__, d);
+ [](struct wl_display *d) {
+ logdebug("wl::display ~display @ %p", d);
wl_display_disconnect(d);
})),
- r(std::make_unique<registry>(d.get())) {}
+ r(!d ? nullptr : std::make_unique<struct registry>(d.get())) {}
display::~display() {}
-bool display::ok() const {
- return d.get() != nullptr && wl_display_get_error(d.get()) == 0;
-}
+bool display::ok() const { return d && wl_display_get_error(d.get()) == 0; }
void display::roundtrip() { wl_display_roundtrip(this->d.get()); }
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()); }
+
// _ _
// _ __ ___ __ _(_)___| |_ _ __ _ _
// | '__/ _ \/ _` | / __| __| '__| | | |
namespace {
void registry_global(void *data, struct wl_registry *r, uint32_t name,
char const *iface, uint32_t v) {
- static_cast<registry *>(data)->global(name, iface, v);
+ static_cast<struct registry *>(data)->global(name, iface, v);
}
void registry_global_remove(void *data, struct wl_registry *r, uint32_t name) {
- static_cast<registry *>(data)->global_remove(name);
+ static_cast<struct registry *>(data)->global_remove(name);
}
-constexpr wl_registry_listener registry_listener = {registry_global,
- registry_global_remove};
+constexpr struct wl_registry_listener registry_listener = {
+ registry_global, registry_global_remove};
}
-registry::registry(wl_display *d) : wayland_proxy(wl_display_get_registry(d)) {
- wl_registry_add_listener(this->proxy, ®istry_listener, this);
+registry::registry(struct wl_display *d)
+ : wayland_proxy(!d ? nullptr : wl_display_get_registry(d)) {
+ if (this->proxy)
+ wl_registry_add_listener(this->proxy, ®istry_listener, this);
}
registry::~registry() {
int32_t y, int32_t physical_width, int32_t physical_height,
int32_t subpixel, const char *make, const char *model,
int32_t transform) {
- static_cast<output *>(data)->geometry(x, y, physical_width, physical_height,
- subpixel, make, model, transform);
+ static_cast<struct output *>(data)->geometry(
+ x, y, physical_width, physical_height, subpixel, make, model, transform);
}
void output_mode(void *data, struct wl_output *wl_output, uint32_t flags,
int32_t width, int32_t height, int32_t refresh) {
- static_cast<output *>(data)->mode(flags, width, height, refresh);
+ static_cast<struct output *>(data)->mode(flags, width, height, refresh);
}
void output_done(void *data, struct wl_output *wl_output) {
- static_cast<output *>(data)->done();
+ static_cast<struct output *>(data)->done();
}
void output_scale(void *data, struct wl_output *wl_output, int32_t factor) {
- static_cast<output *>(data)->scale(factor);
+ static_cast<struct output *>(data)->scale(factor);
}
-constexpr wl_output_listener output_listener = {output_geometry, output_mode,
- output_done, output_scale};
+constexpr struct wl_output_listener output_listener = {
+ output_geometry, output_mode, output_done, output_scale};
}
-output::output(wl_registry *r, uint32_t name, uint32_t v)
+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);
}
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);
+ if (flags & WL_OUTPUT_MODE_CURRENT) {
+ this->width = w;
+ this->height = h;
+ this->refresh = r;
+ }
}
void output::done() {
void controller_screen(void *data, struct ivi_controller *ivi_controller,
uint32_t id_screen,
struct ivi_controller_screen *screen) {
- static_cast<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<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<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<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 ivi_controller_listener listener = {
+constexpr struct ivi_controller_listener listener = {
controller_screen, controller_layer, controller_surface, controller_error};
}
-controller::controller(wl_registry *r, uint32_t name, uint32_t version)
+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::screen(uint32_t id, struct ivi_controller_screen *screen) {
+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,
screen);
- this->screens[id] = std::make_unique<struct screen>(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->proxy);
+ 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->proxy);
+ 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 layer_visibility(void *data,
struct ivi_controller_layer *ivi_controller_layer,
int32_t visibility) {
- static_cast<layer *>(data)->visibility(visibility);
+ static_cast<struct layer *>(data)->parent->layer_visibility(
+ static_cast<struct layer *>(data)->id, visibility);
}
void layer_opacity(void *data,
struct ivi_controller_layer *ivi_controller_layer,
wl_fixed_t opacity) {
- static_cast<layer *>(data)->opacity(wl_fixed_to_double(opacity));
+ static_cast<struct layer *>(data)->parent->layer_opacity(
+ static_cast<struct layer *>(data)->id, 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<layer *>(data)->source_rectangle(x, y, width, height);
+ static_cast<struct layer *>(data)->parent->layer_source_rectangle(
+ static_cast<struct layer *>(data)->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<layer *>(data)->destination_rectangle(x, y, width, height);
+ static_cast<struct layer *>(data)->parent->layer_destination_rectangle(
+ static_cast<struct layer *>(data)->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<layer *>(data)->configuration(width, height);
+ static_cast<struct layer *>(data)->parent->layer_configuration(
+ static_cast<struct layer *>(data)->id, width, height);
}
void layer_orientation(void *data,
struct ivi_controller_layer *ivi_controller_layer,
int32_t orientation) {
- static_cast<layer *>(data)->orientation(orientation);
+ static_cast<struct layer *>(data)->parent->layer_orientation(
+ static_cast<struct layer *>(data)->id, orientation);
}
void layer_screen(void *data, struct ivi_controller_layer *ivi_controller_layer,
struct wl_output *screen) {
- static_cast<layer *>(data)->screen(screen);
+ static_cast<struct layer *>(data)->parent->layer_screen(
+ static_cast<struct layer *>(data)->id, screen);
}
void layer_destroyed(void *data,
struct ivi_controller_layer *ivi_controller_layer) {
- static_cast<layer *>(data)->destroyed();
+ static_cast<struct layer *>(data)->parent->layer_destroyed(
+ static_cast<struct layer *>(data)->id);
}
-constexpr ivi_controller_layer_listener layer_listener = {
+constexpr struct ivi_controller_layer_listener layer_listener = {
layer_visibility, layer_opacity,
layer_source_rectangle, layer_destination_rectangle,
layer_configuration, layer_orientation,
};
}
-layer::layer(uint32_t i, ivi_controller *c)
- : wayland_proxy(ivi_controller_layer_create(c, i, 0, 0)), id(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) {
ivi_controller_layer_add_listener(this->proxy, &layer_listener, this);
}
this->proxy = nullptr;
}
-void layer::visibility(int32_t visibility) {
+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 layer::opacity(float opacity) {
+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 layer::source_rectangle(int32_t x, int32_t y, int32_t width,
- int32_t height) {
+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 layer::destination_rectangle(int32_t x, int32_t y, int32_t width,
- int32_t height) {
+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 layer::configuration(int32_t width, int32_t height) {
+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 layer::orientation(int32_t orientation) {
+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 layer::screen(struct wl_output *screen) {
+void controller::layer_screen(uint32_t id, struct wl_output *screen) {
logdebug("genivi::layer %s @ %p s %p", __func__, this->proxy, screen);
}
-void layer::destroyed() {
+void controller::layer_destroyed(uint32_t id) {
logdebug("genivi::layer %s @ %p", __func__, this->proxy);
}
void surface_visibility(void *data,
struct ivi_controller_surface *ivi_controller_surface,
int32_t visibility) {
- static_cast<surface *>(data)->visibility(visibility);
+ static_cast<struct surface *>(data)->parent->surface_visibility(
+ static_cast<struct surface *>(data)->id, visibility);
}
void surface_opacity(void *data,
struct ivi_controller_surface *ivi_controller_surface,
wl_fixed_t opacity) {
- static_cast<surface *>(data)->opacity(wl_fixed_to_double(opacity));
+ static_cast<struct surface *>(data)->parent->surface_opacity(
+ static_cast<struct surface *>(data)->id, 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<surface *>(data)->source_rectangle(x, y, width, height);
+ static_cast<struct surface *>(data)->parent->surface_source_rectangle(
+ static_cast<struct surface *>(data)->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<surface *>(data)->destination_rectangle(x, y, width, height);
+ static_cast<struct surface *>(data)->parent->surface_destination_rectangle(
+ static_cast<struct surface *>(data)->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<surface *>(data)->configuration(width, height);
+ static_cast<struct surface *>(data)->parent->surface_configuration(
+ static_cast<struct surface *>(data)->id, width, height);
}
void surface_orientation(void *data,
struct ivi_controller_surface *ivi_controller_surface,
int32_t orientation) {
- static_cast<surface *>(data)->orientation(orientation);
+ static_cast<struct surface *>(data)->parent->surface_orientation(
+ static_cast<struct surface *>(data)->id, orientation);
}
void surface_pixelformat(void *data,
struct ivi_controller_surface *ivi_controller_surface,
int32_t pixelformat) {
- static_cast<surface *>(data)->pixelformat(pixelformat);
+ static_cast<struct surface *>(data)->parent->surface_pixelformat(
+ static_cast<struct surface *>(data)->id, pixelformat);
}
void surface_layer(void *data,
struct ivi_controller_surface *ivi_controller_surface,
struct ivi_controller_layer *layer) {
- static_cast<surface *>(data)->layer(layer);
+ static_cast<struct surface *>(data)->parent->surface_layer(
+ static_cast<struct surface *>(data)->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<surface *>(data)->stats(redraw_count, frame_count, update_count,
- pid, process_name);
+ static_cast<struct surface *>(data)->parent->surface_stats(
+ static_cast<struct surface *>(data)->id, redraw_count, frame_count,
+ update_count, pid, process_name);
}
void surface_destroyed(void *data,
struct ivi_controller_surface *ivi_controller_surface) {
- static_cast<surface *>(data)->destroyed();
+ static_cast<struct surface *>(data)->parent->surface_destroyed(
+ static_cast<struct surface *>(data)->id);
}
void surface_content(void *data,
struct ivi_controller_surface *ivi_controller_surface,
int32_t content_state) {
- static_cast<surface *>(data)->content(content_state);
+ static_cast<struct surface *>(data)->parent->surface_content(
+ static_cast<struct surface *>(data)->id, content_state);
}
-static constexpr ivi_controller_surface_listener surface_listener = {
+constexpr struct ivi_controller_surface_listener surface_listener = {
surface_visibility,
surface_opacity,
surface_source_rectangle,
};
}
-surface::surface(uint32_t i, ivi_controller *c)
- : wayland_proxy(ivi_controller_surface_create(c, i)), id(i) {
+surface::surface(uint32_t i, struct controller *c)
+ : wayland_proxy(ivi_controller_surface_create(c->proxy, i)),
+ controlled_entity(c, i),
+ dst_rect{},
+ src_rect{},
+ size{},
+ orientation{},
+ visibility{},
+ opacity{1.f} {
ivi_controller_surface_add_listener(this->proxy, &surface_listener, this);
}
this->proxy = nullptr;
}
-void surface::visibility(int32_t visibility) {
+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;
}
-void surface::opacity(float opacity) {
+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;
}
-void surface::source_rectangle(int32_t x, int32_t y, int32_t width,
- int32_t height) {
+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};
}
-void surface::destination_rectangle(int32_t x, int32_t y, int32_t width,
- int32_t height) {
+void controller::surface_destination_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->dst_rect = rect{uint32_t(width), uint32_t(height), x, y};
}
-void surface::configuration(int32_t width, int32_t height) {
+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);
-}
-
-void surface::orientation(int32_t orientation) {
+ struct surface *s = this->surfaces[id].get();
+ bool center = int(s->size.w) != int(width) && int(s->size.h) != int(height);
+ s->size = size{uint32_t(width), uint32_t(height)};
+ if (center)
+ 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);
+ c->layers[100]->add_surface(c->surfaces[id].get());
+ c->layers[100]->set_visibility(1);
+ });
+}
+
+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;
}
-void surface::pixelformat(int32_t pixelformat) {
+void controller::surface_pixelformat(uint32_t id, int32_t pixelformat) {
logdebug("genivi::surface %s @ %p f %i", __func__, this->proxy, pixelformat);
}
-void surface::layer(struct ivi_controller_layer *layer) {
+void controller::surface_layer(uint32_t id,
+ struct ivi_controller_layer *layer) {
logdebug("genivi::surface %s @ %p l @ %p", __func__, this->proxy, layer);
}
-void surface::stats(uint32_t redraw_count, uint32_t frame_count,
- uint32_t update_count, uint32_t pid,
- const char *process_name) {
+void controller::surface_stats(uint32_t id, 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,
process_name);
}
-void surface::destroyed() {
+void controller::surface_destroyed(uint32_t id) {
logdebug("genivi::surface %s @ %p", __func__, this->proxy);
}
-void surface::content(int32_t content_state) {
+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) {
+ add_task("remove surface",
+ [id](struct controller *c) { c->surfaces.erase(id); });
+ }
}
//
-// ___ ___ _ __ ___ ___ _ __
-/// __|/ __| '__/ _ \/ _ \ '_ \
-//\__ \ (__| | | __/ __/ | | |
-//|___/\___|_| \___|\___|_| |_|
+// ___ ___ _ __ ___ ___ _ __
+// / __|/ __| '__/ _ \/ _ \ '_ \
+// \__ \ (__| | | __/ __/ | | |
+// |___/\___|_| \___|\___|_| |_|
//
-screen::screen(uint32_t i, ivi_controller_screen *p)
- : wayland_proxy(p), id(i) {}
+screen::screen(uint32_t i, struct controller *c,
+ struct ivi_controller_screen *p)
+ : wayland_proxy(p), controlled_entity(c, i) {
+ logdebug("genivi::screen @ %p id %u", p, i);
+}
}
Code Review / staging / windowmanager.git / blobdiff