diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-11-03 17:37:15 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-03 17:37:15 +0100 |
commit | baf4841d790a976bc6293b9b5d1e70621f236747 (patch) | |
tree | 5dfe97b2acfe005b74fc23fa4db8ab04b91aa747 /sway/ipc-json.c | |
parent | Correction to dependency updates (diff) | |
parent | swaymsg: get_outputs: use output->current_mode for current mode display (diff) | |
download | sway-baf4841d790a976bc6293b9b5d1e70621f236747.tar.gz sway-baf4841d790a976bc6293b9b5d1e70621f236747.tar.zst sway-baf4841d790a976bc6293b9b5d1e70621f236747.zip |
Merge pull request #3052 from colemickens/output-current-mode
Correct "Current mode" in `swaymsg -t get_outputs` for scaled outputs
Diffstat (limited to 'sway/ipc-json.c')
-rw-r--r-- | sway/ipc-json.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sway/ipc-json.c b/sway/ipc-json.c index 20ab57b4..7cc965c8 100644 --- a/sway/ipc-json.c +++ b/sway/ipc-json.c | |||
@@ -136,13 +136,18 @@ static void ipc_json_describe_output(struct sway_output *output, | |||
136 | json_object_new_int(mode->width)); | 136 | json_object_new_int(mode->width)); |
137 | json_object_object_add(mode_object, "height", | 137 | json_object_object_add(mode_object, "height", |
138 | json_object_new_int(mode->height)); | 138 | json_object_new_int(mode->height)); |
139 | json_object_object_add(mode_object, "refresh", | ||
140 | json_object_new_int(mode->refresh)); | ||
141 | json_object_array_add(modes_array, mode_object); | 139 | json_object_array_add(modes_array, mode_object); |
142 | } | 140 | } |
143 | 141 | ||
144 | json_object_object_add(object, "modes", modes_array); | 142 | json_object_object_add(object, "modes", modes_array); |
145 | 143 | ||
144 | json_object *current_mode_object = json_object_new_object(); | ||
145 | json_object_object_add(current_mode_object, "width", | ||
146 | json_object_new_int(wlr_output->width)); | ||
147 | json_object_object_add(current_mode_object, "height", | ||
148 | json_object_new_int(wlr_output->height)); | ||
149 | json_object_object_add(object, "current_mode", current_mode_object); | ||
150 | |||
146 | struct sway_node *parent = node_get_parent(&output->node); | 151 | struct sway_node *parent = node_get_parent(&output->node); |
147 | struct wlr_box parent_box = {0, 0, 0, 0}; | 152 | struct wlr_box parent_box = {0, 0, 0, 0}; |
148 | 153 | ||