aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcus Fritzsch <marcus_fritzsch@mentor.com>2017-08-31 14:49:43 +0200
committerMarcus Fritzsch <marcus_fritzsch@mentor.com>2017-09-14 14:04:51 +0200
commitf9ab62922d45a9524d9f6af269aefd1af3c2e850 (patch)
tree685e8897f88e5a3d73a21180f2ec507025df0bf4
parent2624def304610c4111d11ca529e1e8433ede453e (diff)
AFBClient:: clang-format
Signed-off-by: Marcus Fritzsch <marcus_fritzsch@mentor.com>
-rw-r--r--AFBClient.cpp221
1 files changed, 105 insertions, 116 deletions
diff --git a/AFBClient.cpp b/AFBClient.cpp
index d63b8c1..eef3617 100644
--- a/AFBClient.cpp
+++ b/AFBClient.cpp
@@ -1,9 +1,9 @@
#include "AFBClient.h"
#include <cctype>
-#include <stdlib.h>
-#include <stdio.h>
#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
#include <unistd.h>
@@ -32,9 +32,9 @@ int ScopeTrace::indent = 0;
#endif
/* called when wsj1 receives a method invocation */
-void onCall(void *closure, const char *api, const char *verb, struct afb_wsj1_msg *msg)
-{
- TRACE();
+void onCall(void *closure, const char *api, const char *verb,
+ struct afb_wsj1_msg *msg) {
+ TRACE();
UNUSED(closure);
int rc;
printf("ON-CALL %s/%s:\n%s\n", api, verb,
@@ -47,9 +47,8 @@ void onCall(void *closure, const char *api, const char *verb, struct afb_wsj1_ms
}
/* called when wsj1 receives an event */
-void onEvent(void *closure, const char *event, afb_wsj1_msg *msg)
-{
- TRACE();
+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),
@@ -58,9 +57,8 @@ void onEvent(void *closure, const char *event, afb_wsj1_msg *msg)
}
/* called when wsj1 hangsup */
-void onHangup(void *closure, afb_wsj1 *wsj1)
-{
- TRACE();
+void onHangup(void *closure, afb_wsj1 *wsj1) {
+ TRACE();
UNUSED(closure);
UNUSED(wsj1);
printf("ON-HANGUP\n");
@@ -69,10 +67,9 @@ void onHangup(void *closure, afb_wsj1 *wsj1)
}
/* called when wsj1 receives a reply */
-void onReply(void *closure, afb_wsj1_msg *msg)
-{
- TRACE();
- printf("ON-REPLY %s: %s\n%s\n", (char*)closure,
+void onReply(void *closure, afb_wsj1_msg *msg) {
+ TRACE();
+ 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));
@@ -82,59 +79,56 @@ void onReply(void *closure, afb_wsj1_msg *msg)
} // namespace
-AFBClient &AFBClient::instance()
-{
- TRACE();
- static AFBClient obj;
- return obj;
+AFBClient &AFBClient::instance() {
+ TRACE();
+ static AFBClient obj;
+ return obj;
}
-AFBClient::AFBClient() : wsj1{}, itf{}, loop{}
-{
- TRACE();
+AFBClient::AFBClient() : wsj1{}, itf{}, loop{} {
+ TRACE();
///* itinializing the callback interface for wsj1 */
itf.on_hangup = onHangup;
itf.on_call = onCall;
itf.on_event = onEvent;
}
-AFBClient::~AFBClient()
-{
- TRACE();
- sd_event_unref(loop);
- loop = nullptr;
+AFBClient::~AFBClient() {
+ TRACE();
+ sd_event_unref(loop);
+ loop = nullptr;
}
-int AFBClient::init(int port, char const *token)
-{
- TRACE();
+int AFBClient::init(int port, char const *token) {
+ TRACE();
char *uribuf = nullptr;
int rc = -1;
if (!token || strlen(token) > token_maxlen) {
- fprintf(stderr, "Token is invalid\n");
- rc = -EINVAL;
- goto fail;
+ 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 (!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;
+ fprintf(stderr, "Port is invalid\n");
+ rc = -EINVAL;
+ goto fail;
}
/* get the default event loop */
rc = sd_event_default(&loop);
if (rc < 0) {
- fprintf(stderr, "Connection to default event loop failed: %s\n", strerror(-rc));
+ fprintf(stderr, "Connection to default event loop failed: %s\n",
+ strerror(-rc));
goto fail;
}
@@ -156,76 +150,73 @@ fail:
}
int AFBClient::dispatch(uint64_t timeout) {
- TRACE();
+ TRACE();
return sd_event_run(loop, timeout);
}
-int AFBClient::requestSurface(const char *label)
-{
- TRACE();
- constexpr char const *verb = "request_surface";
-
- json_object *jp = json_object_new_object();
- json_object_object_add(jp, "drawing_name", json_object_new_string(label));
-
- // std::experimental::optional look-alike
- struct optional {
- int value;
- bool is_not_set;
- };
-
- constexpr struct optional const nullopt = {0, true};
- auto id = nullopt;
-
- /* send the request */
- int rc = afb_wsj1_call_j(
- wsj1, 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", 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;
- }
- }
-
- return rc;
+int AFBClient::requestSurface(const char *label) {
+ TRACE();
+ constexpr char const *verb = "request_surface";
+
+ json_object *jp = json_object_new_object();
+ json_object_object_add(jp, "drawing_name", json_object_new_string(label));
+
+ // std::experimental::optional look-alike
+ struct optional {
+ int value;
+ bool is_not_set;
+ };
+
+ constexpr struct optional const nullopt = {0, true};
+ auto id = nullopt;
+
+ /* send the request */
+ int rc = afb_wsj1_call_j(
+ wsj1, 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", 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;
+ }
+ }
+
+ return rc;
}
-int AFBClient::activateSurface(const char *label)
-{
- TRACE();
+int AFBClient::activateSurface(const char *label) {
+ TRACE();
const char begin[] = "{\"drawing_name\":\"";
const char end[] = "\"}";
const char verb[] = "activate_surface";
- char *parameter = (char *)malloc(strlen(begin) +
- strlen(label) +
- strlen(end) + 1);
+ char *parameter =
+ (char *)malloc(strlen(begin) + strlen(label) + strlen(end) + 1);
strcpy(parameter, begin);
strcat(parameter, label);
strcat(parameter, end);
@@ -237,9 +228,8 @@ int AFBClient::activateSurface(const char *label)
return 0;
}
-int AFBClient::deactivateSurface(const char *label)
-{
- TRACE();
+int AFBClient::deactivateSurface(const char *label) {
+ TRACE();
json_object *j = json_object_new_object();
json_object_object_add(j, "drawing_name", json_object_new_string(label));
call(wmAPI, "deactivate_surface", json_object_to_json_string(j));
@@ -248,9 +238,8 @@ int AFBClient::deactivateSurface(const char *label)
return 0;
}
-int AFBClient::endDraw(const char *label)
-{
- TRACE();
+int AFBClient::endDraw(const char *label) {
+ TRACE();
json_object *j = json_object_new_object();
json_object_object_add(j, "drawing_name", json_object_new_string(label));
call(wmAPI, "enddraw", json_object_to_json_string(j));
@@ -260,9 +249,8 @@ int AFBClient::endDraw(const char *label)
}
/* makes a call */
-void AFBClient::call(const char *api, const char *verb, const char *object)
-{
- TRACE();
+void AFBClient::call(const char *api, const char *verb, const char *object) {
+ TRACE();
static int num = 0;
char *key;
int rc;
@@ -280,7 +268,8 @@ void AFBClient::call(const char *api, const char *verb, const char *object)
fflush(stdout);
}
-void AFBClient::set_event_handler(enum EventType at, std::function<void(char const *)> func) {
- TRACE();
- // XXX todo
+void AFBClient::set_event_handler(enum EventType at,
+ std::function<void(char const *)> func) {
+ TRACE();
+ // XXX todo
}