===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-display-menu.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -c -r1.22 -r1.23
*** src/usr.bin/tmux/cmd-display-menu.c	2020/11/26 13:06:21	1.22
--- src/usr.bin/tmux/cmd-display-menu.c	2021/03/02 10:56:45	1.23
***************
*** 1,4 ****
! /* $OpenBSD: cmd-display-menu.c,v 1.22 2020/11/26 13:06:21 nicm Exp $ */
  
  /*
   * Copyright (c) 2019 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-display-menu.c,v 1.23 2021/03/02 10:56:45 nicm Exp $ */
  
  /*
   * Copyright (c) 2019 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 18,23 ****
--- 18,24 ----
  
  #include <sys/types.h>
  
+ #include <paths.h>
  #include <stdlib.h>
  #include <string.h>
  
***************
*** 50,59 ****
  	.name = "display-popup",
  	.alias = "popup",
  
! 	.args = { "CEKc:d:h:R:t:w:x:y:", 0, -1 },
! 	.usage = "[-CEK] [-c target-client] [-d start-directory] [-h height] "
! 	         "[-R shell-command] " CMD_TARGET_PANE_USAGE " [-w width] "
! 	         "[-x position] [-y position] [command line ...]",
  
  	.target = { 't', CMD_FIND_PANE, 0 },
  
--- 51,60 ----
  	.name = "display-popup",
  	.alias = "popup",
  
! 	.args = { "Cc:d:Eh:t:w:x:y:", 0, -1 },
! 	.usage = "[-CE] [-c target-client] [-d start-directory] [-h height] "
! 	         CMD_TARGET_PANE_USAGE " [-w width] "
! 	         "[-x position] [-y position] [command]",
  
  	.target = { 't', CMD_FIND_PANE, 0 },
  
***************
*** 325,337 ****
  {
  	struct args		*args = cmd_get_args(self);
  	struct cmd_find_state	*target = cmdq_get_target(item);
  	struct client		*tc = cmdq_get_target_client(item);
  	struct tty		*tty = &tc->tty;
! 	const char		*value, *cmd = NULL, **lines = NULL;
  	const char		*shellcmd = NULL;
! 	char			*cwd, *cause;
! 	int			 flags = 0;
! 	u_int			 px, py, w, h, nlines = 0;
  
  	if (args_has(args, 'C')) {
  		server_client_clear_overlay(tc);
--- 326,339 ----
  {
  	struct args		*args = cmd_get_args(self);
  	struct cmd_find_state	*target = cmdq_get_target(item);
+ 	struct session		*s = target->s;
  	struct client		*tc = cmdq_get_target_client(item);
  	struct tty		*tty = &tc->tty;
! 	const char		*value, *shell[] = { NULL, NULL };
  	const char		*shellcmd = NULL;
! 	char			*cwd, *cause, **argv = args->argv;
! 	int			 flags = 0, argc = args->argc;
! 	u_int			 px, py, w, h;
  
  	if (args_has(args, 'C')) {
  		server_client_clear_overlay(tc);
***************
*** 340,356 ****
  	if (tc->overlay_draw != NULL)
  		return (CMD_RETURN_NORMAL);
  
! 	if (args->argc >= 1)
! 		cmd = args->argv[0];
! 	if (args->argc >= 2) {
! 		lines = (const char **)args->argv + 1;
! 		nlines = args->argc - 1;
! 	}
! 
! 	if (nlines != 0)
! 		h = popup_height(nlines, lines) + 2;
! 	else
! 		h = tty->sy / 2;
  	if (args_has(args, 'h')) {
  		h = args_percentage(args, 'h', 1, tty->sy, tty->sy, &cause);
  		if (cause != NULL) {
--- 342,348 ----
  	if (tc->overlay_draw != NULL)
  		return (CMD_RETURN_NORMAL);
  
! 	h = tty->sy / 2;
  	if (args_has(args, 'h')) {
  		h = args_percentage(args, 'h', 1, tty->sy, tty->sy, &cause);
  		if (cause != NULL) {
***************
*** 360,369 ****
  		}
  	}
  
! 	if (nlines != 0)
! 		w = popup_width(item, nlines, lines, tc, target) + 2;
! 	else
! 		w = tty->sx / 2;
  	if (args_has(args, 'w')) {
  		w = args_percentage(args, 'w', 1, tty->sx, tty->sx, &cause);
  		if (cause != NULL) {
--- 352,358 ----
  		}
  	}
  
! 	w = tty->sx / 2;
  	if (args_has(args, 'w')) {
  		w = args_percentage(args, 'w', 1, tty->sx, tty->sx, &cause);
  		if (cause != NULL) {
***************
*** 384,403 ****
  	if (value != NULL)
  		cwd = format_single_from_target(item, value);
  	else
! 		cwd = xstrdup(server_client_get_cwd(tc, target->s));
  
- 	value = args_get(args, 'R');
- 	if (value != NULL)
- 		shellcmd = format_single_from_target(item, value);
- 
- 	if (args_has(args, 'K'))
- 		flags |= POPUP_WRITEKEYS;
  	if (args_has(args, 'E') > 1)
  		flags |= POPUP_CLOSEEXITZERO;
  	else if (args_has(args, 'E'))
  		flags |= POPUP_CLOSEEXIT;
! 	if (popup_display(flags, item, px, py, w, h, nlines, lines, shellcmd,
! 	    cmd, cwd, tc, target, NULL, NULL) != 0)
  		return (CMD_RETURN_NORMAL);
  	return (CMD_RETURN_WAIT);
  }
--- 373,398 ----
  	if (value != NULL)
  		cwd = format_single_from_target(item, value);
  	else
! 		cwd = xstrdup(server_client_get_cwd(tc, s));
! 	if (argc == 0)
! 		shellcmd = options_get_string(s->options, "default-command");
! 	else if (argc == 1)
! 		shellcmd = argv[0];
! 	if (argc <= 1 && (shellcmd == NULL || *shellcmd == '\0')) {
! 		shellcmd = NULL;
! 		shell[0] = options_get_string(s->options, "default-shell");
! 		if (!checkshell(shell[0]))
! 			shell[0] = _PATH_BSHELL;
! 		argc = 1;
! 		argv = (char**)shell;
! 	}
  
  	if (args_has(args, 'E') > 1)
  		flags |= POPUP_CLOSEEXITZERO;
  	else if (args_has(args, 'E'))
  		flags |= POPUP_CLOSEEXIT;
! 	if (popup_display(flags, item, px, py, w, h, shellcmd, argc, argv, cwd,
! 	    tc, s, NULL, NULL) != 0)
  		return (CMD_RETURN_NORMAL);
  	return (CMD_RETURN_WAIT);
  }