X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain.cpp;h=9b2f48af519404f8ab19c1fbd19a5dc7ffbaf73f;hb=02698c25c7c553b6293b42fc28753c7578745dcd;hp=c5756157552abb15f2ff6d0a119b531729c7caad;hpb=8fa57a084f696f454f8940d34243e8e9ac6dba34;p=staging%2Fwindowmanager.git

diff --git a/src/main.cpp b/src/main.cpp
index c575615..9b2f48a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4,12 +4,6 @@
 #include <unistd.h>
 
 #include <stdlib.h>
-#include <string.h>
-
-#include <map>
-#include <memory>
-#include <string>
-#include <vector>
 
 #include <sys/poll.h>
 
@@ -19,6 +13,12 @@ struct conn {
 };
 
 namespace {
+//       _               _                            _        ____
+//   ___| |__   ___  ___| | __    _____   _____ _ __ | |_ ___ / /\ \
+//  / __| '_ \ / _ \/ __| |/ /   / _ \ \ / / _ \ '_ \| __/ __| |  | |
+// | (__| | | |  __/ (__|   <   |  __/\ V /  __/ | | | |_\__ \ |  | |
+//  \___|_| |_|\___|\___|_|\_\___\___| \_/ \___|_| |_|\__|___/ |  | |
+//                          |_____|                           \_\/_/
 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}};
@@ -46,8 +46,8 @@ int check_events(struct wl::display *d, struct conn *c, int fd) {
          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;
+               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);
             }
@@ -57,8 +57,8 @@ int check_events(struct wl::display *d, struct conn *c, int fd) {
          if (!c->c->layers.empty()) {
             puts("Layers:");
             for (auto const &i : c->c->layers) {
-               struct genivi::rect const &r = i.second->dst_rect;
-               struct genivi::size const &s = i.second->size;
+               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);
             }
@@ -70,33 +70,51 @@ int check_events(struct wl::display *d, struct conn *c, int fd) {
    return 0;
 }
 
+//  _       _ _       _                         _    ____
+// (_)_ __ (_) |_    | | __ _ _   _  ___  _   _| |_ / /\ \
+// | | '_ \| | __|   | |/ _` | | | |/ _ \| | | | __| |  | |
+// | | | | | | |_    | | (_| | |_| | (_) | |_| | |_| |  | |
+// |_|_| |_|_|\__|___|_|\__,_|\__, |\___/ \__,_|\__| |  | |
+//              |_____|       |___/                 \_\/_/
 void init_layout(struct conn &c) {
-   struct wl::output &o = *c.outputs.begin()->get();
-   struct genivi::screen &s = *c.c->screens.begin()->second;
+   auto &o = c.outputs.front();
+   auto &s = c.c->screens.begin()->second;
    auto &layers = c.c->layers;
 
    // XXX: Write output dimensions to ivi controller...
-   c.c->output_size = genivi::size{uint32_t(o.width), uint32_t(o.height)};
+   c.c->output_size = genivi::size{uint32_t(o->width), uint32_t(o->height)};
+
+   // Clear scene
+   layers.clear();
+
+   // Clear screen
+   s->clear();
 
    // Setup our dummy scene...
-   if (layers.find(100) == layers.end()) {
-      logdebug("Creating layer 100 with output dimensions (%ux%u)", o.width, o.height);
-      c.c->layer_create(100, o.width, o.height);
-   }
+   c.c->layer_create(100, 0, 0);  // bottom layer, anything else
+   c.c->layer_create(1000, 0, 0); // top layer, mandelbrot
 
-   struct genivi::layer &l = *c.c->layers[100].get();
+   auto &l100 = c.c->layers[100];
+   auto &l1k = c.c->layers[1000];
 
-   l.set_destination_rectangle(0, 0, o.width, o.height);
-   s.clear();
+   // Set layers fullscreen
+   l100->set_destination_rectangle(0, 0, o->width, o->height);
+   l1k->set_destination_rectangle(0, 0, o->width, o->height);
 
-   logdebug("Add layer 100 to screen %u", s.id);
-   s.add_layer(&l);
+   // Add layers to screen
+   s->set_render_order({100, 1000});
 
    c.c->commit_changes();
    // Note: this does not flush the display!
 }
 }
 
+//                  _        ____
+//  _ __ ___   __ _(_)_ __  / /\ \
+// | '_ ` _ \ / _` | | '_ \| |  | |
+// | | | | | | (_| | | | | | |  | |
+// |_| |_| |_|\__,_|_|_| |_| |  | |
+//                          \_\/_/
 int main(int argc, char **argv) {
    lognotice("WinMan ver. %s", WINMAN_VERSION_STRING);
 
@@ -107,15 +125,15 @@ int main(int argc, char **argv) {
    if (!d->ok())
       fatal("Could not connect to compositor");
 
-   struct conn c = {};
+   struct conn c{};
 
    d->r->add_global_handler(
-      "ivi_controller", [&](wl_registry *r, uint32_t name, uint32_t v) {
+      "ivi_controller", [&c](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) {
+      "wl_output", [&c](wl_registry *r, uint32_t name, uint32_t v) {
          c.outputs.emplace_back(std::make_unique<wl::output>(r, name, v));
       });
 
@@ -136,6 +154,7 @@ int main(int argc, char **argv) {
 
    while (check_events(d.get(), &c, STDIN_FILENO) != -1) {
       c.c->execute_pending();
+      d->flush();
    }
 
    d->roundtrip();