mirror of
https://github.com/tmux/tmux.git
synced 2024-11-01 07:08:49 +00:00
Merge branch 'obsd-master'
This commit is contained in:
commit
933d6b90ed
@ -117,6 +117,7 @@ server_client_set_overlay(struct client *c, u_int delay,
|
|||||||
c->tty.flags |= TTY_FREEZE;
|
c->tty.flags |= TTY_FREEZE;
|
||||||
if (c->overlay_mode == NULL)
|
if (c->overlay_mode == NULL)
|
||||||
c->tty.flags |= TTY_NOCURSOR;
|
c->tty.flags |= TTY_NOCURSOR;
|
||||||
|
window_update_focus(c->session->curw->window);
|
||||||
server_redraw_client(c);
|
server_redraw_client(c);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -141,6 +142,7 @@ server_client_clear_overlay(struct client *c)
|
|||||||
c->overlay_data = NULL;
|
c->overlay_data = NULL;
|
||||||
|
|
||||||
c->tty.flags &= ~(TTY_FREEZE|TTY_NOCURSOR);
|
c->tty.flags &= ~(TTY_FREEZE|TTY_NOCURSOR);
|
||||||
|
window_update_focus(c->session->curw->window);
|
||||||
server_redraw_client(c);
|
server_redraw_client(c);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
3
window.c
3
window.c
@ -489,7 +489,8 @@ window_pane_update_focus(struct window_pane *wp)
|
|||||||
if (c->session != NULL &&
|
if (c->session != NULL &&
|
||||||
c->session->attached != 0 &&
|
c->session->attached != 0 &&
|
||||||
(c->flags & CLIENT_FOCUSED) &&
|
(c->flags & CLIENT_FOCUSED) &&
|
||||||
c->session->curw->window == wp->window) {
|
c->session->curw->window == wp->window &&
|
||||||
|
c->overlay_draw == NULL) {
|
||||||
focused = 1;
|
focused = 1;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user