diff options
| author | Thomas Adam <thomas@xteddy.org> | 2015-01-10 21:38:50 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2015-01-10 21:38:50 +0000 |
| commit | da72a0b7a8b1f893fd25cfdacef9be7dffa61989 (patch) | |
| tree | bffabb2773618cc1f535ea0c8a01a5aa69ade363 | |
| parent | daea0e4fff77e63ea05392b67d96606c5e7b3ecc (diff) | |
| parent | aae2b7aa89b80ec6b07a8036f923dc6c8882cfae (diff) | |
Merge branch 'obsd-master'
| -rw-r--r-- | grid-view.c | 9 | ||||
| -rw-r--r-- | server-fn.c | 1 | ||||
| -rw-r--r-- | tmux.1 | 12 |
3 files changed, 13 insertions, 9 deletions
diff --git a/grid-view.c b/grid-view.c index 078a0da4..badabd56 100644 --- a/grid-view.c +++ b/grid-view.c @@ -184,10 +184,7 @@ grid_view_insert_cells(struct grid *gd, u_int px, u_int py, u_int nx) px = grid_view_x(gd, px); py = grid_view_y(gd, py); - if (gd->linedata[py].cellsize + nx < gd->sx) - sx = grid_view_x(gd, gd->linedata[py].cellsize + nx); - else - sx = grid_view_x(gd, gd->sx); + sx = grid_view_x(gd, gd->sx); if (px == sx - 1) grid_clear(gd, px, py, 1, 1); @@ -204,9 +201,7 @@ grid_view_delete_cells(struct grid *gd, u_int px, u_int py, u_int nx) px = grid_view_x(gd, px); py = grid_view_y(gd, py); - sx = grid_view_x(gd, gd->linedata[py].cellsize); - if (sx < px + nx) - sx = px + nx; + sx = grid_view_x(gd, gd->sx); grid_move_cells(gd, px, px + nx, py, sx - px - nx); grid_clear(gd, sx - nx, py, px + nx - (sx - nx), 1); diff --git a/server-fn.c b/server-fn.c index 6cab6bd9..1ed3a01f 100644 --- a/server-fn.c +++ b/server-fn.c @@ -270,6 +270,7 @@ server_kill_window(struct window *w) if (session_has(s, w) == NULL) continue; + server_unzoom_window(w); while ((wl = winlink_find_by_window(&s->windows, w)) != NULL) { if (session_detach(s, wl)) { server_destroy_session_group(s); @@ -251,6 +251,10 @@ Split the current pane into two, left and right. Kill the current window. .It ' Prompt for a window index to select. +.It \&( +Switch the attached client to the previous session. +.It \&) +Switch the attached client to the next session. .It , Rename the current window. .It - @@ -271,6 +275,8 @@ Choose which buffer to paste interactively from a list. List all key bindings. .It D Choose a client to detach. +.It L +Switch the attached client back to the last session. .It \&[ Enter copy mode to copy text or view the history. .It \&] @@ -297,14 +303,14 @@ Briefly display pane indexes. Force redraw of the attached client. .It s Select a new session for the attached client interactively. -.It L -Switch the attached client back to the last session. .It t Show the time. .It w Choose the current window interactively. .It x Kill the current pane. +.It z +Toggle zoom state of the current pane. .It { Swap the current pane with the previous pane. .It } @@ -322,6 +328,8 @@ pane. .It M-1 to M-5 Arrange panes in one of the five preset layouts: even-horizontal, even-vertical, main-horizontal, main-vertical, or tiled. +.It Space +Arrange the current window in the next preset layout. .It M-n Move to the next window with a bell or activity marker. .It M-o |