aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--server-client.c7
-rw-r--r--tmux.h4
-rw-r--r--tty.c12
3 files changed, 8 insertions, 15 deletions
diff --git a/server-client.c b/server-client.c
index 673f1642..15b0d2dc 100644
--- a/server-client.c
+++ b/server-client.c
@@ -1451,10 +1451,9 @@ server_client_dispatch(struct imsg *imsg, void *arg)
if (c->flags & CLIENT_CONTROL)
break;
- if (tty_resize(&c->tty)) {
- recalculate_sizes();
- server_redraw_client(c);
- }
+ tty_resize(&c->tty);
+ recalculate_sizes();
+ server_redraw_client(c);
if (c->session != NULL)
notify_client("client-resized", c);
break;
diff --git a/tmux.h b/tmux.h
index f56f3b1b..79ae8ddc 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1661,8 +1661,8 @@ void tty_puts(struct tty *, const char *);
void tty_putc(struct tty *, u_char);
void tty_putn(struct tty *, const void *, size_t, u_int);
int tty_init(struct tty *, struct client *, int, char *);
-int tty_resize(struct tty *);
-int tty_set_size(struct tty *, u_int, u_int);
+void tty_resize(struct tty *);
+void tty_set_size(struct tty *, u_int, u_int);
void tty_start_tty(struct tty *);
void tty_stop_tty(struct tty *);
void tty_set_title(struct tty *, const char *);
diff --git a/tty.c b/tty.c
index 9de1f50a..72453821 100644
--- a/tty.c
+++ b/tty.c
@@ -120,7 +120,7 @@ tty_init(struct tty *tty, struct client *c, int fd, char *term)
return (0);
}
-int
+void
tty_resize(struct tty *tty)
{
struct client *c = tty->client;
@@ -139,21 +139,15 @@ tty_resize(struct tty *tty)
sy = 24;
}
log_debug("%s: %s now %ux%u", __func__, c->name, sx, sy);
-
- if (!tty_set_size(tty, sx, sy))
- return (0);
+ tty_set_size(tty, sx, sy);
tty_invalidate(tty);
- return (1);
}
-int
+void
tty_set_size(struct tty *tty, u_int sx, u_int sy)
{
- if (sx == tty->sx && sy == tty->sy)
- return (0);
tty->sx = sx;
tty->sy = sy;
- return (1);
}
static void