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

Merge pull request #3052 from colemickens/output-current-mode

Browse source 
Correct "Current mode" in `swaymsg -t get_outputs` for scaled outputs
This commit is contained in:
Drew DeVault 2018-11-03 17:37:15 +01:00 committed by GitHub
parent 6297b757b1 1f486fe898
commit baf4841d79
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sway/ipc-json.c
View file

@ -136,13 +136,18 @@ static void ipc_json_describe_output(struct sway_output *output,
json_object_new_int(mode->width)); json_object_new_int(mode->width));
json_object_object_add(mode_object, "height", json_object_object_add(mode_object, "height",
json_object_new_int(mode->height)); json_object_new_int(mode->height));
json_object_object_add(mode_object, "refresh",
json_object_new_int(mode->refresh));
json_object_array_add(modes_array, mode_object); json_object_array_add(modes_array, mode_object);
} }
json_object_object_add(object, "modes", modes_array); json_object_object_add(object, "modes", modes_array);
json_object *current_mode_object = json_object_new_object();
json_object_object_add(current_mode_object, "width",
json_object_new_int(wlr_output->width));
json_object_object_add(current_mode_object, "height",
json_object_new_int(wlr_output->height));
json_object_object_add(object, "current_mode", current_mode_object);
struct sway_node *parent = node_get_parent(&output->node); struct sway_node *parent = node_get_parent(&output->node);
struct wlr_box parent_box = {0, 0, 0, 0}; struct wlr_box parent_box = {0, 0, 0, 0};

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)
); );