===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-display-menu.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -c -r1.36 -r1.37
*** src/usr.bin/tmux/cmd-display-menu.c	2021/10/20 09:50:40	1.36
--- src/usr.bin/tmux/cmd-display-menu.c	2021/10/25 09:38:36	1.37
***************
*** 1,4 ****
! /* $OpenBSD: cmd-display-menu.c,v 1.36 2021/10/20 09:50:40 nicm Exp $ */
  
  /*
   * Copyright (c) 2019 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-display-menu.c,v 1.37 2021/10/25 09:38:36 nicm Exp $ */
  
  /*
   * Copyright (c) 2019 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 53,63 ****
  	.name = "display-popup",
  	.alias = "popup",
  
! 	.args = { "Bb:Cc:d:e:Eh:t:T:w:x:y:", 0, -1, NULL },
  	.usage = "[-BCE] [-b border-lines] [-c target-client] "
  		 "[-d start-directory] [-e environment] [-h height] "
! 		 CMD_TARGET_PANE_USAGE " [-T title] "
! 		 "[-w width] [-x position] [-y position] [shell-command]",
  
  	.target = { 't', CMD_FIND_PANE, 0 },
  
--- 53,64 ----
  	.name = "display-popup",
  	.alias = "popup",
  
! 	.args = { "Bb:Cc:d:e:Eh:s:S:t:T:w:x:y:", 0, -1, NULL },
  	.usage = "[-BCE] [-b border-lines] [-c target-client] "
  		 "[-d start-directory] [-e environment] [-h height] "
! 		 "[-s style] [-S border-style] " CMD_TARGET_PANE_USAGE
! 		 "[-T title] [-w width] [-x position] [-y position] "
! 		 "[shell-command]",
  
  	.target = { 't', CMD_FIND_PANE, 0 },
  
***************
*** 355,360 ****
--- 356,363 ----
  	struct client		*tc = cmdq_get_target_client(item);
  	struct tty		*tty = &tc->tty;
  	const char		*value, *shell, *shellcmd = NULL;
+ 	const char		*style = args_get(args, 's');
+ 	const char		*border_style = args_get(args, 'S');
  	char			*cwd, *cause = NULL, **argv = NULL, *title;
  	int			 flags = 0, argc = 0;
  	enum box_lines		 lines = BOX_LINES_DEFAULT;
***************
*** 448,454 ****
  	else if (args_has(args, 'E'))
  		flags |= POPUP_CLOSEEXIT;
  	if (popup_display(flags, lines, item, px, py, w, h, env, shellcmd, argc,
! 	    argv, cwd, title, tc, s, NULL, NULL) != 0) {
  		cmd_free_argv(argc, argv);
  		if (env != NULL)
  			environ_free(env);
--- 451,457 ----
  	else if (args_has(args, 'E'))
  		flags |= POPUP_CLOSEEXIT;
  	if (popup_display(flags, lines, item, px, py, w, h, env, shellcmd, argc,
! 	    argv, cwd, title, tc, s, style, border_style, NULL, NULL) != 0) {
  		cmd_free_argv(argc, argv);
  		if (env != NULL)
  			environ_free(env);