diff options
Diffstat (limited to 'sway/ipc-json.c')
-rw-r--r-- | sway/ipc-json.c | 38 |
1 files changed, 36 insertions, 2 deletions
diff --git a/sway/ipc-json.c b/sway/ipc-json.c index 2e774a96..09a32c1b 100644 --- a/sway/ipc-json.c +++ b/sway/ipc-json.c | |||
@@ -4,6 +4,7 @@ | |||
4 | #include "log.h" | 4 | #include "log.h" |
5 | #include "sway/ipc-json.h" | 5 | #include "sway/ipc-json.h" |
6 | #include "sway/container.h" | 6 | #include "sway/container.h" |
7 | #include "sway/output.h" | ||
7 | #include <wlr/types/wlr_box.h> | 8 | #include <wlr/types/wlr_box.h> |
8 | #include <wlr/types/wlr_output.h> | 9 | #include <wlr/types/wlr_output.h> |
9 | 10 | ||
@@ -38,10 +39,43 @@ static void ipc_json_describe_root(swayc_t *root, json_object *object) { | |||
38 | json_object_object_add(object, "layout", json_object_new_string("splith")); | 39 | json_object_object_add(object, "layout", json_object_new_string("splith")); |
39 | } | 40 | } |
40 | 41 | ||
41 | static void ipc_json_describe_output(swayc_t *output, json_object *object) { | 42 | static const char *ipc_json_get_output_transform(enum wl_output_transform transform) { |
43 | switch (transform) { | ||
44 | case WL_OUTPUT_TRANSFORM_NORMAL: | ||
45 | return "normal"; | ||
46 | case WL_OUTPUT_TRANSFORM_90: | ||
47 | return "90"; | ||
48 | case WL_OUTPUT_TRANSFORM_180: | ||
49 | return "180"; | ||
50 | case WL_OUTPUT_TRANSFORM_270: | ||
51 | return "270"; | ||
52 | case WL_OUTPUT_TRANSFORM_FLIPPED: | ||
53 | return "flipped"; | ||
54 | case WL_OUTPUT_TRANSFORM_FLIPPED_90: | ||
55 | return "flipped-90"; | ||
56 | case WL_OUTPUT_TRANSFORM_FLIPPED_180: | ||
57 | return "flipped-180"; | ||
58 | case WL_OUTPUT_TRANSFORM_FLIPPED_270: | ||
59 | return "flipped-270"; | ||
60 | } | ||
61 | return NULL; | ||
62 | } | ||
63 | |||
64 | static void ipc_json_describe_output(swayc_t *container, json_object *object) { | ||
65 | struct wlr_output *wlr_output = container->sway_output->wlr_output; | ||
42 | json_object_object_add(object, "type", json_object_new_string("output")); | 66 | json_object_object_add(object, "type", json_object_new_string("output")); |
67 | json_object_object_add(object, "active", json_object_new_boolean(true)); | ||
68 | json_object_object_add(object, "primary", json_object_new_boolean(false)); | ||
69 | json_object_object_add(object, "layout", json_object_new_string("output")); | ||
70 | json_object_object_add(object, "make", json_object_new_string(wlr_output->make)); | ||
71 | json_object_object_add(object, "model", json_object_new_string(wlr_output->model)); | ||
72 | json_object_object_add(object, "serial", json_object_new_string(wlr_output->serial)); | ||
73 | json_object_object_add(object, "scale", json_object_new_double(wlr_output->scale)); | ||
74 | json_object_object_add(object, "refresh", json_object_new_int(wlr_output->refresh)); | ||
75 | json_object_object_add(object, "transform", | ||
76 | json_object_new_string(ipc_json_get_output_transform(wlr_output->transform))); | ||
43 | json_object_object_add(object, "current_workspace", | 77 | json_object_object_add(object, "current_workspace", |
44 | (output->focused) ? json_object_new_string(output->focused->name) : NULL); | 78 | (container->focused) ? json_object_new_string(container->focused->name) : NULL); |
45 | } | 79 | } |
46 | 80 | ||
47 | static void ipc_json_describe_workspace(swayc_t *workspace, json_object *object) { | 81 | static void ipc_json_describe_workspace(swayc_t *workspace, json_object *object) { |