aboutsummaryrefslogtreecommitdiff
path: root/window.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2014-10-02 09:29:48 +0100
committerNicholas Marriott <nicholas.marriott@gmail.com>2014-10-02 09:29:48 +0100
commit931c17ed4f3ac18470f5b385210d61b24a57b5d4 (patch)
tree6dbcfe073cec1ba8f34626bdfa04123b621eb9ed /window.c
parent24d9dc518de6761f645165d49f321b2b56904fb5 (diff)
parent2874a431c050527244a56e7f241baf053c722f88 (diff)
downloadrtmux-931c17ed4f3ac18470f5b385210d61b24a57b5d4.tar.gz
rtmux-931c17ed4f3ac18470f5b385210d61b24a57b5d4.tar.bz2
rtmux-931c17ed4f3ac18470f5b385210d61b24a57b5d4.zip
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
Diffstat (limited to 'window.c')
-rw-r--r--window.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/window.c b/window.c
index e9ec7eaf..d3c41154 100644
--- a/window.c
+++ b/window.c
@@ -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;