X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=AFBClient.h;h=c6da6f7c2553d692da614f6b49ac4d4a7908714e;hb=31768957cd3e7ce3152db910b487ff73b73fffc4;hp=9119c9c4c865bc198e0e5ffef85307ba4b912920;hpb=bcdcf57a93ac30b0aac23ed2fed9f71312cae5da;p=staging%2Fwindowmanager.git

diff --git a/AFBClient.h b/AFBClient.h
index 9119c9c..c6da6f7 100644
--- a/AFBClient.h
+++ b/AFBClient.h
@@ -1,51 +1,52 @@
 #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:
-    static AFBClient &instance()
-    {
-        static AFBClient obj;
-        return obj;
-    }
+    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);
 
-    bool init();
+    // WM API
     int requestSurface(const char *label);
-    void activateSurface(const char *label);
-    void deactivateSurface(const char *label);
-    void endDraw(const char *label);
-    int dispatch(uint64_t timeout);
+    int activateSurface(const char *label);
+    int deactivateSurface(const char *label);
+    int endDraw(const char *label);
 
-    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