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

Detach reply escape sequences from the pane so they work in popups.

Browse Source
This commit is contained in:
nicm
2020-03-31 06:35:38 +00:00
parent 1fb504d0d5
commit eedf059d00
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
popup.c
View File

@@ -443,8 +443,6 @@ popup_display(int flags, struct cmdq_item *item, u_int px, u_int py, u_int sx,
popup_write_screen(c, pd); popup_write_screen(c, pd);
if (shellcmd != NULL) { if (shellcmd != NULL) {
pd->ictx = input_init(NULL);
if (fs != NULL) if (fs != NULL)
s = fs->s; s = fs->s;
else else
@@ -455,6 +453,7 @@ popup_display(int flags, struct cmdq_item *item, u_int px, u_int py, u_int sx,
pd->job = job_run(shellcmd, s, cwd, popup_job_update_cb, pd->job = job_run(shellcmd, s, cwd, popup_job_update_cb,
popup_job_complete_cb, NULL, pd, jobflags, pd->sx - 2, popup_job_complete_cb, NULL, pd, jobflags, pd->sx - 2,
pd->sy - 2); pd->sy - 2);
pd->ictx = input_init(NULL, job_get_event(pd->job));
} }
server_client_set_overlay(c, 0, popup_check_cb, popup_mode_cb, server_client_set_overlay(c, 0, popup_check_cb, popup_mode_cb,

2
spawn.c
View File

@@ -256,7 +256,7 @@ spawn_pane(struct spawn_context *sc, char **cause)
window_pane_reset_mode_all(sc->wp0); window_pane_reset_mode_all(sc->wp0);
screen_reinit(&sc->wp0->base); screen_reinit(&sc->wp0->base);
input_free(sc->wp0->ictx); input_free(sc->wp0->ictx);
sc->wp0->ictx = input_init(sc->wp0); sc->wp0->ictx = NULL;
new_wp = sc->wp0; new_wp = sc->wp0;
new_wp->flags &= ~(PANE_STATUSREADY|PANE_STATUSDRAWN); new_wp->flags &= ~(PANE_STATUSREADY|PANE_STATUSDRAWN);
} else if (sc->lc == NULL) { } else if (sc->lc == NULL) {