diff options
| author | Cole Mickens <cole.mickens@gmail.com> | 2018-11-02 01:34:33 -0700 |
|---|---|---|
| committer | Cole Mickens <cole.mickens@gmail.com> | 2018-11-03 04:30:53 -0700 |
| commit | 1f486fe89819c28c3b04f8da3456aa9e7888a2eb (patch) | |
| tree | 5dfe97b2acfe005b74fc23fa4db8ab04b91aa747 /swaymsg/main.c | |
| parent | d05aeb77a00a957854c12b188b6a3268f7782df9 (diff) | |
swaymsg: get_outputs: use output->current_mode for current mode display
Diffstat (limited to 'swaymsg/main.c')
| -rw-r--r-- | swaymsg/main.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/swaymsg/main.c b/swaymsg/main.c index 3c984225..e13dd7ec 100644 --- a/swaymsg/main.c +++ b/swaymsg/main.c @@ -183,13 +183,15 @@ static void pretty_print_output(json_object *o) { json_object_object_get_ex(rect, "height", &height); json_object *modes; json_object_object_get_ex(o, "modes", &modes); + json_object *current_mode; + json_object_object_get_ex(o, "current_mode", ¤t_mode); if (json_object_get_boolean(active)) { printf( "Output %s '%s %s %s'%s\n" " Current mode: %dx%d @ %f Hz\n" " Position: %d,%d\n" - " Scale factor: %dx\n" + " Scale factor: %f\n" " Transform: %s\n" " Workspace: %s\n", json_object_get_string(name), @@ -197,10 +199,13 @@ static void pretty_print_output(json_object *o) { json_object_get_string(model), json_object_get_string(serial), json_object_get_boolean(focused) ? " (focused)" : "", - json_object_get_int(width), json_object_get_int(height), + json_object_get_int( + json_object_object_get(current_mode, "width")), + json_object_get_int( + json_object_object_get(current_mode, "height")), (float)json_object_get_int(refresh) / 1000, json_object_get_int(x), json_object_get_int(y), - json_object_get_int(scale), + json_object_get_double(scale), json_object_get_string(transform), json_object_get_string(ws) ); |