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

swaymsg: get_outputs: use output->current_mode for current mode display

Browse source
This commit is contained in:
Cole Mickens 2018-11-02 01:34:33 -07:00
parent d05aeb77a0
commit 1f486fe898
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
swaymsg/main.c
View file

@ -183,13 +183,15 @@ static void pretty_print_output(json_object *o) {
json_object_object_get_ex(rect, "height", &height); json_object_object_get_ex(rect, "height", &height);
json_object *modes; json_object *modes;
json_object_object_get_ex(o, "modes", &modes); json_object_object_get_ex(o, "modes", &modes);
json_object *current_mode;
json_object_object_get_ex(o, "current_mode", &current_mode);
if (json_object_get_boolean(active)) { if (json_object_get_boolean(active)) {
printf( printf(
"Output %s '%s %s %s'%s\n" "Output %s '%s %s %s'%s\n"
" Current mode: %dx%d @ %f Hz\n" " Current mode: %dx%d @ %f Hz\n"
" Position: %d,%d\n" " Position: %d,%d\n"
" Scale factor: %dx\n" " Scale factor: %f\n"
" Transform: %s\n" " Transform: %s\n"
" Workspace: %s\n", " Workspace: %s\n",
json_object_get_string(name), 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(model),
json_object_get_string(serial), json_object_get_string(serial),
json_object_get_boolean(focused) ? " (focused)" : "", 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, (float)json_object_get_int(refresh) / 1000,
json_object_get_int(x), json_object_get_int(y), 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(transform),
json_object_get_string(ws) json_object_get_string(ws)
); );