clang-tidy the place up

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

diff --git a/src/main.cpp b/src/main.cpp
index 52d6b32..ba41a65 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,9 +1,12 @@
-#include "util.h"
+#include "util.hpp"
 #include "wayland.hpp"
 
 #include <unistd.h>
 
-#include <sys/poll.h>
+#include <signal.h>
+#include <sys/signalfd.h>
+
+#include <algorithm>
 
 struct connection {
    std::vector<std::unique_ptr<wl::output>> outputs;
@@ -11,65 +14,6 @@ struct connection {
 };
 
 namespace {
-//       _               _                            _        ____
-//   ___| |__   ___  ___| | __    _____   _____ _ __ | |_ ___ / /\ \
-//  / __| '_ \ / _ \/ __| |/ /   / _ \ \ / / _ \ '_ \| __/ __| |  | |
-// | (__| | | |  __/ (__|   <   |  __/\ V /  __/ | | | |_\__ \ |  | |
-//  \___|_| |_|\___|\___|_|\_\___\___| \_/ \___|_| |_|\__|___/ |  | |
-//                          |_____|                           \_\/_/
-int check_events(struct wl::display &d, struct connection &c, int fd) {
-   struct pollfd pfd[2] = {{.fd = d.get_fd(), .events = POLLIN, .revents = 0},
-                           {.fd = fd, .events = POLLIN, .revents = 0}};
-
-   d.flush();
-
-   if (poll(pfd, fd != -1 ? 2 : 1, -1) != -1 && errno != EINTR) {
-      int ret = 0;
-
-      if ((pfd[0].revents & POLLIN) != 0) {
-         ret = d.dispatch();
-      }
-
-      if (ret == -1) {
-         return ret;
-      }
-
-      if (fd != -1 && ((pfd[1].revents & POLLIN) != 0)) {
-         char buf[256];
-
-         // read all there is ...
-         while (read(pfd[1].fd, buf, sizeof(buf)) == sizeof(buf)) {
-            ;
-         }
-
-         // Display current status
-         if (!c.c->surfaces.empty()) {
-            puts("Surfaces:");
-            for (auto const &i : c.c->surfaces) {
-               auto const &r = i.second->dst_rect;
-               auto const &s = i.second->size;
-               printf("%d [%ux%u] (%ux%u@%dx%d), ", i.first, s.w, s.h, r.w, r.h,
-                      r.x, r.y);
-            }
-            puts("\b\b ");
-         }
-
-         if (!c.c->layers.empty()) {
-            puts("Layers:");
-            for (auto const &i : c.c->layers) {
-               auto const &r = i.second->dst_rect;
-               auto const &s = i.second->size;
-               printf("%d [%ux%u] (%ux%u@%dx%d), ", i.first, s.w, s.h, r.w, r.h,
-                      r.x, r.y);
-            }
-            puts("\b\b ");
-         }
-      }
-   }
-
-   return 0;
-}
-
 //  _       _ _       _                         _    ____
 // (_)_ __ (_) |_    | | __ _ _   _  ___  _   _| |_ / /\ \
 // | | '_ \| | __|   | |/ _` | | | |/ _ \| | | | __| |  | |
@@ -142,13 +86,20 @@ int main(int /*argc*/, char ** /*argv*/) {
    struct connection c {};
 
    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);
+      "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", [&c](wl_registry *r, uint32_t name, uint32_t v) {
-         c.outputs.emplace_back(std::make_unique<wl::output>(r, name, v));
+      "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
@@ -162,10 +113,38 @@ int main(int /*argc*/, char ** /*argv*/) {
       fatal("Could not init layout: %s", e);
    }
 
-   while (check_events(d, c, STDIN_FILENO) != -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;
+   });
+
+   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, nullptr);
+   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();
-      d.flush();
    }
 
+   c.c->commit_changes();
+   d.roundtrip();
+
    return 0;
 }