circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 00:56:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2017-07-07 10:01:09 +01:00
parent 6b1ceca86a 1f7ca973c5
commit 1029f2b277
1 changed files with 48 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
cmd-find.c
View File

@@ -95,6 +95,22 @@ cmd_find_try_TMUX(struct client *c)
return (session_find_by_id(session)); return (session_find_by_id(session));
} }
/* Find pane containing client if any. */
static struct window_pane *
cmd_find_inside_pane(struct client *c)
{
struct window_pane *wp;
if (c == NULL)
return (NULL);
RB_FOREACH(wp, window_pane_tree, &all_window_panes) {
if (strcmp(wp->tty, c->ttyname) == 0)
break;
}
return (wp);
}
/* Is this client better? */ /* Is this client better? */
static int static int
cmd_find_client_better(struct client *c, struct client *than) cmd_find_client_better(struct client *c, struct client *than)
@@ -874,10 +890,7 @@ cmd_find_from_client(struct cmd_find_state *fs, struct client *c)
* If this is an unattached client running in a pane, we can use that * If this is an unattached client running in a pane, we can use that
* to limit the list of sessions to those containing that pane. * to limit the list of sessions to those containing that pane.
*/ */
RB_FOREACH(wp, window_pane_tree, &all_window_panes) { wp = cmd_find_inside_pane(c);
if (strcmp(wp->tty, c->ttyname) == 0)
break;
}
if (wp == NULL) if (wp == NULL)
goto unknown_pane; goto unknown_pane;
@@ -1231,30 +1244,46 @@ no_pane:
goto error; goto error;
} }
/* Find the current client. */
static struct client *
cmd_find_current_client(struct cmdq_item *item, int quiet)
{
struct client *c;
struct session *s;
struct window_pane *wp;
struct cmd_find_state fs;
if (item->client != NULL && item->client->session != NULL)
return (item->client);
c = NULL;
if ((wp = cmd_find_inside_pane(item->client)) != NULL) {
cmd_find_clear_state(&fs, CMD_FIND_QUIET);
fs.w = wp->window;
if (cmd_find_best_session_with_window(&fs) == 0)
c = cmd_find_best_client(fs.s);
} else {
s = cmd_find_best_session(NULL, 0, CMD_FIND_QUIET);
if (s != NULL)
c = cmd_find_best_client(s);
}
if (c == NULL && !quiet)
cmdq_error(item, "no current client");
log_debug("%s: no target, return %p", __func__, c);
return (c);
}
/* Find the target client or report an error and return NULL. */ /* Find the target client or report an error and return NULL. */
struct client * struct client *
cmd_find_client(struct cmdq_item *item, const char *target, int quiet) cmd_find_client(struct cmdq_item *item, const char *target, int quiet)
{ {
struct client *c; struct client *c;
struct session *s;
char *copy; char *copy;
size_t size; size_t size;
/* A NULL argument means the current client. */ /* A NULL argument means the current client. */
if (target == NULL) { if (target == NULL)
c = NULL; return (cmd_find_current_client(item, quiet));
if (item->client != NULL && item->client->session != NULL)
c = item->client;
else {
s = cmd_find_best_session(NULL, 0, CMD_FIND_QUIET);
if (s != NULL)
c = cmd_find_best_client(s);
}
if (c == NULL && !quiet)
cmdq_error(item, "no current client");
log_debug("%s: no target, return %p", __func__, c);
return (c);
}
copy = xstrdup(target); copy = xstrdup(target);
/* Trim a single trailing colon if any. */ /* Trim a single trailing colon if any. */