1 files changed, 17 insertions, 10 deletions

diff --git a/sway/commands/kill.c b/sway/commands/kill.c
index f6774767..46d6e98e 100644
--- a/sway/commands/kill.c
+++ b/sway/commands/kill.c
@@ -3,21 +3,28 @@
 #include "sway/input/input-manager.h"
 #include "sway/input/seat.h"
 #include "sway/tree/view.h"
+#include "sway/tree/container.h"
 #include "sway/commands.h"
 
 struct cmd_results *cmd_kill(int argc, char **argv) {
-        enum sway_container_type type = config->handler_context.current_container->type;
-        if (type != C_VIEW && type != C_CONTAINER) {
+        struct sway_container *con =
+                config->handler_context.current_container;
+
+        switch (con->type) {
+        case C_ROOT:
+        case C_OUTPUT:
+        case C_WORKSPACE:
+        case C_TYPES:
                 return cmd_results_new(CMD_INVALID, NULL,
                                 "Can only kill views and containers with this command");
-        }
-
-        // TODO close arbitrary containers without a view
-        struct sway_view *view =
-                config->handler_context.current_container->sway_view;
-
-        if (view) {
-                view_close(view);
+                break;
+        case C_CONTAINER:
+                con = container_destroy(con);
+                arrange_windows(con, -1, -1);
+                break;
+        case C_VIEW:
+                view_close(con->sway_view);
+                break;
         }
 
         return cmd_results_new(CMD_SUCCESS, NULL, NULL);