mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-18 05:59:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1525 from emersion/ipc-get-outputs

Browse source 
Add IPC get_outputs
This commit is contained in:
Drew DeVault 2017-12-18 09:21:14 -05:00 committed by GitHub
parent 1aab9ae3e7 4e2ab53119
commit 4fea223aba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 53 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/sway/ipc-json.h
View file

@ -5,6 +5,7 @@
json_object *ipc_json_get_version();
json_object *ipc_json_describe_container(swayc_t *c);
json_object *ipc_json_describe_container_recursive(swayc_t *c);
#endif

38
sway/ipc-json.c
View file

@ -4,6 +4,7 @@
#include "log.h"
#include "sway/ipc-json.h"
#include "sway/container.h"
#include "sway/output.h"
#include <wlr/types/wlr_box.h>
#include <wlr/types/wlr_output.h>
@ -38,10 +39,43 @@ static void ipc_json_describe_root(swayc_t *root, json_object *object) {
json_object_object_add(object, "layout", json_object_new_string("splith"));
}
static void ipc_json_describe_output(swayc_t *output, json_object *object) {
static const char *ipc_json_get_output_transform(enum wl_output_transform transform) {
switch (transform) {
case WL_OUTPUT_TRANSFORM_NORMAL:
return "normal";
case WL_OUTPUT_TRANSFORM_90:
return "90";
case WL_OUTPUT_TRANSFORM_180:
return "180";
case WL_OUTPUT_TRANSFORM_270:
return "270";
case WL_OUTPUT_TRANSFORM_FLIPPED:
return "flipped";
case WL_OUTPUT_TRANSFORM_FLIPPED_90:
return "flipped-90";
case WL_OUTPUT_TRANSFORM_FLIPPED_180:
return "flipped-180";
case WL_OUTPUT_TRANSFORM_FLIPPED_270:
return "flipped-270";
}
return NULL;
}
static void ipc_json_describe_output(swayc_t *container, json_object *object) {
struct wlr_output *wlr_output = container->sway_output->wlr_output;
json_object_object_add(object, "type", json_object_new_string("output"));
json_object_object_add(object, "active", json_object_new_boolean(true));
json_object_object_add(object, "primary", json_object_new_boolean(false));
json_object_object_add(object, "layout", json_object_new_string("output"));
json_object_object_add(object, "make", json_object_new_string(wlr_output->make));
json_object_object_add(object, "model", json_object_new_string(wlr_output->model));
json_object_object_add(object, "serial", json_object_new_string(wlr_output->serial));
json_object_object_add(object, "scale", json_object_new_double(wlr_output->scale));
json_object_object_add(object, "refresh", json_object_new_int(wlr_output->refresh));
json_object_object_add(object, "transform",
json_object_new_string(ipc_json_get_output_transform(wlr_output->transform)));
json_object_object_add(object, "current_workspace",
(output->focused) ? json_object_new_string(output->focused->name) : NULL);
(container->focused) ? json_object_new_string(container->focused->name) : NULL);
}
static void ipc_json_describe_workspace(swayc_t *workspace, json_object *object) {

16
sway/ipc-server.c
View file

@ -343,6 +343,22 @@ void ipc_client_handle_command(struct ipc_client *client) {
goto exit_cleanup;
}
case IPC_GET_OUTPUTS:
{
json_object *outputs = json_object_new_array();
for (int i = 0; i < root_container.children->length; ++i) {
swayc_t *container = root_container.children->items[i];
if (container->type == C_OUTPUT) {
json_object_array_add(outputs,
ipc_json_describe_container(container));
}
}
const char *json_string = json_object_to_json_string(outputs);
ipc_send_reply(client, json_string, (uint32_t) strlen(json_string));
json_object_put(outputs); // free
goto exit_cleanup;
}
case IPC_GET_TREE:
{
json_object *tree =