X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain.cpp;h=8b77545dfa6b03d85a1be244a4a75f975f68b6b7;hb=7c2d33392edeb07f14f15c9ad337d9cf4ad63576;hp=146020e87c1465575fdfead97ce8239a28ea4b72;hpb=0794731455fbf919882c8a9cc03dd42c66117a93;p=staging%2Fwindowmanager.git diff --git a/src/main.cpp b/src/main.cpp index 146020e..8b77545 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3,80 +3,65 @@ #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)) - ; +// _ _ ____ _ _ +// ___| |_ _ __ _ _ ___| |_ | _ \ ___ | | | ___ _ __ +// / __| __| '__| | | |/ __| __| | |_) / _ \| | |/ _ \ '__| +// \__ \ |_| | | |_| | (__| |_ | __/ (_) | | | __/ | +// |___/\__|_| \__,_|\___|\__| |_| \___/|_|_|\___|_| +// +struct Poller { + std::vector> handlers; + std::vector pfds; + + Poller() = default; + void add_fd(int fd, std::function handler); + int check_events(); +}; - // Display current status - if (!c->c->surfaces.empty()) { - puts("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, - r.x, r.y); - } - puts("\b\b "); - } +void Poller::add_fd(int fd, std::function handler) { + pfds.emplace_back(pollfd{ .fd = fd, .events = POLLIN, .revents = 0 }); + handlers.emplace_back(std::move(handler)); +} - if (!c->c->layers.empty()) { - puts("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, - r.x, r.y); +int Poller::check_events() { + int ret = 0; + if ((ret = poll(this->pfds.data(), this->pfds.size(), -1)) != -1 && errno != EINTR) { + for (unsigned i = 0; i < pfds.size(); i++) { + if (pfds[i].revents & POLLIN) { + if (handlers[i](pfds[i].fd) == -1) { + return -1; } - puts("\b\b "); + pfds[i].revents = 0; + pfds[i].events = POLLIN; } } } - - return 0; + return ret; } +namespace { // _ _ _ _ _ ____ // (_)_ __ (_) |_ | | __ _ _ _ ___ _ _| |_ / /\ \ // | | '_ \| | __| | |/ _` | | | |/ _ \| | | | __| | | | // | | | | | | |_ | | (_| | |_| | (_) | |_| | |_| | | | // |_|_| |_|_|\__|___|_|\__,_|\__, |\___/ \__,_|\__| | | | // |_____| |___/ \_\/_/ -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 +76,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 +85,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 +104,65 @@ 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!"); - - init_layout(c); + if (char const *e = init_layout(c)) { + fatal("Could not init layout: %s", e); + } - while (check_events(d.get(), &c, STDIN_FILENO) != -1) { + struct Poller p{}; + p.add_fd(STDIN_FILENO, [&c](int fd) { + int buf; + ssize_t ret; + while ((ret = read(fd, &buf, sizeof(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(); + }); + + while ((d.flush(), p.check_events()) != -1) { c.c->execute_pending(); - d->flush(); } - d->roundtrip(); - return 0; }