Hi
I like this, just a few things:
- I think choose-session and choose-window should look unchanged, no
extra flags - you can just convert format from -F.
- The flags should be -w and -s and the formats -W and -S. I think this
matches set-option more closely.
- If I give -w I want windows, -s sessions. If I give neither I want the
full tree (so no flags is the same as -ws).
- I don't get how the ACS works for you, for me it just shows tq. It may
be too much work to turn them on properly and better just to use ->.
On Wed, Jun 27, 2012 at 03:20:13PM +0100, Thomas Adam wrote:
> This introduces a choose-tree command, which amalgamates the functionality
> of choose-session and choose-window to be displayed as a tree.
> ---
> trunk/Makefile.am | 1 +
> trunk/cmd-choose-tree.c | 188
> +++++++++++++++++++++++++++++++++++++++++++++++
> trunk/cmd.c | 1 +
> trunk/tmux.1 | 62 ++++++++++++++++
> trunk/tmux.h | 1 +
> 5 files changed, 253 insertions(+)
> create mode 100644 trunk/cmd-choose-tree.c
>
> diff --git a/trunk/Makefile.am b/trunk/Makefile.am
> index c4f45be..d1d820c 100644
> --- a/trunk/Makefile.am
> +++ b/trunk/Makefile.am
> @@ -67,6 +67,7 @@ dist_tmux_SOURCES = \
> cmd-choose-buffer.c \
> cmd-choose-client.c \
> cmd-choose-session.c \
> + cmd-choose-tree.c \
> cmd-choose-window.c \
> cmd-clear-history.c \
> cmd-clock-mode.c \
> diff --git a/trunk/cmd-choose-tree.c b/trunk/cmd-choose-tree.c
> new file mode 100644
> index 0000000..4051261
> --- /dev/null
> +++ b/trunk/cmd-choose-tree.c
> @@ -0,0 +1,188 @@
> +/* $Id$ */
> +
> +/*
> + * Copyright (c) 2012 Thomas Adam <tho...@xteddy.org>
> + *
> + * Permission to use, copy, modify, and distribute this software for any
> + * purpose with or without fee is hereby granted, provided that the above
> + * copyright notice and this permission notice appear in all copies.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
> + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
> + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
> + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
> + * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
> + * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
> + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
> + */
> +
> +#include <sys/types.h>
> +
> +#include <ctype.h>
> +
> +#include <string.h>
> +
> +#include "tmux.h"
> +
> +/*
> + * Enter choice mode to choose a session and/or window.
> + */
> +
> +int cmd_choose_tree_exec(struct cmd *, struct cmd_ctx *);
> +
> +void cmd_choose_tree_callback(struct window_choose_data *);
> +void cmd_choose_tree_free(struct window_choose_data *);
> +
> +const struct cmd_entry cmd_choose_tree_entry = {
> + "choose-tree", NULL,
> + "SWs:w:b:c:t:", 0, 1,
> + "[-S] [-W] [-s format] [-w format ] [-b session template] " \
> + "[-c window template] " CMD_TARGET_WINDOW_USAGE,
> + 0,
> + NULL,
> + NULL,
> + cmd_choose_tree_exec
> +};
> +
> +int
> +cmd_choose_tree_exec(struct cmd *self, struct cmd_ctx *ctx)
> +{
> + struct args *args = self->args;
> + struct winlink *wl, *wm;
> + struct session *s, *s2;
> + struct tty *tty;
> + struct window_choose_data *wcd = NULL;
> + const char *ses_template, *win_template;
> + char *final_win_action, *final_win_template;
> + const char *ses_action, *win_action;
> + u_int cur_win, idx_ses, win_ses;
> + u_int wflag, sflag;
> +
> + if (ctx->curclient == NULL) {
> + ctx->error(ctx, "must be run interactively");
> + return (-1);
> + }
> + s = ctx->curclient->session;
> + tty = &ctx->curclient->tty;
> +
> + if ((wl = cmd_find_window(ctx, args_get(args, 't'), NULL)) == NULL)
> + return (-1);
> +
> + if (window_pane_set_mode(wl->window->active, &window_choose_mode) != 0)
> + return (0);
> +
> + if ((ses_action = args_get(args, 'b')) == NULL)
> + ses_action = "switch-client -t '%%'";
> +
> + if ((win_action = args_get(args, 'c')) == NULL)
> + win_action = "select-window -t '%%'";
> +
> + if ((ses_template = args_get(args, 's')) == NULL)
> + ses_template = DEFAULT_SESSION_TEMPLATE;
> +
> + if ((win_template = args_get(args, 'w')) == NULL)
> + win_template = DEFAULT_WINDOW_TEMPLATE " \"#{pane_title}\"";
> +
> + wflag = args_has(args, 'W');
> + sflag = args_has(args, 'S');
> +
> + /* If we're drawing in tree mode, including sessions, then pad the
> + * window template with ACS drawing characters, otherwise just render
> + * the windows as a flat list, without any padding.
> + */
> + if (wflag && sflag)
> + xasprintf(&final_win_template, " %s%s> %s",
> + tty_acs_get(tty, 't'), tty_acs_get(tty, 'q'),
> + win_template);
> + else
> + final_win_template = xstrdup(win_template);
> +
> + idx_ses = cur_win = -1;
> + RB_FOREACH(s2, sessions, &sessions) {
> + idx_ses++;
> +
> + /* If we're just choosing windows, jump straight there. Note
> + * that this implies the current session, so only choose
> + * windows when the session matches this one.
> + */
> + if (wflag && !sflag) {
> + if (s != s2)
> + continue;
> + goto windows_only;
> + }
> +
> + wcd = window_choose_add_session(wl->window->active,
> + ctx, s2, ses_template, (char *)ses_action, idx_ses);
> +
> + /* If we're just choosing sessions, skip choosing windows. */
> + if (sflag && !wflag) {
> + if (s == s2)
> + cur_win = idx_ses;
> + continue;
> + }
> +windows_only:
> + win_ses = -1;
> + RB_FOREACH(wm, winlinks, &s2->windows) {
> + win_ses++;
> + if (sflag && wflag)
> + idx_ses++;
> +
> + if (wm == s2->curw && s == s2) {
> + if (wflag && !sflag)
> + /* Then we're only counting windows.
> + * So remember which is the current
> + * window in the list.
> + */
> + cur_win = win_ses;
> + else
> + cur_win = idx_ses;
> + }
> +
> + xasprintf(&final_win_action, "%s ; %s", win_action,
> + wcd ? wcd->command : "");
> +
> + window_choose_add_window(wl->window->active,
> + ctx, s2, wm, final_win_template,
> + final_win_action, idx_ses);
> +
> + xfree(final_win_action);
> + }
> + /* If we're just drawing windows, don't consider moving on to
> + * other sessions as we only list windows in this session.
> + */
> + if (wflag && !sflag)
> + break;
> + }
> + xfree(final_win_template);
> +
> + window_choose_ready(wl->window->active, cur_win,
> + cmd_choose_tree_callback, cmd_choose_tree_free);
> +
> + return (0);
> +}
> +
> +void
> +cmd_choose_tree_callback(struct window_choose_data *cdata)
> +{
> + if (cdata == NULL)
> + return;
> +
> + if (cdata->client->flags & CLIENT_DEAD)
> + return;
> +
> + window_choose_ctx(cdata);
> +}
> +
> +void
> +cmd_choose_tree_free(struct window_choose_data *cdata)
> +{
> + cdata->session->references--;
> + cdata->client->references--;
> +
> + xfree(cdata->ft_template);
> + xfree(cdata->command);
> + format_free(cdata->ft);
> + xfree(cdata);
> +
> +}
> +
> diff --git a/trunk/cmd.c b/trunk/cmd.c
> index c4217c2..d1b60ec 100644
> --- a/trunk/cmd.c
> +++ b/trunk/cmd.c
> @@ -35,6 +35,7 @@ const struct cmd_entry *cmd_table[] = {
> &cmd_choose_buffer_entry,
> &cmd_choose_client_entry,
> &cmd_choose_session_entry,
> + &cmd_choose_tree_entry,
> &cmd_choose_window_entry,
> &cmd_clear_history_entry,
> &cmd_clock_mode_entry,
> diff --git a/trunk/tmux.1 b/trunk/tmux.1
> index 7062890..4cf41b4 100644
> --- a/trunk/tmux.1
> +++ b/trunk/tmux.1
> @@ -1094,6 +1094,68 @@ section.
> This command works only from inside
> .Nm .
> .It Xo
> +.Ic choose-tree
> +.Op Fl S
> +.Op Fl W
> +.Op Fl b Ar session-template
> +.Op Fl c Ar window-template
> +.Op Fl s Ar format
> +.Op Fl w Ar format
> +.Op Fl t Ar target-window
> +.Xc
> +Put a window into tree choice mode, where either sessions or windows may be
> +selected interactively from a list.
> +By default, windows belonging to a session are indented to show their
> +relationship to a session.
> +.Pp
> +Note that the
> +.Ic choose-window
> +and
> +.Ic choose-session
> +commands are wrappers around
> +.Ic choose-tree .
> +.
> +.Pp
> +If
> +.Fl S
> +is given, will show sessions.
> +If
> +.Fl W
> +is given, will show windows.
> +If
> +.Fl b
> +is given, will override the default session command.
> +Note that
> +.Ql %%
> +can be used, and will be replaced with the session name.
> +The default option if not specified is "switch-client -t '%%'".
> +If
> +.Fl c
> +is given, will override the default window command.
> +Note that
> +.Ql %%
> +can be used, and will be replaced with the session name and window index.
> +This command will run
> +.Ar session-template
> +before it.
> +If
> +.Fl s
> +is given will display the specified format instead of the default session
> +format.
> +If
> +.Fl w
> +is given will display the specified format instead of the default window
> +format.
> +For the meaning of the
> +.Fl s
> +and
> +.Fl w
> +options, see the
> +.Sx FORMATS
> +section.
> +This command only works from inside
> +.Nm .
> +.It Xo
> .Ic choose-window
> .Op Fl F Ar format
> .Op Fl t Ar target-window
> diff --git a/trunk/tmux.h b/trunk/tmux.h
> index df05dd3..9cf4a7b 100644
> --- a/trunk/tmux.h
> +++ b/trunk/tmux.h
> @@ -1660,6 +1660,7 @@ extern const struct cmd_entry cmd_capture_pane_entry;
> extern const struct cmd_entry cmd_choose_buffer_entry;
> extern const struct cmd_entry cmd_choose_client_entry;
> extern const struct cmd_entry cmd_choose_session_entry;
> +extern const struct cmd_entry cmd_choose_tree_entry;
> extern const struct cmd_entry cmd_choose_window_entry;
> extern const struct cmd_entry cmd_clear_history_entry;
> extern const struct cmd_entry cmd_clock_mode_entry;
> --
> 1.7.10
>
>
> ------------------------------------------------------------------------------
> Live Security Virtual Conference
> Exclusive live event will cover all the ways today's security and
> threat landscape has changed and how IT managers can respond. Discussions
> will include endpoint security, mobile security and the latest in malware
> threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
> _______________________________________________
> tmux-users mailing list
> tmux-users@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/tmux-users
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
tmux-users mailing list
tmux-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tmux-users
