Code Review
/
staging
/
windowmanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
AFBClient: fix port sanity check
[staging/windowmanager.git]
/
AFBClient.h
diff --git
a/AFBClient.h
b/AFBClient.h
index
a31479c
..
964e2b0
100644
(file)
--- a/
AFBClient.h
+++ b/
AFBClient.h
@@
-1,20
+1,9
@@
#ifndef AFBCLIENT_H
#define AFBCLIENT_H
#ifndef AFBCLIENT_H
#define AFBCLIENT_H
-#include <systemd/sd-event.h>
-
#include <functional>
#include <functional>
-extern "C"
-{
-#include <json-c/json.h>
-
-#include "afb-wsj1.h"
-#include "afb-ws-client.h"
-}
-
-class AFBClient
-{
+class AFBClient {
AFBClient();
~AFBClient();
AFBClient();
~AFBClient();
@@
-22,19
+11,23
@@
class AFBClient
AFBClient &operator=(const AFBClient &) = delete;
public:
AFBClient &operator=(const AFBClient &) = delete;
public:
+ using handler_fun = std::function<void(const char *)>;
+
enum EventType {
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();
int init(int port, char const *token);
};
static AFBClient &instance();
int init(int port, char const *token);
- int dispatch(
uint64_t timeout
);
+ int dispatch();
// WM API
int requestSurface(const char *label);
// WM API
int requestSurface(const char *label);
@@
-42,17
+35,11
@@
public:
int deactivateSurface(const char *label);
int endDraw(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:
- /// object will be json_object_put
- int call(const char *verb, json_object *object,
- std::function<void(bool ok, json_object*)> onReply);
+ void set_event_handler(enum EventType et, handler_fun f);
- struct afb_wsj1 *wsj1;
- struct afb_wsj1_itf itf;
+ struct Impl;
- sd_event *loop;
+private:
+ Impl *d;
};
#endif // AFBCLIENT_H
};
#endif // AFBCLIENT_H