Bugfix: Perform some bounds checking for snapped containers in fix_colrowspan (Thanks...

This fixes ticket #22

diff --git a/src/handlers.c b/src/handlers.c
index 88f7ec6508a49b90396baa51f8db11122acd392b..42f3b947fe412ec9ff088844ddfe4c5caef0b860 100644 (file)
--- a/src/handlers.c
+++ b/src/handlers.c
@@ -635,6 +635,8 @@ int handle_unmap_notify_event(void *data, xcb_connection_t *conn, xcb_unmap_noti
         if (client->container != NULL)
                 cleanup_table(conn, client->container->workspace);
 
+        fix_colrowspan(conn, client->container->workspace);
+
         /* Let’s see how many clients there are left on the workspace to delete it if it’s empty */
         bool workspace_empty = true;
         FOR_TABLE(client->workspace)

diff --git a/src/table.c b/src/table.c
index 0bf7aa4972f363ebb7273d56b76ff9ce3105ebf3..491d3bc85a25524d49bd3c6d301512eae9e35272 100644 (file)
--- a/src/table.c
+++ b/src/table.c
@@ -296,7 +296,7 @@ void cleanup_table(xcb_connection_t *conn, Workspace *workspace) {
 }
 
 /*
- * Fixes col/rowspan (makes sure there are no overlapping windows)
+ * Fixes col/rowspan (makes sure there are no overlapping windows, obeys borders).
  *
  */
 void fix_colrowspan(xcb_connection_t *conn, Workspace *workspace) {
@@ -305,16 +305,18 @@ void fix_colrowspan(xcb_connection_t *conn, Workspace *workspace) {
         FOR_TABLE(workspace) {
                 Container *con = workspace->table[cols][rows];
                 if (con->colspan > 1) {
-                        LOG("gots one with colspan %d\n", con->colspan);
+                        LOG("gots one with colspan %d (at %d c, %d r)\n", con->colspan, cols, rows);
                         while (con->colspan > 1 &&
-                               workspace->table[cols + (con->colspan - 1)][rows]->currently_focused != NULL)
+                               (!cell_exists(cols + (con->colspan-1), rows) ||
+                                workspace->table[cols + (con->colspan - 1)][rows]->currently_focused != NULL))
                                 con->colspan--;
                         LOG("fixed it to %d\n", con->colspan);
                 }
                 if (con->rowspan > 1) {
-                        LOG("gots one with rowspan %d\n", con->rowspan);
+                        LOG("gots one with rowspan %d (at %d c, %d r)\n", con->rowspan, cols, rows);
                         while (con->rowspan > 1 &&
-                               workspace->table[cols][rows + (con->rowspan - 1)]->currently_focused != NULL)
+                               (!cell_exists(cols, rows + (con->rowspan - 1)) ||
+                                workspace->table[cols][rows + (con->rowspan - 1)]->currently_focused != NULL))
                                 con->rowspan--;
                         LOG("fixed it to %d\n", con->rowspan);
                 }