X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=AFBClient.h;h=b1694b87fe50f1c8e6c2d5cc5ee5897c1488a44f;hb=b4cf01ec167f17c5df96906741fb4c6690ed9164;hp=c816e97f901579d438605ea2381fa323650510bd;hpb=bd5fbcc6a43098dd28ff0b44ab8ca8a8a724d3b0;p=staging%2Fwindowmanager.git

diff --git a/AFBClient.h b/AFBClient.h
index c816e97..b1694b8 100644
--- a/AFBClient.h
+++ b/AFBClient.h
@@ -1,54 +1,46 @@
 #ifndef AFBCLIENT_H
 #define AFBCLIENT_H
 
-#include <systemd/sd-event.h>
+#include <functional>
 
-#ifdef AFB
-extern "C"
-{
-#include <json-c/json.h>
-
-#include "afb-wsj1.h"
-#include "afb-ws-client.h"
-}
-#endif
+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:
-    static AFBClient &instance()
-    {
-        static AFBClient obj;
-        return obj;
-    }
-
-    bool init();
-    void requestSurface(const char *label);
-    void activateSurface(const char *label);
-    void deactivateSurface(const char *label);
-    void endDraw(const char *label);
+    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();
 
-    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);
-    static void onRequestSurfaceReply(void *closure, struct afb_wsj1_msg *msg);
+    // WM API
+    int requestSurface(const char *label);
+    int activateSurface(const char *label);
+    int deactivateSurface(const char *label);
+    int endDraw(const char *label);
 
-private:
-    void call(const char *api, const char *verb, const char *object);
-    void event(const char *event, const char *object);
+    void set_event_handler(enum EventType et,
+          std::function<void(char const *label)> f);
 
+private:
     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