#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 func);
+
+ 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 ScopeTrace {
thread_local static int indent;
char const *f{};
- ScopeTrace(char const *func) : f(func) {
+ explicit ScopeTrace(char const *func) : f(func) {
fprintf(stderr, "%*s%s -->\n", 2 * indent++, "", this->f);
}
~ScopeTrace() { fprintf(stderr, "%*s%s <--\n", 2 * --indent, "", this->f); }
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 */
TRACE();
UNUSED(closure);
UNUSED(wsj1);
- printf("ON-HANGUP\n");
- fflush(stdout);
- exit(0);
+ fputs("Hangup, the WindowManager vanished\n", stderr);
+ exit(1);
}
-constexpr static struct afb_wsj1_itf itf = {
+constexpr struct afb_wsj1_itf itf = {
onHangup, onCall, onEvent,
};
/// object will be json_object_put
int api_call(struct sd_event *loop, struct afb_wsj1 *wsj1, const char *verb,
json_object *object,
- std::function<void(bool, json_object *)> onReply) {
+ const std::function<void(bool, json_object *)> &onReply) {
TRACE();
// We need to wrap the actual onReply call once in order to
// Alternatively we could setup a local struct and use it as
// closure, but I think it is cleaner this way.
int call_rc = 0;
- std::atomic<bool> returned;
+ 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) {
auto *onReply =
reinterpret_cast<std::function<void(bool, json_object *)> *>(
closure);
- (*onReply)(!!afb_wsj1_msg_is_reply_ok(msg),
+ (*onReply)(!(afb_wsj1_msg_is_reply_ok(msg) == 0),
afb_wsj1_msg_object_j(msg));
},
&wrappedOnReply);
// if events get triggered by the call (and would be dispatched before
// the actual call-reply).
while (!returned.load(std::memory_order_consume)) {
- dispatch_internal(loop);
+ 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
-// _ ___ _
-// ___| | __ _ ___ ___ |_ _|_ __ ___ _ __ | |
-// / __| |/ _` / __/ __| | || '_ ` _ \| '_ \| |
-// | (__| | (_| \__ \__ \ | || | | | | | |_) | |
-// \___|_|\__,_|___/___/ |___|_| |_| |_| .__/|_|
-// |_|
-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,
- std::function<void(char const *label)> f);
-
- Impl();
- ~Impl();
-
- struct afb_wsj1 *wsj1;
- struct sd_event *loop;
-};
-
-AFBClient::Impl::Impl() : wsj1{}, loop{} { TRACE(); }
+// _ ___ _ _ _
+// ___| | __ _ ___ ___ |_ _|_ __ ___ _ __ | | (_)_ __ ___ _ __ | |
+// / __| |/ _` / __/ __| | || '_ ` _ \| '_ \| | | | '_ ` _ \| '_ \| |
+// | (__| | (_| \__ \__ \ | || | | | | | |_) | | | | | | | | | |_) | |
+// \___|_|\__,_|___/___/ |___|_| |_| |_| .__/|_| |_|_| |_| |_| .__/|_|
+// |_| |_|
+AFBClient::Impl::Impl() : wsj1{}, loop{}, labels(), handlers() { TRACE(); }
AFBClient::Impl::~Impl() {
TRACE();
afb_wsj1_unref(wsj1);
sd_event_unref(loop);
- loop = nullptr;
}
int AFBClient::Impl::init(int port, char const *token) {
char *uribuf = nullptr;
int rc = -1;
- if (!token || strlen(token) > token_maxlen) {
- fprintf(stderr, "Token is invalid\n");
+ if (this->loop != nullptr && this->wsj1 != nullptr) {
+ fputs("AFBClient instance is already initialized!\n", stderr);
+ rc = -EALREADY;
+ goto fail;
+ }
+
+ if ((token == nullptr) || strlen(token) > token_maxlen) {
+ fputs("Token is invalid\n", stderr);
rc = -EINVAL;
goto fail;
}
- for (char const *p = token; *p; p++) {
- if (!isalnum(*p)) {
- fprintf(stderr, "Token is invalid\n");
+ for (char const *p = token; *p != 0; p++) {
+ if (isalnum(*p) == 0) {
+ fputs("Token is invalid\n", stderr);
rc = -EINVAL;
goto fail;
}
}
if (port < 1 && port > 0xffff) {
- fprintf(stderr, "Port is invalid\n");
+ fputs("Port is invalid\n", stderr);
rc = -EINVAL;
goto fail;
}
/* get the default event loop */
- rc = sd_event_default(&loop);
+ rc = sd_event_default(&this->loop);
if (rc < 0) {
fprintf(stderr, "Connection to default event loop failed: %s\n",
strerror(-rc));
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, const_cast<struct afb_wsj1_itf *>(&itf), nullptr);
- if (wsj1 == nullptr) {
- sd_event_unref(loop);
+ this->wsj1 = afb_ws_client_connect_wsj1(
+ this->loop, uribuf, const_cast<struct afb_wsj1_itf *>(&itf), this);
+ if (this->wsj1 == nullptr) {
+ sd_event_unref(this->loop);
+ this->loop = nullptr;
fprintf(stderr, "Connection to %s failed: %m\n", uribuf);
rc = -errno;
goto fail;
int AFBClient::Impl::dispatch() {
std::lock_guard<std::recursive_mutex> guard(dispatch_mutex);
- return sd_event_run(loop, 1);
+ return sd_event_run(this->loop, 1);
+}
}
int AFBClient::Impl::requestSurface(const char *label) {
TRACE();
+
+ if (this->labels.find(label) != this->labels.end()) {
+ fputs("Surface label already known!\n", stderr);
+ 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(
}
} else {
fprintf(stderr, "Could not get surface ID from WM: %s\n",
- j ? json_object_to_json_string_ext(
- j, JSON_C_TO_STRING_PRETTY)
- : "no-info");
+ j != nullptr ? json_object_to_json_string_ext(
+ j, JSON_C_TO_STRING_PRETTY)
+ : "no-info");
rc = -EINVAL;
}
});
- return rc2 < 0 ? rc2 : rc;
+ if (rc2 < 0) {
+ rc = rc2;
+ }
+
+ if (rc >= 0) {
+ this->labels.insert(this->labels.end(), label);
+ }
+
+ return rc;
}
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));
- return api_call(loop, wsj1, "activate_surface", j, [](bool ok,
- json_object *j) {
- if (!ok) {
- fprintf(
- stderr, "API Call activate_surface() failed: %s\n",
- j ? json_object_to_json_string_ext(j, JSON_C_TO_STRING_PRETTY)
- : "no-info");
- }
- });
+ return api_call(
+ loop, wsj1, "activate_surface", j, [](bool ok, json_object *j) {
+ if (!ok) {
+ fprintf(stderr, "API Call activate_surface() failed: %s\n",
+ j != nullptr ? json_object_to_json_string_ext(
+ j, JSON_C_TO_STRING_PRETTY)
+ : "no-info");
+ }
+ });
}
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));
- return api_call(loop, wsj1, "deactivate_surface", j, [](bool ok,
- json_object *j) {
- if (!ok) {
- fprintf(
- stderr, "API Call deactivate_surface() failed: %s\n",
- j ? json_object_to_json_string_ext(j, JSON_C_TO_STRING_PRETTY)
- : "no-info");
- }
- });
+ return api_call(
+ loop, wsj1, "deactivate_surface", j, [](bool ok, json_object *j) {
+ if (!ok) {
+ fprintf(stderr, "API Call deactivate_surface() failed: %s\n",
+ j != nullptr ? json_object_to_json_string_ext(
+ j, JSON_C_TO_STRING_PRETTY)
+ : "no-info");
+ }
+ });
}
int AFBClient::Impl::endDraw(const char *label) {
json_object_object_add(j, "drawing_name", json_object_new_string(label));
return api_call(loop, wsj1, "enddraw", j, [](bool ok, json_object *j) {
if (!ok) {
- fprintf(
- stderr, "API Call endDraw() failed: %s\n",
- j ? json_object_to_json_string_ext(j, JSON_C_TO_STRING_PRETTY)
- : "no-info");
+ fprintf(stderr, "API Call endDraw() failed: %s\n",
+ j != nullptr ? json_object_to_json_string_ext(
+ j, JSON_C_TO_STRING_PRETTY)
+ : "no-info");
}
});
}
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 != nullptr) {
+ et = et2 + 1;
+ }
+
+#define ET(N, A) \
+ do { \
+ if (strcasecmp(et, N) == 0) \
+ return std::pair<bool, AFBClient::EventType>( \
+ true, CONCAT(AFBClient::Event_, A)); \
+ } while (false)
+
+ ET("activated", Active);
+ ET("deactivated", Inactive);
+ ET("visible", Visible);
+ ET("invisible", Invisible);
+ ET("syncdraw", SyncDraw);
+ ET("flushdraw", FlushDraw);
+#undef ET
+
+ return std::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()) {
+ if (this->labels.find(label) != this->labels.end()) {
+ i->second(label);
+ }
+ }
}
// _ _ _____ ____ ____ _ _ _
Code Review / staging / windowmanager.git / blobdiff