diff options
| author | Thomas Adam <thomas@xteddy.org> | 2020-03-28 14:01:28 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2020-03-28 14:01:28 +0000 |
| commit | 374f5ea60c652fe5c08dd3063cca9bff8e642eea (patch) | |
| tree | c88c897b72479a60ecd892ffb596374cd20ca956 /popup.c | |
| parent | 88ca50054695ce1447c48ba607f5a6fa1264dc41 (diff) | |
| parent | 8036d0f834bbcce1a0eeff983750086354aec1e2 (diff) | |
| download | rtmux-374f5ea60c652fe5c08dd3063cca9bff8e642eea.tar.gz rtmux-374f5ea60c652fe5c08dd3063cca9bff8e642eea.tar.bz2 rtmux-374f5ea60c652fe5c08dd3063cca9bff8e642eea.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'popup.c')
| -rw-r--r-- | popup.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -260,7 +260,8 @@ popup_key_cb(struct client *c, struct key_event *event) if (pd->ictx != NULL && (pd->flags & POPUP_WRITEKEYS)) { if (KEYC_IS_MOUSE(event->key)) return (0); - if ((~pd->flags & POPUP_CLOSEEXIT) && + if (((pd->flags & (POPUP_CLOSEEXIT|POPUP_CLOSEEXITZERO)) == 0 || + pd->job == NULL) && (event->key == '\033' || event->key == '\003')) return (1); if (pd->job == NULL) @@ -347,6 +348,8 @@ popup_job_complete_cb(struct job *job) if (pd->flags & POPUP_CLOSEEXIT) server_client_clear_overlay(pd->c); + if ((pd->flags & POPUP_CLOSEEXITZERO) && pd->status == 0) + server_client_clear_overlay(pd->c); } u_int |