X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain.cpp;h=7734d97e1a8401fa425ee804dac18832d74b1c69;hb=5968e97fec8fe24398f05c694d6882895671b9f6;hp=c5756157552abb15f2ff6d0a119b531729c7caad;hpb=8fa57a084f696f454f8940d34243e8e9ac6dba34;p=staging%2Fwindowmanager.git diff --git a/src/main.cpp b/src/main.cpp index c575615..7734d97 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3,14 +3,6 @@ #include -#include -#include - -#include -#include -#include -#include - #include struct conn { @@ -19,46 +11,54 @@ struct conn { }; 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}, +// _ _ _ ____ +// ___| |__ ___ ___| | __ _____ _____ _ __ | |_ ___ / /\ \ +// / __| '_ \ / _ \/ __| |/ / / _ \ \ / / _ \ '_ \| __/ __| | | | +// | (__| | | | __/ (__| < | __/\ 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}}; - d->flush(); + 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 ((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) { - struct genivi::rect const &r = i.second->dst_rect; - struct genivi::size const &s = i.second->size; + 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, r.x, r.y); } puts("\b\b "); } - if (!c->c->layers.empty()) { + 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; + 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, r.x, r.y); } @@ -70,75 +70,100 @@ 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); + l100->set_visibility(1); + l1k->set_visibility(1); - 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) { +} // namespace + +// _ ____ +// _ __ ___ __ _(_)_ __ / /\ \ +// | '_ ` _ \ / _` | | '_ \| | | | +// | | | | | | (_| | | | | | | | | +// |_| |_| |_|\__,_|_|_| |_| | | | +// \_\/_/ +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"); + } - auto d = std::make_unique(); - if (!d->ok()) + struct wl::display d {}; + 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) { + d.r.add_global_handler( + "ivi_controller", [&c](wl_registry *r, uint32_t name, uint32_t v) { c.c = std::make_unique(r, name, v); }); - d->r->add_global_handler( - "wl_output", [&](wl_registry *r, uint32_t name, uint32_t v) { + d.r.add_global_handler( + "wl_output", [&c](wl_registry *r, uint32_t name, uint32_t v) { c.outputs.emplace_back(std::make_unique(r, name, v)); }); // First level objects - d->roundtrip(); + d.roundtrip(); // Second level objects - d->roundtrip(); + d.roundtrip(); // Third level objects - d->roundtrip(); + d.roundtrip(); - if (!c.c) + if (!c.c) { fatal("ivi_controller global not available"); + } - if (c.outputs.empty()) + if (c.outputs.empty()) { fatal("no output was set up!"); + } init_layout(c); - while (check_events(d.get(), &c, STDIN_FILENO) != -1) { + while (check_events(d, c, STDIN_FILENO) != -1) { c.c->execute_pending(); + d.flush(); } - d->roundtrip(); + d.roundtrip(); return 0; }