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

diff --git a/AFBClient.cpp b/AFBClient.cpp
index eb85a39..09d174d 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,14 +41,12 @@ 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;
@@ -84,9 +90,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);
@@ -99,6 +102,10 @@ void AFBClient::activateSurface(const char *label)
     fflush(stdout);
 }
 
+int AFBClient::dispatch() {
+    return sd_event_run(loop, -1);
+}
+
 void AFBClient::deactivateSurface(const char *label)
 {
     UNUSED(label);
@@ -112,7 +119,6 @@ void AFBClient::endDraw(const char *label)
 /* 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 +128,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 +153,43 @@ 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);
+    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);
-#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 +207,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
 }