AFBClient: trace dispatch_internal(), header hygiene

[staging/windowmanager.git] / AFBClient.h

diff --git a/AFBClient.h b/AFBClient.h
index f8f824a..c6da6f7 100644 (file)
--- a/AFBClient.h
+++ b/AFBClient.h
@@ -1,23 +1,22 @@
 #ifndef AFBCLIENT_H
 #define AFBCLIENT_H
 
-#include <systemd/sd-event.h>
-
 #include <functional>
 
 extern "C"
 {
-#include <json-c/json.h>
-
-#include "afb-wsj1.h"
-#include "afb-ws-client.h"
+   struct json_object;
+   struct afb_wsj1;
+   struct sd_event;
 }
 
 class AFBClient
 {
-    explicit AFBClient();
-    AFBClient(const AFBClient& that) = delete;
-    virtual~AFBClient();
+    AFBClient();
+    ~AFBClient();
+
+    AFBClient(const AFBClient &) = delete;
+    AFBClient &operator=(const AFBClient &) = delete;
 
 public:
     enum EventType {
@@ -29,11 +28,7 @@ public:
        Event_FlushDraw,
     };
 
-    static AFBClient &instance()
-    {
-        static AFBClient obj;
-        return obj;
-    }
+    static AFBClient &instance();
 
     int init(int port, char const *token);
     int dispatch(uint64_t timeout);
@@ -44,22 +39,14 @@ public:
     int deactivateSurface(const char *label);
     int endDraw(const char *label);
 
-    void set_event_handler(enum EventType et, std::function<void(char const *label)> f);
-
-    static void onCall(void *closure, const char *api, const char *verb, struct afb_wsj1_msg *msg);
-    static void onEvent(void *closure, const char *event, struct afb_wsj1_msg *msg);
-    static void onHangup(void *closure, struct afb_wsj1 *wsj1);
-    static void onReply(void *closure, struct afb_wsj1_msg *msg);
+    void set_event_handler(enum EventType et,
+          std::function<void(char const *label)> f);
 
 private:
-    void call(const char *api, const char *verb, const char *object);
-    void event(const char *event, const char *object);
+    int call(const char *verb, json_object *object,
+          std::function<void(bool ok, json_object*)> onReply);
 
     struct afb_wsj1 *wsj1;
-    struct afb_wsj1_itf itf;
-
-    sd_event *loop;
-    static const char *wmURI;
-    static const char *wmAPI;
+    struct sd_event *loop;
 };
 #endif // AFBCLIENT_H