Merge pull request #31 from Stebalien/arrange-after-kill

Arrange after killing a window

diff --git a/messages.c b/messages.c
index 98e9f3783c35cd52a5a29b4a5c49abaf6705556f..dac53436251ae2226f6fb95af8b5273b38ef6700 100644 (file)
--- a/messages.c
+++ b/messages.c
@@ -55,7 +55,7 @@ void process_message(char *msg, char *rsp)
     } else if (strcmp(cmd, "close") == 0) {
         window_close(mon->desk->focus);
     } else if (strcmp(cmd, "kill") == 0) {
-        window_kill(mon->desk, mon->desk->focus);
+        window_kill(mon, mon->desk, mon->desk->focus);
     } else if (strcmp(cmd, "rotate") == 0) {
         char *deg = strtok(NULL, TOK_SEP);
         if (deg != NULL) {

diff --git a/window.c b/window.c
index 7733558b1b1219467acee28a3de19c4f581f07a0..680c610cb91f5c2d610d6de0d85158d4ec985faf 100644 (file)
--- a/window.c
+++ b/window.c
@@ -328,7 +328,7 @@ void window_close(node_t *n)
     xcb_send_event(dpy, false, win, XCB_EVENT_MASK_NO_EVENT, (char *) &e);
 }
 
-void window_kill(desktop_t *d, node_t *n)
+void window_kill(monitor_t *m, desktop_t *d, node_t *n)
 {
     if (n == NULL)
         return;
@@ -338,6 +338,7 @@ void window_kill(desktop_t *d, node_t *n)
 
     xcb_kill_client(dpy, win);
     remove_node(d, n);
+    arrange(m, d);
 }
 
 void toggle_fullscreen(desktop_t *d, node_t *n)

diff --git a/window.h b/window.h
index 3d1b1547c4942e1b251f1599a4448741d3f65970..3a1a097be31d75f8123e666898f6bbcdc54cc320 100644 (file)
--- a/window.h
+++ b/window.h
@@ -24,7 +24,7 @@ void update_floating_rectangle(client_t *);
 void query_pointer(xcb_window_t *, xcb_point_t *);
 void list_windows(char *);
 void window_close(node_t *);
-void window_kill(desktop_t *, node_t *);
+void window_kill(monitor_t *, desktop_t *, node_t *);
 void toggle_fullscreen(desktop_t *, node_t *);
 void toggle_floating(desktop_t *, node_t *);
 void toggle_locked(monitor_t *, desktop_t *, node_t *);