X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain.cpp;h=e8ae75a383887827bf12000ce8befe8c32369bcf;hb=a5872e5c14a97d738fd9a0daaf0764b655baeebd;hp=c615d3a9c3369fdd09eea06d37af0f27669aacae;hpb=aea325bfd3f449416cc3954e84ad4471885d93ec;p=apps%2Fagl-service-windowmanager-2017.git

diff --git a/src/main.cpp b/src/main.cpp
index c615d3a..e8ae75a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -15,23 +15,21 @@
  */
 
 #include <unistd.h>
+#include <algorithm>
+#include <mutex>
+#include <json.h>
+#include <json.hpp>
 #include "app.hpp"
+#include "result.hpp"
 #include "json_helper.hpp"
 #include "util.hpp"
 #include "wayland.hpp"
 
-#include <algorithm>
-#include <mutex>
-
-#include <json.h>
-
 extern "C" {
 #include <afb/afb-binding.h>
 #include <systemd/sd-event.h>
 }
 
-namespace {
-
 struct afb_instance {
    std::unique_ptr<wl::display> display;
    wm::App app;
@@ -42,6 +40,7 @@ struct afb_instance {
 };
 
 struct afb_instance *g_afb_instance;
+std::mutex binding_m;
 
 int afb_instance::init() {
    return this->app.init();
@@ -86,10 +85,7 @@ error:
    return -1;
 }
 
-/**
- * binding_init_()
- */
-int binding_init_() {
+int _binding_init() {
    HMI_NOTICE("wm", "WinMan ver. %s", WINMAN_VERSION_STRING);
 
    if (g_afb_instance != nullptr) {
@@ -146,43 +142,381 @@ error:
 
 int binding_init() noexcept {
    try {
-      return binding_init_();
+      return _binding_init();
    } catch (std::exception &e) {
       HMI_ERROR("wm", "Uncaught exception in binding_init(): %s", e.what());
    }
    return -1;
 }
 
-}  // namespace
+void windowmanager_requestsurface(afb_req req) noexcept {
+   std::lock_guard<std::mutex> guard(binding_m);
+   #ifdef ST
+   ST();
+   #endif
+   if (g_afb_instance == nullptr) {
+      afb_req_fail(req, "failed", "Binding not initialized, did the compositor die?");
+      return;
+   }
+
+   try {
+   const char* a_drawing_name = afb_req_value(req, "drawing_name");
+   if(!a_drawing_name){
+       afb_req_fail(req, "failed", "Need char const* argument drawing_name");
+       return;
+   }
+
+   auto ret = g_afb_instance->app.api_request_surface(a_drawing_name);
+   if (ret.is_err()) {
+      afb_req_fail(req, "failed", ret.unwrap_err());
+      return;
+   }
+
+   afb_req_success(req, json_object_new_int(ret.unwrap()), "success");
+
+   } catch (std::exception &e) {
+      afb_req_fail_f(req, "failed", "Uncaught exception while calling requestsurface: %s", e.what());
+      return;
+   }
+
+}
+
+void windowmanager_requestsurfacexdg(afb_req req) noexcept {
+   std::lock_guard<std::mutex> guard(binding_m);
+   #ifdef ST
+   ST();
+   #endif
+   if (g_afb_instance == nullptr) {
+      afb_req_fail(req, "failed", "Binding not initialized, did the compositor die?");
+      return;
+   }
+
+   try {
+   json_object *jreq = afb_req_json(req);
+
+   json_object *j_drawing_name = nullptr;
+   if (! json_object_object_get_ex(jreq, "drawing_name", &j_drawing_name)) {
+      afb_req_fail(req, "failed", "Need char const* argument drawing_name");
+      return;
+   }
+   char const* a_drawing_name = json_object_get_string(j_drawing_name);
+
+   json_object *j_ivi_id = nullptr;
+   if (! json_object_object_get_ex(jreq, "ivi_id", &j_ivi_id)) {
+      afb_req_fail(req, "failed", "Need char const* argument ivi_id");
+      return;
+   }
+   char const* a_ivi_id = json_object_get_string(j_ivi_id);
+
+   auto ret = g_afb_instance->app.api_request_surface(a_drawing_name, a_ivi_id);
+   if (ret != nullptr) {
+      afb_req_fail(req, "failed", ret);
+      return;
+   }
+
+   afb_req_success(req, NULL, "success");
+   } catch (std::exception &e) {
+      afb_req_fail_f(req, "failed", "Uncaught exception while calling requestsurfacexdg: %s", e.what());
+      return;
+   }
+}
+
+void windowmanager_activatesurface(afb_req req) noexcept {
+   std::lock_guard<std::mutex> guard(binding_m);
+   #ifdef ST
+   ST();
+   #endif
+   if (g_afb_instance == nullptr) {
+      afb_req_fail(req, "failed", "Binding not initialized, did the compositor die?");
+      return;
+   }
+
+   try {
+   const char* a_drawing_name = afb_req_value(req, "drawing_name");
+   if(!a_drawing_name){
+       afb_req_fail(req, "failed", "Need char const* argument drawing_name");
+       return;
+   }
+
+   const char* a_drawing_area = afb_req_value(req, "drawing_area");
+   if(!a_drawing_area){
+       afb_req_fail(req, "failed", "Need char const* argument drawing_area");
+       return;
+   }
+
+   auto ret = g_afb_instance->app.api_activate_surface(a_drawing_name, a_drawing_area);
+   if (ret != nullptr) {
+      afb_req_fail(req, "failed", ret);
+      return;
+   }
+
+   afb_req_success(req, NULL, "success");
+   } catch (std::exception &e) {
+      afb_req_fail_f(req, "failed", "Uncaught exception while calling activatesurface: %s", e.what());
+      return;
+   }
+
+}
+
+void windowmanager_deactivatesurface(afb_req req) noexcept {
+   std::lock_guard<std::mutex> guard(binding_m);
+   #ifdef ST
+   ST();
+   #endif
+   if (g_afb_instance == nullptr) {
+      afb_req_fail(req, "failed", "Binding not initialized, did the compositor die?");
+      return;
+   }
+
+   try {
+   const char* a_drawing_name = afb_req_value(req, "drawing_name");
+   if(!a_drawing_name){
+       afb_req_fail(req, "failed", "Need char const* argument drawing_name");
+       return;
+   }
+
+   auto ret = g_afb_instance->app.api_deactivate_surface(a_drawing_name);
+   if (ret != nullptr) {
+      afb_req_fail(req, "failed", ret);
+      return;
+   }
+
+   afb_req_success(req, NULL, "success");
+   } catch (std::exception &e) {
+      afb_req_fail_f(req, "failed", "Uncaught exception while calling deactivatesurface: %s", e.what());
+      return;
+   }
+}
+
+void windowmanager_enddraw(afb_req req) noexcept {
+   std::lock_guard<std::mutex> guard(binding_m);
+   #ifdef ST
+   ST();
+   #endif
+   if (g_afb_instance == nullptr) {
+      afb_req_fail(req, "failed", "Binding not initialized, did the compositor die?");
+      return;
+   }
+
+   try {
+   const char* a_drawing_name = afb_req_value(req, "drawing_name");
+   if(!a_drawing_name){
+       afb_req_fail(req, "failed", "Need char const* argument drawing_name");
+       return;
+   }
+
+   auto ret = g_afb_instance->app.api_enddraw(a_drawing_name);
+   if (ret != nullptr) {
+      afb_req_fail(req, "failed", ret);
+      return;
+   }
+
+   afb_req_success(req, NULL, "success");
+   } catch (std::exception &e) {
+      afb_req_fail_f(req, "failed", "Uncaught exception while calling enddraw: %s", e.what());
+      return;
+   }
+
+}
+
+void windowmanager_wm_subscribe(afb_req req) noexcept {
+   std::lock_guard<std::mutex> guard(binding_m);
+   #ifdef ST
+   ST();
+   #endif
+   if (g_afb_instance == nullptr) {
+      afb_req_fail(req, "failed", "Binding not initialized, did the compositor die?");
+      return;
+   }
+
+   try {
+   json_object *jreq = afb_req_json(req);
+   json_object *j = nullptr;
+   if (! json_object_object_get_ex(jreq, "event", &j)) {
+      afb_req_fail(req, "failed", "Need char const* argument event");
+      return;
+   }
+   int event_type = json_object_get_int(j);
+   const char *event_name = g_afb_instance->app.kListEventName[event_type];
+   struct afb_event event = g_afb_instance->app.map_afb_event[event_name];
+   int ret = afb_req_subscribe(req, event);
+   if (ret) {
+      afb_req_fail(req, "failed", "Error: afb_req_subscribe()");
+      return;
+   }
+   afb_req_success(req, NULL, "success");
+
+   } catch (std::exception &e) {
+      afb_req_fail_f(req, "failed", "Uncaught exception while calling wm_subscribe: %s", e.what());
+      return;
+   }
+
+}
+
+void windowmanager_list_drawing_names(afb_req req) noexcept {
+   std::lock_guard<std::mutex> guard(binding_m);
+   #ifdef ST
+   ST();
+   #endif
+   if (g_afb_instance == nullptr) {
+      afb_req_fail(req, "failed", "Binding not initialized, did the compositor die?");
+      return;
+   }
+
+   try {
+
+   nlohmann::json j = g_afb_instance->app.id_alloc.name2id;
+   auto ret = wm::Ok(json_tokener_parse(j.dump().c_str()));
+   if (ret.is_err()) {
+      afb_req_fail(req, "failed", ret.unwrap_err());
+      return;
+   }
+
+   afb_req_success(req, ret.unwrap(), "success");
+
+   } catch (std::exception &e) {
+      afb_req_fail_f(req, "failed", "Uncaught exception while calling list_drawing_names: %s", e.what());
+      return;
+   }
+
+}
+
+void windowmanager_ping(afb_req req) noexcept {
+   std::lock_guard<std::mutex> guard(binding_m);
+   #ifdef ST
+   ST();
+   #endif
+   if (g_afb_instance == nullptr) {
+      afb_req_fail(req, "failed", "Binding not initialized, did the compositor die?");
+      return;
+   }
+
+   try {
+
+   g_afb_instance->app.api_ping();
+
+   afb_req_success(req, NULL, "success");
+
+   } catch (std::exception &e) {
+      afb_req_fail_f(req, "failed", "Uncaught exception while calling ping: %s", e.what());
+      return;
+   }
+}
+
+void windowmanager_debug_status(afb_req req) noexcept {
+   std::lock_guard<std::mutex> guard(binding_m);
+   #ifdef ST
+   ST();
+   #endif
+   if (g_afb_instance == nullptr) {
+      afb_req_fail(req, "failed", "Binding not initialized, did the compositor die?");
+      return;
+   }
+
+   try {
+
+   json_object *jr = json_object_new_object();
+   json_object_object_add(jr, "surfaces",
+                          to_json(g_afb_instance->app.controller->sprops));
+   json_object_object_add(jr, "layers", to_json(g_afb_instance->app.controller->lprops));
+
+   afb_req_success(req, jr, "success");
+
+   } catch (std::exception &e) {
+      afb_req_fail_f(req, "failed", "Uncaught exception while calling debug_status: %s", e.what());
+      return;
+   }
+}
+
+void windowmanager_debug_layers(afb_req req) noexcept {
+   std::lock_guard<std::mutex> guard(binding_m);
+   #ifdef ST
+   ST();
+   #endif
+   if (g_afb_instance == nullptr) {
+      afb_req_fail(req, "failed", "Binding not initialized, did the compositor die?");
+      return;
+   }
+
+   try {
+   auto ret = wm::Ok(json_tokener_parse(g_afb_instance->app.layers.to_json().dump().c_str()));
+
+   afb_req_success(req, ret, "success");
+
+   } catch (std::exception &e) {
+      afb_req_fail_f(req, "failed", "Uncaught exception while calling debug_layers: %s", e.what());
+      return;
+   }
+}
+
+void windowmanager_debug_surfaces(afb_req req) noexcept {
+   std::lock_guard<std::mutex> guard(binding_m);
+   #ifdef ST
+   ST();
+   #endif
+   if (g_afb_instance == nullptr) {
+      afb_req_fail(req, "failed", "Binding not initialized, did the compositor die?");
+      return;
+   }
 
-#include "afb_binding_glue.inl"
+   try {
 
-namespace wm {
-void binding_api::send_event(char const *evname, char const *label) {
-   HMI_DEBUG("wm", "%s: %s(%s)", __func__, evname, label);
+   auto ret = wm::Ok(to_json(g_afb_instance->app.controller->sprops));
+   if (ret.is_err()) {
+      afb_req_fail(req, "failed", ret.unwrap_err());
+      return;
+   }
 
-   json_object *j = json_object_new_object();
-   json_object_object_add(j, kKeyDrawingName, json_object_new_string(label));
+   afb_req_success(req, ret.unwrap(), "success");
 
-   int ret = afb_event_push(g_afb_instance->app.map_afb_event[evname], j);
-   if (ret != 0) {
-      HMI_DEBUG("wm", "afb_event_push failed: %m");
+   } catch (std::exception &e) {
+      afb_req_fail_f(req, "failed", "Uncaught exception while calling debug_surfaces: %s", e.what());
+      return;
    }
+
 }
 
-void binding_api::send_event(char const *evname, char const *label, char const *area) {
-   HMI_DEBUG("wm", "%s: %s(%s, %s)", __func__, evname, label, area);
+void windowmanager_debug_terminate(afb_req req) noexcept {
+   std::lock_guard<std::mutex> guard(binding_m);
+   #ifdef ST
+   ST();
+   #endif
+   if (g_afb_instance == nullptr) {
+      afb_req_fail(req, "failed", "Binding not initialized, did the compositor die?");
+      return;
+   }
 
-   json_object *j = json_object_new_object();
-   json_object_object_add(j, kKeyDrawingName, json_object_new_string(label));
-   json_object_object_add(j, kKeyDrawingArea, json_object_new_string(area));
+   try {
 
-   int ret = afb_event_push(g_afb_instance->app.map_afb_event[evname], j);
-   if (ret != 0) {
-      HMI_DEBUG("wm", "afb_event_push failed: %m");
+   if (getenv("WINMAN_DEBUG_TERMINATE") != nullptr) {
+      raise(SIGKILL);  // afb-daemon kills it's pgroup using TERM, which
+                       // doesn't play well with perf
    }
+
+   afb_req_success(req, NULL, "success");
+
+   } catch (std::exception &e) {
+      afb_req_fail_f(req, "failed", "Uncaught exception while calling debug_terminate: %s", e.what());
+      return;
+   }
+
 }
-} // namespace wm
+
+const struct afb_verb_v2 windowmanager_verbs[] = {
+   { "requestsurface", windowmanager_requestsurface, nullptr, nullptr, AFB_SESSION_NONE },
+   { "requestsurfacexdg", windowmanager_requestsurfacexdg, nullptr, nullptr, AFB_SESSION_NONE },
+   { "activatesurface", windowmanager_activatesurface, nullptr, nullptr, AFB_SESSION_NONE },
+   { "deactivatesurface", windowmanager_deactivatesurface, nullptr, nullptr, AFB_SESSION_NONE },
+   { "enddraw", windowmanager_enddraw, nullptr, nullptr, AFB_SESSION_NONE },
+   { "wm_subscribe", windowmanager_wm_subscribe, nullptr, nullptr, AFB_SESSION_NONE },
+   { "list_drawing_names", windowmanager_list_drawing_names, nullptr, nullptr, AFB_SESSION_NONE },
+   { "ping", windowmanager_ping, nullptr, nullptr, AFB_SESSION_NONE },
+   { "debug_status", windowmanager_debug_status, nullptr, nullptr, AFB_SESSION_NONE },
+   { "debug_layers", windowmanager_debug_layers, nullptr, nullptr, AFB_SESSION_NONE },
+   { "debug_surfaces", windowmanager_debug_surfaces, nullptr, nullptr, AFB_SESSION_NONE },
+   { "debug_terminate", windowmanager_debug_terminate, nullptr, nullptr, AFB_SESSION_NONE },
+   {}
+};
 
 extern "C" const struct afb_binding_v2 afbBindingV2 = {
    "windowmanager", nullptr, nullptr, windowmanager_verbs, nullptr, binding_init, nullptr, 0};