swaymsg: show non-desktop property when pretty printing outputs

This commit is contained in:
Alex Maese 2022-06-09 19:17:14 -05:00 committed by Simon Zeni
parent 52f0e3a4d5
commit cffb006feb

View file

@ -185,12 +185,13 @@ static void pretty_print_seat(json_object *i) {
} }
static void pretty_print_output(json_object *o) { static void pretty_print_output(json_object *o) {
json_object *name, *rect, *focused, *active, *ws, *current_mode; json_object *name, *rect, *focused, *active, *ws, *current_mode, *non_desktop;
json_object_object_get_ex(o, "name", &name); json_object_object_get_ex(o, "name", &name);
json_object_object_get_ex(o, "rect", &rect); json_object_object_get_ex(o, "rect", &rect);
json_object_object_get_ex(o, "focused", &focused); json_object_object_get_ex(o, "focused", &focused);
json_object_object_get_ex(o, "active", &active); json_object_object_get_ex(o, "active", &active);
json_object_object_get_ex(o, "current_workspace", &ws); json_object_object_get_ex(o, "current_workspace", &ws);
json_object_object_get_ex(o, "non_desktop", &non_desktop);
json_object *make, *model, *serial, *scale, *scale_filter, *subpixel, json_object *make, *model, *serial, *scale, *scale_filter, *subpixel,
*transform, *max_render_time, *adaptive_sync_status; *transform, *max_render_time, *adaptive_sync_status;
json_object_object_get_ex(o, "make", &make); json_object_object_get_ex(o, "make", &make);
@ -213,7 +214,15 @@ static void pretty_print_output(json_object *o) {
json_object_object_get_ex(current_mode, "height", &height); json_object_object_get_ex(current_mode, "height", &height);
json_object_object_get_ex(current_mode, "refresh", &refresh); json_object_object_get_ex(current_mode, "refresh", &refresh);
if (json_object_get_boolean(active)) { if (json_object_get_boolean(non_desktop)) {
printf(
"Output %s '%s %s %s' (non-desktop)\n",
json_object_get_string(name),
json_object_get_string(make),
json_object_get_string(model),
json_object_get_string(serial)
);
} else 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 @ %.3f Hz\n" " Current mode: %dx%d @ %.3f Hz\n"