circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-02 05:21:10 +00:00
Code Issues Projects Releases Wiki Activity

Add -e flag to set environment for popup, from Alexis Hildebrandt in

Browse Source 
GitHub issue 2924.
This commit is contained in:
nicm
2021-10-11 10:55:30 +00:00
parent 7800a431ea
commit 759efe1b33
9 changed files with 48 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
cmd-display-menu.c
View File

@ -53,10 +53,10 @@ const struct cmd_entry cmd_display_popup_entry = {
.name = "display-popup",
.alias = "popup",
.args = { "BCc:d:Eh:t:w:x:y:", 0, -1, NULL },
.usage = "[-BCE] [-c target-client] [-d start-directory] [-h height] "
CMD_TARGET_PANE_USAGE " [-w width] "
"[-x position] [-y position] [shell-command]",
.args = { "BCc:d:e:Eh:t:w:x:y:", 0, -1, NULL },
.usage = "[-BCE] [-c target-client] [-d start-directory] "
"[-e environment] [-h height] " CMD_TARGET_PANE_USAGE " "
"[-w width] [-x position] [-y position] [shell-command]",
.target = { 't', CMD_FIND_PANE, 0 },
@ -357,6 +357,8 @@ cmd_display_popup_exec(struct cmd *self, struct cmdq_item *item)
char *cwd, *cause, **argv = NULL;
int flags = 0, argc = 0;
u_int px, py, w, h, count = args_count(args);
struct args_value *av;
struct environ *env = NULL;
if (args_has(args, 'C')) {
server_client_clear_overlay(tc);
@ -410,17 +412,30 @@ cmd_display_popup_exec(struct cmd *self, struct cmdq_item *item)
} else
args_to_vector(args, &argc, &argv);
if (args_has(args, 'e') >= 1) {
env = environ_create();
av = args_first_value(args, 'e');
while (av != NULL) {
environ_put(env, av->string, 0);
av = args_next_value(av);
}
}
if (args_has(args, 'E') > 1)
flags |= POPUP_CLOSEEXITZERO;
else if (args_has(args, 'E'))
flags |= POPUP_CLOSEEXIT;
if (args_has(args, 'B'))
flags |= POPUP_NOBORDER;
if (popup_display(flags, item, px, py, w, h, shellcmd, argc, argv, cwd,
tc, s, NULL, NULL) != 0) {
if (popup_display(flags, item, px, py, w, h, env, shellcmd, argc, argv,
cwd, tc, s, NULL, NULL) != 0) {
cmd_free_argv(argc, argv);
if (env != NULL)
environ_free(env);
return (CMD_RETURN_NORMAL);
}
if (env != NULL)
environ_free(env);
cmd_free_argv(argc, argv);
return (CMD_RETURN_WAIT);
}