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

ipc: move refresh to current_mode

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