#include "AFBClient.h"
+#include <cctype>
#include <stdlib.h>
#include <stdio.h>
#include <errno.h>
#define UNUSED(x) (void)(x)
-extern "C" {
-extern struct afb_wsj1 *afb_ws_client_connect_wsj1(struct sd_event *eloop, const char *uri, struct afb_wsj1_itf *itf, void *closure);
-extern int afb_wsj1_call_s(struct afb_wsj1 *wsj1, const char *api, const char *verb, const char *object, void (*on_reply)(void *closure, struct afb_wsj1_msg *msg), void *closure);
-extern int afb_wsj1_msg_is_reply_ok(struct afb_wsj1_msg *msg);
-extern int afb_wsj1_send_event_s(struct afb_wsj1 *wsj1, const char *event, const char *object);
-static inline int afb_wsj1_reply_error_s(struct afb_wsj1_msg *msg, const char *object, const char *token);
-}
-
-const char * AFBClient::wmURI = "ws://localhost:1700/api?token=wm";
+constexpr const int token_maxlen = 20;
const char * AFBClient::wmAPI = "winman";
AFBClient::AFBClient() : itf()
{
}
-bool AFBClient::init()
+int AFBClient::init(int port, char const *token)
{
- printf("init() -->\n");
+ char *uribuf = NULL;
+ int rc = -1;
+
+ printf("AFBClient::init() -->\n");
+
+ if (!token || strlen(token) > token_maxlen) {
+ fprintf(stderr, "Token is invalid\n");
+ rc = -EINVAL;
+ goto fail;
+ }
+
+ for (char const *p = token; *p; p++) {
+ if (!isalnum(*p)) {
+ fprintf(stderr, "Token is invalid\n");
+ rc = -EINVAL;
+ goto fail;
+ }
+ }
+
+ if (port < 1 && port > 0xffff) {
+ fprintf(stderr, "Port is invalid\n");
+ rc = -EINVAL;
+ goto fail;
+ }
+
/* get the default event loop */
- int rc = sd_event_default(&loop);
+ rc = sd_event_default(&loop);
if (rc < 0) {
fprintf(stderr, "Connection to default event loop failed: %s\n", strerror(-rc));
- return false;
+ goto fail;
}
-#ifdef AFB
+ 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, wmURI, &itf, NULL);
+ wsj1 = afb_ws_client_connect_wsj1(loop, uribuf, &itf, NULL);
if (wsj1 == NULL) {
- fprintf(stderr, "Connection to %s failed: %m\n", wmURI);
- return false;
+ sd_event_unref(loop);
+ fprintf(stderr, "Connection to %s failed: %m\n", uribuf);
+ rc = -errno;
+ goto fail;
}
-#endif
- printf("init() <--\n");
- return true;
+ printf("AFBClient::init() <--\n");
+ return 0;
+
+fail:
+ printf("AFBClient::init() <--\n");
+ return rc;
}
-void AFBClient::requestSurface(const char *label)
+int AFBClient::dispatch(uint64_t timeout) {
+ return sd_event_run(loop, timeout);
+}
+
+int AFBClient::requestSurface(const char *label)
{
- printf("requestSurface(%s) -->\n", label);
- fflush(stdout);
+ printf("AFBClient::requestSurface(%s) -->\n", label);
+ constexpr char const *verb = "request_surface";
- static int num = 0;
- char *key;
- int rc;
- const char begin[] = "{\"drawing_name\":\"";
- const char end[] = "\"}";
- const char verb[] = "request_surface";
- char *parameter = (char *)malloc(strlen(begin) +
- strlen(label) +
- strlen(end) + 1);
- strcpy(parameter, begin);
- strcat(parameter, label);
- strcat(parameter, end);
+ json_object *jp = json_object_new_object();
+ json_object_object_add(jp, "drawing_name", json_object_new_string(label));
- /* allocates an id for the request */
- rc = asprintf(&key, "%d:%s/%s", ++num, AFBClient::wmAPI, verb);
+ // std::experimental::optional look-alike
+ struct optional {
+ int value;
+ bool is_not_set;
+ };
- /* send the request */
- rc = afb_wsj1_call_s(wsj1, AFBClient::wmAPI, verb, parameter, AFBClient::onRequestSurfaceReply, key);
- if (rc < 0)
- fprintf(stderr, "calling %s/%s(%s) failed: %m\n", AFBClient::wmAPI, verb, parameter);
+ constexpr struct optional const nullopt = {0, true};
+ auto id = nullopt;
- printf("requestSurface(%s) <--\n", label);
- fflush(stdout);
+ /* send the request */
+ int rc = afb_wsj1_call_j(
+ wsj1, AFBClient::wmAPI, verb, jp,
+ [](void *closure, afb_wsj1_msg *msg) {
+ if (afb_wsj1_msg_is_reply_ok(msg)) {
+ int id = json_object_get_int(
+ json_object_object_get(afb_wsj1_msg_object_j(msg), "response"));
+ auto oid = (optional *)closure;
+ *oid = optional{id};
+ } else
+ fprintf(stderr, "wrong request surface reply received!\n");
+ },
+ (void *)&id);
+
+ if (rc < 0) {
+ fprintf(stderr, "calling %s/%s(%s) failed: %m\n", AFBClient::wmAPI, verb,
+ json_object_to_json_string(jp));
+ } else {
+ // Lets make this call sync here...
+ dispatch(-1);
+
+ if (! id.is_not_set) {
+ char *buf;
+ asprintf(&buf, "%d", id.value);
+ printf("setenv(\"QT_IVI_SURFACE_ID\", %s, 1)\n", buf);
+ if (setenv("QT_IVI_SURFACE_ID", buf, 1) != 0) {
+ fprintf(stderr, "putenv failed: %m\n");
+ } else {
+ rc = 0; // Single point of success
+ }
+ } else {
+ fprintf(stderr, "Could not get surface ID from WM\n");
+ rc = -EINVAL;
+ }
+ }
+
+ printf("AFBClient::requestSurface(%s) = %d <--\n", label, rc);
+
+ return rc;
}
-void AFBClient::activateSurface(const char *label)
+int AFBClient::activateSurface(const char *label)
{
- printf("activateSurface(%s) -->\n", label);
+ printf("AFBClient::activateSurface(%s) -->\n", label);
fflush(stdout);
const char begin[] = "{\"drawing_name\":\"";
strcat(parameter, end);
call(AFBClient::wmAPI, verb, parameter);
- printf("activateSurface(%s) <--\n", label);
+ // Sync this one too
+ dispatch(-1);
+
+ printf("AFBClient::activateSurface(%s) <--\n", label);
fflush(stdout);
+ return 0;
}
-void AFBClient::deactivateSurface(const char *label)
+int AFBClient::deactivateSurface(const char *label)
{
- UNUSED(label);
+ printf("AFBClient::deactivateSurface(%s) -->\n", label);
+ fflush(stdout);
+ json_object *j = json_object_new_object();
+ json_object_object_add(j, "drawing_name", json_object_new_string(label));
+ call(AFBClient::wmAPI, "deactivate_surface", json_object_to_json_string(j));
+ json_object_put(j);
+ dispatch(-1);
+ printf("AFBClient::deactivateSurface(%s) <--\n", label);
+ fflush(stdout);
+ return 0;
}
-void AFBClient::endDraw(const char *label)
+int AFBClient::endDraw(const char *label)
{
- UNUSED(label);
+ printf("AFBClient::endDraw(%s) -->\n", label);
+ fflush(stdout);
+ json_object *j = json_object_new_object();
+ json_object_object_add(j, "drawing_name", json_object_new_string(label));
+ call(AFBClient::wmAPI, "enddraw", json_object_to_json_string(j));
+ json_object_put(j);
+ dispatch(-1);
+ printf("AFBClient::endDraw(%s) <--\n", label);
+ fflush(stdout);
+ return 0;
}
/* called when wsj1 receives a method invocation */
void AFBClient::onCall(void *closure, const char *api, const char *verb, struct afb_wsj1_msg *msg)
{
-#ifdef AFB
UNUSED(closure);
int rc;
printf("ON-CALL %s/%s:\n%s\n", api, verb,
rc = afb_wsj1_reply_error_s(msg, "\"unimplemented\"", NULL);
if (rc < 0)
fprintf(stderr, "replying failed: %m\n");
-#endif
}
/* called when wsj1 receives an event */
void AFBClient::onEvent(void *closure, const char *event, afb_wsj1_msg *msg)
{
-#ifdef AFB
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);
-#endif
}
/* called when wsj1 hangsup */
/* called when wsj1 receives a reply */
void AFBClient::onReply(void *closure, afb_wsj1_msg *msg)
{
-#ifdef AFB
printf("ON-REPLY %s: %s\n%s\n", (char*)closure,
afb_wsj1_msg_is_reply_ok(msg) ? "OK" : "ERROR",
json_object_to_json_string_ext(afb_wsj1_msg_object_j(msg),
JSON_C_TO_STRING_PRETTY));
fflush(stdout);
free(closure);
-#endif
-}
-
-void AFBClient::onRequestSurfaceReply(void *closure, afb_wsj1_msg *msg)
-{
-#ifdef AFB
- printf("onRequestSurfaceReply %s: %s\n%s\n", (char*)closure,
- afb_wsj1_msg_is_reply_ok(msg) ? "OK" : "ERROR",
- json_object_to_json_string_ext(afb_wsj1_msg_object_j(msg),
- JSON_C_TO_STRING_PRETTY));
- printf("\n\n===>RETURN STR: %s\n\n", afb_wsj1_msg_object_s(msg));
- // putenv("QT_IVI_SURFACE_ID=16778219");
- fflush(stdout);
- free(closure);
-#endif
}
/* makes a call */
void AFBClient::call(const char *api, const char *verb, const char *object)
{
-#ifdef AFB
static int num = 0;
char *key;
int rc;
printf("call(%s, %s, %s) <--\n", api, verb, object);
fflush(stdout);
-#endif
}
/* sends an event */
void AFBClient::event(const char *event, const char *object)
{
-#ifdef AFB
int rc;
rc = afb_wsj1_send_event_s(wsj1, event, object);
if (rc < 0)
fprintf(stderr, "sending !%s(%s) failed: %m\n", event, object);
-#endif
+}
+
+void AFBClient::set_event_handler(enum EventType at, std::function<void(char const *)> func) {
+ // XXX todo
}
Code Review / staging / windowmanager.git / blobdiff