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

Get rid of the layout string code which tries to walk through the layout

Browse Source 
hierarchy and instead just look at what panes are actually in the window.
This commit is contained in:
Nicholas Marriott
2011-06-05 10:53:05 +00:00
parent f537870909
commit 2b60c648c4
6 changed files with 74 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cmd.c
View File

@ -1058,12 +1058,11 @@ struct winlink *
cmd_find_pane(struct cmd_ctx *ctx,
const char *arg, struct session **sp, struct window_pane **wpp)
{
struct session *s;
struct winlink *wl;
struct layout_cell *lc;
const char *period, *errstr;
char *winptr, *paneptr;
u_int idx;
struct session *s;
struct winlink *wl;
const char *period, *errstr;
char *winptr, *paneptr;
u_int idx;
/* Get the current session. */
if ((s = cmd_current_session(ctx, 0)) == NULL) {
@ -1119,11 +1118,10 @@ cmd_find_pane(struct cmd_ctx *ctx,
lookup_string:
/* Try pane string description. */
if ((lc = layout_find_string(wl->window, paneptr)) == NULL) {
if ((*wpp = window_find_string(wl->window, paneptr)) == NULL) {
ctx->error(ctx, "can't find pane: %s", paneptr);
goto error;
}
*wpp = lc->wp;
xfree(winptr);
return (wl);
@ -1142,10 +1140,8 @@ no_period:
lookup_window:
/* Try pane string description. */
if ((lc = layout_find_string(s->curw->window, arg)) != NULL) {
*wpp = lc->wp;
if ((*wpp = window_find_string(s->curw->window, arg)) != NULL)
return (s->curw);
}
/* Try as a window and use the active pane. */
if ((wl = cmd_find_window(ctx, arg, sp)) != NULL)