Skip to content

Commit

Permalink
Add -f to list-clients like the other list commands, from Andy Walker in
Browse files Browse the repository at this point in the history
GitHub issue 3449.
  • Loading branch information
nicm committed Feb 6, 2023
1 parent 0cb75f1 commit 7acc8d7
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 9 deletions.
24 changes: 17 additions & 7 deletions cmd-list-clients.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ const struct cmd_entry cmd_list_clients_entry = {
.name = "list-clients",
.alias = "lsc",

.args = { "F:t:", 0, 0, NULL },
.usage = "[-F format] " CMD_TARGET_SESSION_USAGE,
.args = { "F:f:t:", 0, 0, NULL },
.usage = "[-F format] [-f filter] " CMD_TARGET_SESSION_USAGE,

.target = { 't', CMD_FIND_SESSION, 0 },

Expand All @@ -58,9 +58,10 @@ cmd_list_clients_exec(struct cmd *self, struct cmdq_item *item)
struct client *c;
struct session *s;
struct format_tree *ft;
const char *template;
const char *template, *filter;
u_int idx;
char *line;
char *line, *expanded;
int flag;

if (args_has(args, 't'))
s = target->s;
Expand All @@ -69,6 +70,7 @@ cmd_list_clients_exec(struct cmd *self, struct cmdq_item *item)

if ((template = args_get(args, 'F')) == NULL)
template = LIST_CLIENTS_TEMPLATE;
filter = args_get(args, 'f');

idx = 0;
TAILQ_FOREACH(c, &clients, entry) {
Expand All @@ -79,9 +81,17 @@ cmd_list_clients_exec(struct cmd *self, struct cmdq_item *item)
format_add(ft, "line", "%u", idx);
format_defaults(ft, c, NULL, NULL, NULL);

line = format_expand(ft, template);
cmdq_print(item, "%s", line);
free(line);
if (filter != NULL) {
expanded = format_expand(ft, filter);
flag = format_true(expanded);
free(expanded);
} else
flag = 1;
if (flag) {
line = format_expand(ft, template);
cmdq_print(item, "%s", line);
free(line);
}

format_free(ft);

Expand Down
8 changes: 6 additions & 2 deletions tmux.1
Original file line number Diff line number Diff line change
Expand Up @@ -1164,13 +1164,17 @@ session.
.Tg lsc
.It Xo Ic list-clients
.Op Fl F Ar format
.Op Fl f Ar filter
.Op Fl t Ar target-session
.Xc
.D1 Pq alias: Ic lsc
List all clients attached to the server.
For the meaning of the
.Fl F
flag, see the
specifies the format of each line and
.Fl f
a filter.
Only clients for which the filter is true are shown.
See the
.Sx FORMATS
section.
If
Expand Down

0 comments on commit 7acc8d7

Please sign in to comment.