wayland: remove surfaces that got destroyed

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

diff --git a/src/main.cpp b/src/main.cpp
index 0c010ea..a07a73c 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,6 +1,8 @@
 #include "util.h"
 #include "wayland.hpp"
 
+#include <unistd.h>
+
 #include <stdlib.h>
 #include <string.h>
 
@@ -9,15 +11,48 @@
 #include <string>
 #include <vector>
 
+#include <sys/poll.h>
+
 struct conn {
    std::vector<std::unique_ptr<wl::output>> outputs;
    std::unique_ptr<genivi::controller> c;
-
-   ~conn();
 };
 
-conn::~conn() {
-   this->outputs.clear();
+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 }
+   };
+
+   d->flush();
+
+   if (poll(pfd, fd != -1 ? 2 : 1, -1) != -1 && errno != EINTR) {
+      int ret = 0;
+
+      if (pfd[0].revents & POLLIN) {
+         ret = d->dispatch();
+      }
+
+      if (ret == -1)
+         return ret;
+
+      if (fd != -1 && (pfd[1].revents & POLLIN)) {
+         char buf[10];
+
+         while (read(pfd[1].fd, buf, 10) == 10)
+            ;
+
+         // Display current status
+         for (auto const &i : c->c->surfaces) {
+            printf("Surface %d\n", i.first);
+         }
+      }
+   }
+
+   return 0;
+}
 }
 
 int main(int argc, char **argv) {
@@ -27,29 +62,36 @@ int main(int argc, char **argv) {
       fatal("Environment variable XDG_RUNTIME_DIR not set");
 
    auto d = std::make_unique<wl::display>();
-   if (!d->d)
+   if (!d->ok())
       fatal("Could not connect to compositor");
 
    struct conn 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(
+      "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", [&](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));
+      });
 
    // First level objects
    d->roundtrip();
    // Second level objects
    d->roundtrip();
    // Third level objects
-   /* wl_display_roundtrip(c.d); */
+   d->roundtrip();
 
    if (!c.c)
       fatal("ivi_controller global not available");
-   // main loop
+
+   while (check_events(d.get(), &c, STDIN_FILENO) != -1) {
+      ;
+   }
+
+   d->roundtrip();
 
    return 0;
 }