X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain.cpp;h=d4da785b4759b50010801367cae799ded3be0937;hb=34a3740d9318dedf29180b86e935b7a750eb1e9d;hp=7734d97e1a8401fa425ee804dac18832d74b1c69;hpb=d1cebefc3d280fa1960ac203d24edff31ed9e8de;p=staging%2Fwindowmanager.git diff --git a/src/main.cpp b/src/main.cpp index 7734d97..d4da785 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,72 +1,61 @@ -#include "util.h" +#include "json_helper.hpp" +#include "util.hpp" #include "wayland.hpp" -#include +#include +#include -#include +extern "C" { +#include +#include +} -struct conn { +namespace { +struct afb_instance { + std::unique_ptr display; + std::unique_ptr controller; 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) != 0) { - ret = d.dispatch(); - } + wm::App app; - if (ret == -1) { - return ret; - } + afb_instance() : display{new wl::display}, controller{nullptr}, outputs{}, app{} {} - 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)) { - ; - } - - // 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 "); - } - - 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 afb_instance *g_afb_instance; + +int afb_instance::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_afb_instance->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_afb_instance->controller = + std::make_unique(r, name, v); + + // XXX: This protocol needs the output, so lets just add our mapping + // here... + g_afb_instance->controller->add_proxy_to_id_mapping( + g_afb_instance->outputs.back()->proxy.get(), + wl_proxy_get_id(reinterpret_cast( + g_afb_instance->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 +65,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_afb_instance->controller) { + return "ivi_controller global not available"; + } + + if (g_afb_instance->outputs.empty()) { + return "no output was set up!"; + } + + auto &c = g_afb_instance->controller; + + auto &o = g_afb_instance->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,11 +90,11 @@ 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); @@ -106,64 +105,188 @@ void init_layout(struct conn &c) { // 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_afb_instance->display->flush(); + + return nullptr; } -} // namespace -// _ ____ -// _ __ ___ __ _(_)_ __ / /\ \ -// | '_ ` _ \ / _` | | '_ \| | | | -// | | | | | | (_| | | | | | | | | -// |_| |_| |_|\__,_|_|_| |_| | | | -// \_\/_/ -int main(int /*argc*/, char ** /*argv*/) { +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_afb_instance; + g_afb_instance = nullptr; + goto error; + } + + if (events & EPOLLIN) { + int ret = g_afb_instance->display->dispatch(); + if (ret == -1) { + logerror("wl_display_dipatch() returned error %d", + g_afb_instance->display->get_error()); + goto error; + } + g_afb_instance->display->flush(); + + // execute pending tasks, that is layout changes etc. + g_afb_instance->controller->execute_pending(); + g_afb_instance->display->roundtrip(); + } + + return 0; + +error: + sd_event_source_unref(evs); + return -1; +} + +// _ _ _ _ _ _ _ ____ +// | |__ (_)_ __ __| (_)_ __ __ _ (_)_ __ (_) |_ / /\ \ +// | '_ \| | '_ \ / _` | | '_ \ / _` | | | '_ \| | __| | | | +// | |_) | | | | | (_| | | | | | (_| | | | | | | | |_| | | | +// |_.__/|_|_| |_|\__,_|_|_| |_|\__, |___|_|_| |_|_|\__| | | | +// |___/_____| \_\/_/ +int binding_init_() { lognotice("WinMan ver. %s", WINMAN_VERSION_STRING); + if (g_afb_instance != nullptr) { + logerror("Wayland context already initialized?"); + return 0; + } + if (getenv("XDG_RUNTIME_DIR") == nullptr) { - fatal("Environment variable XDG_RUNTIME_DIR not set"); + logerror("Environment variable XDG_RUNTIME_DIR not set"); + goto error; } - struct wl::display d {}; - if (!d.ok()) { - fatal("Could not connect to compositor"); + g_afb_instance = new afb_instance; + if (g_afb_instance->init() == -1) { + logerror("Could not connect to compositor"); + goto error; } - struct conn c {}; + if (char const *e = init_layout()) { + logerror("Could not init layout: %s", e); + goto error; + } - 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); - }); + { + int ret = sd_event_add_io(afb_daemon_get_event_loop(), nullptr, + g_afb_instance->display->get_fd(), EPOLLIN, + display_event_callback, g_afb_instance); + if (ret < 0) { + logerror("Could not initialize afb_instance event handler: %d", -ret); + goto error; + } + } - 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)); - }); + atexit([] { delete g_afb_instance; }); - // First level objects - d.roundtrip(); - // Second level objects - d.roundtrip(); - // Third level objects - d.roundtrip(); + return 0; + +error: + delete g_afb_instance; + g_afb_instance = 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; +} - if (!c.c) { - fatal("ivi_controller global not available"); +// _ _ _ _ ____ +// __| | ___| |__ _ _ __ _ ___| |_ __ _| |_ _ _ ___ / /\ \ +// / _` |/ _ \ '_ \| | | |/ _` | / __| __/ _` | __| | | / __| | | | +// | (_| | __/ |_) | |_| | (_| | \__ \ || (_| | |_| |_| \__ \ | | | +// \__,_|\___|_.__/ \__,_|\__, |___|___/\__\__,_|\__|\__,_|___/ | | | +// |___/_____| \_\/_/ +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_afb_instance->controller->sprops)); + json_object_object_add(o, "layers", to_json(g_afb_instance->controller->lprops)); +// json_object_object_add(o, "screens", +// to_json(g_afb_instance->controller->screens)); + + afb_req_success(req, o, "status"); +} + +void debug_surfaces(afb_req req) { + afb_req_success(req, to_json(g_afb_instance->controller->sprops), "surfaces"); +} + +void debug_layers(afb_req req) { + afb_req_success(req, to_json(g_afb_instance->controller->lprops), "layers"); +} + +// Dummy register_surface implementation +void register_surface(afb_req req) { + AFB_DEBUG("register_surface"); + + 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; } - if (c.outputs.empty()) { - fatal("no output was set up!"); + json_object *jsurfid; + if (! json_object_object_get_ex(jo, "surfaceid", &jsurfid)) { + afb_req_fail(req, "failed", "register_surface needs 'surfaceid' integer argument"); + return; } - init_layout(c); + int32_t appid = json_object_get_int(jappid); + int32_t surfid = json_object_get_int(jsurfid); - while (check_events(d, c, STDIN_FILENO) != -1) { - c.c->execute_pending(); - d.flush(); + 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_afb_instance == 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};