Add set_event_handler, added int returns for all API methods.

[staging/windowmanager.git] / AFBClient.h

diff --git a/AFBClient.h b/AFBClient.h
index fa88663..f8f824a 100644 (file)
--- a/AFBClient.h
+++ b/AFBClient.h
@@ -3,7 +3,8 @@
 
 #include <systemd/sd-event.h>
 
-#ifdef AFB
+#include <functional>
+
 extern "C"
 {
 #include <json-c/json.h>
@@ -11,17 +12,39 @@ extern "C"
 #include "afb-wsj1.h"
 #include "afb-ws-client.h"
 }
-#endif
 
 class AFBClient
 {
+    explicit AFBClient();
+    AFBClient(const AFBClient& that) = delete;
+    virtual~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);
+    enum EventType {
+       Event_Active = 1,
+       Event_Inactive,
+       Event_Visible,
+       Event_Invisible,
+       Event_SyncDraw,
+       Event_FlushDraw,
+    };
+
+    static AFBClient &instance()
+    {
+        static AFBClient obj;
+        return obj;
+    }
+
+    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);
 
     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);
@@ -30,7 +53,6 @@ public:
 
 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);
 
     struct afb_wsj1 *wsj1;
@@ -40,5 +62,4 @@ private:
     static const char *wmURI;
     static const char *wmAPI;
 };
-
 #endif // AFBCLIENT_H