From 234f91e8668b168257adc7ec941db7203537fe56 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Mon, 4 Jul 2011 14:04:41 +0000 Subject: Show full targets for lsp/lsw -a. --- usr.bin/tmux/cmd-list-panes.c | 52 +++++++++++++++++++++++++++++------------ usr.bin/tmux/cmd-list-windows.c | 24 ++++++++++++------- 2 files changed, 53 insertions(+), 23 deletions(-) (limited to 'usr.bin') diff --git a/usr.bin/tmux/cmd-list-panes.c b/usr.bin/tmux/cmd-list-panes.c index 905ce6e0c61..b0c30c4dfed 100644 --- a/usr.bin/tmux/cmd-list-panes.c +++ b/usr.bin/tmux/cmd-list-panes.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-list-panes.c,v 1.10 2011/04/05 19:37:01 nicm Exp $ */ +/* $OpenBSD: cmd-list-panes.c,v 1.11 2011/07/04 14:04:40 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott @@ -29,8 +29,9 @@ int cmd_list_panes_exec(struct cmd *, struct cmd_ctx *); void cmd_list_panes_server(struct cmd_ctx *); -void cmd_list_panes_session(struct session *, struct cmd_ctx *); -void cmd_list_panes_window(struct winlink *, struct cmd_ctx *); +void cmd_list_panes_session(struct session *, struct cmd_ctx *, int); +void cmd_list_panes_window( + struct session *, struct winlink *, struct cmd_ctx *, int); const struct cmd_entry cmd_list_panes_entry = { "list-panes", "lsp", @@ -55,12 +56,12 @@ cmd_list_panes_exec(struct cmd *self, struct cmd_ctx *ctx) s = cmd_find_session(ctx, args_get(args, 't'), 0); if (s == NULL) return (-1); - cmd_list_panes_session(s, ctx); + cmd_list_panes_session(s, ctx, 1); } else { - wl = cmd_find_window(ctx, args_get(args, 't'), NULL); + wl = cmd_find_window(ctx, args_get(args, 't'), &s); if (wl == NULL) return (-1); - cmd_list_panes_window(wl, ctx); + cmd_list_panes_window(s, wl, ctx, 0); } return (0); @@ -72,20 +73,21 @@ cmd_list_panes_server(struct cmd_ctx *ctx) struct session *s; RB_FOREACH(s, sessions, &sessions) - cmd_list_panes_session(s, ctx); + cmd_list_panes_session(s, ctx, 2); } void -cmd_list_panes_session(struct session *s, struct cmd_ctx *ctx) +cmd_list_panes_session(struct session *s, struct cmd_ctx *ctx, int type) { struct winlink *wl; RB_FOREACH(wl, winlinks, &s->windows) - cmd_list_panes_window(wl, ctx); + cmd_list_panes_window(s, wl, ctx, type); } void -cmd_list_panes_window(struct winlink *wl, struct cmd_ctx *ctx) +cmd_list_panes_window( + struct session *s, struct winlink *wl, struct cmd_ctx *ctx, int type) { struct window_pane *wp; struct grid *gd; @@ -105,11 +107,31 @@ cmd_list_panes_window(struct winlink *wl, struct cmd_ctx *ctx) } size += gd->hsize * sizeof *gd->linedata; - ctx->print(ctx, - "%u: [%ux%u] [history %u/%u, %llu bytes] %%%u%s%s", - n, wp->sx, wp->sy, gd->hsize, gd->hlimit, size, wp->id, - wp == wp->window->active ? " (active)" : "", - wp->fd == -1 ? " (dead)" : ""); + switch (type) { + case 0: + ctx->print(ctx, + "%u: [%ux%u] [history %u/%u, %llu bytes] %%%u%s%s", + n, wp->sx, wp->sy, gd->hsize, gd->hlimit, size, + wp->id, wp == wp->window->active ? " (active)" : "", + wp->fd == -1 ? " (dead)" : ""); + break; + case 1: + ctx->print(ctx, + "%d.%u: [%ux%u] [history %u/%u, %llu bytes] " + "%%%u%s%s", wl->idx, + n, wp->sx, wp->sy, gd->hsize, gd->hlimit, size, + wp->id, wp == wp->window->active ? " (active)" : "", + wp->fd == -1 ? " (dead)" : ""); + break; + case 2: + ctx->print(ctx, + "%s:%d.%u: [%ux%u] [history %u/%u, %llu bytes] " + "%%%u%s%s", s->name, wl->idx, + n, wp->sx, wp->sy, gd->hsize, gd->hlimit, size, + wp->id, wp == wp->window->active ? " (active)" : "", + wp->fd == -1 ? " (dead)" : ""); + break; + } n++; } } diff --git a/usr.bin/tmux/cmd-list-windows.c b/usr.bin/tmux/cmd-list-windows.c index 266fc4d22cf..0a71bff2c9b 100644 --- a/usr.bin/tmux/cmd-list-windows.c +++ b/usr.bin/tmux/cmd-list-windows.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-list-windows.c,v 1.13 2011/04/05 19:37:01 nicm Exp $ */ +/* $OpenBSD: cmd-list-windows.c,v 1.14 2011/07/04 14:04:40 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -29,7 +29,7 @@ int cmd_list_windows_exec(struct cmd *, struct cmd_ctx *); void cmd_list_windows_server(struct cmd_ctx *); -void cmd_list_windows_session(struct session *, struct cmd_ctx *); +void cmd_list_windows_session(struct session *, struct cmd_ctx *, int); const struct cmd_entry cmd_list_windows_entry = { "list-windows", "lsw", @@ -53,7 +53,7 @@ cmd_list_windows_exec(struct cmd *self, struct cmd_ctx *ctx) s = cmd_find_session(ctx, args_get(args, 't'), 0); if (s == NULL) return (-1); - cmd_list_windows_session(s, ctx); + cmd_list_windows_session(s, ctx, 0); } return (0); @@ -65,20 +65,28 @@ cmd_list_windows_server(struct cmd_ctx *ctx) struct session *s; RB_FOREACH(s, sessions, &sessions) - cmd_list_windows_session(s, ctx); + cmd_list_windows_session(s, ctx, 1); } void -cmd_list_windows_session(struct session *s, struct cmd_ctx *ctx) +cmd_list_windows_session(struct session *s, struct cmd_ctx *ctx, int type) { struct winlink *wl; char *layout; RB_FOREACH(wl, winlinks, &s->windows) { layout = layout_dump(wl->window); - ctx->print(ctx, "%d: %s [%ux%u] [layout %s]%s", - wl->idx, wl->window->name, wl->window->sx, wl->window->sy, - layout, wl == s->curw ? " (active)" : ""); + if (type) { + ctx->print(ctx, "%s:%d: %s [%ux%u] [layout %s]%s", + s->name, wl->idx, wl->window->name, wl->window->sx, + wl->window->sy, layout, + wl == s->curw ? " (active)" : ""); + } else { + ctx->print(ctx, "%d: %s [%ux%u] [layout %s]%s", + wl->idx, wl->window->name, wl->window->sx, + wl->window->sy, layout, + wl == s->curw ? " (active)" : ""); + } xfree(layout); } } -- cgit v1.2.3