alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

converted IPC to use json-c

Browse source 
get_workspaces and get_outputs
This commit is contained in:
minus 2015-08-27 00:41:07 +02:00
parent c948432fb4
commit 873a51f7e2
1 changed files with 42 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

111
sway/ipc.c
View file

@ -41,11 +41,9 @@ int ipc_client_handle_readable(int client_fd, uint32_t mask, void *data);
void ipc_client_disconnect(struct ipc_client *client); void ipc_client_disconnect(struct ipc_client *client);
void ipc_client_handle_command(struct ipc_client *client); void ipc_client_handle_command(struct ipc_client *client);
bool ipc_send_reply(struct ipc_client *client, const char *payload, uint32_t payload_length); bool ipc_send_reply(struct ipc_client *client, const char *payload, uint32_t payload_length);
void ipc_get_workspaces_callback(swayc_t *container, void *data); void ipc_get_workspaces_callback(swayc_t *workspace, void *data);
void ipc_get_outputs_callback(swayc_t *container, void *data); void ipc_get_outputs_callback(swayc_t *container, void *data);
char *json_list(list_t *items);
void ipc_init(void) { void ipc_init(void) {
ipc_socket = socket(AF_UNIX, SOCK_STREAM | SOCK_NONBLOCK | SOCK_CLOEXEC, 0); ipc_socket = socket(AF_UNIX, SOCK_STREAM | SOCK_NONBLOCK | SOCK_CLOEXEC, 0);
if (ipc_socket == -1) { if (ipc_socket == -1) {
@ -209,22 +207,20 @@ void ipc_client_handle_command(struct ipc_client *client) {
} }
case IPC_GET_WORKSPACES: case IPC_GET_WORKSPACES:
{ {
list_t *workspaces = create_list(); json_object *workspaces = json_object_new_array();
container_map(&root_container, ipc_get_workspaces_callback, workspaces); container_map(&root_container, ipc_get_workspaces_callback, workspaces);
char *json = json_list(workspaces); const char *json_string = json_object_to_json_string(workspaces);
free_flat_list(workspaces); ipc_send_reply(client, json_string, (uint32_t) strlen(json_string));
ipc_send_reply(client, json, strlen(json)); json_object_put(workspaces); // free
free(json);
break; break;
} }
case IPC_GET_OUTPUTS: case IPC_GET_OUTPUTS:
{ {
list_t *outputs = create_list(); json_object *outputs = json_object_new_array();
container_map(&root_container, ipc_get_outputs_callback, outputs); container_map(&root_container, ipc_get_outputs_callback, outputs);
char *json = json_list(outputs); const char *json_string = json_object_to_json_string(outputs);
free_flat_list(outputs); ipc_send_reply(client, json_string, (uint32_t) strlen(json_string));
ipc_send_reply(client, json, strlen(json)); json_object_put(outputs); // free
free(json);
break; break;
} }
case IPC_GET_VERSION: case IPC_GET_VERSION:
@ -272,67 +268,44 @@ bool ipc_send_reply(struct ipc_client *client, const char *payload, uint32_t pay
return true; return true;
} }
char *json_list(list_t *items) { void ipc_get_workspaces_callback(swayc_t *workspace, void *data) {
char *json_elements = join_list(items, ","); if (workspace->type == C_WORKSPACE) {
size_t len = strlen(json_elements); int num = isdigit(workspace->name[0]) ? atoi(workspace->name) : -1;
char *json = malloc(len + 3); json_object *object = json_object_new_object();
json[0] = '['; json_object *rect = json_object_new_object();
memcpy(json + 1, json_elements, len); json_object_object_add(rect, "x", json_object_new_int((int32_t) workspace->x));
json[len+1] = ']'; json_object_object_add(rect, "y", json_object_new_int((int32_t) workspace->y));
json[len+2] = '\0'; json_object_object_add(rect, "width", json_object_new_int((int32_t) workspace->width));
free(json_elements); json_object_object_add(rect, "height", json_object_new_int((int32_t) workspace->height));
return json;
}
void ipc_get_workspaces_callback(swayc_t *container, void *data) { json_object_object_add(object, "num", json_object_new_int(num));
if (container->type == C_WORKSPACE) { json_object_object_add(object, "name", json_object_new_string(workspace->name));
char *json = malloc(512); // Output should usually be around 180 chars json_object_object_add(object, "visible", json_object_new_boolean(workspace->visible));
int num = isdigit(container->name[0]) ? atoi(container->name) : -1; bool focused = root_container.focused == workspace->parent && workspace->parent->focused == workspace;
// TODO: escape the name (quotation marks, unicode) json_object_object_add(object, "focused", json_object_new_boolean(focused));
sprintf(json, json_object_object_add(object, "rect", rect);
"{" json_object_object_add(object, "output", json_object_new_string(workspace->parent->name));
"\"num\":%d," json_object_object_add(object, "urgent", json_object_new_boolean(false));
"\"name\":\"%s\","
"\"visible\":%s," json_object_array_add((json_object *)data, object);
"\"focused\":%s,"
"\"rect\":{"
"\"x\":%d,"
"\"y\":%d,"
"\"width\":%d,"
"\"height\":%d"
"},"
"\"output\":\"%s\","
"\"urgent\":%s"
"}",
num, container->name, container->visible ? "true" : "false", container->is_focused ? "true" : "false",
(int)container->x, (int)container->y, (int)container->width, (int)container->height,
container->parent->name, "false" // TODO: urgent hint
);
list_add((list_t *)data, json);
} }
} }
void ipc_get_outputs_callback(swayc_t *container, void *data) { void ipc_get_outputs_callback(swayc_t *container, void *data) {
if (container->type == C_OUTPUT) { if (container->type == C_OUTPUT) {
char *json = malloc(512); // Output should usually be around 130 chars json_object *object = json_object_new_object();
// TODO: escape the name (quotation marks, unicode) json_object *rect = json_object_new_object();
sprintf(json, json_object_object_add(rect, "x", json_object_new_int((int32_t) container->x));
"{" json_object_object_add(rect, "y", json_object_new_int((int32_t) container->y));
"\"name\":\"%s\"," json_object_object_add(rect, "width", json_object_new_int((int32_t) container->width));
"\"active\":%s," json_object_object_add(rect, "height", json_object_new_int((int32_t) container->height));
"\"primary\":%s,"
"\"rect\":{" json_object_object_add(object, "name", json_object_new_string(container->name));
"\"x\":%d," json_object_object_add(object, "active", json_object_new_boolean(true));
"\"y\":%d," json_object_object_add(object, "primary", json_object_new_boolean(false));
"\"width\":%d," json_object_object_add(object, "rect", rect);
"\"height\":%d" json_object_object_add(object, "current_workspace", container->focused ? json_object_new_string(container->focused->name) : NULL);
"},"
"\"current_workspace\":\"%s\"" json_object_array_add((json_object *)data, object);
"}",
container->name, "true", "false", // TODO: active, primary
(int)container->x, (int)container->y, (int)container->width, (int)container->height,
container->focused ? container->focused->name : ""
);
list_add((list_t *)data, json);
} }
} }