#include <cstdlib>
#include <cstring>
+#include <atomic>
+#include <map>
#include <mutex>
+#include <set>
#include <unistd.h>
#define UNUSED(x) (void)(x)
+// _ ___ _
+// ___| | __ _ ___ ___ |_ _|_ __ ___ _ __ | |
+// / __| |/ _` / __/ __| | || '_ ` _ \| '_ \| |
+// | (__| | (_| \__ \__ \ | || | | | | | |_) | |
+// \___|_|\__,_|___/___/ |___|_| |_| |_| .__/|_|
+// |_|
+class AFBClient::Impl {
+ friend class AFBClient;
+
+ // This is the AFBClient interface impl
+ 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, handler_fun f);
+
+ Impl();
+ ~Impl();
+
+ struct afb_wsj1 *wsj1;
+ struct sd_event *loop;
+
+ std::set<std::string> labels;
+ std::map<EventType, handler_fun> handlers;
+
+public:
+ void event(char const *et, char const *label);
+};
+
namespace {
constexpr const int token_maxlen = 20;
struct afb_wsj1_msg *msg) {
TRACE();
UNUSED(closure);
- int rc;
- printf("ON-CALL %s/%s:\n%s\n", api, verb,
- json_object_to_json_string_ext(afb_wsj1_msg_object_j(msg),
- JSON_C_TO_STRING_PRETTY));
- fflush(stdout);
- rc = afb_wsj1_reply_error_s(msg, "\"unimplemented\"", nullptr);
- if (rc < 0)
- fprintf(stderr, "replying failed: %m\n");
+ UNUSED(verb);
+ UNUSED(api);
+ UNUSED(msg);
}
/* called when wsj1 receives an event */
void onEvent(void *closure, const char *event, afb_wsj1_msg *msg) {
TRACE();
- UNUSED(closure);
- printf("ON-EVENT %s:\n%s\n", event,
- json_object_to_json_string_ext(afb_wsj1_msg_object_j(msg),
- JSON_C_TO_STRING_PRETTY));
- fflush(stdout);
+ reinterpret_cast<AFBClient::Impl *>(closure)->event(
+ event, json_object_get_string(
+ json_object_object_get(afb_wsj1_msg_object_j(msg), "data")));
}
/* called when wsj1 hangsup */
exit(0);
}
-static struct afb_wsj1_itf itf = {
+constexpr static struct afb_wsj1_itf itf = {
onHangup, onCall, onEvent,
};
+// XXX: I am not sure this is the right thing to do though...
std::recursive_mutex dispatch_mutex;
void dispatch_internal(struct sd_event *loop) {
// Alternatively we could setup a local struct and use it as
// closure, but I think it is cleaner this way.
int call_rc = 0;
- bool returned = false;
+ std::atomic<bool> returned;
+ returned.store(false, std::memory_order_relaxed);
std::function<void(bool, json_object *)> wrappedOnReply =
[&returned, &call_rc, &onReply](bool ok, json_object *j) {
TRACEN(wrappedOnReply);
TRACEN(onReply);
onReply(ok, j);
}
- returned = true;
+ returned.store(true, std::memory_order_release);
};
// make the actual call, use wrappedOnReply as closure
// We need to dispatch until "returned" got set, this is necessary
// if events get triggered by the call (and would be dispatched before
// the actual call-reply).
- while (!returned) {
- dispatch_internal(loop);
+ while (!returned.load(std::memory_order_consume)) {
+ std::lock_guard<std::recursive_mutex> guard(dispatch_mutex);
+ if (!returned.load(std::memory_order_consume)) {
+ dispatch_internal(loop);
+ }
}
// return the actual API call result
} // namespace
-AFBClient &AFBClient::instance() {
- TRACE();
- static AFBClient obj;
- return obj;
-}
-
-AFBClient::AFBClient() : wsj1{}, loop{} { TRACE(); }
+// _ ___ _ _ _
+// ___| | __ _ ___ ___ |_ _|_ __ ___ _ __ | | (_)_ __ ___ _ __ | |
+// / __| |/ _` / __/ __| | || '_ ` _ \| '_ \| | | | '_ ` _ \| '_ \| |
+// | (__| | (_| \__ \__ \ | || | | | | | |_) | | | | | | | | | |_) | |
+// \___|_|\__,_|___/___/ |___|_| |_| |_| .__/|_| |_|_| |_| |_| .__/|_|
+// |_| |_|
+AFBClient::Impl::Impl() : wsj1{}, loop{}, labels(), handlers() { TRACE(); }
-AFBClient::~AFBClient() {
+AFBClient::Impl::~Impl() {
TRACE();
afb_wsj1_unref(wsj1);
sd_event_unref(loop);
loop = nullptr;
}
-int AFBClient::init(int port, char const *token) {
+int AFBClient::Impl::init(int port, char const *token) {
TRACE();
char *uribuf = nullptr;
int rc = -1;
asprintf(&uribuf, "ws://localhost:%d/api?token=%s", port, token);
/* connect the websocket wsj1 to the uri given by the first argument */
- wsj1 = afb_ws_client_connect_wsj1(loop, uribuf, &itf, nullptr);
+ wsj1 = afb_ws_client_connect_wsj1(
+ loop, uribuf, const_cast<struct afb_wsj1_itf *>(&itf), this);
if (wsj1 == nullptr) {
sd_event_unref(loop);
fprintf(stderr, "Connection to %s failed: %m\n", uribuf);
return rc;
}
-int AFBClient::dispatch() {
+int AFBClient::Impl::dispatch() {
std::lock_guard<std::recursive_mutex> guard(dispatch_mutex);
return sd_event_run(loop, 1);
}
-int AFBClient::requestSurface(const char *label) {
+int AFBClient::Impl::requestSurface(const char *label) {
TRACE();
+
+ if (this->labels.find(label) != this->labels.end()) {
+ fprintf(stderr, "Surface label already known!\n");
+ return -EINVAL;
+ }
+
json_object *jp = json_object_new_object();
json_object_object_add(jp, "drawing_name", json_object_new_string(label));
+
int rc = -1;
/* send the request */
int rc2 = api_call(
}
});
- return rc2 < 0 ? rc2 : rc;
+ if (rc2 < 0)
+ rc = rc2;
+
+ if (rc >= 0) {
+ this->labels.insert(this->labels.end(), label);
+ }
+
+ return rc;
}
-int AFBClient::activateSurface(const char *label) {
+int AFBClient::Impl::activateSurface(const char *label) {
TRACE();
json_object *j = json_object_new_object();
json_object_object_add(j, "drawing_name", json_object_new_string(label));
});
}
-int AFBClient::deactivateSurface(const char *label) {
+int AFBClient::Impl::deactivateSurface(const char *label) {
TRACE();
json_object *j = json_object_new_object();
json_object_object_add(j, "drawing_name", json_object_new_string(label));
});
}
-int AFBClient::endDraw(const char *label) {
+int AFBClient::Impl::endDraw(const char *label) {
TRACE();
json_object *j = json_object_new_object();
json_object_object_add(j, "drawing_name", json_object_new_string(label));
});
}
-void AFBClient::set_event_handler(enum EventType et,
- std::function<void(char const *)> func) {
+void AFBClient::Impl::set_event_handler(
+ enum EventType et, std::function<void(char const *)> func) {
UNUSED(et);
UNUSED(func);
TRACE();
- // XXX todo
+
+ if (et >= 1 && et <= 6) { // Yeah ... just go with it!
+ this->handlers[et] = std::move(func);
+ }
}
+
+namespace {
+std::pair<bool, AFBClient::EventType> make_event_type(char const *et) {
+ // Event have the form "$API/$EVENT", just try to find the first / and
+ // get on with it.
+ char const *et2 = strchr(et, '/');
+ if (et2) {
+ et = et2 + 1;
+ }
+
+#define ET(N, A) \
+ do { \
+ if (strcasecmp(et, N) == 0) \
+ return std::make_pair<bool, AFBClient::EventType>( \
+ true, CONCAT(AFBClient::Event_, A)); \
+ } while (0)
+
+ ET("activated", Active);
+ ET("deactivated", Inactive);
+ ET("visible", Visible);
+ ET("invisible", Invisible);
+ ET("syncdraw", SyncDraw);
+ ET("flushdraw", FlushDraw);
+#undef ET
+
+ return std::make_pair<bool, AFBClient::EventType>(false,
+ AFBClient::Event_Active);
+}
+} // namespace
+
+void AFBClient::Impl::event(char const *et, char const *label) {
+ TRACE();
+ auto oet = make_event_type(et);
+ if (!oet.first) {
+ fprintf(stderr, "Unknown event type string '%s'\n", et);
+ return;
+ }
+
+ auto i = this->handlers.find(oet.second);
+ if (i != this->handlers.end()) {
+ i->second(label);
+ }
+}
+
+// _ _ _____ ____ ____ _ _ _
+// ___| | __ _ ___ ___ / \ | ___| __ ) / ___| (_) ___ _ __ | |_
+// / __| |/ _` / __/ __| / _ \ | |_ | _ \| | | | |/ _ \ '_ \| __|
+// | (__| | (_| \__ \__ \ / ___ \| _| | |_) | |___| | | __/ | | | |_
+// \___|_|\__,_|___/___/ /_/ \_\_| |____/ \____|_|_|\___|_| |_|\__|
+//
+int AFBClient::init(int port, char const *token) {
+ return this->d->init(port, token);
+}
+
+int AFBClient::dispatch() { return this->d->dispatch(); }
+
+int AFBClient::requestSurface(const char *label) {
+ return this->d->requestSurface(label);
+}
+
+int AFBClient::activateSurface(const char *label) {
+ return this->d->activateSurface(label);
+}
+
+int AFBClient::deactivateSurface(const char *label) {
+ return this->d->deactivateSurface(label);
+}
+
+int AFBClient::endDraw(const char *label) { return this->d->endDraw(label); }
+
+void AFBClient::set_event_handler(enum EventType et,
+ std::function<void(char const *label)> f) {
+ return this->d->set_event_handler(et, std::move(f));
+}
+
+AFBClient &AFBClient::instance() {
+ TRACE();
+ static AFBClient obj;
+ return obj;
+}
+
+AFBClient::AFBClient() : d(new Impl) {}
+
+AFBClient::~AFBClient() { delete d; }
Code Review / staging / windowmanager.git / blobdiff