mirrors
/
sway
mirror of https://github.com/swaywm/sway.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Send disabled output available modes on IPC get_outputs 

- Also fix missing trailing newline on pretty print

Signed-off-by: Ranieri Althoff <1993083+ranisalt@users.noreply.github.com>
This commit is contained in:
Ranieri Althoff 2019-04-15 21:46:50 -03:00 committed by Brian Ashworth
parent b2cfcebef6
commit fd6903673b
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sway/ipc-json.c
View File

@ -240,7 +240,21 @@ json_object *ipc_json_describe_disabled_output(struct sway_output *output) {
json_object_new_string(wlr_output->model));
json_object_object_add(object, "serial",
json_object_new_string(wlr_output->serial));
json_object_object_add(object, "modes", json_object_new_array());
json_object *modes_array = json_object_new_array();
struct wlr_output_mode *mode;
wl_list_for_each(mode, &wlr_output->modes, link) {
json_object *mode_object = json_object_new_object();
json_object_object_add(mode_object, "width",
json_object_new_int(mode->width));
json_object_object_add(mode_object, "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_object_add(object, "modes", modes_array);
json_object_object_add(object, "current_workspace", NULL);

2
swaymsg/main.c
View File

@ -230,7 +230,7 @@ static void pretty_print_output(json_object *o) {
);
} else {
printf(
"Output %s '%s %s %s' (inactive)",
"Output %s '%s %s %s' (inactive)\n",
json_object_get_string(name),
json_object_get_string(make),
json_object_get_string(model),