aboutsummaryrefslogtreecommitdiff
path: root/server-client.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2016-04-29 18:01:09 +0100
committerThomas Adam <thomas@xteddy.org>2016-04-29 18:01:09 +0100
commit55d472a9fe9b3d4196b8307a65480f6d66b95e9c (patch)
treee76c0961ba35fa67566947ea0247dc0aed3e1ce4 /server-client.c
parentba9f32b464effc09b7ceaef21b1804c49ece17db (diff)
parenteb8e76d4332e089e5cd3c5a3c9f4bf64c9474909 (diff)
downloadrtmux-55d472a9fe9b3d4196b8307a65480f6d66b95e9c.tar.gz
rtmux-55d472a9fe9b3d4196b8307a65480f6d66b95e9c.tar.bz2
rtmux-55d472a9fe9b3d4196b8307a65480f6d66b95e9c.zip
Merge branch 'obsd-master'
Diffstat (limited to 'server-client.c')
-rw-r--r--server-client.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/server-client.c b/server-client.c
index 26425c8f..7cd2f9bf 100644
--- a/server-client.c
+++ b/server-client.c
@@ -929,7 +929,7 @@ server_client_check_redraw(struct client *c)
struct session *s = c->session;
struct tty *tty = &c->tty;
struct window_pane *wp;
- int flags, redraw;
+ int flags, masked, redraw;
if (c->flags & (CLIENT_CONTROL|CLIENT_SUSPENDED))
return;
@@ -969,15 +969,15 @@ server_client_check_redraw(struct client *c)
}
}
- if (c->flags & CLIENT_BORDERS) {
+ masked = c->flags & (CLIENT_BORDERS|CLIENT_STATUS);
+ if (masked != 0)
tty_update_mode(tty, tty->mode, NULL);
+ if (masked == CLIENT_BORDERS)
screen_redraw_screen(c, 0, 0, 1);
- }
-
- if (c->flags & CLIENT_STATUS) {
- tty_update_mode(tty, tty->mode, NULL);
+ else if (masked == CLIENT_STATUS)
screen_redraw_screen(c, 0, 1, 0);
- }
+ else if (masked != 0)
+ screen_redraw_screen(c, 0, 1, 1);
tty->flags = (tty->flags & ~(TTY_FREEZE|TTY_NOCURSOR)) | flags;
tty_update_mode(tty, tty->mode, NULL);