X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain.cpp;h=8dde44940fdeee6e03777e50766e803c05c14474;hb=8c712205657ceceb8644065735b5fff06bedfbb5;hp=0c010ea465991217ab21e1df8701058f5a86cbfc;hpb=db95653246560c24ad3c8cb224b3d9321b50af0a;p=staging%2Fwindowmanager.git

diff --git a/src/main.cpp b/src/main.cpp
index 0c010ea..8dde449 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,55 +1,210 @@
 #include "util.h"
 #include "wayland.hpp"
 
-#include <stdlib.h>
-#include <string.h>
+#include <unistd.h>
 
-#include <map>
-#include <memory>
-#include <string>
-#include <vector>
+#include <signal.h>
+#include <sys/poll.h>
+#include <sys/signalfd.h>
 
-struct conn {
+#include <algorithm>
+
+struct connection {
    std::vector<std::unique_ptr<wl::output>> outputs;
    std::unique_ptr<genivi::controller> c;
+};
+
+//      _                   _     ____       _ _
+//  ___| |_ _ __ _   _  ___| |_  |  _ \ ___ | | | ___ _ __
+// / __| __| '__| | | |/ __| __| | |_) / _ \| | |/ _ \ '__|
+// \__ \ |_| |  | |_| | (__| |_  |  __/ (_) | | |  __/ |
+// |___/\__|_|   \__,_|\___|\__| |_|   \___/|_|_|\___|_|
+//
+struct Poller {
+   std::vector<std::function<int(int)>> handlers;
+   std::vector<struct pollfd> pfds;
 
-   ~conn();
+   Poller() = default;
+   void add_fd(int fd, std::function<int(int)> handler);
+   int check_events();
 };
 
-conn::~conn() {
-   this->outputs.clear();
+void Poller::add_fd(int fd, std::function<int(int)> handler) {
+   pfds.emplace_back(pollfd{.fd = fd, .events = POLLIN, .revents = 0});
+   handlers.emplace_back(std::move(handler));
+}
+
+int Poller::check_events() {
+   int ret = 0;
+   if ((ret = poll(this->pfds.data(), this->pfds.size(), -1)) != -1 &&
+       errno != EINTR) {
+      for (unsigned i = 0; i < pfds.size(); i++) {
+         if (pfds[i].revents & POLLIN) {
+            if (handlers[i](pfds[i].fd) == -1) {
+               return -1;
+            }
+            pfds[i].revents = 0;
+            pfds[i].events = POLLIN;
+         }
+      }
+   }
+   return ret;
 }
 
-int main(int argc, char **argv) {
+struct unique_fd {
+   int fd {-1};
+   unique_fd() = default;
+   explicit unique_fd(int f) : fd{f} {}
+   operator int() const { return fd; }
+   ~unique_fd() {
+      if (this->fd != -1)
+         close(this->fd);
+   }
+   unique_fd(unique_fd const &) = delete;
+   unique_fd &operator=(unique_fd const &) = delete;
+   unique_fd(unique_fd &&o) : fd(o.fd) { o.fd = -1; }
+   unique_fd &operator=(unique_fd &&o) {
+      std::swap(this->fd, o.fd);
+      return *this;
+   }
+};
+
+
+namespace {
+//  _       _ _       _                         _    ____
+// (_)_ __ (_) |_    | | __ _ _   _  ___  _   _| |_ / /\ \
+// | | '_ \| | __|   | |/ _` | | | |/ _ \| | | | __| |  | |
+// | | | | | | |_    | | (_| | |_| | (_) | |_| | |_| |  | |
+// |_|_| |_|_|\__|___|_|\__,_|\__, |\___/ \__,_|\__| |  | |
+//              |_____|       |___/                 \_\/_/
+char const *init_layout(struct connection &c) {
+   if (!c.c) {
+      return "ivi_controller global not available";
+   }
+
+   if (c.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;
+
+   // XXX: Write output dimensions to ivi controller...
+   c.c->output_size = genivi::size{uint32_t(o->width), uint32_t(o->height)};
+
+   // Clear scene
+   layers.clear();
+
+   // Clear screen
+   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
+
+   auto &l100 = c.c->layers[100];
+   auto &l1k = c.c->layers[1000];
+
+   // Set layers fullscreen
+   l100->set_destination_rectangle(0, 0, o->width, o->height);
+   l1k->set_destination_rectangle(0, 0, o->width, o->height);
+   l100->set_visibility(1);
+   l1k->set_visibility(1);
+
+   // Add layers to screen
+   s->set_render_order({100, 1000});
+
+   c.c->commit_changes();
+   // Note: this does not flush the display!
+
+   return nullptr;
+}
+}  // namespace
+
+//                  _        ____
+//  _ __ ___   __ _(_)_ __  / /\ \
+// | '_ ` _ \ / _` | | '_ \| |  | |
+// | | | | | | (_| | | | | | |  | |
+// |_| |_| |_|\__,_|_|_| |_| |  | |
+//                          \_\/_/
+int main(int /*argc*/, char ** /*argv*/) {
    lognotice("WinMan ver. %s", WINMAN_VERSION_STRING);
 
-   if (!getenv("XDG_RUNTIME_DIR"))
+   if (getenv("XDG_RUNTIME_DIR") == nullptr) {
       fatal("Environment variable XDG_RUNTIME_DIR not set");
+   }
 
-   auto d = std::make_unique<wl::display>();
-   if (!d->d)
+   struct wl::display d {};
+   if (!d.ok()) {
       fatal("Could not connect to compositor");
+   }
 
-   struct conn c = {};
+   struct connection c {};
 
-   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);
-   });
+   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));
+           });
 
-   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));
-   });
+   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);
+
+         // 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())));
+      });
 
    // First level objects
-   d->roundtrip();
+   d.roundtrip();
    // Second level objects
-   d->roundtrip();
+   d.roundtrip();
    // Third level objects
-   /* wl_display_roundtrip(c.d); */
+   d.roundtrip();
+
+   if (char const *e = init_layout(c)) {
+      fatal("Could not init layout: %s", e);
+   }
+
+   struct Poller p{};
+   p.add_fd(STDIN_FILENO, [&c](int fd) {
+       int buf;
+       ssize_t ret;
+       while ((ret = read(fd, &buf, sizeof(buf))) == sizeof(buf)) {
+          ;
+       }
+       c.c->debug_dump_current_status();
+       return ret == 0 ? -1 : 0;
+   });
+
+   p.add_fd(d.get_fd(), [&d](int fd) {
+      return d.dispatch();
+   });
+
+   sigset_t sset{};
+   sigemptyset(&sset);
+   sigaddset(&sset, SIGINT);
+   sigaddset(&sset, SIGTERM);
+
+   auto sfd = unique_fd(signalfd(-1, &sset, SFD_NONBLOCK | SFD_CLOEXEC));
+   sigprocmask(SIG_BLOCK, &sset, NULL);
+   p.add_fd(sfd.fd, [](int fd) {
+      struct signalfd_siginfo si;
+      while (read(fd, &si, sizeof(si)) == sizeof(si)) {
+          lognotice("Received signal %u", si.ssi_signo);
+      }
+      return -1;
+   });
+
+   while ((d.flush(), p.check_events()) != -1) {
+      c.c->execute_pending();
+   }
 
-   if (!c.c)
-      fatal("ivi_controller global not available");
-   // main loop
+   c.c->commit_changes();
+   d.roundtrip();
 
    return 0;
 }