circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-01-07 16:28:48 +00:00
Code Issues Projects Releases Wiki Activity

Make two -E only close popup automatically if the command exited with 0.

Browse Source
This commit is contained in:
nicm 2020-03-28 09:51:12 +00:00
parent 4346098e97
commit 593fddf84b
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
popup.c
View File

@ -260,7 +260,8 @@ popup_key_cb(struct client *c, struct key_event *event)
if (pd->ictx != NULL && (pd->flags & POPUP_WRITEKEYS)) { if (pd->ictx != NULL && (pd->flags & POPUP_WRITEKEYS)) {
if (KEYC_IS_MOUSE(event->key)) if (KEYC_IS_MOUSE(event->key))
return (0); return (0);
if ((~pd->flags & POPUP_CLOSEEXIT) && if (((pd->flags & (POPUP_CLOSEEXIT|POPUP_CLOSEEXITZERO)) == 0 ||
pd->job == NULL) &&
(event->key == '\033' || event->key == '\003')) (event->key == '\033' || event->key == '\003'))
return (1); return (1);
if (pd->job == NULL) if (pd->job == NULL)
@ -347,6 +348,8 @@ popup_job_complete_cb(struct job *job)
if (pd->flags & POPUP_CLOSEEXIT) if (pd->flags & POPUP_CLOSEEXIT)
server_client_clear_overlay(pd->c); server_client_clear_overlay(pd->c);
if ((pd->flags & POPUP_CLOSEEXITZERO) && pd->status == 0)
server_client_clear_overlay(pd->c);
} }
u_int u_int

5
tmux.1
View File

@ -5032,6 +5032,11 @@ shell command.
closes the popup automatically when closes the popup automatically when
.Ar shell-command .Ar shell-command
exits. exits.
Two
.Fl E
closes the popup only if
.Ar shell-command
exited with success.
With With
.Fl K , .Fl K ,
.Ql Escape .Ql Escape

1
tmux.h
View File

@ -2761,6 +2761,7 @@ int menu_display(struct menu *, int, struct cmdq_item *, u_int,
/* popup.c */ /* popup.c */
#define POPUP_WRITEKEYS 0x1 #define POPUP_WRITEKEYS 0x1
#define POPUP_CLOSEEXIT 0x2 #define POPUP_CLOSEEXIT 0x2
#define POPUP_CLOSEEXITZERO 0x4
u_int popup_width(struct cmdq_item *, u_int, const char **, u_int popup_width(struct cmdq_item *, u_int, const char **,
struct client *, struct cmd_find_state *); struct client *, struct cmd_find_state *);
u_int popup_height(u_int, const char **); u_int popup_height(u_int, const char **);