summaryrefslogtreecommitdiffstats
path: root/usr.bin/tmux/server.c
diff options
context:
space:
mode:
Diffstat (limited to 'usr.bin/tmux/server.c')
-rw-r--r--usr.bin/tmux/server.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/usr.bin/tmux/server.c b/usr.bin/tmux/server.c
index 3e4c2adf8a1..a33a5ff91bc 100644
--- a/usr.bin/tmux/server.c
+++ b/usr.bin/tmux/server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: server.c,v 1.10 2009/07/18 14:59:25 nicm Exp $ */
+/* $OpenBSD: server.c,v 1.11 2009/07/19 13:21:40 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -840,7 +840,9 @@ server_handle_client(struct client *c)
/* Ensure cursor position and mode settings. */
status = options_get_number(&c->session->options, "status");
- if (wp->yoff + s->cy < c->tty.sy - status)
+ if (!window_pane_visible(wp) || wp->yoff + s->cy >= c->tty.sy - status)
+ tty_cursor(&c->tty, 0, 0, 0, 0);
+ else
tty_cursor(&c->tty, s->cx, s->cy, wp->xoff, wp->yoff);
mode = s->mode;
@@ -1072,9 +1074,9 @@ server_check_window(struct window *w)
* pane dies).
*/
if (wp->fd == -1 && !flag) {
+ layout_close_pane(wp);
window_remove_pane(w, wp);
server_redraw_window(w);
- layout_refresh(w, 0);
} else
destroyed = 0;
wp = wq;