X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=AFBClient.h;h=964e2b0d8f3a05a148001eb3e69d73777caff717;hb=da89d53e9abb971d3e2898597362f8886159868b;hp=f8f824af2693eaeee102a5a54dc37f7b387344ac;hpb=2f3a00b5f628b9db684505fc6566148cf6701d0a;p=staging%2Fwindowmanager.git

diff --git a/AFBClient.h b/AFBClient.h
index f8f824a..964e2b0 100644
--- a/AFBClient.h
+++ b/AFBClient.h
@@ -1,42 +1,33 @@
 #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"
-}
+class AFBClient {
+    AFBClient();
+    ~AFBClient();
 
-class AFBClient
-{
-    explicit AFBClient();
-    AFBClient(const AFBClient& that) = delete;
-    virtual~AFBClient();
+    AFBClient(const AFBClient &) = delete;
+    AFBClient &operator=(const AFBClient &) = delete;
 
 public:
+    using handler_fun = std::function<void(const char *)>;
+
     enum EventType {
-       Event_Active = 1,
-       Event_Inactive,
-       Event_Visible,
-       Event_Invisible,
-       Event_SyncDraw,
-       Event_FlushDraw,
+        Event_Active = 1,
+        Event_Inactive,
+
+        Event_Visible,
+        Event_Invisible,
+
+        Event_SyncDraw,
+        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);
+    int dispatch();
 
     // WM API
     int requestSurface(const char *label);
@@ -44,22 +35,11 @@ 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);
+    void set_event_handler(enum EventType et, handler_fun 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);
+    struct Impl;
 
 private:
-    void call(const char *api, const char *verb, const char *object);
-    void event(const char *event, const char *object);
-
-    struct afb_wsj1 *wsj1;
-    struct afb_wsj1_itf itf;
-
-    sd_event *loop;
-    static const char *wmURI;
-    static const char *wmAPI;
+    Impl *d;
 };
 #endif // AFBCLIENT_H