X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain.cpp;h=03aa2029994e8f7cbcf45818a52e2b07d98f2953;hb=dc747bcc7b70476ac14cde38e5e90a60bc057546;hp=9b2f48af519404f8ab19c1fbd19a5dc7ffbaf73f;hpb=02698c25c7c553b6293b42fc28753c7578745dcd;p=staging%2Fwindowmanager.git diff --git a/src/main.cpp b/src/main.cpp index 9b2f48a..03aa202 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,72 +1,62 @@ -#include "util.h" +#include "util.hpp" #include "wayland.hpp" -#include +#include +#include -#include +#define AFB_BINDING_VERSION 2 -#include +extern "C" { +#include +#include +} -struct conn { - std::vector> outputs; - std::unique_ptr c; -}; +#include 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(); - } +struct wayland { + std::unique_ptr display; + std::unique_ptr controller; + std::vector> outputs; - 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) { - 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 "); - } + wayland() : display(new wl::display), controller(nullptr), outputs() {} - 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); - } - puts("\b\b "); - } - } + int init(); +}; + +struct wayland *g_wayland; + +int wayland::init() { + if (!this->display->ok()) { + return -1; } + this->display->r.add_global_handler("wl_output", [](wl_registry *r, + uint32_t name, + uint32_t v) { + g_wayland->outputs.emplace_back(std::make_unique(r, name, v)); + }); + + this->display->r.add_global_handler( + "ivi_controller", [](wl_registry *r, uint32_t name, uint32_t v) { + g_wayland->controller = + std::make_unique(r, name, v); + + // XXX: This protocol needs the output, so lets just add our mapping + // here... + g_wayland->controller->add_proxy_to_id_mapping( + g_wayland->outputs.back()->proxy.get(), + wl_proxy_get_id(reinterpret_cast( + g_wayland->outputs.back()->proxy.get()))); + }); + + // First level objects + this->display->roundtrip(); + // Second level objects + this->display->roundtrip(); + // Third level objects + this->display->roundtrip(); + return 0; } @@ -76,13 +66,23 @@ int check_events(struct wl::display *d, struct conn *c, int fd) { // | | | | | | |_ | | (_| | |_| | (_) | |_| | |_| | | | // |_|_| |_|_|\__|___|_|\__,_|\__, |\___/ \__,_|\__| | | | // |_____| |___/ \_\/_/ -void init_layout(struct conn &c) { - auto &o = c.outputs.front(); - auto &s = c.c->screens.begin()->second; - auto &layers = c.c->layers; +char const *init_layout() { + if (!g_wayland->controller) { + return "ivi_controller global not available"; + } + + if (g_wayland->outputs.empty()) { + return "no output was set up!"; + } + + auto &c = g_wayland->controller; + + auto &o = g_wayland->outputs.front(); + auto &s = c->screens.begin()->second; + auto &layers = c->layers; // XXX: Write output dimensions to ivi controller... - c.c->output_size = genivi::size{uint32_t(o->width), uint32_t(o->height)}; + c->output_size = genivi::size{uint32_t(o->width), uint32_t(o->height)}; // Clear scene layers.clear(); @@ -91,73 +91,198 @@ 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->layer_create(100, 0, 0); // bottom layer, anything else + c->layer_create(1000, 0, 0); // top layer, mandelbrot - auto &l100 = c.c->layers[100]; - auto &l1k = c.c->layers[1000]; + auto &l100 = c->layers[100]; + auto &l1k = c->layers[1000]; // 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! + c->commit_changes(); + + g_wayland->display->flush(); + + return nullptr; } + +int display_event_callback(sd_event_source *evs, int fd, uint32_t events, + void *data) { + if ((events & EPOLLHUP) != 0) { + AFB_ERROR("The compositor hung up, dying now."); + delete g_wayland; + g_wayland = nullptr; + goto error; + } + + if (events & EPOLLIN) { + int ret = g_wayland->display->dispatch(); + if (ret == -1) { + AFB_ERROR("wl_display_dipatch() returned error %d", + g_wayland->display->get_error()); + goto error; + } + g_wayland->display->flush(); + + // execute pending tasks, that is layout changes etc. + g_wayland->controller->execute_pending(); + g_wayland->display->roundtrip(); + } + + return 0; + +error: + sd_event_source_unref(evs); + return -1; } -// _ ____ -// _ __ ___ __ _(_)_ __ / /\ \ -// | '_ ` _ \ / _` | | '_ \| | | | -// | | | | | | (_| | | | | | | | | -// |_| |_| |_|\__,_|_|_| |_| | | | -// \_\/_/ -int main(int argc, char **argv) { +// _ _ _ _ _ _ _ ____ +// | |__ (_)_ __ __| (_)_ __ __ _ (_)_ __ (_) |_ / /\ \ +// | '_ \| | '_ \ / _` | | '_ \ / _` | | | '_ \| | __| | | | +// | |_) | | | | | (_| | | | | | (_| | | | | | | | |_| | | | +// |_.__/|_|_| |_|\__,_|_|_| |_|\__, |___|_|_| |_|_|\__| | | | +// |___/_____| \_\/_/ +int binding_init_() { lognotice("WinMan ver. %s", WINMAN_VERSION_STRING); - if (!getenv("XDG_RUNTIME_DIR")) - fatal("Environment variable XDG_RUNTIME_DIR not set"); + if (g_wayland != nullptr) { + AFB_ERROR("Wayland context already initialized?"); + return -1; + } - auto d = std::make_unique(); - if (!d->ok()) - fatal("Could not connect to compositor"); + if (getenv("XDG_RUNTIME_DIR") == nullptr) { + AFB_ERROR("Environment variable XDG_RUNTIME_DIR not set"); + return -1; + } - struct conn c{}; + g_wayland = new wayland; + if (g_wayland->init() == -1) { + AFB_ERROR("Could not connect to compositor"); + delete g_wayland; + return -1; + } - 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); - }); + if (char const *e = init_layout()) { + AFB_ERROR("Could not init layout: %s", e); + return -1; + } - 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)); - }); + sd_event_add_io(afb_daemon_get_event_loop(), nullptr, + g_wayland->display->get_fd(), EPOLLIN, + display_event_callback, g_wayland); - // First level objects - d->roundtrip(); - // Second level objects - d->roundtrip(); - // Third level objects - d->roundtrip(); + atexit([] { delete g_wayland; }); - if (!c.c) - fatal("ivi_controller global not available"); + return 0; +} + +int binding_init() noexcept { + try { + return binding_init_(); + } catch (std::exception &e) { + AFB_ERROR("Uncaught exception in binding_init(): %s", e.what()); + } + return -1; +} - if (c.outputs.empty()) - fatal("no output was set up!"); +#define CHECK_WAYLAND() \ + do { \ + if (g_wayland == nullptr) { \ + afb_req_fail(req, "failed", \ + "Binding not initialized, did the compositor die?"); \ + return; \ + } \ + } while (0) + +// _ _ _ _ ____ +// __| | ___| |__ _ _ __ _ ___| |_ __ _| |_ _ _ ___ / /\ \ +// / _` |/ _ \ '_ \| | | |/ _` | / __| __/ _` | __| | | / __| | | | +// | (_| | __/ |_) | |_| | (_| | \__ \ || (_| | |_| |_| \__ \ | | | +// \__,_|\___|_.__/ \__,_|\__, |___|___/\__\__,_|\__|\__,_|___/ | | | +// |___/_____| \_\/_/ +void debug_status(struct afb_req req) noexcept { + // Quick and dirty, dump current surfaces and layers + AFB_REQ_DEBUG(req, "status"); + + CHECK_WAYLAND(); + + try { + using json = nlohmann::json; + + json j; + + if (!g_wayland->controller->surfaces.empty()) { + auto a = json::array(); + for (auto const &i : g_wayland->controller->surfaces) { + auto const &r = i.second->dst_rect; + auto const &s = i.second->size; + a.push_back({{"id", i.first}, + {"size", {s.w, s.h}}, + {"dst_rect", {r.w, r.h, r.x, r.y}}}); + } + j["surfaces"] = a; + } - init_layout(c); + if (!g_wayland->controller->layers.empty()) { + auto a = json::array(); + for (auto const &i : g_wayland->controller->layers) { + auto const &r = i.second->dst_rect; + auto const &s = i.second->size; + a.push_back({{"id", i.first}, + {"size", {s.w, s.h}}, + {"dst_rect", {r.w, r.h, r.x, r.y}}}); + } + j["layers"] = a; + } - while (check_events(d.get(), &c, STDIN_FILENO) != -1) { - c.c->execute_pending(); - d->flush(); + afb_req_success(req, json_tokener_parse(j.dump().c_str()), "status"); + } catch (std::exception &e) { + afb_req_fail_f(req, "failed", "Uncaught exception: %s", e.what()); } +} - d->roundtrip(); +void debug_surfaces(afb_req req) { + CHECK_WAYLAND(); - return 0; + auto a = json_object_new_array(); + + if (!g_wayland->controller->surfaces.empty()) { + for (auto const &i : g_wayland->controller->surfaces) { + json_object_array_add(a, json_object_new_int(i.first)); + } + } + + afb_req_success(req, a, "surfaces"); +} + +void debug_layers(afb_req req) { + CHECK_WAYLAND(); + + auto a = json_object_new_array(); + + if (!g_wayland->controller->layers.empty()) { + for (auto const &i : g_wayland->controller->layers) { + json_object_array_add(a, json_object_new_int(i.first)); + } + } + + afb_req_success(req, a, "surfaces"); } + +const struct afb_verb_v2 verbs[] = { + {"status", debug_status, NULL, NULL, AFB_SESSION_NONE_V2}, + {"layers", debug_layers, NULL, NULL, AFB_SESSION_NONE_V2}, + {"surfaces", debug_surfaces, NULL, NULL, AFB_SESSION_NONE_V2}, + {}, +}; +} // namespace + +extern "C" const struct afb_binding_v2 afbBindingV2 = { + "winman", NULL, NULL, verbs, NULL, binding_init, NULL, 1};