From 290636bc869e383403905b22a0665079b5adef95 Mon Sep 17 00:00:00 2001 From: Tiago Cunha Date: Wed, 15 Feb 2012 19:32:12 +0000 Subject: [PATCH] Sync OpenBSD patchset 1029: Add a wrapper function tty_set_size from George Nachman. --- tmux.h | 1 + tty.c | 13 ++++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/tmux.h b/tmux.h index d5184278..b8caee43 100644 --- a/tmux.h +++ b/tmux.h @@ -1454,6 +1454,7 @@ void tty_putc(struct tty *, u_char); void tty_pututf8(struct tty *, const struct grid_utf8 *); void tty_init(struct tty *, int, char *); int tty_resize(struct tty *); +int tty_set_size(struct tty *tty, u_int sx, u_int sy); 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 7febed33..dca95cc9 100644 --- a/tty.c +++ b/tty.c @@ -93,10 +93,8 @@ tty_resize(struct tty *tty) sx = 80; sy = 24; } - if (sx == tty->sx && sy == tty->sy) + if (!tty_set_size(tty, sx, sy)) return (0); - tty->sx = sx; - tty->sy = sy; tty->cx = UINT_MAX; tty->cy = UINT_MAX; @@ -116,6 +114,15 @@ tty_resize(struct tty *tty) return (1); } +int +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); +} + int tty_open(struct tty *tty, const char *overrides, char **cause) {