X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain.cpp;h=ba41a65bb3b6544d4a013a4eb7c3e763a068770f;hb=d2ad02c40bad6b67f0b38071987ce1fa9f8039ab;hp=d01950b251eadf5683b87fd978c7e86aea6602cb;hpb=4312bcdc2121c0e6f97290f6c03fe42bdb1c1a58;p=staging%2Fwindowmanager.git diff --git a/src/main.cpp b/src/main.cpp index d01950b..ba41a65 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,82 +1,34 @@ -#include "util.h" +#include "util.hpp" #include "wayland.hpp" #include -#include +#include +#include -#include +#include -struct conn { +struct connection { std::vector> outputs; std::unique_ptr c; }; 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}}; - - 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[256]; - - // read all there is ... - while (read(pfd[1].fd, buf, sizeof(buf)) == sizeof(buf)) - ; - - // Display current status - 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; - 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()) { - 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 "); - } - } - } - - return 0; -} - // _ _ _ _ _ ____ // (_)_ __ (_) |_ | | __ _ _ _ ___ _ _| |_ / /\ \ // | | '_ \| | __| | |/ _` | | | |/ _ \| | | | __| | | | // | | | | | | |_ | | (_| | |_| | (_) | |_| | |_| | | | // |_|_| |_|_|\__|___|_|\__,_|\__, |\___/ \__,_|\__| | | | // |_____| |___/ \_\/_/ -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; @@ -91,8 +43,8 @@ void init_layout(struct conn &c) { s->clear(); // Setup our dummy scene... - c.c->layer_create(100, 0, 0); // bottom layer, anything else - c.c->layer_create(1000, 0, 0); // top layer, mandelbrot + c.c->layer_create(100, 0, 0); // bottom layer, anything else + c.c->layer_create(1000, 0, 0); // top layer, mandelbrot auto &l100 = c.c->layers[100]; auto &l1k = c.c->layers[1000]; @@ -100,14 +52,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,49 +71,80 @@ 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"); + } - 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 connection c {}; - d->r->add_global_handler( + 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)); + }); + + 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", [&c](wl_registry *r, uint32_t name, uint32_t v) { - c.outputs.emplace_back(std::make_unique(r, name, v)); + // XXX: This protocol needs the output, so lets just add our mapping + // here... + c.c->add_proxy_to_id_mapping( + c.outputs.back()->proxy.get(), + wl_proxy_get_id(reinterpret_cast( + c.outputs.back()->proxy.get()))); }); // First level objects - d->roundtrip(); + d.roundtrip(); // Second level objects - d->roundtrip(); + d.roundtrip(); // Third level objects - d->roundtrip(); - - if (!c.c) - fatal("ivi_controller global not available"); + d.roundtrip(); - if (c.outputs.empty()) - fatal("no output was set up!"); + if (char const *e = init_layout(c)) { + fatal("Could not init layout: %s", e); + } - init_layout(c); + struct Poller p {}; + p.add_fd(STDIN_FILENO, [&c](int fd) { + int buf; + ssize_t ret; + ret = read(fd, &buf, sizeof(buf)); + c.c->debug_dump_current_status(); + return ret == 0 ? -1 : 0; + }); + + p.add_fd(d.get_fd(), [&d](int fd) { return d.dispatch(); }); + + sigset_t sset{}; + sigemptyset(&sset); + sigaddset(&sset, SIGINT); + sigaddset(&sset, SIGTERM); + + auto sfd = unique_fd(signalfd(-1, &sset, SFD_NONBLOCK | SFD_CLOEXEC)); + sigprocmask(SIG_BLOCK, &sset, nullptr); + p.add_fd(sfd.fd, [](int fd) { + struct signalfd_siginfo si; + while (read(fd, &si, sizeof(si)) == sizeof(si)) { + lognotice("Received signal %u", si.ssi_signo); + } + return -1; + }); - while (check_events(d.get(), &c, STDIN_FILENO) != -1) { + while ((d.flush(), p.check_events()) != -1) { c.c->execute_pending(); - d->flush(); } - d->roundtrip(); + c.c->commit_changes(); + d.roundtrip(); return 0; }