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

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2020-03-19 16:01:29 +00:00
parent c15396459b 74ed17d41b
commit 35c4897d8f
8 changed files with 176 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
window.c
View File

@ -898,7 +898,7 @@ window_pane_create(struct window *w, u_int sx, u_int sy, u_int hlimit)
if (gethostname(host, sizeof host) == 0)
screen_set_title(&wp->base, host);
input_init(wp);
wp->ictx = input_init(wp);
return (wp);
}
@ -917,7 +917,7 @@ window_pane_destroy(struct window_pane *wp)
close(wp->fd);
}
input_free(wp);
input_free(wp->ictx);
screen_free(&wp->status_screen);
@ -959,7 +959,7 @@ window_pane_read_callback(__unused struct bufferevent *bufev, void *data)
}
log_debug("%%%u has %zu bytes", wp->id, size);
input_parse(wp);
input_parse_pane(wp);
wp->pipe_off = EVBUFFER_LENGTH(evb);
}
@ -1267,7 +1267,7 @@ window_pane_key(struct window_pane *wp, struct client *c, struct session *s,
if (wp->fd == -1 || wp->flags & PANE_INPUTOFF)
return (0);
if (input_key(wp, key, m) != 0)
if (input_key_pane(wp, key, m) != 0)
return (-1);
if (KEYC_IS_MOUSE(key))
@ -1279,7 +1279,7 @@ window_pane_key(struct window_pane *wp, struct client *c, struct session *s,
wp2->fd != -1 &&
(~wp2->flags & PANE_INPUTOFF) &&
window_pane_visible(wp2))
input_key(wp2, key, NULL);
input_key_pane(wp2, key, NULL);
}
}
return (0);