diff options
| author |   nicm <nicm@openbsd.org> | 2017-04-17 06:40:32 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2017-04-17 06:40:32 +0000 |
| commit | c409818b0213d7776f44d247a6ea9408417afb15 (patch) | |
| tree | 255b9d958202f142a2476ac962680611eb312407 | |
| parent | Memory leak, from David CARLIER. (diff) | |
| download | wireguard-openbsd-c409818b0213d7776f44d247a6ea9408417afb15.tar.xz wireguard-openbsd-c409818b0213d7776f44d247a6ea9408417afb15.zip | |
Remove a couple of redraw flags that no longer have any effect.
| -rw-r--r-- | usr.bin/tmux/server-client.c | 8 | ||||
| -rw-r--r-- | usr.bin/tmux/server-fn.c | 3 | ||||
| -rw-r--r-- | usr.bin/tmux/tmux.h | 6 | ||||
| -rw-r--r-- | usr.bin/tmux/tty.c | 6 |
4 files changed, 7 insertions, 16 deletions
diff --git a/usr.bin/tmux/server-client.c b/usr.bin/tmux/server-client.c index a06035c698a..27979e5778f 100644 --- a/usr.bin/tmux/server-client.c +++ b/usr.bin/tmux/server-client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server-client.c,v 1.216 2017/04/05 10:49:46 nicm Exp $ */ +/* $OpenBSD: server-client.c,v 1.217 2017/04/17 06:40:32 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -992,7 +992,6 @@ server_client_loop(void) */ focus = options_get_number(global_options, "focus-events"); RB_FOREACH(w, windows, &windows) { - w->flags &= ~WINDOW_REDRAW; TAILQ_FOREACH(wp, &w->panes, entry) { if (wp->fd != -1) { if (focus) @@ -1227,11 +1226,6 @@ server_client_check_redraw(struct client *c) tty_update_mode(tty, tty->mode, NULL); screen_redraw_screen(c, 1, 1, 1); c->flags &= ~(CLIENT_STATUS|CLIENT_BORDERS); - } else if (c->flags & CLIENT_REDRAWWINDOW) { - tty_update_mode(tty, tty->mode, NULL); - TAILQ_FOREACH(wp, &c->session->curw->window->panes, entry) - screen_redraw_pane(c, wp); - c->flags &= ~CLIENT_REDRAWWINDOW; } else { TAILQ_FOREACH(wp, &c->session->curw->window->panes, entry) { if (wp->flags & PANE_REDRAW) { diff --git a/usr.bin/tmux/server-fn.c b/usr.bin/tmux/server-fn.c index 9808851a082..9397ef848f2 100644 --- a/usr.bin/tmux/server-fn.c +++ b/usr.bin/tmux/server-fn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server-fn.c,v 1.106 2017/03/09 17:06:35 nicm Exp $ */ +/* $OpenBSD: server-fn.c,v 1.107 2017/04/17 06:40:32 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -100,7 +100,6 @@ server_redraw_window(struct window *w) if (c->session != NULL && c->session->curw->window == w) server_redraw_client(c); } - w->flags |= WINDOW_REDRAW; } void diff --git a/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h index 83121ecdc5c..537dfcaed52 100644 --- a/usr.bin/tmux/tmux.h +++ b/usr.bin/tmux/tmux.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tmux.h,v 1.734 2017/04/05 10:49:46 nicm Exp $ */ +/* $OpenBSD: tmux.h,v 1.735 2017/04/17 06:40:32 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -816,7 +816,7 @@ struct window { int flags; #define WINDOW_BELL 0x1 #define WINDOW_ACTIVITY 0x2 -#define WINDOW_REDRAW 0x4 +/* 0x4 unused */ #define WINDOW_SILENCE 0x8 #define WINDOW_ZOOMED 0x1000 #define WINDOW_FORCEWIDTH 0x2000 @@ -1332,7 +1332,7 @@ struct client { #define CLIENT_DEAD 0x200 #define CLIENT_BORDERS 0x400 #define CLIENT_READONLY 0x800 -#define CLIENT_REDRAWWINDOW 0x1000 +/* 0x1000 unused */ #define CLIENT_CONTROL 0x2000 #define CLIENT_CONTROLCONTROL 0x4000 #define CLIENT_FOCUSED 0x8000 diff --git a/usr.bin/tmux/tty.c b/usr.bin/tmux/tty.c index 20fe7645cbd..f556400e3c9 100644 --- a/usr.bin/tmux/tty.c +++ b/usr.bin/tmux/tty.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tty.c,v 1.259 2017/04/16 20:32:14 nicm Exp $ */ +/* $OpenBSD: tty.c,v 1.260 2017/04/17 06:40:32 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -816,9 +816,7 @@ tty_write(void (*cmdfn)(struct tty *, const struct tty_ctx *), if (wp == NULL) return; - if (wp->window->flags & WINDOW_REDRAW || wp->flags & PANE_REDRAW) - return; - if (!window_pane_visible(wp) || wp->flags & PANE_DROP) + if ((wp->flags & (PANE_REDRAW|PANE_DROP)) || !window_pane_visible(wp)) return; TAILQ_FOREACH(c, &clients, entry) { |