summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2009-07-14 19:11:58 +0000
committernicm <nicm@openbsd.org>2009-07-14 19:11:58 +0000
commitb8718912d7b334fa5e4a730fb6422eedc8d9893f (patch)
tree5839733ba948a1f21bcc95a5d0693061b0da7237
parentInstead of faking up a status line in status_redraw, use the same code to (diff)
downloadwireguard-openbsd-b8718912d7b334fa5e4a730fb6422eedc8d9893f.tar.xz
wireguard-openbsd-b8718912d7b334fa5e4a730fb6422eedc8d9893f.zip
For some reason when clearing status/message it was redrawing the entire client
not just the status line. Changing this also revealed the check for the status line was incorrect when drawing the pane.
-rw-r--r--usr.bin/tmux/screen-redraw.c4
-rw-r--r--usr.bin/tmux/status.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/tmux/screen-redraw.c b/usr.bin/tmux/screen-redraw.c
index c44aa84c54f..a610dc76388 100644
--- a/usr.bin/tmux/screen-redraw.c
+++ b/usr.bin/tmux/screen-redraw.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: screen-redraw.c,v 1.4 2009/07/14 19:03:16 nicm Exp $ */
+/* $OpenBSD: screen-redraw.c,v 1.5 2009/07/14 19:11:58 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -166,7 +166,7 @@ screen_redraw_screen(struct client *c, int status_only)
/* Draw the pane. */
for (i = 0; i < wp->sy; i++) {
- if (status_only && i != tty->sy - 1)
+ if (status_only && wp->yoff + i != tty->sy - 1)
continue;
tty_draw_line(tty, wp->screen, i, wp->xoff, wp->yoff);
}
diff --git a/usr.bin/tmux/status.c b/usr.bin/tmux/status.c
index 844a1adadf8..f684ccc2fd6 100644
--- a/usr.bin/tmux/status.c
+++ b/usr.bin/tmux/status.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: status.c,v 1.7 2009/07/14 19:03:16 nicm Exp $ */
+/* $OpenBSD: status.c,v 1.8 2009/07/14 19:11:58 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -494,7 +494,7 @@ status_message_clear(struct client *c)
c->message_string = NULL;
c->tty.flags &= ~(TTY_NOCURSOR|TTY_FREEZE);
- c->flags |= CLIENT_REDRAW;
+ c->flags |= CLIENT_STATUS;
screen_reinit(&c->status);
}
@@ -581,7 +581,7 @@ status_prompt_clear(struct client *c)
c->prompt_buffer = NULL;
c->tty.flags &= ~(TTY_NOCURSOR|TTY_FREEZE);
- c->flags |= CLIENT_REDRAW;
+ c->flags |= CLIENT_STATUS;
screen_reinit(&c->status);
}