summaryrefslogtreecommitdiffstats
path: root/cmd-find.c
diff options
context:
space:
mode:
authornicm <nicm>2017-08-28 12:36:38 +0000
committernicm <nicm>2017-08-28 12:36:38 +0000
commitfe4467ad2bf7b37a12330ed0a147e7230d60179a (patch)
treee784bfc89adead217255a618cb875922e8e9264a /cmd-find.c
parentfccfc4e4bed37b42c80797178621fe0d28c2f33b (diff)
Do not forbid targets to specify non-visible panes - the checks for
visibility are better where the target is used. GitHub issue 1049.
Diffstat (limited to 'cmd-find.c')
-rw-r--r--cmd-find.c32
1 files changed, 13 insertions, 19 deletions
diff --git a/cmd-find.c b/cmd-find.c
index 89771814..8fd98c94 100644
--- a/cmd-find.c
+++ b/cmd-find.c
@@ -510,7 +510,7 @@ cmd_find_get_pane(struct cmd_find_state *fs, const char *pane, int only)
/* Check for pane ids starting with %. */
if (*pane == '%') {
fs->wp = window_pane_find_by_id_str(pane);
- if (fs->wp == NULL || window_pane_outside(fs->wp))
+ if (fs->wp == NULL)
return (-1);
fs->w = fs->wp->window;
return (cmd_find_best_session_with_window(fs));
@@ -547,7 +547,7 @@ cmd_find_get_pane_with_session(struct cmd_find_state *fs, const char *pane)
/* Check for pane ids starting with %. */
if (*pane == '%') {
fs->wp = window_pane_find_by_id_str(pane);
- if (fs->wp == NULL || window_pane_outside(fs->wp))
+ if (fs->wp == NULL)
return (-1);
fs->w = fs->wp->window;
return (cmd_find_best_winlink_with_window(fs));
@@ -579,7 +579,7 @@ cmd_find_get_pane_with_window(struct cmd_find_state *fs, const char *pane)
/* Check for pane ids starting with %. */
if (*pane == '%') {
fs->wp = window_pane_find_by_id_str(pane);
- if (fs->wp == NULL || window_pane_outside(fs->wp))
+ if (fs->wp == NULL)
return (-1);
if (fs->wp->window != fs->w)
return (-1);
@@ -591,27 +591,27 @@ cmd_find_get_pane_with_window(struct cmd_find_state *fs, const char *pane)
if (fs->w->last == NULL)
return (-1);
fs->wp = fs->w->last;
- if (fs->wp == NULL || window_pane_outside(fs->wp))
+ if (fs->wp == NULL)
return (-1);
return (0);
} else if (strcmp(pane, "{up-of}") == 0) {
fs->wp = window_pane_find_up(fs->w->active);
- if (fs->wp == NULL || window_pane_outside(fs->wp))
+ if (fs->wp == NULL)
return (-1);
return (0);
} else if (strcmp(pane, "{down-of}") == 0) {
fs->wp = window_pane_find_down(fs->w->active);
- if (fs->wp == NULL || window_pane_outside(fs->wp))
+ if (fs->wp == NULL)
return (-1);
return (0);
} else if (strcmp(pane, "{left-of}") == 0) {
fs->wp = window_pane_find_left(fs->w->active);
- if (fs->wp == NULL || window_pane_outside(fs->wp))
+ if (fs->wp == NULL)
return (-1);
return (0);
} else if (strcmp(pane, "{right-of}") == 0) {
fs->wp = window_pane_find_right(fs->w->active);
- if (fs->wp == NULL || window_pane_outside(fs->wp))
+ if (fs->wp == NULL)
return (-1);
return (0);
}
@@ -627,7 +627,7 @@ cmd_find_get_pane_with_window(struct cmd_find_state *fs, const char *pane)
fs->wp = window_pane_next_by_number(fs->w, wp, n);
else
fs->wp = window_pane_previous_by_number(fs->w, wp, n);
- if (fs->wp != NULL && !window_pane_outside(fs->wp))
+ if (fs->wp != NULL)
return (0);
}
@@ -635,13 +635,13 @@ cmd_find_get_pane_with_window(struct cmd_find_state *fs, const char *pane)
idx = strtonum(pane, 0, INT_MAX, &errstr);
if (errstr == NULL) {
fs->wp = window_pane_at_index(fs->w, idx);
- if (fs->wp != NULL && !window_pane_outside(fs->wp))
+ if (fs->wp != NULL)
return (0);
}
/* Try as a description. */
fs->wp = window_find_string(fs->w, pane);
- if (fs->wp != NULL && !window_pane_outside(fs->wp))
+ if (fs->wp != NULL)
return (0);
return (-1);
@@ -689,9 +689,7 @@ cmd_find_valid_state(struct cmd_find_state *fs)
if (fs->w != fs->wl->window)
return (0);
- if (!window_has_pane(fs->w, fs->wp))
- return (0);
- return (!window_pane_outside(fs->wp));
+ return (window_has_pane(fs->w, fs->wp));
}
/* Copy a state. */
@@ -818,10 +816,6 @@ cmd_find_from_pane(struct cmd_find_state *fs, struct window_pane *wp)
{
if (cmd_find_from_window(fs, wp->window) != 0)
return (-1);
- if (window_pane_outside(wp)) {
- cmd_find_clear_state(fs, 0);
- return (-1);
- }
fs->wp = wp;
cmd_find_log_state(__func__, fs);
@@ -1016,7 +1010,7 @@ cmd_find_target(struct cmd_find_state *fs, struct cmdq_item *item,
switch (type) {
case CMD_FIND_PANE:
fs->wp = cmd_mouse_pane(m, &fs->s, &fs->wl);
- if (fs->wp != NULL && !window_pane_outside(fs->wp))
+ if (fs->wp != NULL)
fs->w = fs->wl->window;
break;
case CMD_FIND_WINDOW: