-#include "util.h"
+#include "util.hpp"
#include "wayland.hpp"
-#include <unistd.h>
-
-#include <signal.h>
-#include <sys/poll.h>
-#include <sys/signalfd.h>
-
#include <algorithm>
+#include <json.h>
-struct connection {
- std::vector<std::unique_ptr<wl::output>> outputs;
- std::unique_ptr<genivi::controller> c;
-};
+#define AFB_BINDING_VERSION 2
-// _ _ ____ _ _
-// ___| |_ _ __ _ _ ___| |_ | _ \ ___ | | | ___ _ __
-// / __| __| '__| | | |/ __| __| | |_) / _ \| | |/ _ \ '__|
-// \__ \ |_| | | |_| | (__| |_ | __/ (_) | | | __/ |
-// |___/\__|_| \__,_|\___|\__| |_| \___/|_|_|\___|_|
-//
-struct Poller {
- std::vector<std::function<int(int)>> handlers;
- std::vector<struct pollfd> pfds;
-
- Poller() = default;
- void add_fd(int fd, std::function<int(int)> handler);
- int check_events();
-};
-
-void Poller::add_fd(int fd, std::function<int(int)> handler) {
- pfds.emplace_back(pollfd{.fd = fd, .events = POLLIN, .revents = 0});
- handlers.emplace_back(std::move(handler));
+extern "C" {
+#include <afb/afb-binding.h>
+#include <systemd/sd-event.h>
}
-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;
- }
- pfds[i].revents = 0;
- pfds[i].events = POLLIN;
- }
- }
- }
- return ret;
-}
+#include <json.hpp>
-struct unique_fd {
- int fd {-1};
- unique_fd() = default;
- explicit unique_fd(int f) : fd{f} {}
- operator int() const { return fd; }
- ~unique_fd() {
- if (this->fd != -1)
- close(this->fd);
- }
- unique_fd(unique_fd const &) = delete;
- unique_fd &operator=(unique_fd const &) = delete;
- unique_fd(unique_fd &&o) : fd(o.fd) { o.fd = -1; }
- unique_fd &operator=(unique_fd &&o) {
- std::swap(this->fd, o.fd);
- return *this;
- }
+using json = nlohmann::json;
+
+namespace {
+struct wayland {
+ std::unique_ptr<wl::display> display;
+ std::unique_ptr<genivi::controller> controller;
+ std::vector<std::unique_ptr<wl::output>> outputs;
+ sd_event_source *event_source;
+
+ wayland()
+ : display(new wl::display),
+ controller(nullptr),
+ outputs(),
+ event_source{} {}
};
+struct wayland *g_wayland;
-namespace {
// _ _ _ _ _ ____
// (_)_ __ (_) |_ | | __ _ _ _ ___ _ _| |_ / /\ \
// | | '_ \| | __| | |/ _` | | | |/ _ \| | | | __| | | |
// | | | | | | |_ | | (_| | |_| | (_) | |_| | |_| | | |
// |_|_| |_|_|\__|___|_|\__,_|\__, |\___/ \__,_|\__| | | |
// |_____| |___/ \_\/_/
-char const *init_layout(struct connection &c) {
- if (!c.c) {
+char const *init_layout() {
+ if (!g_wayland->controller) {
return "ivi_controller global not available";
}
- if (c.outputs.empty()) {
+ if (g_wayland->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;
+ 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();
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);
// 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;
}
-} // namespace
-// _ ____
-// _ __ ___ __ _(_)_ __ / /\ \
-// | '_ ` _ \ / _` | | '_ \| | | |
-// | | | | | | (_| | | | | | | | |
-// |_| |_| |_|\__,_|_|_| |_| | | |
-// \_\/_/
-int main(int /*argc*/, char ** /*argv*/) {
+// _ _ _ _ _ _ _ ____
+// | |__ (_)_ __ __| (_)_ __ __ _ (_)_ __ (_) |_ / /\ \
+// | '_ \| | '_ \ / _` | | '_ \ / _` | | | '_ \| | __| | | |
+// | |_) | | | | | (_| | | | | | (_| | | | | | | | |_| | | |
+// |_.__/|_|_| |_|\__,_|_|_| |_|\__, |___|_|_| |_|_|\__| | | |
+// |___/_____| \_\/_/
+int binding_init_() {
lognotice("WinMan ver. %s", WINMAN_VERSION_STRING);
- if (getenv("XDG_RUNTIME_DIR") == nullptr) {
- fatal("Environment variable XDG_RUNTIME_DIR not set");
+ if (g_wayland != nullptr) {
+ AFB_ERROR("Wayland context already initialized?");
+ return -1;
}
- struct wl::display d {};
- 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 connection c {};
+ g_wayland = new wayland;
+ if (!g_wayland->display->ok()) {
+ AFB_ERROR("Could not connect to compositor");
+ 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<wl::output>(r, name, v));
- });
+ auto &d = g_wayland->display;
+ d->r.add_global_handler("wl_output", [](wl_registry *r, uint32_t name,
+ uint32_t v) {
+ g_wayland->outputs.emplace_back(std::make_unique<wl::output>(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<genivi::controller>(r, name, v);
+ d->r.add_global_handler("ivi_controller", [](wl_registry *r, uint32_t name,
+ uint32_t v) {
+ g_wayland->controller = std::make_unique<genivi::controller>(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<struct wl_proxy *>(
- c.outputs.back()->proxy.get())));
- });
+ // 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<struct wl_proxy *>(
+ g_wayland->outputs.back()->proxy.get())));
+ });
// First level objects
- d.roundtrip();
+ d->roundtrip();
// Second level objects
- d.roundtrip();
+ d->roundtrip();
// Third level objects
- d.roundtrip();
+ d->roundtrip();
- if (char const *e = init_layout(c)) {
- fatal("Could not init layout: %s", e);
+ if (char const *e = init_layout()) {
+ AFB_ERROR("Could not init layout: %s", e);
+ return -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;
- });
+ sd_event *ev = afb_daemon_get_event_loop();
+ sd_event_add_io(
+ ev, &g_wayland->event_source, g_wayland->display->get_fd(),
+ EPOLLIN | EPOLLHUP,
+ [](sd_event_source *evs, int fd, uint32_t events, void *data) {
+ if ((events & EPOLLHUP) != 0) {
+ sd_event_source_unref(evs);
+ delete g_wayland;
+ g_wayland = nullptr;
+ return 1;
+ }
- p.add_fd(d.get_fd(), [&d](int fd) {
- return d.dispatch();
- });
+ if (events & EPOLLIN) {
+ int ret = g_wayland->display->dispatch();
+ g_wayland->display->flush();
- 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, NULL);
- 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);
+ // execute pending tasks, that is layout changes etc.
+ g_wayland->controller->execute_pending();
+ g_wayland->display->roundtrip();
+ return ret == -1 ? -1 : 0;
+ }
+
+ return 0;
+ },
+ g_wayland);
+
+ atexit([] { delete g_wayland; });
+
+ 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;
+}
+
+#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 {
+ json j;
+
+ if (!g_wayland->controller->surfaces.empty()) {
+ auto js = json::array();
+ for (auto const &i : g_wayland->controller->surfaces) {
+ auto const &r = i.second->dst_rect;
+ auto const &s = i.second->size;
+ js.push_back({{"id", i.first},
+ {"size", {s.w, s.h}},
+ {"dst_rect", {r.w, r.h, r.x, r.y}}});
+ }
+ j["surfaces"] = js;
}
- return -1;
- });
- while ((d.flush(), p.check_events()) != -1) {
- c.c->execute_pending();
+ if (!g_wayland->controller->layers.empty()) {
+ auto js = json::array();
+ for (auto const &i : g_wayland->controller->layers) {
+ auto const &r = i.second->dst_rect;
+ auto const &s = i.second->size;
+ js.push_back({{"id", i.first},
+ {"size", {s.w, s.h}},
+ {"dst_rect", {r.w, r.h, r.x, r.y}}});
+ }
+ j["layers"] = js;
+ }
+
+ 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());
+ }
+}
+
+void debug_surfaces(afb_req req) {
+ CHECK_WAYLAND();
+
+ 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));
+ }
}
- c.c->commit_changes();
- d.roundtrip();
+ afb_req_success(req, a, "surfaces");
+}
+
+void debug_layers(afb_req req) {
+ CHECK_WAYLAND();
- return 0;
+ 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};
Code Review / staging / windowmanager.git / blobdiff