diff options
| author | emersion <contact@emersion.fr> | 2018-11-03 23:44:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-03 23:44:04 +0100 |
| commit | d19648a304dd7c6731ce53a7b7a265019f5b4473 (patch) | |
| tree | 0396af53f1684e36469ea8a651281d3c1228f391 /sway/ipc-json.c | |
| parent | c18cd9dd0369452a8b09ac2290d4a0a5b29d6ded (diff) | |
| parent | ef888321bacd22d061670d7172b21a79362d7d09 (diff) | |
Merge pull request #3061 from colemickens/output-current-mode
ipc: move refresh to current_mode
Diffstat (limited to 'sway/ipc-json.c')
| -rw-r--r-- | sway/ipc-json.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sway/ipc-json.c b/sway/ipc-json.c index 7cc965c8..4583558c 100644 --- a/sway/ipc-json.c +++ b/sway/ipc-json.c @@ -118,8 +118,6 @@ static void ipc_json_describe_output(struct sway_output *output, json_object_new_string(wlr_output->serial)); json_object_object_add(object, "scale", json_object_new_double(wlr_output->scale)); - json_object_object_add(object, "refresh", - json_object_new_int(wlr_output->refresh)); json_object_object_add(object, "transform", json_object_new_string( ipc_json_get_output_transform(wlr_output->transform))); @@ -136,6 +134,8 @@ static void ipc_json_describe_output(struct sway_output *output, 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); } @@ -146,6 +146,8 @@ static void ipc_json_describe_output(struct sway_output *output, 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(current_mode_object, "refresh", + json_object_new_int(wlr_output->refresh)); json_object_object_add(object, "current_mode", current_mode_object); struct sway_node *parent = node_get_parent(&output->node); |