- printf("requestSurface(%s) -->\n", label);
- fflush(stdout);
-
- 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);
-
- /* allocates an id for the request */
- rc = asprintf(&key, "%d:%s/%s", ++num, AFBClient::wmAPI, verb);
-
- /* 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);
-
- printf("requestSurface(%s) <--\n", label);
- fflush(stdout);
+ printf("requestSurface(%s) -->\n", label);
+ constexpr char const *verb = "request_surface";
+ int ret = -1;
+
+ 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 nullopt = {0, true};
+ auto id = nullopt;
+
+ /* 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 {
+ ret = 0; // Single point of success
+ }
+ } else {
+ fprintf(stderr, "Could not get surface ID from WM\n");
+ }
+ }
+
+ printf("requestSurface(%s) = %d <--\n", label, ret);
+
+ return ret;