wayland: sprops and lprops should be before the *_map_types

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

diff --git a/src/main.cpp b/src/main.cpp
index bf78b52..965599d 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -6,7 +6,6 @@
 #include <json.h>
 
 extern "C" {
-#define AFB_BINDING_VERSION 2
 #include <afb/afb-binding.h>
 #include <systemd/sd-event.h>
 }
@@ -114,7 +113,7 @@ char const *init_layout() {
 int display_event_callback(sd_event_source *evs, int fd, uint32_t events,
                            void *data) {
    if ((events & EPOLLHUP) != 0) {
-      AFB_ERROR("The compositor hung up, dying now.");
+      logerror("The compositor hung up, dying now.");
       delete g_wayland;
       g_wayland = nullptr;
       goto error;
@@ -123,7 +122,7 @@ int display_event_callback(sd_event_source *evs, int fd, uint32_t events,
    if (events & EPOLLIN) {
       int ret = g_wayland->display->dispatch();
       if (ret == -1) {
-         AFB_ERROR("wl_display_dipatch() returned error %d",
+         logerror("wl_display_dipatch() returned error %d",
                    g_wayland->display->get_error());
          goto error;
       }
@@ -151,23 +150,23 @@ int binding_init_() {
    lognotice("WinMan ver. %s", WINMAN_VERSION_STRING);
 
    if (g_wayland != nullptr) {
-      AFB_ERROR("Wayland context already initialized?");
+      logerror("Wayland context already initialized?");
       return 0;
    }
 
    if (getenv("XDG_RUNTIME_DIR") == nullptr) {
-      AFB_ERROR("Environment variable XDG_RUNTIME_DIR not set");
+      logerror("Environment variable XDG_RUNTIME_DIR not set");
       goto error;
    }
 
    g_wayland = new wayland;
    if (g_wayland->init() == -1) {
-      AFB_ERROR("Could not connect to compositor");
+      logerror("Could not connect to compositor");
       goto error;
    }
 
    if (char const *e = init_layout()) {
-      AFB_ERROR("Could not init layout: %s", e);
+      logerror("Could not init layout: %s", e);
       goto error;
    }
 
@@ -176,7 +175,7 @@ int binding_init_() {
                                 g_wayland->display->get_fd(), EPOLLIN,
                                 display_event_callback, g_wayland);
       if (ret < 0) {
-         AFB_ERROR("Could not initialize wayland event handler: %d", -ret);
+         logerror("Could not initialize wayland event handler: %d", -ret);
          goto error;
       }
    }
@@ -195,20 +194,11 @@ int binding_init() noexcept {
    try {
       return binding_init_();
    } catch (std::exception &e) {
-      AFB_ERROR("Uncaught exception in binding_init(): %s", e.what());
+      logerror("Uncaught exception in binding_init(): %s", e.what());
    }
    return -1;
 }
 
-#define CHECK_WAYLAND()                                                    \
-   do {                                                                    \
-      if (g_wayland == nullptr) {                                          \
-         afb_req_fail(req, "failed",                                       \
-                      "Binding not initialized, did the compositor die?"); \
-         return;                                                           \
-      }                                                                    \
-   } while (0)
-
 //      _      _                         _        _              ____
 //   __| | ___| |__  _   _  __ _     ___| |_ __ _| |_ _   _ ___ / /\ \
 //  / _` |/ _ \ '_ \| | | |/ _` |   / __| __/ _` | __| | | / __| |  | |
@@ -221,25 +211,64 @@ void debug_status(struct afb_req req) {
 
    auto o = json_object_new_object();
    json_object_object_add(o, "surfaces",
-                          to_json(g_wayland->controller->surfaces));
-   json_object_object_add(o, "layers", to_json(g_wayland->controller->layers));
-   json_object_object_add(o, "screens",
-                          to_json(g_wayland->controller->screens));
+                          to_json(g_wayland->controller->sprops));
+   json_object_object_add(o, "layers", to_json(g_wayland->controller->lprops));
+//   json_object_object_add(o, "screens",
+//                          to_json(g_wayland->controller->screens));
 
    afb_req_success(req, o, "status");
 }
 
 void debug_surfaces(afb_req req) {
-   afb_req_success(req, to_json(g_wayland->controller->surfaces), "surfaces");
+   afb_req_success(req, to_json(g_wayland->controller->sprops), "surfaces");
 }
 
 void debug_layers(afb_req req) {
-   afb_req_success(req, to_json(g_wayland->controller->layers), "layers");
+   afb_req_success(req, to_json(g_wayland->controller->lprops), "layers");
+}
+
+// Dummy register_surface implementation
+void register_surface(afb_req req) {
+   AFB_DEBUG("register_surface");
+
+   auto jo = afb_req_json(req);
+   json_object *jappid;
+   if (! json_object_object_get_ex(jo, "appid", &jappid)) {
+      afb_req_fail(req, "failed", "register_surface needs 'appid' integer argument");
+      return;
+   }
+
+   json_object *jsurfid;
+   if (! json_object_object_get_ex(jo, "surfaceid", &jsurfid)) {
+      afb_req_fail(req, "failed", "register_surface needs 'surfaceid' integer argument");
+      return;
+   }
+
+   int32_t appid = json_object_get_int(jappid);
+   int32_t surfid = json_object_get_int(jsurfid);
+
+   if (appid < 0 || appid > 0xff) {
+      afb_req_fail(req, "failed", "invalid appid");
+      return;
+   }
+
+   if (surfid < 0 || surfid > 0xffff) {
+      afb_req_fail(req, "failed", "invalid surfaceid");
+      return;
+   }
+
+   lognotice("register_surface, got appid %d and surfaceid %d", appid, surfid);
+
+   afb_req_success(req, json_object_new_int((appid << 16) + surfid), "success");
 }
 
 #define WRAP(F)                                                             \
    [](afb_req req) noexcept {                                               \
-      CHECK_WAYLAND();                                                      \
+      if (g_wayland == nullptr) {                                           \
+         afb_req_fail(req, "failed",                                        \
+                      "Binding not initialized, did the compositor die?");  \
+         return;                                                            \
+      }                                                                     \
       try {                                                                 \
          F(req);                                                            \
       } catch (std::exception & e) {                                        \
@@ -251,7 +280,9 @@ const struct afb_verb_v2 verbs[] = {
    {"debug::status", WRAP(debug_status), NULL, NULL, AFB_SESSION_NONE_V2},
    {"debug::layers", WRAP(debug_layers), NULL, NULL, AFB_SESSION_NONE_V2},
    {"debug::surfaces", WRAP(debug_surfaces), NULL, NULL, AFB_SESSION_NONE_V2},
-   {},
+
+   {"register_surface", WRAP(register_surface), NULL, NULL, AFB_SESSION_NONE_V2},
+   {}
 };
 }  // namespace