Implement window manager as an AGL App-FW binding

* Compile to shared object module, to be loaded by afb-daemon.
* Take most of main, rewrite to adhere to the AFB API.
* Implement dummy API call winman/status.
* Use export.map to specify symbol visibility.
* Poller and unique_fd are currently useless/unused.
* Logging is still only to stdout/stderr.

Signed-off-by: Marcus Fritzsch <marcus_fritzsch@mentor.com>

2 files changed, 191 insertions, 87 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2b81367..4a0eafe 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,6 +1,13 @@
 wlproto(IVI_CON ivi-controller)
 
-add_executable(winman
+include(FindPkgConfig)
+pkg_check_modules(AFB REQUIRED afb-daemon==1.0)
+pkg_check_modules(SD REQUIRED libsystemd>=222)
+
+# We do not want a prefix for our module
+set(CMAKE_SHARED_MODULE_PREFIX "")
+
+add_library(winman MODULE
    main.cpp
    wayland.cpp
    wayland.hpp
@@ -8,12 +15,24 @@ add_executable(winman
    util.hpp
    ${IVI_CON_PROTO})
 
+target_include_directories(winman
+    PRIVATE
+        ${AFB_INCLUDE_DIRS}
+        ${SD_INCLUDE_DIRS}
+        ../include)
+
+target_link_libraries(winman
+    PRIVATE
+        ${AFB_LIBRARIES}
+        ${WLC_LIBRARIES}
+        ${SD_LIBRARIES})
+
 target_compile_definitions(winman
     PRIVATE
         WINMAN_VERSION_STRING="${PACKAGE_VERSION}"
         _GNU_SOURCE)  # XXX should I define this here?!
 
-if(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
+if(NOT ${CMAKE_BUILD_TYPE} STREQUAL "Release")
    target_compile_definitions(winman
        PRIVATE
            _GLIBCXX_DEBUG)
@@ -33,7 +52,9 @@ set_target_properties(winman
 
         C_EXTENSIONS OFF
         C_STANDARD 99
-        C_STANDARD_REQUIRED ON)
+        C_STANDARD_REQUIRED ON
+
+        LINK_FLAGS "-Wl,--version-script=../../export.map")
 
 if (NOT ${SANITIZER_MODE} STREQUAL "none" AND NOT ${SANITIZER_MODE} STREQUAL "")
    target_compile_options(winman
@@ -43,6 +64,3 @@ if (NOT ${SANITIZER_MODE} STREQUAL "none" AND NOT ${SANITIZER_MODE} STREQUAL "")
       PROPERTIES
          LINK_FLAGS "-fsanitize=${SANITIZER_MODE} -g")
 endif()
-
-target_link_libraries(winman
-   ${WLC_LIBRARIES})
diff --git a/src/main.cpp b/src/main.cpp
index 80a5c4d..e78b42f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,40 +1,59 @@
 #include "util.hpp"
 #include "wayland.hpp"
 
-#include <unistd.h>
+#include <algorithm>
+#include <json.h>
 
-#include <signal.h>
-#include <sys/signalfd.h>
+#define AFB_BINDING_VERSION 2
 
-#include <algorithm>
+extern "C" {
+#include <afb/afb-binding.h>
+#include <systemd/sd-event.h>
+}
+
+#include <json.hpp>
 
-struct connection {
+using json = nlohmann::json;
+
+namespace {
+struct wayland {
+   std::unique_ptr<wl::display> display;
+   std::unique_ptr<genivi::controller> controller;
    std::vector<std::unique_ptr<wl::output>> outputs;
-   std::unique_ptr<genivi::controller> c;
+   sd_event_source *event_source;
+
+   wayland()
+      : display(new wl::display),
+        controller(nullptr),
+        outputs(),
+        event_source{} {}
 };
 
-namespace {
+struct wayland *g_wayland;
+
 //  _       _ _       _                         _    ____
 // (_)_ __ (_) |_    | | __ _ _   _  ___  _   _| |_ / /\ \
 // | | '_ \| | __|   | |/ _` | | | |/ _ \| | | | __| |  | |
 // | | | | | | |_    | | (_| | |_| | (_) | |_| | |_| |  | |
 // |_|_| |_|_|\__|___|_|\__,_|\__, |\___/ \__,_|\__| |  | |
 //              |_____|       |___/                 \_\/_/
-char const *init_layout(struct connection &c) {
-   if (!c.c) {
+char const *init_layout() {
+   if (!g_wayland->controller) {
       return "ivi_controller global not available";
    }
 
-   if (c.outputs.empty()) {
+   if (g_wayland->outputs.empty()) {
       return "no output was set up!";
    }
 
-   auto &o = c.outputs.front();
-   auto &s = c.c->screens.begin()->second;
-   auto &layers = c.c->layers;
+   auto &c = g_wayland->controller;
+
+   auto &o = g_wayland->outputs.front();
+   auto &s = c->screens.begin()->second;
+   auto &layers = c->layers;
 
    // XXX: Write output dimensions to ivi controller...
-   c.c->output_size = genivi::size{uint32_t(o->width), uint32_t(o->height)};
+   c->output_size = genivi::size{uint32_t(o->width), uint32_t(o->height)};
 
    // Clear scene
    layers.clear();
@@ -43,11 +62,11 @@ char const *init_layout(struct connection &c) {
    s->clear();
 
    // Setup our dummy scene...
-   c.c->layer_create(100, 0, 0);   // bottom layer, anything else
-   c.c->layer_create(1000, 0, 0);  // top layer, mandelbrot
+   c->layer_create(100, 0, 0);   // bottom layer, anything else
+   c->layer_create(1000, 0, 0);  // top layer, mandelbrot
 
-   auto &l100 = c.c->layers[100];
-   auto &l1k = c.c->layers[1000];
+   auto &l100 = c->layers[100];
+   auto &l1k = c->layers[1000];
 
    // Set layers fullscreen
    l100->set_destination_rectangle(0, 0, o->width, o->height);
@@ -58,94 +77,161 @@ char const *init_layout(struct connection &c) {
    // Add layers to screen
    s->set_render_order({100, 1000});
 
-   c.c->commit_changes();
-   // Note: this does not flush the display!
+   c->commit_changes();
+
+   g_wayland->display->flush();
 
    return nullptr;
 }
-}  // namespace
 
-//                  _        ____
-//  _ __ ___   __ _(_)_ __  / /\ \
-// | '_ ` _ \ / _` | | '_ \| |  | |
-// | | | | | | (_| | | | | | |  | |
-// |_| |_| |_|\__,_|_|_| |_| |  | |
-//                          \_\/_/
-int main(int /*argc*/, char ** /*argv*/) {
+//  _     _           _ _                 _       _ _    ____
+// | |__ (_)_ __   __| (_)_ __   __ _    (_)_ __ (_) |_ / /\ \
+// | '_ \| | '_ \ / _` | | '_ \ / _` |   | | '_ \| | __| |  | |
+// | |_) | | | | | (_| | | | | | (_| |   | | | | | | |_| |  | |
+// |_.__/|_|_| |_|\__,_|_|_| |_|\__, |___|_|_| |_|_|\__| |  | |
+//                              |___/_____|             \_\/_/
+int binding_init_() {
    lognotice("WinMan ver. %s", WINMAN_VERSION_STRING);
 
-   if (getenv("XDG_RUNTIME_DIR") == nullptr) {
-      fatal("Environment variable XDG_RUNTIME_DIR not set");
+   if (g_wayland != nullptr) {
+      AFB_ERROR("Wayland context already initialized?");
+      return -1;
    }
 
-   struct wl::display d {};
-   if (!d.ok()) {
-      fatal("Could not connect to compositor");
+   if (getenv("XDG_RUNTIME_DIR") == nullptr) {
+      AFB_ERROR("Environment variable XDG_RUNTIME_DIR not set");
+      return -1;
    }
 
-   struct connection c {};
+   g_wayland = new wayland;
+   if (!g_wayland->display->ok()) {
+      AFB_ERROR("Could not connect to compositor");
+      return -1;
+   }
 
-   d.r.add_global_handler(
-      "wl_output", [&c](wl_registry *r, uint32_t name, uint32_t v) {
-         c.outputs.emplace_back(std::make_unique<wl::output>(r, name, v));
-      });
+   auto &d = g_wayland->display;
+   d->r.add_global_handler("wl_output", [](wl_registry *r, uint32_t name,
+                                           uint32_t v) {
+      g_wayland->outputs.emplace_back(std::make_unique<wl::output>(r, name, v));
+   });
 
-   d.r.add_global_handler(
-      "ivi_controller", [&c](wl_registry *r, uint32_t name, uint32_t v) {
-         c.c = std::make_unique<genivi::controller>(r, name, v);
+   d->r.add_global_handler("ivi_controller", [](wl_registry *r, uint32_t name,
+                                                uint32_t v) {
+      g_wayland->controller = std::make_unique<genivi::controller>(r, name, v);
 
-         // XXX: This protocol needs the output, so lets just add our mapping
-         // here...
-         c.c->add_proxy_to_id_mapping(
-            c.outputs.back()->proxy.get(),
-            wl_proxy_get_id(reinterpret_cast<struct wl_proxy *>(
-               c.outputs.back()->proxy.get())));
-      });
+      // XXX: This protocol needs the output, so lets just add our mapping
+      // here...
+      g_wayland->controller->add_proxy_to_id_mapping(
+         g_wayland->outputs.back()->proxy.get(),
+         wl_proxy_get_id(reinterpret_cast<struct wl_proxy *>(
+            g_wayland->outputs.back()->proxy.get())));
+   });
 
    // First level objects
-   d.roundtrip();
+   d->roundtrip();
    // Second level objects
-   d.roundtrip();
+   d->roundtrip();
    // Third level objects
-   d.roundtrip();
+   d->roundtrip();
 
-   if (char const *e = init_layout(c)) {
-      fatal("Could not init layout: %s", e);
+   if (char const *e = init_layout()) {
+      AFB_ERROR("Could not init layout: %s", e);
+      return -1;
    }
 
-   struct Poller p {};
-   p.add_fd(STDIN_FILENO, [&c](int fd) {
-      int buf;
-      ssize_t ret;
-      ret = read(fd, &buf, sizeof(buf));
-      c.c->debug_dump_current_status();
-      return ret == 0 ? -1 : 0;
-   });
+   sd_event *ev = afb_daemon_get_event_loop();
+   sd_event_add_io(
+      ev, &g_wayland->event_source, g_wayland->display->get_fd(),
+      EPOLLIN | EPOLLHUP,
+      [](sd_event_source *evs, int fd, uint32_t events, void *data) {
+         if ((events & EPOLLHUP) != 0) {
+            sd_event_source_unref(evs);
+            delete g_wayland;
+            g_wayland = nullptr;
+            return 1;
+         }
+
+         if (events & EPOLLIN) {
+            int ret = g_wayland->display->dispatch();
+            g_wayland->display->flush();
+
+            // execute pending tasks, that is layout changes etc.
+            g_wayland->controller->execute_pending();
+            g_wayland->display->roundtrip();
+            return ret == -1 ? -1 : 0;
+         }
+
+         return 0;
+      },
+      g_wayland);
+
+   atexit([] { delete g_wayland; });
+
+   return 0;
+}
+
+int binding_init() noexcept {
+   try {
+      return binding_init_();
+   } catch (std::exception &e) {
+      AFB_ERROR("Uncaught exception in binding_init(): %s", e.what());
+   }
+   return -1;
+}
 
-   p.add_fd(d.get_fd(), [&d](int fd) { return d.dispatch(); });
+//      _      _                         _        _              ____
+//   __| | ___| |__  _   _  __ _     ___| |_ __ _| |_ _   _ ___ / /\ \
+//  / _` |/ _ \ '_ \| | | |/ _` |   / __| __/ _` | __| | | / __| |  | |
+// | (_| |  __/ |_) | |_| | (_| |   \__ \ || (_| | |_| |_| \__ \ |  | |
+//  \__,_|\___|_.__/ \__,_|\__, |___|___/\__\__,_|\__|\__,_|___/ |  | |
+//                         |___/_____|                          \_\/_/
+void debug_status(struct afb_req req) noexcept {
+   // Quick and dirty, dump current surfaces and layers
+   AFB_REQ_DEBUG(req, "status");
+
+   if (g_wayland == nullptr) {
+      afb_req_fail(req, "failed",
+                   "Binding not initialized, did the compositor die?");
+      return;
+   }
 
-   sigset_t sset{};
-   sigemptyset(&sset);
-   sigaddset(&sset, SIGINT);
-   sigaddset(&sset, SIGTERM);
+   try {
+      json j;
+
+      if (!g_wayland->controller->surfaces.empty()) {
+         auto js = json::array();
+         for (auto const &i : g_wayland->controller->surfaces) {
+            auto const &r = i.second->dst_rect;
+            auto const &s = i.second->size;
+            js.push_back({{"id", i.first},
+                          {"size", {s.w, s.h}},
+                          {"dst_rect", {r.w, r.h, r.x, r.y}}});
+         }
+         j["surfaces"] = js;
+      }
 
-   auto sfd = unique_fd(signalfd(-1, &sset, SFD_NONBLOCK | SFD_CLOEXEC));
-   sigprocmask(SIG_BLOCK, &sset, nullptr);
-   p.add_fd(sfd.fd, [](int fd) {
-      struct signalfd_siginfo si;
-      if (read(fd, &si, sizeof(si)) == sizeof(si)) {
-         lognotice("Received signal %u", si.ssi_signo);
-         return -1;
+      if (!g_wayland->controller->layers.empty()) {
+         auto js = json::array();
+         for (auto const &i : g_wayland->controller->layers) {
+            auto const &r = i.second->dst_rect;
+            auto const &s = i.second->size;
+            js.push_back({{"id", i.first},
+                          {"size", {s.w, s.h}},
+                          {"dst_rect", {r.w, r.h, r.x, r.y}}});
+         }
+         j["layers"] = js;
       }
-      return 0;
-   });
 
-   while ((d.flush(), p.check_events()) != -1) {
-      c.c->execute_pending();
+      afb_req_success(req, json_tokener_parse(j.dump().c_str()), "status");
+   } catch (std::exception &e) {
+      afb_req_fail_f(req, "failed", "Uncaught exception: %s", e.what());
    }
+}
 
-   c.c->commit_changes();
-   d.roundtrip();
+const struct afb_verb_v2 verbs[] = {
+   {"status", debug_status, NULL, NULL, AFB_SESSION_NONE_V2}, {},
+};
+}  // namespace
 
-   return 0;
-}
+extern "C" const struct afb_binding_v2 afbBindingV2 = {
+   "winman", NULL, NULL, verbs, NULL, binding_init, NULL, 1};