X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=AFBClient.cpp;h=3d5a878135da5e3cd1f41ef25ae98559f19f263e;hb=4206071440384c5336d720475800bc4dbf9414cc;hp=e67e74bf0d0bb6ab0918c0fa93b2e45f8b9b6dcd;hpb=67df8203b206ef5aeef860a0447103600ea69700;p=staging%2Fwindowmanager.git

diff --git a/AFBClient.cpp b/AFBClient.cpp
index e67e74b..3d5a878 100644
--- a/AFBClient.cpp
+++ b/AFBClient.cpp
@@ -4,10 +4,19 @@
 #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";
+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";
 
 AFBClient::AFBClient() : itf()
@@ -18,18 +27,13 @@ AFBClient::AFBClient() : itf()
     itf.on_event = AFBClient::onEvent;
 }
 
-AFBClient& AFBClient::operator =(const AFBClient &that)
-{
-    itf = that.itf;
-    return *this;
-}
-
 AFBClient::~AFBClient()
 {
 }
 
 bool AFBClient::init()
 {
+    printf("init() -->\n");
     /* get the default event loop */
     int rc = sd_event_default(&loop);
     if (rc < 0) {
@@ -37,38 +41,69 @@ 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)
 {
-    const char functionParamName[] = "{\"drawing_name\":\"";
-    char *parameter = (char *)malloc(strlen(functionParamName) + strlen(label) + 3);
-    strcpy(parameter, functionParamName);
+    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, "\"}");
-    printf("requestSurface(%s): %s\n", label, parameter);
-    call(AFBClient::wmAPI, "request_surface", parameter);
+    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);
 }
 
 void AFBClient::activateSurface(const char *label)
 {
-    const char functionParamName[] = "{\"drawing_name\":\"";
-    char *parameter = (char *)malloc(strlen(functionParamName) + strlen(label) + 3);
-    strcpy(parameter, functionParamName);
+    printf("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);
+
+    printf("activateSurface(%s) <--\n", label);
+    fflush(stdout);
+}
+
+int AFBClient::dispatch() {
+    return sd_event_run(loop, -1);
 }
 
 void AFBClient::deactivateSurface(const char *label)
@@ -84,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,
@@ -94,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 */
@@ -122,24 +153,36 @@ 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)
+{
+    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);
 }
 
 /* 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);
 
@@ -147,27 +190,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);
 }