X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=AFBClient.cpp;h=283e22c5b73137ee562e2172aa21375801079f03;hb=4a2c73eca3713fa049c86d021aae27ac66c4e481;hp=eb85a39224a48e79a4142c08ee28fef395dd678f;hpb=329592dddc1737071547075bd9df0bc9f9643ee3;p=staging%2Fwindowmanager.git

diff --git a/AFBClient.cpp b/AFBClient.cpp
index eb85a39..283e22c 100644
--- a/AFBClient.cpp
+++ b/AFBClient.cpp
@@ -8,6 +8,14 @@
 
 #define UNUSED(x) (void)(x)
 
+extern "C" {
+extern struct afb_wsj1 *afb_ws_client_connect_wsj1(struct sd_event *eloop, const char *uri, struct afb_wsj1_itf *itf, void *closure);
+extern int afb_wsj1_call_s(struct afb_wsj1 *wsj1, const char *api, const char *verb, const char *object, void (*on_reply)(void *closure, struct afb_wsj1_msg *msg), void *closure);
+extern int afb_wsj1_msg_is_reply_ok(struct afb_wsj1_msg *msg);
+extern int afb_wsj1_send_event_s(struct afb_wsj1 *wsj1, const char *event, const char *object);
+static inline int afb_wsj1_reply_error_s(struct afb_wsj1_msg *msg, const char *object, const char *token);
+}
+
 const char * AFBClient::wmURI = "ws://localhost:1700/api?token=wm";
 const char * AFBClient::wmAPI = "winman";
 
@@ -33,47 +41,73 @@ bool AFBClient::init()
         return false;
     }
 
-#ifdef AFB
     /* connect the websocket wsj1 to the uri given by the first argument */
     wsj1 = afb_ws_client_connect_wsj1(loop, wmURI, &itf, NULL);
     if (wsj1 == NULL) {
         fprintf(stderr, "Connection to %s failed: %m\n", wmURI);
         return false;
     }
-#endif
 
     printf("init() <--\n");
     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 const 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)
@@ -84,9 +118,6 @@ void AFBClient::activateSurface(const char *label)
     const char begin[] = "{\"drawing_name\":\"";
     const char end[] = "\"}";
     const char verb[] = "activate_surface";
-    strcpy(parameter, functionParamName);
-    strcat(parameter, label);
-    strcat(parameter, "\"}");
     char *parameter = (char *)malloc(strlen(begin) +
                                      strlen(label) +
                                      strlen(end) + 1);
@@ -95,24 +126,38 @@ 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(uint64_t timeout) {
+    return sd_event_run(loop, timeout);
+}
+
 void AFBClient::deactivateSurface(const char *label)
 {
-    UNUSED(label);
+    json_object *j = json_object_new_object();
+    json_object_object_add(j, "drawing_name", json_object_new_string(label));
+    call(AFBClient::wmAPI, "deactivate_surface", json_object_to_json_string(j));
+    json_object_put(j);
+    dispatch(-1);
 }
 
 void AFBClient::endDraw(const char *label)
 {
-    UNUSED(label);
+    json_object *j = json_object_new_object();
+    json_object_object_add(j, "drawing_name", json_object_new_string(label));
+    call(AFBClient::wmAPI, "enddraw", json_object_to_json_string(j));
+    json_object_put(j);
+    dispatch(-1);
 }
 
 /* called when wsj1 receives a method invocation */
 void AFBClient::onCall(void *closure, const char *api, const char *verb, struct afb_wsj1_msg *msg)
 {
-#ifdef AFB
     UNUSED(closure);
     int rc;
     printf("ON-CALL %s/%s:\n%s\n", api, verb,
@@ -122,19 +167,16 @@ void AFBClient::onCall(void *closure, const char *api, const char *verb, struct
     rc = afb_wsj1_reply_error_s(msg, "\"unimplemented\"", NULL);
     if (rc < 0)
         fprintf(stderr, "replying failed: %m\n");
-#endif
 }
 
 /* called when wsj1 receives an event */
 void AFBClient::onEvent(void *closure, const char *event, afb_wsj1_msg *msg)
 {
-#ifdef AFB
     UNUSED(closure);
     printf("ON-EVENT %s:\n%s\n", event,
            json_object_to_json_string_ext(afb_wsj1_msg_object_j(msg),
                                           JSON_C_TO_STRING_PRETTY));
     fflush(stdout);
-#endif
 }
 
 /* called when wsj1 hangsup */
@@ -150,34 +192,17 @@ void AFBClient::onHangup(void *closure, afb_wsj1 *wsj1)
 /* called when wsj1 receives a reply */
 void AFBClient::onReply(void *closure, afb_wsj1_msg *msg)
 {
-#ifdef AFB
     printf("ON-REPLY %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));
     fflush(stdout);
     free(closure);
-#endif
-}
-
-void AFBClient::onRequestSurfaceReply(void *closure, afb_wsj1_msg *msg)
-{
-#ifdef AFB
-    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));
-    printf("\n\n===>RETURN STR: %s\n\n", afb_wsj1_msg_object_s(msg));
-    //    putenv("QT_IVI_SURFACE_ID=16778219");
-    fflush(stdout);
-    free(closure);
-#endif
 }
 
 /* makes a call */
 void AFBClient::call(const char *api, const char *verb, const char *object)
 {
-#ifdef AFB
     static int num = 0;
     char *key;
     int rc;
@@ -195,17 +220,14 @@ void AFBClient::call(const char *api, const char *verb, const char *object)
 
     printf("call(%s, %s, %s) <--\n", api, verb, object);
     fflush(stdout);
-#endif
 }
 
 /* sends an event */
 void AFBClient::event(const char *event, const char *object)
 {
-#ifdef AFB
     int rc;
 
     rc = afb_wsj1_send_event_s(wsj1, event, object);
     if (rc < 0)
         fprintf(stderr, "sending !%s(%s) failed: %m\n", event, object);
-#endif
 }