From: Michael Stapelberg Date: Tue, 24 Feb 2009 19:29:30 +0000 (+0100) Subject: Implement automatic cleaning of the table X-Git-Tag: 3.a~156 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=dadace2fa36a42a559dc68e186df5959d5eba136;p=i3%2Fi3 Implement automatic cleaning of the table --- diff --git a/include/table.h b/include/table.h index a57b392f..24605b72 100644 --- a/include/table.h +++ b/include/table.h @@ -27,5 +27,6 @@ void init_table(); void expand_table_rows(Workspace *workspace); void expand_table_cols(Workspace *workspace); bool cell_exists(int col, int row); +void cleanup_table(Workspace *workspace); #endif diff --git a/src/commands.c b/src/commands.c index 930696ee..e05c0af5 100644 --- a/src/commands.c +++ b/src/commands.c @@ -175,7 +175,8 @@ static void move_current_window(xcb_connection_t *connection, direction_t direct container->currently_focused = to_focus; new->currently_focused = current_client; - /* TODO: delete all empty columns/rows */ + /* delete all empty columns/rows */ + cleanup_table(container->workspace); render_layout(connection); set_focus(connection, current_client); diff --git a/src/table.c b/src/table.c index 76316371..76e99bd8 100644 --- a/src/table.c +++ b/src/table.c @@ -80,11 +80,84 @@ void expand_table_cols(Workspace *workspace) { new_container(workspace, &(workspace->table[workspace->cols-1][c])); } +static void shrink_table_cols(Workspace *workspace) { + workspace->cols--; + free(workspace->table[workspace->cols]); + workspace->table = realloc(workspace->table, sizeof(Container**) * workspace->cols); +} + +static void shrink_table_rows(Workspace *workspace) { + workspace->rows--; + for (int cols = 0; cols < workspace->cols; cols++) + workspace->table[cols] = realloc(workspace->table[cols], sizeof(Container*) * workspace->rows); +} + + /* * Performs simple bounds checking for the given column/row * */ bool cell_exists(int col, int row) { return (col >= 0 && col < c_ws->cols) && - (row >= 0 && row < c_ws->rows); + (row >= 0 && row < c_ws->rows); +} + +static void move_columns_from(Workspace *workspace, int cols) { + for (; cols < workspace->cols; cols++) + for (int rows = 0; rows < workspace->rows; rows++) { + free(workspace->table[cols-1][rows]); + + printf("moving cols = %d to cols -1 = %d\n", cols, cols-1); + workspace->table[cols-1][rows] = workspace->table[cols][rows]; + workspace->table[cols][rows] = NULL; + } +} + +static void move_rows_from(Workspace *workspace, int rows) { + for (; rows < workspace->rows; rows++) + for (int cols = 0; cols < workspace->cols; cols++) { + free(workspace->table[cols][rows-1]); + + printf("moving rows = %d to rows -1 = %d\n", rows, rows - 1); + workspace->table[cols][rows-1] = workspace->table[cols][rows]; + workspace->table[cols][rows] = NULL; + } +} + +/* + * Shrinks the table by "compacting" it, that is, removing completely empty rows/columns + * + */ +void cleanup_table(Workspace *workspace) { + /* Check for empty columns */ + for (int cols = 0; cols < workspace->cols;) { + bool completely_empty = true; + for (int rows = 0; rows < workspace->rows; rows++) + if (workspace->table[cols][rows]->currently_focused != NULL) { + completely_empty = false; + break; + } + if (completely_empty && cols > 0) { + printf("Removing completely empty column %d\n", cols); + if (cols < (workspace->cols - 1)) + move_columns_from(workspace, cols+1); + shrink_table_cols(workspace); + } else cols++; + } + + /* Check for empty rows */ + for (int rows = 0; rows < workspace->rows;) { + bool completely_empty = true; + for (int cols = 0; cols < workspace->cols; cols++) + if (workspace->table[cols][rows]->currently_focused != NULL) { + completely_empty = false; + break; + } + if (completely_empty && rows > 0) { + printf("Removing completely empty row %d\n", rows); + if (rows < (workspace->rows - 1)) + move_rows_from(workspace, rows+1); + shrink_table_rows(workspace); + } else rows++; + } }