+#include "json_helper.hpp"
#include "util.hpp"
#include "wayland.hpp"
#include <algorithm>
#include <json.h>
-#define AFB_BINDING_VERSION 2
-
extern "C" {
+#define AFB_BINDING_VERSION 2
#include <afb/afb-binding.h>
#include <systemd/sd-event.h>
}
-#include <json.hpp>
-
-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{} {}
+ wayland() : display(new wl::display), controller(nullptr), outputs() {}
+
+ 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<wl::output>(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<genivi::controller>(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<struct wl_proxy *>(
+ 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;
+}
+
// _ _ _ _ _ ____
// (_)_ __ (_) |_ | | __ _ _ _ ___ _ _| |_ / /\ \
// | | '_ \| | __| | |/ _` | | | |/ _ \| | | | __| | | |
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;
+}
+
// _ _ _ _ _ _ _ ____
// | |__ (_)_ __ __| (_)_ __ __ _ (_)_ __ (_) |_ / /\ \
// | '_ \| | '_ \ / _` | | '_ \ / _` | | | '_ \| | __| | | |
if (g_wayland != nullptr) {
AFB_ERROR("Wayland context already initialized?");
- return -1;
+ return 0;
}
if (getenv("XDG_RUNTIME_DIR") == nullptr) {
AFB_ERROR("Environment variable XDG_RUNTIME_DIR not set");
- return -1;
+ goto error;
}
g_wayland = new wayland;
- if (!g_wayland->display->ok()) {
+ if (g_wayland->init() == -1) {
AFB_ERROR("Could not connect to compositor");
- return -1;
+ goto error;
}
- 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", [](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...
- 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();
- // Second level objects
- d->roundtrip();
- // Third level objects
- d->roundtrip();
-
if (char const *e = init_layout()) {
AFB_ERROR("Could not init layout: %s", e);
- return -1;
+ goto error;
}
- 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;
- }
-
- if (events & EPOLLIN) {
- int ret = g_wayland->display->dispatch();
- g_wayland->display->flush();
-
- // 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);
+ {
+ 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) {
+ AFB_ERROR("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 {
// | (_| | __/ |_) | |_| | (_| | \__ \ || (_| | |_| |_| \__ \ | | |
// \__,_|\___|_.__/ \__,_|\__, |___|___/\__\__,_|\__|\__,_|___/ | | |
// |___/_____| \_\/_/
-void debug_status(struct afb_req req) noexcept {
+void debug_status(struct afb_req req) {
// Quick and dirty, dump current surfaces and layers
AFB_REQ_DEBUG(req, "status");
- CHECK_WAYLAND();
+ auto o = json_object_new_object();
+ json_object_object_add(o, "surfaces",
+ to_json(g_wayland->controller->surfaces));
+ json_object_object_add(o, "layers", to_json(g_wayland->controller->layers));
+ json_object_object_add(o, "screens",
+ to_json(g_wayland->controller->screens));
- 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;
- }
-
- 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());
- }
+ afb_req_success(req, o, "status");
}
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));
- }
- }
-
- afb_req_success(req, a, "surfaces");
+ afb_req_success(req, to_json(g_wayland->controller->surfaces), "surfaces");
}
void debug_layers(afb_req req) {
- CHECK_WAYLAND();
-
- auto a = json_object_new_array();
+ afb_req_success(req, to_json(g_wayland->controller->layers), "layers");
+}
- 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));
- }
+#define WRAP(F) \
+ [](afb_req req) noexcept { \
+ CHECK_WAYLAND(); \
+ try { \
+ F(req); \
+ } catch (std::exception & e) { \
+ afb_req_fail_f(req, "failed", "Uncaught exception: %s", e.what()); \
+ } \
}
- 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},
+ {"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},
{},
};
} // namespace