2 files changed, 62 insertions, 58 deletions

diff --git a/AFBClient.cpp b/AFBClient.cpp
index 09d174d..6a57310 100644
--- a/AFBClient.cpp
+++ b/AFBClient.cpp
@@ -52,34 +52,62 @@ bool AFBClient::init()
     return true;
 }
 
-void AFBClient::requestSurface(const char *label)
+int AFBClient::requestSurface(const char *label)
 {
-    printf("requestSurface(%s) -->\n", label);
-    fflush(stdout);
-
-    static int num = 0;
-    char *key;
-    int rc;
-    const char begin[] = "{\"drawing_name\":\"";
-    const char end[] = "\"}";
-    const char verb[] = "request_surface";
-    char *parameter = (char *)malloc(strlen(begin) +
-                                     strlen(label) +
-                                     strlen(end) + 1);
-    strcpy(parameter, begin);
-    strcat(parameter, label);
-    strcat(parameter, end);
-
-    /* allocates an id for the request */
-    rc = asprintf(&key, "%d:%s/%s", ++num, AFBClient::wmAPI, verb);
-
-    /* send the request */
-    rc = afb_wsj1_call_s(wsj1, AFBClient::wmAPI, verb, parameter, AFBClient::onRequestSurfaceReply, key);
-    if (rc < 0)
-        fprintf(stderr, "calling %s/%s(%s) failed: %m\n", AFBClient::wmAPI, verb, parameter);
-
-    printf("requestSurface(%s) <--\n", label);
-    fflush(stdout);
+   printf("requestSurface(%s) -->\n", label);
+   constexpr char const *verb = "request_surface";
+   int ret = -1;
+
+   json_object *jp = json_object_new_object();
+   json_object_object_add(jp, "drawing_name", json_object_new_string(label));
+
+   // std::experimental::optional look-alike
+   struct optional {
+      int value;
+      bool is_not_set;
+   };
+
+   constexpr struct optional nullopt = {0, true};
+   auto id = nullopt;
+
+   /* send the request */
+   int rc = afb_wsj1_call_j(
+      wsj1, AFBClient::wmAPI, verb, jp,
+      [](void *closure, afb_wsj1_msg *msg) {
+         if (afb_wsj1_msg_is_reply_ok(msg)) {
+            int id = json_object_get_int(
+               json_object_object_get(afb_wsj1_msg_object_j(msg), "response"));
+            auto oid = (optional *)closure;
+            *oid = optional{id};
+         } else
+            fprintf(stderr, "wrong request surface reply received!\n");
+      },
+      (void *)&id);
+
+   if (rc < 0) {
+      fprintf(stderr, "calling %s/%s(%s) failed: %m\n", AFBClient::wmAPI, verb,
+              json_object_to_json_string(jp));
+   } else {
+      // Lets make this call sync here...
+      dispatch(-1);
+
+      if (! id.is_not_set) {
+          char *buf;
+          asprintf(&buf, "%d", id.value);
+          printf("setenv(\"QT_IVI_SURFACE_ID\", %s, 1)\n", buf);
+          if (setenv("QT_IVI_SURFACE_ID", buf, 1) != 0) {
+              fprintf(stderr, "putenv failed: %m\n");
+          } else {
+              ret = 0; // Single point of success
+          }
+      } else {
+          fprintf(stderr, "Could not get surface ID from WM\n");
+      }
+   }
+
+   printf("requestSurface(%s) = %d <--\n", label, ret);
+
+   return ret;
 }
 
 void AFBClient::activateSurface(const char *label)
@@ -98,12 +126,15 @@ void AFBClient::activateSurface(const char *label)
     strcat(parameter, end);
     call(AFBClient::wmAPI, verb, parameter);
 
+    // Sync this one too
+    dispatch(-1);
+
     printf("activateSurface(%s) <--\n", label);
     fflush(stdout);
 }
 
-int AFBClient::dispatch() {
-    return sd_event_run(loop, -1);
+int AFBClient::dispatch(uint64_t timeout) {
+    return sd_event_run(loop, timeout);
 }
 
 void AFBClient::deactivateSurface(const char *label)
@@ -161,32 +192,6 @@ void AFBClient::onReply(void *closure, afb_wsj1_msg *msg)
     free(closure);
 }
 
-void AFBClient::onRequestSurfaceReply(void *closure, afb_wsj1_msg *msg)
-{
-    printf("onRequestSurfaceReply %s: %s\n%s\n", (char*)closure,
-           afb_wsj1_msg_is_reply_ok(msg) ? "OK" : "ERROR",
-           json_object_to_json_string_ext(afb_wsj1_msg_object_j(msg),
-                                          JSON_C_TO_STRING_PRETTY));
-    if(afb_wsj1_msg_is_reply_ok(msg))
-    {
-        const char begin[] = "QT_IVI_SURFACE_ID=\"";
-        const char end[] = "\"";
-        char *parameter = (char *)malloc(strlen(begin) +
-                                         strlen(json_object_get_string(json_object_object_get(afb_wsj1_msg_object_j(msg), "response"))) +
-                                         strlen(end) + 1);
-        strcpy(parameter, begin);
-        strcat(parameter, json_object_get_string(json_object_object_get(afb_wsj1_msg_object_j(msg), "response")));
-        strcat(parameter, end);
-        printf("\n\n===>RETURN STR: %s\n\n", parameter);
-        putenv(parameter);
-        fflush(stdout);
-    }
-    else
-        fprintf(stderr, "wrong request surface reply received!");
-
-    free(closure);
-}
-
 /* makes a call */
 void AFBClient::call(const char *api, const char *verb, const char *object)
 {
diff --git a/AFBClient.h b/AFBClient.h
index f6ad965..9119c9c 100644
--- a/AFBClient.h
+++ b/AFBClient.h
@@ -25,17 +25,16 @@ public:
     }
 
     bool init();
-    void requestSurface(const char *label);
+    int requestSurface(const char *label);
     void activateSurface(const char *label);
     void deactivateSurface(const char *label);
     void endDraw(const char *label);
-    int dispatch();
+    int dispatch(uint64_t timeout);
 
     static void onCall(void *closure, const char *api, const char *verb, struct afb_wsj1_msg *msg);
     static void onEvent(void *closure, const char *event, struct afb_wsj1_msg *msg);
     static void onHangup(void *closure, struct afb_wsj1 *wsj1);
     static void onReply(void *closure, struct afb_wsj1_msg *msg);
-    static void onRequestSurfaceReply(void *closure, struct afb_wsj1_msg *msg);
 
 private:
     void call(const char *api, const char *verb, const char *object);