From 7461c165b5a802c70b7ac460efa0942ec6acf285 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 17 Apr 2017 06:40:32 +0000
Subject: [PATCH] Remove a couple of redraw flags that no longer have any
effect.
---
server-client.c | 6 ------
server-fn.c | 1 -
tmux.h | 4 ++--
tty.c | 4 +---
4 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/server-client.c b/server-client.c
index 6be467af..db8ba432 100644
--- a/server-client.c
+++ b/server-client.c
@@ -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/server-fn.c b/server-fn.c
index 53bcb6b5..0e66ee34 100644
--- a/server-fn.c
+++ b/server-fn.c
@@ -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/tmux.h b/tmux.h
index 509497bb..482f3c74 100644
--- a/tmux.h
+++ b/tmux.h
@@ -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/tty.c b/tty.c
index 29211be8..04c98e9e 100644
--- a/tty.c
+++ b/tty.c
@@ -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) {