circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 09:26:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2015-01-10 21:38:50 +00:00
parent daea0e4fff aae2b7aa89
commit da72a0b7a8
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
grid-view.c
View File

@@ -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); px = grid_view_x(gd, px);
py = grid_view_y(gd, py); py = grid_view_y(gd, py);
if (gd->linedata[py].cellsize + nx < gd->sx) sx = grid_view_x(gd, gd->sx);
sx = grid_view_x(gd, gd->linedata[py].cellsize + nx);
else
sx = grid_view_x(gd, gd->sx);
if (px == sx - 1) if (px == sx - 1)
grid_clear(gd, px, py, 1, 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); px = grid_view_x(gd, px);
py = grid_view_y(gd, py); py = grid_view_y(gd, py);
sx = grid_view_x(gd, gd->linedata[py].cellsize); sx = grid_view_x(gd, gd->sx);
if (sx < px + nx)
sx = px + nx;
grid_move_cells(gd, px, px + nx, py, sx - px - nx); grid_move_cells(gd, px, px + nx, py, sx - px - nx);
grid_clear(gd, sx - nx, py, px + nx - (sx - nx), 1); grid_clear(gd, sx - nx, py, px + nx - (sx - nx), 1);

1
server-fn.c
View File

@@ -270,6 +270,7 @@ server_kill_window(struct window *w)
if (session_has(s, w) == NULL) if (session_has(s, w) == NULL)
continue; continue;
server_unzoom_window(w);
while ((wl = winlink_find_by_window(&s->windows, w)) != NULL) { while ((wl = winlink_find_by_window(&s->windows, w)) != NULL) {
if (session_detach(s, wl)) { if (session_detach(s, wl)) {
server_destroy_session_group(s); server_destroy_session_group(s);

12
tmux.1
View File

@@ -251,6 +251,10 @@ Split the current pane into two, left and right.
Kill the current window. Kill the current window.
.It ' .It '
Prompt for a window index to select. 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 , .It ,
Rename the current window. Rename the current window.
.It - .It -
@@ -271,6 +275,8 @@ Choose which buffer to paste interactively from a list.
List all key bindings. List all key bindings.
.It D .It D
Choose a client to detach. Choose a client to detach.
.It L
Switch the attached client back to the last session.
.It \&[ .It \&[
Enter copy mode to copy text or view the history. Enter copy mode to copy text or view the history.
.It \&] .It \&]
@@ -297,14 +303,14 @@ Briefly display pane indexes.
Force redraw of the attached client. Force redraw of the attached client.
.It s .It s
Select a new session for the attached client interactively. Select a new session for the attached client interactively.
.It L
Switch the attached client back to the last session.
.It t .It t
Show the time. Show the time.
.It w .It w
Choose the current window interactively. Choose the current window interactively.
.It x .It x
Kill the current pane. Kill the current pane.
.It z
Toggle zoom state of the current pane.
.It { .It {
Swap the current pane with the previous pane. Swap the current pane with the previous pane.
.It } .It }
@@ -322,6 +328,8 @@ pane.
.It M-1 to M-5 .It M-1 to M-5
Arrange panes in one of the five preset layouts: even-horizontal, Arrange panes in one of the five preset layouts: even-horizontal,
even-vertical, main-horizontal, main-vertical, or tiled. even-vertical, main-horizontal, main-vertical, or tiled.
.It Space
Arrange the current window in the next preset layout.
.It M-n .It M-n
Move to the next window with a bell or activity marker. Move to the next window with a bell or activity marker.
.It M-o .It M-o