mirror of
				https://github.com/tmux/tmux.git
				synced 2025-11-04 00:56:10 +00:00 
			
		
		
		
	Remove the choose-list command to prepare for some later choose-* work.
This commit is contained in:
		
							
								
								
									
										1
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										1
									
								
								Makefile
									
									
									
									
									
								
							@@ -11,7 +11,6 @@ SRCS=	arguments.c \
 | 
			
		||||
	cmd-capture-pane.c \
 | 
			
		||||
	cmd-choose-buffer.c \
 | 
			
		||||
	cmd-choose-client.c \
 | 
			
		||||
	cmd-choose-list.c \
 | 
			
		||||
	cmd-choose-tree.c \
 | 
			
		||||
	cmd-clear-history.c \
 | 
			
		||||
	cmd-clock-mode.c \
 | 
			
		||||
 
 | 
			
		||||
@@ -1,97 +0,0 @@
 | 
			
		||||
/* $Id$ */
 | 
			
		||||
 | 
			
		||||
/*
 | 
			
		||||
 * Copyright (c) 2012 Thomas Adam <thomas@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 <stdlib.h>
 | 
			
		||||
 | 
			
		||||
#include <string.h>
 | 
			
		||||
 | 
			
		||||
#include "tmux.h"
 | 
			
		||||
 | 
			
		||||
#define CMD_CHOOSE_LIST_DEFAULT_TEMPLATE "run-shell '%%'"
 | 
			
		||||
 | 
			
		||||
/*
 | 
			
		||||
 * Enter choose mode to choose a custom list.
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
enum cmd_retval cmd_choose_list_exec(struct cmd *, struct cmd_q *);
 | 
			
		||||
 | 
			
		||||
const struct cmd_entry cmd_choose_list_entry = {
 | 
			
		||||
	"choose-list", NULL,
 | 
			
		||||
	"l:t:", 0, 1,
 | 
			
		||||
	"[-l items] " CMD_TARGET_WINDOW_USAGE "[template]",
 | 
			
		||||
	0,
 | 
			
		||||
	NULL,
 | 
			
		||||
	cmd_choose_list_exec
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
enum cmd_retval
 | 
			
		||||
cmd_choose_list_exec(struct cmd *self, struct cmd_q *cmdq)
 | 
			
		||||
{
 | 
			
		||||
	struct args			*args = self->args;
 | 
			
		||||
	struct client			*c;
 | 
			
		||||
	struct winlink			*wl;
 | 
			
		||||
	const char			*list1;
 | 
			
		||||
	char				*template, *item, *copy, *list;
 | 
			
		||||
	u_int				 idx;
 | 
			
		||||
 | 
			
		||||
	if ((c = cmd_current_client(cmdq)) == NULL) {
 | 
			
		||||
		cmdq_error(cmdq, "no client available");
 | 
			
		||||
		return (CMD_RETURN_ERROR);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if ((list1 = args_get(args, 'l')) == NULL)
 | 
			
		||||
		return (CMD_RETURN_ERROR);
 | 
			
		||||
 | 
			
		||||
	if ((wl = cmd_find_window(cmdq, args_get(args, 't'), NULL)) == NULL)
 | 
			
		||||
		return (CMD_RETURN_ERROR);
 | 
			
		||||
 | 
			
		||||
	if (window_pane_set_mode(wl->window->active, &window_choose_mode) != 0)
 | 
			
		||||
		return (CMD_RETURN_NORMAL);
 | 
			
		||||
 | 
			
		||||
	if (args->argc != 0)
 | 
			
		||||
		template = xstrdup(args->argv[0]);
 | 
			
		||||
	else
 | 
			
		||||
		template = xstrdup(CMD_CHOOSE_LIST_DEFAULT_TEMPLATE);
 | 
			
		||||
 | 
			
		||||
	copy = list = xstrdup(list1);
 | 
			
		||||
	idx = 0;
 | 
			
		||||
	while ((item = strsep(&list, ",")) != NULL)
 | 
			
		||||
	{
 | 
			
		||||
		if (*item == '\0') /* no empty entries */
 | 
			
		||||
			continue;
 | 
			
		||||
		window_choose_add_item(wl->window->active, c, wl, item,
 | 
			
		||||
		    template, idx);
 | 
			
		||||
		idx++;
 | 
			
		||||
	}
 | 
			
		||||
	free(copy);
 | 
			
		||||
 | 
			
		||||
	if (idx == 0) {
 | 
			
		||||
		free(template);
 | 
			
		||||
		window_pane_reset_mode(wl->window->active);
 | 
			
		||||
		return (CMD_RETURN_ERROR);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	window_choose_ready(wl->window->active, 0, NULL);
 | 
			
		||||
 | 
			
		||||
	free(template);
 | 
			
		||||
 | 
			
		||||
	return (CMD_RETURN_NORMAL);
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										1
									
								
								cmd.c
									
									
									
									
									
								
							
							
						
						
									
										1
									
								
								cmd.c
									
									
									
									
									
								
							@@ -35,7 +35,6 @@ const struct cmd_entry *cmd_table[] = {
 | 
			
		||||
	&cmd_capture_pane_entry,
 | 
			
		||||
	&cmd_choose_buffer_entry,
 | 
			
		||||
	&cmd_choose_client_entry,
 | 
			
		||||
	&cmd_choose_list_entry,
 | 
			
		||||
	&cmd_choose_session_entry,
 | 
			
		||||
	&cmd_choose_tree_entry,
 | 
			
		||||
	&cmd_choose_window_entry,
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										26
									
								
								tmux.1
									
									
									
									
									
								
							
							
						
						
									
										26
									
								
								tmux.1
									
									
									
									
									
								
							@@ -1155,32 +1155,6 @@ flag, see the
 | 
			
		||||
section.
 | 
			
		||||
This command works only if at least one client is attached.
 | 
			
		||||
.It Xo
 | 
			
		||||
.Ic choose-list
 | 
			
		||||
.Op Fl l Ar items
 | 
			
		||||
.Op Fl t Ar target-window
 | 
			
		||||
.Op Ar template
 | 
			
		||||
.Xc
 | 
			
		||||
Put a window into list choice mode, allowing
 | 
			
		||||
.Ar items
 | 
			
		||||
to be selected.
 | 
			
		||||
.Ar items
 | 
			
		||||
can be a comma-separated list to display more than one item.
 | 
			
		||||
If an item has spaces, that entry must be quoted.
 | 
			
		||||
After an item is chosen,
 | 
			
		||||
.Ql %%
 | 
			
		||||
is replaced by the chosen item in the
 | 
			
		||||
.Ar template
 | 
			
		||||
and the result is executed as a command.
 | 
			
		||||
If
 | 
			
		||||
.Ar template
 | 
			
		||||
is not given, "run-shell '%%'" is used.
 | 
			
		||||
.Ar items
 | 
			
		||||
also accepts format specifiers.
 | 
			
		||||
For the meaning of this see the
 | 
			
		||||
.Sx FORMATS
 | 
			
		||||
section.
 | 
			
		||||
This command works only if at least one client is attached.
 | 
			
		||||
.It Xo
 | 
			
		||||
.Ic choose-session
 | 
			
		||||
.Op Fl F Ar format
 | 
			
		||||
.Op Fl t Ar target-window
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										1
									
								
								tmux.h
									
									
									
									
									
								
							
							
						
						
									
										1
									
								
								tmux.h
									
									
									
									
									
								
							@@ -1759,7 +1759,6 @@ extern const struct cmd_entry cmd_break_pane_entry;
 | 
			
		||||
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_list_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;
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user