wayland: task names, delete surfaces using pending_tasks

[staging/windowmanager.git] / src / wayland.cpp

diff --git a/src/wayland.cpp b/src/wayland.cpp
index c2f55fa..b63d961 100644 (file)
--- a/src/wayland.cpp
+++ b/src/wayland.cpp
@@ -22,7 +22,7 @@ display::display()
            logdebug("wl::display ~display @ %p", d);
            wl_display_disconnect(d);
         })),
-     r(std::make_unique<struct registry>(d.get())) {}
+     r(!d ? nullptr : std::make_unique<struct registry>(d.get())) {}
 
 display::~display() {}
 
@@ -32,6 +32,10 @@ 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()); }
+
 //                 _     _
 //  _ __ ___  __ _(_)___| |_ _ __ _   _
 // | '__/ _ \/ _` | / __| __| '__| | | |
@@ -53,8 +57,9 @@ constexpr struct wl_registry_listener registry_listener = {
 }
 
 registry::registry(struct wl_display *d)
-   : wayland_proxy(wl_display_get_registry(d)) {
-   wl_registry_add_listener(this->proxy, &registry_listener, this);
+   : wayland_proxy(!d ? nullptr : wl_display_get_registry(d)) {
+   if (this->proxy)
+      wl_registry_add_listener(this->proxy, &registry_listener, this);
 }
 
 registry::~registry() {
@@ -124,6 +129,11 @@ void output::geometry(int32_t x, int32_t y, int32_t pw, int32_t ph,
 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() {
@@ -158,24 +168,24 @@ namespace {
 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 = {
@@ -190,24 +200,25 @@ controller::controller(struct wl_registry *r, uint32_t name, uint32_t version)
 
 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);
 }
@@ -436,7 +447,13 @@ constexpr struct ivi_controller_surface_listener surface_listener = {
 
 surface::surface(uint32_t i, struct controller *c)
    : wayland_proxy(ivi_controller_surface_create(c->proxy, i)),
-     controlled_entity(c, 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);
 }
 
@@ -448,16 +465,22 @@ surface::~surface() {
 
 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 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 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 controller::surface_destination_rectangle(uint32_t id, int32_t x,
@@ -465,16 +488,30 @@ 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};
 }
 
 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)
+         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);
+      add_task("fullscreen surface", [id, width, height](struct controller *c) {
+      });
 }
 
 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 controller::surface_pixelformat(uint32_t id, int32_t pixelformat) {
@@ -501,6 +538,10 @@ void controller::surface_destroyed(uint32_t 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) {
+      add_task("remove surface",
+               [id](struct controller *c) { c->surfaces.erase(id); });
+   }
 }
 
 //
@@ -511,5 +552,7 @@ void controller::surface_content(uint32_t id, int32_t content_state) {
 //
 screen::screen(uint32_t i, struct controller *c,
                struct ivi_controller_screen *p)
-   : wayland_proxy(p), controlled_entity(c, i) {}
+   : wayland_proxy(p), controlled_entity(c, i) {
+   logdebug("genivi::screen @ %p id %u", p, i);
+}
 }