scripts: wm-request uses afb-client-demo

[staging/windowmanager.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 4c04f74..f14cf96 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -30,7 +30,6 @@ extern "C" {
 }
 
 namespace {
-std::mutex binding_m;
 
 struct afb_instance {
    std::unique_ptr<wl::display> display;
@@ -66,13 +65,17 @@ int display_event_callback(sd_event_source *evs, int fd, uint32_t events,
       {
          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);
       }
    }