1 files changed, 16 insertions, 6 deletions

diff --git a/sway/ipc-json.c b/sway/ipc-json.c
index 4c2bcc98..06cb7e11 100644
--- a/sway/ipc-json.c
+++ b/sway/ipc-json.c
@@ -5,6 +5,7 @@
 #include "sway/config.h"
 #include "sway/ipc-json.h"
 #include "sway/tree/container.h"
+#include "sway/tree/view.h"
 #include "sway/tree/workspace.h"
 #include "sway/output.h"
 #include "sway/input/input-manager.h"
@@ -23,8 +24,6 @@ static const char *ipc_json_layout_description(enum sway_container_layout l) {
 		return "tabbed";
 	case L_STACKED:
 		return "stacked";
-	case L_FLOATING:
-		return "floating";
 	case L_NONE:
 		break;
 	}
@@ -180,10 +179,11 @@ static void ipc_json_describe_workspace(struct sway_container *workspace,
 
 	// Floating
 	json_object *floating_array = json_object_new_array();
-	struct sway_container *floating = workspace->sway_workspace->floating;
-	for (int i = 0; i < floating->children->length; ++i) {
-		struct sway_container *floater = floating->children->items[i];
-		json_object_array_add(floating_array, ipc_json_describe_container_recursive(floater));
+	list_t *floating = workspace->sway_workspace->floating;
+	for (int i = 0; i < floating->length; ++i) {
+		struct sway_container *floater = floating->items[i];
+		json_object_array_add(floating_array,
+				ipc_json_describe_container_recursive(floater));
 	}
 	json_object_object_add(object, "floating_nodes", floating_array);
 }
@@ -193,6 +193,16 @@ static void ipc_json_describe_view(struct sway_container *c, json_object *object
 			c->name ? json_object_new_string(c->name) : NULL);
 	json_object_object_add(object, "type", json_object_new_string("con"));
 
+	if (c->type == C_VIEW) {
+		const char *app_id = view_get_app_id(c->sway_view);
+		json_object_object_add(object, "app_id",
+				app_id ? json_object_new_string(app_id) : NULL);
+
+		const char *class = view_get_class(c->sway_view);
+		json_object_object_add(object, "class",
+				class ? json_object_new_string(class) : NULL);
+	}
+
 	if (c->parent) {
 		json_object_object_add(object, "layout",
 			json_object_new_string(ipc_json_layout_description(c->layout)));