wayland: print debug message when setting surface onto layer

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

diff --git a/src/main.cpp b/src/main.cpp
index 67687af..364e535 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -53,6 +53,17 @@ int check_events(struct wl::display *d, struct conn *c, int fd) {
             }
             puts("\b\b ");
          }
+
+         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;
+               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 ");
+         }
       }
    }
 
@@ -60,23 +71,33 @@ int check_events(struct wl::display *d, struct conn *c, int fd) {
 }
 
 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)};
+
+   // 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->add_layer(l100.get());
+   s->add_layer(l1k.get());
 
    c.c->commit_changes();
    // Note: this does not flush the display!
@@ -122,6 +143,7 @@ int main(int argc, char **argv) {
 
    while (check_events(d.get(), &c, STDIN_FILENO) != -1) {
       c.c->execute_pending();
+      d->flush();
    }
 
    d->roundtrip();