Moved the AFBClient to singleton

[staging/windowmanager.git] / AFBClient.cpp

diff --git a/AFBClient.cpp b/AFBClient.cpp
index 2c200bc..e67e74b 100644 (file)
--- a/AFBClient.cpp
+++ b/AFBClient.cpp
@@ -1,28 +1,52 @@
 #include "AFBClient.h"
 
-/* the callback interface for wsj1 */
-static struct afb_wsj1_itf itf =
+#include <stdlib.h>
+#include <stdio.h>
+#include <errno.h>
+#include <string.h>
+
+#define UNUSED(x) (void)(x)
+
+const char * AFBClient::wmURI = "ws://localhost:1700/api?wm";
+const char * AFBClient::wmAPI = "winman";
+
+AFBClient::AFBClient() : itf()
 {
-    .on_hangup = AFBClient::onHangup,
-    .on_call = AFBClient::onCall,
-    .on_event = AFBClient::onEvent
-};
+    ///* itinializing the callback interface for wsj1 */
+    itf.on_hangup = AFBClient::onHangup;
+    itf.on_call = AFBClient::onCall;
+    itf.on_event = AFBClient::onEvent;
+}
 
-AFBClient::AFBClient()
+AFBClient& AFBClient::operator =(const AFBClient &that)
+{
+    itf = that.itf;
+    return *this;
+}
+
+AFBClient::~AFBClient()
+{
+}
+
+bool AFBClient::init()
 {
     /* get the default event loop */
     int rc = sd_event_default(&loop);
     if (rc < 0) {
         fprintf(stderr, "Connection to default event loop failed: %s\n", strerror(-rc));
-        return 1;
+        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 1;
+        return false;
     }
+#endif
+
+    return true;
 }
 
 void AFBClient::requestSurface(const char *label)
@@ -33,7 +57,7 @@ void AFBClient::requestSurface(const char *label)
     strcat(parameter, label);
     strcat(parameter, "\"}");
     printf("requestSurface(%s): %s\n", label, parameter);
-    call(wmAPI, "request_surface", parameter);
+    call(AFBClient::wmAPI, "request_surface", parameter);
 }
 
 void AFBClient::activateSurface(const char *label)
@@ -44,20 +68,24 @@ void AFBClient::activateSurface(const char *label)
     strcat(parameter, label);
     strcat(parameter, "\"}");
     printf("activateSurface(%s): %s\n", label, parameter);
-    call(wmAPI, "activate_surface", parameter);
+    call(AFBClient::wmAPI, "activate_surface", parameter);
 }
 
 void AFBClient::deactivateSurface(const char *label)
 {
+    UNUSED(label);
 }
 
 void AFBClient::endDraw(const char *label)
 {
+    UNUSED(label);
 }
 
 /* called when wsj1 receives a method invocation */
-void AFBClient::onCall(void *closure, afb_wsj1 *wsj1)
+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,
            json_object_to_json_string_ext(afb_wsj1_msg_object_j(msg),
@@ -66,20 +94,26 @@ void AFBClient::onCall(void *closure, afb_wsj1 *wsj1)
     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 */
 void AFBClient::onHangup(void *closure, afb_wsj1 *wsj1)
 {
+    UNUSED(closure);
+    UNUSED(wsj1);
     printf("ON-HANGUP\n");
     fflush(stdout);
     exit(0);
@@ -88,17 +122,20 @@ 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;
@@ -110,16 +147,19 @@ 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
 }
 
 /* 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)