diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2009-09-13 20:37:37 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2009-09-13 20:37:37 +0000 |
| commit | 69e7f4af1924343d876214a36e3771a7815d3519 (patch) | |
| tree | ec4e6fba0a43f2ccf00dca4f0ede3f329e0dd135 | |
| parent | 61990deb361983589eafb5779344f3981905194a (diff) | |
| download | rtmux-69e7f4af1924343d876214a36e3771a7815d3519.tar.gz rtmux-69e7f4af1924343d876214a36e3771a7815d3519.tar.bz2 rtmux-69e7f4af1924343d876214a36e3771a7815d3519.zip | |
Sync OpenBSD patchset 324:
Tidy some common code for destroying sessions into a new function.
| -rw-r--r-- | server-fn.c | 38 | ||||
| -rw-r--r-- | server.c | 20 | ||||
| -rw-r--r-- | tmux.h | 3 |
3 files changed, 28 insertions, 33 deletions
diff --git a/server-fn.c b/server-fn.c index 9b7ba907..d686d568 100644 --- a/server-fn.c +++ b/server-fn.c @@ -1,4 +1,4 @@ -/* $Id: server-fn.c,v 1.86 2009-09-05 19:03:41 tcunha Exp $ */ +/* $Id: server-fn.c,v 1.87 2009-09-13 20:37:37 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -278,10 +278,7 @@ server_kill_window(struct window *w) { struct session *s; struct winlink *wl; - struct client *c; - u_int i, j; - int destroyed; - + u_int i; for (i = 0; i < ARRAY_LENGTH(&sessions); i++) { s = ARRAY_ITEM(&sessions, i); @@ -290,23 +287,30 @@ server_kill_window(struct window *w) if ((wl = winlink_find_by_window(&s->windows, w)) == NULL) continue; - destroyed = session_detach(s, wl); - for (j = 0; j < ARRAY_LENGTH(&clients); j++) { - c = ARRAY_ITEM(&clients, j); - if (c == NULL || c->session != s) - continue; - - if (destroyed) { - c->session = NULL; - server_write_client(c, MSG_EXIT, NULL, 0); - } else - server_redraw_client(c); - } + if (session_detach(s, wl)) + server_destroy_session(s); + else + server_redraw_session(s); } recalculate_sizes(); } void +server_destroy_session(struct session *s) +{ + struct client *c; + u_int i; + + for (i = 0; i < ARRAY_LENGTH(&clients); i++) { + c = ARRAY_ITEM(&clients, i); + if (c == NULL || c->session != s) + continue; + c->session = NULL; + server_write_client(c, MSG_EXIT, NULL, 0); + } +} + +void server_set_identify(struct client *c) { struct timeval tv; @@ -1,4 +1,4 @@ -/* $Id: server.c,v 1.184 2009-09-11 14:13:52 tcunha Exp $ */ +/* $Id: server.c,v 1.185 2009-09-13 20:37:37 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -1214,21 +1214,11 @@ server_check_window(struct window *w) RB_FOREACH(wl, winlinks, &s->windows) { if (wl->window != w) continue; - destroyed = session_detach(s, wl); - for (j = 0; j < ARRAY_LENGTH(&clients); j++) { - c = ARRAY_ITEM(&clients, j); - if (c == NULL || c->session != s) - continue; - if (!destroyed) { - server_redraw_client(c); - continue; - } - c->session = NULL; - server_write_client(c, MSG_EXIT, NULL, 0); - } - /* If the session was destroyed, bail now. */ - if (destroyed) + if (session_detach(s, wl)) { + server_destroy_session(s); break; + } + server_redraw_session(s); goto restart; } } @@ -1,4 +1,4 @@ -/* $Id: tmux.h,v 1.440 2009-09-11 14:13:52 tcunha Exp $ */ +/* $Id: tmux.h,v 1.441 2009-09-13 20:37:37 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -1455,6 +1455,7 @@ void server_status_window(struct window *); void server_lock(void); int server_unlock(const char *); void server_kill_window(struct window *); +void server_destroy_session(struct session *); void server_set_identify(struct client *); void server_clear_identify(struct client *); |