diff options
author | nicm <nicm> | 2017-07-07 07:13:14 +0000 |
---|---|---|
committer | nicm <nicm> | 2017-07-07 07:13:14 +0000 |
commit | 1f7ca973c5ddae22db18b1d3dbb9e5c7cb0f3a6a (patch) | |
tree | e0677f8c1f0efa69d221fc26eaa93110cc2d3d72 /cmd-find.c | |
parent | 53d4ed22e8df79068c34745f0507dda2315400fa (diff) |
When working out the current client (for example for switch-client with
no target), prefer clients attached to the current session if there is
one. GitHub issue 995 from Jan Larres.
Diffstat (limited to 'cmd-find.c')
-rw-r--r-- | cmd-find.c | 67 |
1 files changed, 48 insertions, 19 deletions
@@ -96,6 +96,22 @@ cmd_find_try_TMUX(struct client *c) 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? */ static int cmd_find_client_better(struct client *c, struct client *than) @@ -875,10 +891,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 * to limit the list of sessions to those containing that pane. */ - RB_FOREACH(wp, window_pane_tree, &all_window_panes) { - if (strcmp(wp->tty, c->ttyname) == 0) - break; - } + wp = cmd_find_inside_pane(c); if (wp == NULL) goto unknown_pane; @@ -1232,30 +1245,46 @@ no_pane: 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. */ struct client * cmd_find_client(struct cmdq_item *item, const char *target, int quiet) { struct client *c; - struct session *s; char *copy; size_t size; /* A NULL argument means the current client. */ - if (target == NULL) { - c = NULL; - 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); - } + if (target == NULL) + return (cmd_find_current_client(item, quiet)); copy = xstrdup(target); /* Trim a single trailing colon if any. */ |