diff options
| -rw-r--r-- | cmd-select-layout.c | 3 | ||||
| -rw-r--r-- | key-bindings.c | 1 | ||||
| -rw-r--r-- | layout-set.c | 101 | ||||
| -rw-r--r-- | tmux.1 | 3 |
4 files changed, 108 insertions, 0 deletions
diff --git a/cmd-select-layout.c b/cmd-select-layout.c index 2988a44f..fd66578c 100644 --- a/cmd-select-layout.c +++ b/cmd-select-layout.c @@ -59,6 +59,9 @@ cmd_select_layout_init(struct cmd *self, int key) case ('4' | KEYC_ESCAPE): data->arg = xstrdup("main-vertical"); break; + case ('5' | KEYC_ESCAPE): + data->arg = xstrdup("tiled"); + break; } } diff --git a/key-bindings.c b/key-bindings.c index 7b96a12d..9a2fcc12 100644 --- a/key-bindings.c +++ b/key-bindings.c @@ -151,6 +151,7 @@ key_bindings_init(void) { '2' | KEYC_ESCAPE, 0, &cmd_select_layout_entry }, { '3' | KEYC_ESCAPE, 0, &cmd_select_layout_entry }, { '4' | KEYC_ESCAPE, 0, &cmd_select_layout_entry }, + { '5' | KEYC_ESCAPE, 0, &cmd_select_layout_entry }, { KEYC_PPAGE, 0, &cmd_copy_mode_entry }, { 'n' | KEYC_ESCAPE, 0, &cmd_next_window_entry }, { 'o' | KEYC_ESCAPE, 0, &cmd_rotate_window_entry }, diff --git a/layout-set.c b/layout-set.c index e74a1931..7ebdead9 100644 --- a/layout-set.c +++ b/layout-set.c @@ -31,6 +31,7 @@ void layout_set_even_h(struct window *); void layout_set_even_v(struct window *); void layout_set_main_h(struct window *); void layout_set_main_v(struct window *); +void layout_set_tiled(struct window *); const struct { const char *name; @@ -40,6 +41,7 @@ const struct { { "even-vertical", layout_set_even_v }, { "main-horizontal", layout_set_main_h }, { "main-vertical", layout_set_main_v }, + { "tiled", layout_set_tiled }, }; const char * @@ -447,3 +449,102 @@ layout_set_main_v(struct window *w) server_redraw_window(w); } + +void +layout_set_tiled(struct window *w) +{ + struct window_pane *wp; + struct layout_cell *lc, *lcrow, *lcchild; + u_int n, width, height, used; + u_int i, j, columns, rows; + + layout_print_cell(w->layout_root, __func__, 1); + + /* Get number of panes. */ + n = window_count_panes(w); + if (n <= 1) + return; + + /* How many rows and columns are wanted? */ + rows = columns = 1; + while (rows * columns < n) { + rows++; + if (rows * columns < n) + columns++; + } + + /* What width and height should they be? */ + width = w->sx / columns; + if (width < PANE_MINIMUM + 1) + width = PANE_MINIMUM + 1; + height = w->sy / rows; + if (width < PANE_MINIMUM + 1) + width = PANE_MINIMUM + 1; + + /* Free old tree and create a new root. */ + layout_free(w); + lc = w->layout_root = layout_create_cell(NULL); + layout_set_size(lc, width * columns, height * rows, 0, 0); + layout_make_node(lc, LAYOUT_TOPBOTTOM); + + /* Create a grid of the cells. */ + wp = TAILQ_FIRST(&w->panes); + for (j = 0; j < rows; j++) { + /* If this is the last cell, all done. */ + if (wp == NULL) + break; + + /* Create the new row. */ + lcrow = layout_create_cell(lc); + layout_set_size(lcrow, w->sx, height - 1, 0, 0); + TAILQ_INSERT_TAIL(&lc->cells, lcrow, entry); + + /* If only one column, just use the row directly. */ + if (n - (j * columns) == 1) { + layout_make_leaf(lcrow, wp); + wp = TAILQ_NEXT(wp, entry); + continue; + } + + /* Add in the columns. */ + layout_make_node(lcrow, LAYOUT_LEFTRIGHT); + for (i = 0; i < columns; i++) { + /* Create and add a pane cell. */ + lcchild = layout_create_cell(lcrow); + layout_set_size(lcchild, width - 1, height - 1, 0, 0); + layout_make_leaf(lcchild, wp); + TAILQ_INSERT_TAIL(&lcrow->cells, lcchild, entry); + + /* Move to the next cell. */ + if ((wp = TAILQ_NEXT(wp, entry)) == NULL) + break; + } + + /* + * Adjust the row and columns to fit the full width if + * necessary. + */ + if (i == columns) + i--; + used = ((i + 1) * width) - 1; + if (w->sx <= used) + continue; + lcchild = TAILQ_LAST(&lcrow->cells, layout_cells); + layout_resize_adjust(lcchild, LAYOUT_LEFTRIGHT, w->sx - used); + } + + /* Adjust the last row height to fit if necessary. */ + used = (rows * height) - 1; + if (w->sy > used) { + lcrow = TAILQ_LAST(&lc->cells, layout_cells); + layout_resize_adjust(lcrow, LAYOUT_TOPBOTTOM, w->sy - used); + } + + /* Fix cell offsets. */ + layout_fix_offsets(lc); + layout_fix_panes(w, w->sx, w->sy); + + layout_print_cell(w->layout_root, __func__, 1); + + server_redraw_window(w); +} @@ -784,6 +784,9 @@ bottom along the right. See the .Em main-pane-width window option. +.It Ic tiled +Panes are spread out as evenly as possible over the window in both rows and +columns. .El .Pp Commands related to windows and panes are as follows: |