v/tmate-ssh-server
1
0
Fork 0
mirror of https://github.com/tmate-io/tmate-ssh-server.git synced 2020-11-18 19:53:51 -08:00
Code Issues Releases Wiki Activity

Sync all session windows

Browse Source
This commit is contained in:
Nicolas Viennot 2013-06-12 02:53:33 -04:00
parent f1f8233536
commit 5872c01dfd
3 changed files with 67 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
tmate-decoder.c
View File

@ -145,47 +145,74 @@ static void tmate_sync_window_panes(struct window *w,
active_pane_id = unpack_int(w_uk); active_pane_id = unpack_int(w_uk);
wp = window_pane_find_by_id(active_pane_id); wp = window_pane_find_by_id(active_pane_id);
if (wp && wp->window == w)
window_set_active_pane(w, wp); window_set_active_pane(w, wp);
} }
static void tmate_sync_window(struct tmate_unpacker *uk) static void tmate_sync_windows(struct session *s,
struct tmate_unpacker *s_uk)
{ {
struct session *s; struct tmate_unpacker uk, tmp_uk;
struct winlink *wl; struct winlink *wl, *wl_tmp;
struct window *w; struct window *w;
int active_window_id;
char *cause; char *cause;
int id = unpack_int(uk); RB_FOREACH(wl, winlinks, &s->windows)
char *name = unpack_string(uk); wl->window->flags |= WINDOW_KILL;
int sx = unpack_int(uk);
int sy = unpack_int(uk);
if (!main_session) { unpack_each(&uk, &tmp_uk, s_uk) {
main_session = session_create("default", NULL, "default", NULL, int id = unpack_int(&uk);
NULL, 0, sx, sy, &cause); char *name = unpack_string(&uk);
if (!main_session)
tmate_fatal("can't create main session");
}
s = main_session;
wl = winlink_find_by_index(&s->windows, id); wl = winlink_find_by_window_id(&s->windows, id);
if (!wl) { if (!wl) {
wl = session_new(s, name, "sh", NULL, id, &cause); wl = session_new(s, name, "", NULL, id, &cause);
if (!wl) if (!wl)
tmate_fatal("can't create window id=%d", id); tmate_fatal("can't create window id=%d", id);
session_select(s, RB_ROOT(&s->windows)->idx);
} }
w = wl->window; w = wl->window;
w->flags &= ~WINDOW_KILL;
free(w->name); free(w->name);
w->name = name; w->name = name;
s->sx = w->sx = sx; w->sx = s->sx;
s->sy = w->sy = sy; w->sy = s->sy;
tmate_sync_window_panes(w, uk); tmate_sync_window_panes(w, &uk);
}
server_redraw_window(w); RB_FOREACH_SAFE(wl, winlinks, &s->windows, wl_tmp) {
if (wl->window->flags & WINDOW_KILL)
winlink_remove(&s->windows, wl);
}
active_window_id = unpack_int(s_uk);
wl = winlink_find_by_window_id(&s->windows, active_window_id);
session_set_current(s, wl);
server_redraw_window(wl->window);
}
static void tmate_sync_layout(struct tmate_unpacker *uk)
{
struct session *s;
char *cause;
int sx = unpack_int(uk);
int sy = unpack_int(uk);
s = RB_MIN(sessions, &sessions);
if (!s) {
s = session_create("default", NULL, "default", NULL,
NULL, 0, sx, sy, &cause);
if (!s)
tmate_fatal("can't create main session");
}
s->sx = sx;
s->sy = sy;
tmate_sync_windows(s, uk);
} }
static void tmate_pty_data(struct tmate_unpacker *uk) static void tmate_pty_data(struct tmate_unpacker *uk)
@ -239,8 +266,11 @@ static void tmate_status(struct tmate_unpacker *uk)
tmate_left_status = unpack_string(uk); tmate_left_status = unpack_string(uk);
tmate_right_status = unpack_string(uk); tmate_right_status = unpack_string(uk);
for (i = 0; i < ARRAY_LENGTH(&clients); i++) for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
ARRAY_ITEM(&clients, i)->flags |= CLIENT_STATUS; c = ARRAY_ITEM(&clients, i);
if (c)
c->flags |= CLIENT_STATUS;
}
} }
static void handle_message(msgpack_object obj) static void handle_message(msgpack_object obj)
@ -253,7 +283,7 @@ static void handle_message(msgpack_object obj)
switch (unpack_int(uk)) { switch (unpack_int(uk)) {
case TMATE_HEADER: tmate_header(uk); break; case TMATE_HEADER: tmate_header(uk); break;
case TMATE_SYNC_WINDOW: tmate_sync_window(uk); break; case TMATE_SYNC_LAYOUT: tmate_sync_layout(uk); break;
case TMATE_PTY_DATA: tmate_pty_data(uk); break; case TMATE_PTY_DATA: tmate_pty_data(uk); break;
case TMATE_CMD: tmate_cmd(uk); break; case TMATE_CMD: tmate_cmd(uk); break;
case TMATE_STATUS: tmate_status(uk); break; case TMATE_STATUS: tmate_status(uk); break;

2
tmate.h
View File

@ -46,7 +46,7 @@ extern char *tmate_left_status, *tmate_right_status;
enum tmate_commands { enum tmate_commands {
TMATE_HEADER, TMATE_HEADER,
TMATE_SYNC_WINDOW, TMATE_SYNC_LAYOUT,
TMATE_PTY_DATA, TMATE_PTY_DATA,
TMATE_CMD, TMATE_CMD,
TMATE_STATUS, TMATE_STATUS,

3
tmux.h
View File

@ -1008,6 +1008,9 @@ struct window {
#define WINDOW_REDRAW 0x4 #define WINDOW_REDRAW 0x4
#define WINDOW_SILENCE 0x8 #define WINDOW_SILENCE 0x8
#define WINDOW_ZOOMED 0x10 #define WINDOW_ZOOMED 0x10
#ifdef TMATE_SLAVE
#define WINDOW_KILL 0x80
#endif
struct options options; struct options options;