wayland: task names, delete surfaces using pending_tasks

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

diff --git a/src/main.cpp b/src/main.cpp
index 1d92338..cd8d67d 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,11 +11,55 @@
 #include <string>
 #include <vector>
 
+#include <sys/poll.h>
+
 struct conn {
    std::vector<std::unique_ptr<wl::output>> outputs;
    std::unique_ptr<genivi::controller> c;
 };
 
+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[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) {
+               struct genivi::rect const &r = i.second->dst_rect;
+               struct genivi::size 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;
+}
+}
+
 int main(int argc, char **argv) {
    lognotice("WinMan ver. %s", WINMAN_VERSION_STRING);
 
@@ -45,7 +91,12 @@ int main(int argc, char **argv) {
 
    if (!c.c)
       fatal("ivi_controller global not available");
-   // main loop
+
+   while (check_events(d.get(), &c, STDIN_FILENO) != -1) {
+      c.c->execute_pending();
+   }
+
+   d->roundtrip();
 
    return 0;
 }