X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=AFBClient.cpp;h=a009610151263a3c565d5ce380c19aaabcc57c25;hb=f203185be97a192a4174c7d5f89be3bfb4e29ac2;hp=c4b32db6ed84756c9a9bbe57cefc7a109a415e0c;hpb=d5377de21c1eacc164252c2631114815e7c4ae80;p=staging%2Fwindowmanager.git

diff --git a/AFBClient.cpp b/AFBClient.cpp
index c4b32db..a009610 100644
--- a/AFBClient.cpp
+++ b/AFBClient.cpp
@@ -4,10 +4,11 @@
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
+#include <unistd.h>
 
 #define UNUSED(x) (void)(x)
 
-const char * AFBClient::wmURI = "ws://localhost:1700/api?wm";
+const char * AFBClient::wmURI = "ws://localhost:1700/api?token=wm";
 const char * AFBClient::wmAPI = "winman";
 
 AFBClient::AFBClient() : itf()
@@ -18,8 +19,13 @@ AFBClient::AFBClient() : itf()
     itf.on_event = AFBClient::onEvent;
 }
 
+AFBClient::~AFBClient()
+{
+}
+
 bool AFBClient::init()
 {
+    printf("AFBClient::init() -->\n");
     /* get the default event loop */
     int rc = sd_event_default(&loop);
     if (rc < 0) {
@@ -27,54 +33,131 @@ 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("AFBClient::init() <--\n");
     return true;
 }
 
-void AFBClient::requestSurface(const char *label)
+int AFBClient::dispatch(uint64_t timeout) {
+    return sd_event_run(loop, timeout);
+}
+
+int AFBClient::requestSurface(const char *label)
 {
-    const char functionParamName[] = "{\"drawing_name\":\"";
-    char *parameter = (char *)malloc(strlen(functionParamName) + strlen(label) + 3);
-    strcpy(parameter, functionParamName);
-    strcat(parameter, label);
-    strcat(parameter, "\"}");
-    printf("requestSurface(%s): %s\n", label, parameter);
-    call(AFBClient::wmAPI, "request_surface", parameter);
+   printf("AFBClient::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("AFBClient::requestSurface(%s) = %d <--\n", label, ret);
+
+   return ret;
 }
 
 void AFBClient::activateSurface(const char *label)
 {
-    const char functionParamName[] = "{\"drawing_name\":\"";
-    char *parameter = (char *)malloc(strlen(functionParamName) + strlen(label) + 3);
-    strcpy(parameter, functionParamName);
+    printf("AFBClient::activateSurface(%s) -->\n", label);
+    fflush(stdout);
+
+    const char begin[] = "{\"drawing_name\":\"";
+    const char end[] = "\"}";
+    const char verb[] = "activate_surface";
+    char *parameter = (char *)malloc(strlen(begin) +
+                                     strlen(label) +
+                                     strlen(end) + 1);
+    strcpy(parameter, begin);
     strcat(parameter, label);
-    strcat(parameter, "\"}");
-    printf("activateSurface(%s): %s\n", label, parameter);
-    call(AFBClient::wmAPI, "activate_surface", parameter);
+    strcat(parameter, end);
+    call(AFBClient::wmAPI, verb, parameter);
+
+    // Sync this one too
+    dispatch(-1);
+
+    printf("AFBClient::activateSurface(%s) <--\n", label);
+    fflush(stdout);
 }
 
 void AFBClient::deactivateSurface(const char *label)
 {
-    UNUSED(label);
+    printf("AFBClient::deactivateSurface(%s) -->\n", label);
+    fflush(stdout);
+    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);
+    printf("AFBClient::deactivateSurface(%s) <--\n", label);
+    fflush(stdout);
 }
 
 void AFBClient::endDraw(const char *label)
 {
-    UNUSED(label);
+    printf("AFBClient::endDraw(%s) -->\n", label);
+    fflush(stdout);
+    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);
+    printf("AFBClient::endDraw(%s) <--\n", label);
+    fflush(stdout);
 }
 
 /* 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,
@@ -84,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 */
@@ -112,24 +192,24 @@ 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
 }
 
 /* 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;
 
+    printf("call(%s, %s, %s) -->\n", api, verb, object);
+    fflush(stdout);
+
     /* allocates an id for the request */
     rc = asprintf(&key, "%d:%s/%s", ++num, api, verb);
 
@@ -137,27 +217,17 @@ void AFBClient::call(const char *api, const char *verb, const char *object)
     rc = afb_wsj1_call_s(wsj1, api, verb, object, AFBClient::onReply, key);
     if (rc < 0)
         fprintf(stderr, "calling %s/%s(%s) failed: %m\n", api, verb, object);
-#endif
+
+    printf("call(%s, %s, %s) <--\n", api, verb, object);
+    fflush(stdout);
 }
 
 /* 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
-}
-
-void AFBClient::emitSignalOrCall(const char *api, const char *verb, const char *object)
-{
-    if (object == NULL || object[0] == 0)
-        object = "null";
-    if (api[0] == '!' && api[1] == 0)
-        event(verb, object);
-    else
-        call(api, verb, object);
 }