return this->app.init();
}
-int display_event_callback(sd_event_source *evs, int /*fd*/, uint32_t events,
+int display_event_callback(sd_event_source *evs, int fd, uint32_t events,
void * /*data*/) {
- std::lock_guard<std::mutex> guard(binding_m);
+ ST();
if ((events & EPOLLHUP) != 0) {
logerror("The compositor hung up, dying now.");
}
if ((events & EPOLLIN) != 0u) {
- if (g_afb_instance->app.dispatch_events() == -1) {
- goto error;
+ {
+ STN(display_read_events);
+ g_afb_instance->app.display->read_events();
+ g_afb_instance->app.pending_events.store(true, std::memory_order_release);
+ }
+ {
+ STN(winman_ping_api_call);
+ afb_service_call("winman", "ping", json_object_new_object(), [](void *c, int st, json_object* j) {
+ STN(winman_ping_api_call_return);
+ }, nullptr);
}
}
error:
sd_event_source_unref(evs);
+ if (getenv("WINMAN_EXIT_ON_HANGUP") != nullptr)
+ exit(1);
return -1;
}
// XXX implement send_event right here...
namespace wm {
-void binding_api::send_event(char const *evname, json_object *payload) {
- logdebug("%s: %s(%s)", __func__, evname, json_object_to_json_string(payload));
- int ret = afb_daemon_broadcast_event(evname, payload);
+void binding_api::send_event(char const *evname, char const *label) {
+ logdebug("%s: %s(%s)", __func__, evname, label);
+ int ret = afb_daemon_broadcast_event(evname, json_object_new_string(label));
if (ret != 0) {
logdebug("afb_event_broadcast failed: %m");
}
}
extern "C" const struct afb_binding_v2 afbBindingV2 = {
- "winman", nullptr, nullptr, winman_verbs, nullptr, binding_init, nullptr, 1};
+ "winman", nullptr, nullptr, winman_verbs, nullptr, binding_init, nullptr, 0};