circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-03-13 21:58:48 +00:00
Code Issues Projects Releases Wiki Activity

Tidy changing the mode into window_copy_init_for_output.

Browse Source
This commit is contained in:
nicm 2019-03-07 19:34:22 +00:00
parent 7f093fcddc
commit 3c24bc5617
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cfg.c
View File

@ -348,7 +348,6 @@ cfg_show_causes(struct session *s)
return; return;
wp = s->curw->window->active; wp = s->curw->window->active;
window_pane_set_mode(wp, &window_copy_mode, NULL, NULL);
window_copy_init_for_output(wp); window_copy_init_for_output(wp);
for (i = 0; i < cfg_ncauses; i++) { for (i = 0; i < cfg_ncauses; i++) {
window_copy_add(wp, "%s", cfg_causes[i]); window_copy_add(wp, "%s", cfg_causes[i]);

5
cmd-queue.c
View File

@ -426,12 +426,7 @@ cmdq_print(struct cmdq_item *item, const char *fmt, ...)
server_client_push_stdout(c); server_client_push_stdout(c);
} else { } else {
w = c->session->curw->window; w = c->session->curw->window;
if (w->active->mode != &window_copy_mode) {
window_pane_reset_mode(w->active);
window_pane_set_mode(w->active, &window_copy_mode, NULL,
NULL);
window_copy_init_for_output(w->active); window_copy_init_for_output(w->active);
}
window_copy_vadd(w->active, fmt, ap); window_copy_vadd(w->active, fmt, ap);
} }

2
cmd-run-shell.c
View File

@ -75,9 +75,7 @@ cmd_run_shell_print(struct job *job, const char *msg)
return; return;
} }
if (window_pane_set_mode(wp, &window_copy_mode, NULL, NULL) == 0)
window_copy_init_for_output(wp); window_copy_init_for_output(wp);
if (wp->mode == &window_copy_mode)
window_copy_add(wp, "%s", msg); window_copy_add(wp, "%s", msg);
} }

6
window-copy.c
View File

@ -263,6 +263,12 @@ window_copy_init_for_output(struct window_pane *wp)
{ {
struct window_copy_mode_data *data = wp->modedata; struct window_copy_mode_data *data = wp->modedata;
if (wp->mode == &window_copy_mode && data->backing != &wp->base)
return;
window_pane_reset_mode(wp);
window_pane_set_mode(wp, &window_copy_mode, NULL, NULL);
data = wp->modedata;
data->backing = xmalloc(sizeof *data->backing); data->backing = xmalloc(sizeof *data->backing);
screen_init(data->backing, screen_size_x(&wp->base), screen_init(data->backing, screen_size_x(&wp->base),
screen_size_y(&wp->base), UINT_MAX); screen_size_y(&wp->base), UINT_MAX);