circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-02 13:37:12 +00:00
Code Issues Projects Releases Wiki Activity

Sync OpenBSD patchset 333:

Browse Source 
Move some common and untidy code for window link/unlink into generic functions
instead of duplicating it in move/link window..
This commit is contained in:
Tiago Cunha
2009-09-20 22:15:32 +00:00
parent 3266fb5441
commit 7335ef5792
7 changed files with 81 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
server-fn.c
View File

@ -1,4 +1,4 @@
/* $Id: server-fn.c,v 1.88 2009-09-20 22:11:27 tcunha Exp $ */
/* $Id: server-fn.c,v 1.89 2009-09-20 22:15:32 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -292,7 +292,59 @@ server_kill_window(struct window *w)
else
server_redraw_session(s);
}
recalculate_sizes();
}
int
server_link_window(
struct winlink *srcwl, struct session *dst, int dstidx,
int killflag, int selectflag, char **cause)
{
struct winlink *dstwl;
dstwl = NULL;
if (dstidx != -1)
dstwl = winlink_find_by_index(&dst->windows, dstidx);
if (dstwl != NULL) {
if (dstwl->window == srcwl->window)
return (0);
if (killflag) {
/*
* Can't use session_detach as it will destroy session
* if this makes it empty.
*/
session_alert_cancel(dst, dstwl);
winlink_stack_remove(&dst->lastw, dstwl);
winlink_remove(&dst->windows, dstwl);
/* Force select/redraw if current. */
if (dstwl == dst->curw)
selectflag = 1;
}
}
if (dstidx == -1)
dstidx = -1 - options_get_number(&dst->options, "base-index");
dstwl = session_attach(dst, srcwl->window, dstidx, cause);
if (dstwl == NULL)
return (-1);
if (!selectflag)
server_status_session(dst);
else {
session_select(dst, dstwl->idx);
server_redraw_session(dst);
}
return (0);
}
void
server_unlink_window(struct session *s, struct winlink *wl)
{
if (session_detach(s, wl))
server_destroy_session(s);
else
server_redraw_session(s);
}
void