From 4ab55060644a9c7f01e8f257b7dd34067adfaaf8 Mon Sep 17 00:00:00 2001 From: emersion Date: Mon, 12 Mar 2018 13:48:42 +0100 Subject: ipc: add output modes --- swaymsg/main.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) (limited to 'swaymsg') diff --git a/swaymsg/main.c b/swaymsg/main.c index 88b14813..c9be3a86 100644 --- a/swaymsg/main.c +++ b/swaymsg/main.c @@ -125,13 +125,16 @@ static void pretty_print_output(json_object *o) { json_object_object_get_ex(rect, "y", &y); json_object_object_get_ex(rect, "width", &width); json_object_object_get_ex(rect, "height", &height); + json_object *modes; + json_object_object_get_ex(o, "modes", &modes); + printf( "Output %s '%s %s %s'%s%s\n" - " Mode: %dx%d @ %f Hz\n" + " Current mode: %dx%d @ %f Hz\n" " Position: %d,%d\n" " Scale factor: %dx\n" " Transform: %s\n" - " Workspace: %s\n\n", + " Workspace: %s\n", json_object_get_string(name), json_object_get_string(make), json_object_get_string(model), @@ -145,6 +148,25 @@ static void pretty_print_output(json_object *o) { json_object_get_string(transform), json_object_get_string(ws) ); + + size_t modes_len = json_object_array_length(modes); + if (modes_len > 0) { + printf(" Available modes:\n"); + for (size_t i = 0; i < modes_len; ++i) { + json_object *mode = json_object_array_get_idx(modes, i); + + json_object *mode_width, *mode_height, *mode_refresh; + json_object_object_get_ex(mode, "width", &mode_width); + json_object_object_get_ex(mode, "height", &mode_height); + json_object_object_get_ex(mode, "refresh", &mode_refresh); + + printf(" %dx%d @ %f Hz\n", json_object_get_int(mode_width), + json_object_get_int(mode_height), + (float)json_object_get_int(mode_refresh) / 1000); + } + } + + printf("\n"); } static void pretty_print_version(json_object *v) { -- cgit v1.2.3