X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain.cpp;h=52d6b3207317bb28cd31be152d7dd796ce6ecc7d;hb=1c2a6b6e01836423ca4168cc3f067a113efe654b;hp=311631319ce2016ec0458c46fda31462a3a5c4be;hpb=3fc6d2e2cc8942e20ee57e6afb1d302ee1d35636;p=staging%2Fwindowmanager.git

diff --git a/src/main.cpp b/src/main.cpp
index 3116313..52d6b32 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3,11 +3,9 @@
 
 #include <unistd.h>
 
-#include <stdlib.h>
-
 #include <sys/poll.h>
 
-struct conn {
+struct connection {
    std::vector<std::unique_ptr<wl::output>> outputs;
    std::unique_ptr<genivi::controller> c;
 };
@@ -19,7 +17,7 @@ namespace {
 // | (__| | | |  __/ (__|   <   |  __/\ V /  __/ | | | |_\__ \ |  | |
 //  \___|_| |_|\___|\___|_|\_\___\___| \_/ \___|_| |_|\__|___/ |  | |
 //                          |_____|                           \_\/_/
-int check_events(struct wl::display &d, struct conn *c, int fd) {
+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}};
 
@@ -28,24 +26,26 @@ int check_events(struct wl::display &d, struct conn *c, int fd) {
    if (poll(pfd, fd != -1 ? 2 : 1, -1) != -1 && errno != EINTR) {
       int ret = 0;
 
-      if (pfd[0].revents & POLLIN) {
+      if ((pfd[0].revents & POLLIN) != 0) {
          ret = d.dispatch();
       }
 
-      if (ret == -1)
+      if (ret == -1) {
          return ret;
+      }
 
-      if (fd != -1 && (pfd[1].revents & POLLIN)) {
+      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))
+         while (read(pfd[1].fd, buf, sizeof(buf)) == sizeof(buf)) {
             ;
+         }
 
          // Display current status
-         if (!c->c->surfaces.empty()) {
+         if (!c.c->surfaces.empty()) {
             puts("Surfaces:");
-            for (auto const &i : c->c->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,
@@ -54,9 +54,9 @@ int check_events(struct wl::display &d, struct conn *c, int fd) {
             puts("\b\b ");
          }
 
-         if (!c->c->layers.empty()) {
+         if (!c.c->layers.empty()) {
             puts("Layers:");
-            for (auto const &i : c->c->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,
@@ -76,7 +76,15 @@ int check_events(struct wl::display &d, struct conn *c, int fd) {
 // | | | | | | |_    | | (_| | |_| | (_) | |_| | |_| |  | |
 // |_|_| |_|_|\__|___|_|\__,_|\__, |\___/ \__,_|\__| |  | |
 //              |_____|       |___/                 \_\/_/
-void init_layout(struct conn &c) {
+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;
@@ -100,14 +108,18 @@ void init_layout(struct conn &c) {
    // 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
 
 //                  _        ____
 //  _ __ ___   __ _(_)_ __  / /\ \
@@ -115,17 +127,19 @@ void init_layout(struct conn &c) {
 // | | | | | | (_| | | | | | |  | |
 // |_| |_| |_|\__,_|_|_| |_| |  | |
 //                          \_\/_/
-int main(int argc, char **argv) {
+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");
+   }
 
    struct wl::display d {};
-   if (!d.ok())
+   if (!d.ok()) {
       fatal("Could not connect to compositor");
+   }
 
-   struct conn c {};
+   struct connection c {};
 
    d.r.add_global_handler(
       "ivi_controller", [&c](wl_registry *r, uint32_t name, uint32_t v) {
@@ -144,20 +158,14 @@ int main(int argc, char **argv) {
    // Third level objects
    d.roundtrip();
 
-   if (!c.c)
-      fatal("ivi_controller global not available");
-
-   if (c.outputs.empty())
-      fatal("no output was set up!");
-
-   init_layout(c);
+   if (char const *e = init_layout(c)) {
+      fatal("Could not init layout: %s", e);
+   }
 
-   while (check_events(d, &c, STDIN_FILENO) != -1) {
+   while (check_events(d, c, STDIN_FILENO) != -1) {
       c.c->execute_pending();
       d.flush();
    }
 
-   d.roundtrip();
-
    return 0;
 }