}
namespace {
-//std::mutex binding_m;
struct afb_instance {
std::unique_ptr<wl::display> display;
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*/) {
ST();
- // std::lock_guard<std::mutex> guard(binding_m);
if ((events & EPOLLHUP) != 0) {
logerror("The compositor hung up, dying now.");
{
STN(display_read_events);
g_afb_instance->app.display->read_events();
- g_afb_instance->app.pending_events.store(true, std::memory_order_release);
+ g_afb_instance->app.set_pending_events();
}
{
+ // We want do dispatch pending wayland events from within
+ // the API context
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);
+ 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)
+ if (getenv("WINMAN_EXIT_ON_HANGUP") != nullptr) {
exit(1);
+}
return -1;
}
logdebug("afb_event_broadcast failed: %m");
}
}
-}
+} // namespace wm
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};