main/wayland: added a simple main loop

Signed-off-by: Marcus Fritzsch <marcus_fritzsch@mentor.com>

diff --git a/src/main.cpp b/src/main.cpp
index 5e74ed8..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,11 +11,50 @@
 #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[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) {
    lognotice("WinMan ver. %s", WINMAN_VERSION_STRING);
 
@@ -46,11 +87,11 @@ int main(int argc, char **argv) {
    if (!c.c)
       fatal("ivi_controller global not available");
 
-   /* while (1) { */
-   /*    int ret = d->dispatch(); */
-   /*    if (ret != 0) */
-   /*       break; */
-   /* } */
+   while (check_events(d.get(), &c, STDIN_FILENO) != -1) {
+      ;
+   }
+
+   d->roundtrip();
 
    return 0;
 }

diff --git a/src/wayland.cpp b/src/wayland.cpp
index b4f4800..b81f140 100644 (file)
--- a/src/wayland.cpp
+++ b/src/wayland.cpp
@@ -32,6 +32,10 @@ void display::roundtrip() { wl_display_roundtrip(this->d.get()); }
 
 int display::dispatch() { return wl_display_dispatch(this->d.get()); }
 
+void display::flush() { wl_display_flush(this->d.get()); }
+
+int display::get_fd() const { return wl_display_get_fd(this->d.get()); }
+
 //                 _     _
 //  _ __ ___  __ _(_)___| |_ _ __ _   _
 // | '__/ _ \/ _` | / __| __| '__| | | |

diff --git a/src/wayland.hpp b/src/wayland.hpp
index afebe92..d76a023 100644 (file)
--- a/src/wayland.hpp
+++ b/src/wayland.hpp
@@ -57,6 +57,8 @@ struct display {
    bool ok() const;
    void roundtrip();
    int dispatch();
+   void flush();
+   int get_fd() const;
 };
 
 //                 _     _