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

Merge pull request #1542 from emersion/swaymsg-output

Browse source 
Pretty-print all output info in swaymsg -t get_outputs
This commit is contained in:
Drew DeVault 2017-12-29 11:18:36 -05:00 committed by GitHub
parent 60ac3f2e82 fff67906e1
commit 150e145a51
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
swaymsg/main.c
View file

@ -107,29 +107,42 @@ static void pretty_print_input(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, *scale; json_object *name, *rect, *focused, *active, *ws;
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 *make, *model, *serial, *scale, *refresh, *transform;
json_object_object_get_ex(o, "make", &make);
json_object_object_get_ex(o, "model", &model);
json_object_object_get_ex(o, "serial", &serial);
json_object_object_get_ex(o, "scale", &scale); json_object_object_get_ex(o, "scale", &scale);
json_object_object_get_ex(o, "refresh", &refresh);
json_object_object_get_ex(o, "transform", &transform);
json_object *x, *y, *width, *height; json_object *x, *y, *width, *height;
json_object_object_get_ex(rect, "x", &x); json_object_object_get_ex(rect, "x", &x);
json_object_object_get_ex(rect, "y", &y); json_object_object_get_ex(rect, "y", &y);
json_object_object_get_ex(rect, "width", &width); json_object_object_get_ex(rect, "width", &width);
json_object_object_get_ex(rect, "height", &height); json_object_object_get_ex(rect, "height", &height);
printf( printf(
"Output %s%s%s\n" "Output %s '%s %s %s'%s%s\n"
" Geometry: %dx%d @ %d,%d\n" " Mode: %dx%d @ %f Hz\n"
" Position: %d,%d\n"
" Scale factor: %dx\n" " Scale factor: %dx\n"
" Transform: %s\n"
" Workspace: %s\n\n", " Workspace: %s\n\n",
json_object_get_string(name), json_object_get_string(name),
json_object_get_string(make),
json_object_get_string(model),
json_object_get_string(serial),
json_object_get_boolean(focused) ? " (focused)" : "", json_object_get_boolean(focused) ? " (focused)" : "",
!json_object_get_boolean(active) ? " (inactive)" : "", !json_object_get_boolean(active) ? " (inactive)" : "",
json_object_get_int(width), json_object_get_int(height), json_object_get_int(width), json_object_get_int(height),
(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_int(scale),
json_object_get_string(transform),
json_object_get_string(ws) json_object_get_string(ws)
); );
} }