Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2014-09-25 11:29:54 +01:00
20 changed files with 140 additions and 52 deletions

View File

@ -1071,8 +1071,9 @@ window_pane_key(struct window_pane *wp, struct session *sess, int key)
return;
}
if (wp->fd == -1)
if (wp->fd == -1 || wp->flags & PANE_INPUTOFF)
return;
input_key(wp, key);
if (options_get_number(&wp->window->options, "synchronize-panes")) {
TAILQ_FOREACH(wp2, &wp->window->panes, entry) {
@ -1085,8 +1086,8 @@ window_pane_key(struct window_pane *wp, struct session *sess, int key)
}
void
window_pane_mouse(
struct window_pane *wp, struct session *sess, struct mouse_event *m)
window_pane_mouse(struct window_pane *wp, struct session *sess,
struct mouse_event *m)
{
if (!window_pane_visible(wp))
return;