app/afbclient: use the correct names for active/inactive events

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

diff --git a/src/main.cpp b/src/main.cpp
index 8bb0b5c..5b140f2 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,9 +1,27 @@
+/*
+ * Copyright (C) 2017 Mentor Graphics Development (Deutschland) GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "app.hpp"
 #include "json_helper.hpp"
 #include "util.hpp"
 #include "wayland.hpp"
-#include "app.hpp"
 
 #include <algorithm>
+#include <mutex>
+
 #include <json.h>
 
 extern "C" {
@@ -12,6 +30,7 @@ extern "C" {
 }
 
 namespace {
+
 struct afb_instance {
    std::unique_ptr<wl::display> display;
    wm::App app;
@@ -31,8 +50,10 @@ int afb_instance::init() {
    return this->app.init();
 }
 
-int display_event_callback(sd_event_source *evs, int fd, uint32_t events,
-                           void *data) {
+int display_event_callback(sd_event_source *evs, int  /*fd*/, uint32_t events,
+                           void * /*data*/) {
+   ST();
+
    if ((events & EPOLLHUP) != 0) {
       logerror("The compositor hung up, dying now.");
       delete g_afb_instance;
@@ -40,16 +61,31 @@ int display_event_callback(sd_event_source *evs, int fd, uint32_t events,
       goto error;
    }
 
-   if (events & EPOLLIN) {
-       if (g_afb_instance->app.dispatch_events() == -1) {
-          goto error;
-       }
+   if ((events & EPOLLIN) != 0u) {
+      {
+         STN(display_read_events);
+         g_afb_instance->app.display->read_events();
+         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);
+      }
    }
 
    return 0;
 
 error:
    sd_event_source_unref(evs);
+   if (getenv("WINMAN_EXIT_ON_HANGUP") != nullptr) {
+      exit(1);
+}
    return -1;
 }
 
@@ -107,9 +143,20 @@ int binding_init() noexcept {
    return -1;
 }
 
-} // namespace
+}  // namespace
 
 #include "afb_binding_glue.inl"
 
+// XXX implement send_event right here...
+namespace wm {
+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");
+   }
+}
+} // namespace wm
+
 extern "C" const struct afb_binding_v2 afbBindingV2 = {
-   "winman", NULL, NULL, winman_verbs, NULL, binding_init, NULL, 1};
+   "winman", nullptr, nullptr, winman_verbs, nullptr, binding_init, nullptr, 0};