#include <json.h>
extern "C" {
-#define AFB_BINDING_VERSION 2
#include <afb/afb-binding.h>
#include <systemd/sd-event.h>
}
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.");
+ 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) {
- AFB_ERROR("wl_display_dipatch() returned error %d",
+ logerror("wl_display_dipatch() returned error %d",
g_wayland->display->get_error());
goto error;
}
lognotice("WinMan ver. %s", WINMAN_VERSION_STRING);
if (g_wayland != nullptr) {
- AFB_ERROR("Wayland context already initialized?");
+ logerror("Wayland context already initialized?");
return 0;
}
if (getenv("XDG_RUNTIME_DIR") == nullptr) {
- AFB_ERROR("Environment variable XDG_RUNTIME_DIR not set");
+ logerror("Environment variable XDG_RUNTIME_DIR not set");
goto error;
}
g_wayland = new wayland;
if (g_wayland->init() == -1) {
- AFB_ERROR("Could not connect to compositor");
+ logerror("Could not connect to compositor");
goto error;
}
if (char const *e = init_layout()) {
- AFB_ERROR("Could not init layout: %s", e);
+ logerror("Could not init layout: %s", e);
goto error;
}
g_wayland->display->get_fd(), EPOLLIN,
display_event_callback, g_wayland);
if (ret < 0) {
- AFB_ERROR("Could not initialize wayland event handler: %d", -ret);
+ logerror("Could not initialize wayland event handler: %d", -ret);
goto error;
}
}
try {
return binding_init_();
} catch (std::exception &e) {
- AFB_ERROR("Uncaught exception in binding_init(): %s", e.what());
+ logerror("Uncaught exception in binding_init(): %s", e.what());
}
return -1;
}
// | (_| | __/ |_) | |_| | (_| | \__ \ || (_| | |_| |_| \__ \ | | |
// \__,_|\___|_.__/ \__,_|\__, |___|___/\__\__,_|\__|\__,_|___/ | | |
// |___/_____| \_\/_/
-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));
afb_req_success(req, o, "status");
}
-void debug_surfaces(afb_req req) noexcept {
- CHECK_WAYLAND();
-
+void debug_surfaces(afb_req req) {
afb_req_success(req, to_json(g_wayland->controller->surfaces), "surfaces");
}
-void debug_layers(afb_req req) noexcept {
- CHECK_WAYLAND();
-
+void debug_layers(afb_req req) {
afb_req_success(req, to_json(g_wayland->controller->layers), "layers");
}
+#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()); \
+ } \
+ }
+
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