X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=AFBClient.h;h=05fa5a5e1687d4586a2e9e67f0414c7dc2d326f4;hb=e91bb69cb8d5f239f1ad1d1d920b2d0141e21b5c;hp=d93817b995e5adafc5b935fc6bab105e12298127;hpb=41215ddc3ab972d2d3b31a54576103be75a20f44;p=staging%2Fwindowmanager.git

diff --git a/AFBClient.h b/AFBClient.h
index d93817b..05fa5a5 100644
--- a/AFBClient.h
+++ b/AFBClient.h
@@ -1,34 +1,45 @@
 #ifndef AFBCLIENT_H
 #define AFBCLIENT_H
 
-#include <systemd/sd-event.h>
-#include <json-c/json.h>
+#include <functional>
 
-#include "afb-wsj1.h"
-#include "afb-ws-client.h"
+struct afb_wsj1;
+struct sd_event;
 
 class AFBClient
 {
-public:
     AFBClient();
-    void requestSurface(const char *label);
-    void activateSurface(const char *label);
-    void deactivateSurface(const char *label);
-    void endDraw(const char *label);
+    ~AFBClient();
 
-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);
+    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();
+
+    // 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:
     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