X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain.cpp;h=965599ddaa7dd787f76e3d1d126af47972b9655f;hb=239ece2c159c1cef83e01cd9c7d61461de718e84;hp=cd8d67d59d88c90adc5ce5f87169d754406523f3;hpb=44a7f1838f0e85a1a9cf5c7fa6aec67a8a60daeb;p=staging%2Fwindowmanager.git diff --git a/src/main.cpp b/src/main.cpp index cd8d67d..965599d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,102 +1,290 @@ -#include "util.h" +#include "json_helper.hpp" +#include "util.hpp" #include "wayland.hpp" -#include +#include +#include -#include -#include +extern "C" { +#include +#include +} -#include -#include -#include -#include +namespace { +struct wayland { + std::unique_ptr display; + std::unique_ptr controller; + std::vector> outputs; -#include + wayland() : display(new wl::display), controller(nullptr), outputs() {} -struct conn { - std::vector> outputs; - std::unique_ptr c; + int init(); }; -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}, - {.fd = fd, .events = POLLIN, .revents = 0}}; +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; +} + +// _ _ _ _ _ ____ +// (_)_ __ (_) |_ | | __ _ _ _ ___ _ _| |_ / /\ \ +// | | '_ \| | __| | |/ _` | | | |/ _ \| | | | __| | | | +// | | | | | | |_ | | (_| | |_| | (_) | |_| | |_| | | | +// |_|_| |_|_|\__|___|_|\__,_|\__, |\___/ \__,_|\__| | | | +// |_____| |___/ \_\/_/ +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->output_size = genivi::size{uint32_t(o->width), uint32_t(o->height)}; + + // Clear scene + layers.clear(); + + // Clear screen + s->clear(); + + // Setup our dummy scene... + c->layer_create(100, 0, 0); // bottom layer, anything else + c->layer_create(1000, 0, 0); // top layer, mandelbrot + + auto &l100 = c->layers[100]; + auto &l1k = c->layers[1000]; - d->flush(); + // 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); - if (poll(pfd, fd != -1 ? 2 : 1, -1) != -1 && errno != EINTR) { - int ret = 0; + // Add layers to screen + s->set_render_order({100, 1000}); - if (pfd[0].revents & POLLIN) { - ret = d->dispatch(); + 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) { + logerror("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) { + logerror("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 binding_init_() { + lognotice("WinMan ver. %s", WINMAN_VERSION_STRING); - 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 (g_wayland != nullptr) { + logerror("Wayland context already initialized?"); + return 0; + } + + if (getenv("XDG_RUNTIME_DIR") == nullptr) { + logerror("Environment variable XDG_RUNTIME_DIR not set"); + goto error; + } + + g_wayland = new wayland; + if (g_wayland->init() == -1) { + logerror("Could not connect to compositor"); + goto error; + } + + if (char const *e = init_layout()) { + logerror("Could not init layout: %s", e); + goto error; + } + + { + int ret = sd_event_add_io(afb_daemon_get_event_loop(), nullptr, + g_wayland->display->get_fd(), EPOLLIN, + display_event_callback, g_wayland); + if (ret < 0) { + logerror("Could not initialize wayland event handler: %d", -ret); + goto error; } } + atexit([] { delete g_wayland; }); + return 0; + +error: + delete g_wayland; + g_wayland = nullptr; + return -1; } + +int binding_init() noexcept { + try { + return binding_init_(); + } catch (std::exception &e) { + logerror("Uncaught exception in binding_init(): %s", e.what()); + } + return -1; } -int main(int argc, char **argv) { - lognotice("WinMan ver. %s", WINMAN_VERSION_STRING); +// _ _ _ _ ____ +// __| | ___| |__ _ _ __ _ ___| |_ __ _| |_ _ _ ___ / /\ \ +// / _` |/ _ \ '_ \| | | |/ _` | / __| __/ _` | __| | | / __| | | | +// | (_| | __/ |_) | |_| | (_| | \__ \ || (_| | |_| |_| \__ \ | | | +// \__,_|\___|_.__/ \__,_|\__, |___|___/\__\__,_|\__|\__,_|___/ | | | +// |___/_____| \_\/_/ +void debug_status(struct afb_req req) { + // Quick and dirty, dump current surfaces and layers + AFB_REQ_DEBUG(req, "status"); + + auto o = json_object_new_object(); + json_object_object_add(o, "surfaces", + to_json(g_wayland->controller->sprops)); + json_object_object_add(o, "layers", to_json(g_wayland->controller->lprops)); +// json_object_object_add(o, "screens", +// to_json(g_wayland->controller->screens)); - if (!getenv("XDG_RUNTIME_DIR")) - fatal("Environment variable XDG_RUNTIME_DIR not set"); + afb_req_success(req, o, "status"); +} - auto d = std::make_unique(); - if (!d->ok()) - fatal("Could not connect to compositor"); +void debug_surfaces(afb_req req) { + afb_req_success(req, to_json(g_wayland->controller->sprops), "surfaces"); +} - struct conn c = {}; +void debug_layers(afb_req req) { + afb_req_success(req, to_json(g_wayland->controller->lprops), "layers"); +} - d->r->add_global_handler( - "ivi_controller", [&](wl_registry *r, uint32_t name, uint32_t v) { - c.c = std::make_unique(r, name, v); - }); +// Dummy register_surface implementation +void register_surface(afb_req req) { + AFB_DEBUG("register_surface"); - d->r->add_global_handler( - "wl_output", [&](wl_registry *r, uint32_t name, uint32_t v) { - c.outputs.emplace_back(std::make_unique(r, name, v)); - }); + auto jo = afb_req_json(req); + json_object *jappid; + if (! json_object_object_get_ex(jo, "appid", &jappid)) { + afb_req_fail(req, "failed", "register_surface needs 'appid' integer argument"); + return; + } - // First level objects - d->roundtrip(); - // Second level objects - d->roundtrip(); - // Third level objects - d->roundtrip(); + json_object *jsurfid; + if (! json_object_object_get_ex(jo, "surfaceid", &jsurfid)) { + afb_req_fail(req, "failed", "register_surface needs 'surfaceid' integer argument"); + return; + } - if (!c.c) - fatal("ivi_controller global not available"); + int32_t appid = json_object_get_int(jappid); + int32_t surfid = json_object_get_int(jsurfid); - while (check_events(d.get(), &c, STDIN_FILENO) != -1) { - c.c->execute_pending(); + if (appid < 0 || appid > 0xff) { + afb_req_fail(req, "failed", "invalid appid"); + return; } - d->roundtrip(); + if (surfid < 0 || surfid > 0xffff) { + afb_req_fail(req, "failed", "invalid surfaceid"); + return; + } - return 0; + lognotice("register_surface, got appid %d and surfaceid %d", appid, surfid); + + afb_req_success(req, json_object_new_int((appid << 16) + surfid), "success"); } + +#define WRAP(F) \ + [](afb_req req) noexcept { \ + if (g_wayland == nullptr) { \ + afb_req_fail(req, "failed", \ + "Binding not initialized, did the compositor die?"); \ + return; \ + } \ + try { \ + F(req); \ + } catch (std::exception & e) { \ + afb_req_fail_f(req, "failed", "Uncaught exception: %s", e.what()); \ + } \ + } + +const struct afb_verb_v2 verbs[] = { + {"debug::status", WRAP(debug_status), NULL, NULL, AFB_SESSION_NONE_V2}, + {"debug::layers", WRAP(debug_layers), NULL, NULL, AFB_SESSION_NONE_V2}, + {"debug::surfaces", WRAP(debug_surfaces), NULL, NULL, AFB_SESSION_NONE_V2}, + + {"register_surface", WRAP(register_surface), NULL, NULL, AFB_SESSION_NONE_V2}, + {} +}; +} // namespace + +extern "C" const struct afb_binding_v2 afbBindingV2 = { + "winman", NULL, NULL, verbs, NULL, binding_init, NULL, 1};