diff options
| -rw-r--r-- | server-client.c | 71 |
1 files changed, 36 insertions, 35 deletions
diff --git a/server-client.c b/server-client.c index 5775a2fb..0269e0c7 100644 --- a/server-client.c +++ b/server-client.c @@ -175,7 +175,6 @@ server_client_callback(int fd, int events, void *data) if (buffer_poll(fd, events, c->tty.in, c->tty.out) != 0) goto client_lost; - server_client_handle_data(c); } return; @@ -184,7 +183,42 @@ client_lost: server_client_lost(c); } -/* Input data from client. */ +/* Client functions that need to happen every loop. */ +void +server_client_loop(void) +{ + struct client *c; + struct window *w; + struct window_pane *wp; + u_int i; + + for (i = 0; i < ARRAY_LENGTH(&clients); i++) { + c = ARRAY_ITEM(&clients, i); + if (c == NULL || c->session == NULL) + continue; + + server_client_check_timers(c); + server_client_check_redraw(c); + + server_client_handle_data(c); + } + + /* + * Any windows will have been redrawn as part of clients, so clear + * their flags now. + */ + for (i = 0; i < ARRAY_LENGTH(&windows); i++) { + w = ARRAY_ITEM(&windows, i); + if (w == NULL) + continue; + + w->flags &= ~WINDOW_REDRAW; + TAILQ_FOREACH(wp, &w->panes, entry) + wp->flags &= ~PANE_REDRAW; + } +} + +/* Handle data input or output from client. */ void server_client_handle_data(struct client *c) { @@ -338,39 +372,6 @@ server_client_handle_data(struct client *c) tty_reset(&c->tty); } -/* Client functions that need to happen every loop. */ -void -server_client_loop(void) -{ - struct client *c; - struct window *w; - struct window_pane *wp; - u_int i; - - for (i = 0; i < ARRAY_LENGTH(&clients); i++) { - c = ARRAY_ITEM(&clients, i); - if (c == NULL || c->session == NULL) - continue; - - server_client_check_timers(c); - server_client_check_redraw(c); - } - - /* - * Any windows will have been redrawn as part of clients, so clear - * their flags now. - */ - for (i = 0; i < ARRAY_LENGTH(&windows); i++) { - w = ARRAY_ITEM(&windows, i); - if (w == NULL) - continue; - - w->flags &= ~WINDOW_REDRAW; - TAILQ_FOREACH(wp, &w->panes, entry) - wp->flags &= ~PANE_REDRAW; - } -} - /* Check for client redraws. */ void server_client_check_redraw(struct client *c) |