X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=AFBClient.h;h=c6da6f7c2553d692da614f6b49ac4d4a7908714e;hb=9128c27958d1475fd13ed625f5f5c0510e8e68bb;hp=6947629f5b2ee20b0bfaf13211ef482db0308161;hpb=87630355438c21bb30243334e0ed4857e3d06f7c;p=staging%2Fwindowmanager.git

diff --git a/AFBClient.h b/AFBClient.h
index 6947629..c6da6f7 100644
--- a/AFBClient.h
+++ b/AFBClient.h
@@ -1,38 +1,52 @@
 #ifndef AFBCLIENT_H
 #define AFBCLIENT_H
 
-#include <systemd/sd-event.h>
+#include <functional>
 
-#ifdef AFB
-#include <json-c/json.h>
-
-#include "afb-wsj1.h"
-#include "afb-ws-client.h"
-#endif
+extern "C"
+{
+   struct json_object;
+   struct afb_wsj1;
+   struct sd_event;
+}
 
 class AFBClient
 {
-public:
     AFBClient();
-    bool init();
-    void requestSurface(const char *label);
-    void activateSurface(const char *label);
-    void deactivateSurface(const char *label);
-    void endDraw(const char *label);
+    ~AFBClient();
+
+    AFBClient(const AFBClient &) = delete;
+    AFBClient &operator=(const AFBClient &) = delete;
+
+public:
+    enum EventType {
+       Event_Active = 1,
+       Event_Inactive,
+       Event_Visible,
+       Event_Invisible,
+       Event_SyncDraw,
+       Event_FlushDraw,
+    };
+
+    static AFBClient &instance();
+
+    int init(int port, char const *token);
+    int dispatch(uint64_t timeout);
+
+    // WM API
+    int requestSurface(const char *label);
+    int activateSurface(const char *label);
+    int deactivateSurface(const char *label);
+    int endDraw(const char *label);
+
+    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 emitSignalOrCall(const char *api, const char *verb, const char *object);
-    void event(const char *event, const char *object);
-    void onCall(void *closure, struct afb_wsj1 *wsj1);
-    void onEvent(void *closure, const char *event, struct afb_wsj1_msg *msg);
-    void onHangup(void *closure, struct afb_wsj1 *wsj1);
-    void onReply(void *closure, struct afb_wsj1_msg *msg);
+    int call(const char *verb, json_object *object,
+          std::function<void(bool ok, json_object*)> onReply);
 
     struct afb_wsj1 *wsj1;
-    sd_event *loop;
-    const char *wmURI = "ws://localhost:1700/api?wm";
-    const char *wmAPI = "winman";
+    struct sd_event *loop;
 };
-
 #endif // AFBCLIENT_H