X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain.cpp;h=5eb211cb41b7d4a976e7d55cc3ae2780d2d45816;hb=b166f3512f5e426e60a4ff610a9f07239ac18ea1;hp=a07a73cad35674484e192954eb24725c91ce6ce3;hpb=3121d0b9b553ddc709be8b67e91395a796cc6b6e;p=staging%2Fwindowmanager.git

diff --git a/src/main.cpp b/src/main.cpp
index a07a73c..5eb211c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,97 +1,115 @@
-#include "util.h"
+#include "app.hpp"
+#include "json_helper.hpp"
+#include "util.hpp"
 #include "wayland.hpp"
 
-#include <unistd.h>
+#include <algorithm>
+#include <json.h>
 
-#include <stdlib.h>
-#include <string.h>
-
-#include <map>
-#include <memory>
-#include <string>
-#include <vector>
-
-#include <sys/poll.h>
-
-struct conn {
-   std::vector<std::unique_ptr<wl::output>> outputs;
-   std::unique_ptr<genivi::controller> c;
-};
+extern "C" {
+#include <afb/afb-binding.h>
+#include <systemd/sd-event.h>
+}
 
 namespace {
-int check_events(struct wl::display *d, struct conn *c, int fd)
-{
-   struct pollfd pfd[2] = {
-      { .fd = d->get_fd(), .events = POLLIN, .revents = 0 },
-      { .fd = fd, .events = POLLIN, .revents = 0 }
-   };
+struct afb_instance {
+   std::unique_ptr<wl::display> display;
+   wm::App app;
 
-   d->flush();
+   afb_instance() : display{new wl::display}, app{this->display.get()} {}
 
-   if (poll(pfd, fd != -1 ? 2 : 1, -1) != -1 && errno != EINTR) {
-      int ret = 0;
+   int init();
+};
 
-      if (pfd[0].revents & POLLIN) {
-         ret = d->dispatch();
-      }
+struct afb_instance *g_afb_instance;
 
-      if (ret == -1)
-         return ret;
+int afb_instance::init() {
+   if (!this->display->ok()) {
+      return -1;
+   }
 
-      if (fd != -1 && (pfd[1].revents & POLLIN)) {
-         char buf[10];
+   return this->app.init();
+}
 
-         while (read(pfd[1].fd, buf, 10) == 10)
-            ;
+int display_event_callback(sd_event_source *evs, int /*fd*/, uint32_t events,
+                           void * /*data*/) {
+   if ((events & EPOLLHUP) != 0) {
+      logerror("The compositor hung up, dying now.");
+      delete g_afb_instance;
+      g_afb_instance = nullptr;
+      goto error;
+   }
 
-         // Display current status
-         for (auto const &i : c->c->surfaces) {
-            printf("Surface %d\n", i.first);
-         }
+   if ((events & EPOLLIN) != 0u) {
+      if (g_afb_instance->app.dispatch_events() == -1) {
+         goto error;
       }
    }
 
    return 0;
-}
+
+error:
+   sd_event_source_unref(evs);
+   return -1;
 }
 
-int main(int argc, char **argv) {
+//  _     _           _ _                 _       _ _    ____
+// | |__ (_)_ __   __| (_)_ __   __ _    (_)_ __ (_) |_ / /\ \
+// | '_ \| | '_ \ / _` | | '_ \ / _` |   | | '_ \| | __| |  | |
+// | |_) | | | | | (_| | | | | | (_| |   | | | | | | |_| |  | |
+// |_.__/|_|_| |_|\__,_|_|_| |_|\__, |___|_|_| |_|_|\__| |  | |
+//                              |___/_____|             \_\/_/
+int binding_init_() {
    lognotice("WinMan ver. %s", WINMAN_VERSION_STRING);
 
-   if (!getenv("XDG_RUNTIME_DIR"))
-      fatal("Environment variable XDG_RUNTIME_DIR not set");
+   if (g_afb_instance != nullptr) {
+      logerror("Wayland context already initialized?");
+      return 0;
+   }
 
-   auto d = std::make_unique<wl::display>();
-   if (!d->ok())
-      fatal("Could not connect to compositor");
+   if (getenv("XDG_RUNTIME_DIR") == nullptr) {
+      logerror("Environment variable XDG_RUNTIME_DIR not set");
+      goto error;
+   }
 
-   struct conn c = {};
+   g_afb_instance = new afb_instance;
+   if (g_afb_instance->init() == -1) {
+      logerror("Could not connect to compositor");
+      goto error;
+   }
 
-   d->r->add_global_handler(
-      "ivi_controller", [&](wl_registry *r, uint32_t name, uint32_t v) {
-         c.c = std::make_unique<genivi::controller>(r, name, v);
-      });
+   {
+      int ret = sd_event_add_io(afb_daemon_get_event_loop(), nullptr,
+                                g_afb_instance->display->get_fd(), EPOLLIN,
+                                display_event_callback, g_afb_instance);
+      if (ret < 0) {
+         logerror("Could not initialize afb_instance event handler: %d", -ret);
+         goto error;
+      }
+   }
 
-   d->r->add_global_handler(
-      "wl_output", [&](wl_registry *r, uint32_t name, uint32_t v) {
-         c.outputs.emplace_back(std::make_unique<wl::output>(r, name, v));
-      });
+   atexit([] { delete g_afb_instance; });
 
-   // First level objects
-   d->roundtrip();
-   // Second level objects
-   d->roundtrip();
-   // Third level objects
-   d->roundtrip();
+   return 0;
 
-   if (!c.c)
-      fatal("ivi_controller global not available");
+error:
+   delete g_afb_instance;
+   g_afb_instance = nullptr;
+   return -1;
+}
 
-   while (check_events(d.get(), &c, STDIN_FILENO) != -1) {
-      ;
+int binding_init() noexcept {
+   try {
+      return binding_init_();
+   } catch (std::exception &e) {
+      logerror("Uncaught exception in binding_init(): %s", e.what());
    }
+   return -1;
+}
 
-   d->roundtrip();
+}  // namespace
 
-   return 0;
-}
+#include "afb_binding_glue.inl"
+
+extern "C" const struct afb_binding_v2 afbBindingV2 = {
+   "winman", nullptr, nullptr, winman_verbs, nullptr, binding_init, nullptr, 1};