Moved the AFBClient to singleton

[staging/windowmanager.git] / AFBClient.cpp

diff --git a/AFBClient.cpp b/AFBClient.cpp
index 7abdd78..e67e74b 100644 (file)
--- a/AFBClient.cpp
+++ b/AFBClient.cpp
@@ -5,17 +5,26 @@
 #include <errno.h>
 #include <string.h>
 
-#ifdef AFB
-/* the callback interface for wsj1 */
-static struct afb_wsj1_itf itf =
+#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
-};
-#endif
+    ///* itinializing the callback interface for wsj1 */
+    itf.on_hangup = AFBClient::onHangup;
+    itf.on_call = AFBClient::onCall;
+    itf.on_event = AFBClient::onEvent;
+}
+
+AFBClient& AFBClient::operator =(const AFBClient &that)
+{
+    itf = that.itf;
+    return *this;
+}
 
-AFBClient::AFBClient()
+AFBClient::~AFBClient()
 {
 }
 
@@ -48,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)
@@ -59,23 +68,26 @@ 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", wmAPI, verb,
+    printf("ON-CALL %s/%s:\n%s\n", api, verb,
            json_object_to_json_string_ext(afb_wsj1_msg_object_j(msg),
                                           JSON_C_TO_STRING_PRETTY));
     fflush(stdout);
@@ -89,6 +101,7 @@ void AFBClient::onCall(void *closure, afb_wsj1 *wsj1)
 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));
@@ -99,6 +112,8 @@ void AFBClient::onEvent(void *closure, const char *event, afb_wsj1_msg *msg)
 /* called when wsj1 hangsup */
 void AFBClient::onHangup(void *closure, afb_wsj1 *wsj1)
 {
+    UNUSED(closure);
+    UNUSED(wsj1);
     printf("ON-HANGUP\n");
     fflush(stdout);
     exit(0);