circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-03 16:46:18 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2016-06-15 12:01:11 +01:00
parent 150c9f3fe0 bee3e3e28d
commit 5c12230a08
4 changed files with 74 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
window.c
View File

@@ -17,6 +17,7 @@
*/
#include <sys/types.h>
#include <sys/ioctl.h>
#include <errno.h>
#include <fcntl.h>
@@ -1061,15 +1062,38 @@ window_pane_alternate_off(struct window_pane *wp, struct grid_cell *gc,
wp->flags |= PANE_REDRAW;
}
static void
window_pane_mode_timer(__unused int fd, __unused short events, void *arg)
{
struct window_pane *wp = arg;
struct timeval tv = { .tv_sec = 10 };
int n = 0;
evtimer_del(&wp->modetimer);
evtimer_add(&wp->modetimer, &tv);
log_debug("%%%u in mode: last=%ld", wp->id, (long)wp->modelast);
if (wp->modelast < time(NULL) - WINDOW_MODE_TIMEOUT) {
if (ioctl(wp->fd, FIONREAD, &n) == -1 || n > 0)
window_pane_reset_mode(wp);
}
}
int
window_pane_set_mode(struct window_pane *wp, const struct window_mode *mode)
{
struct screen *s;
struct timeval tv = { .tv_sec = 10 };
if (wp->mode != NULL)
return (1);
wp->mode = mode;
wp->modelast = time(NULL);
evtimer_set(&wp->modetimer, window_pane_mode_timer, wp);
evtimer_add(&wp->modetimer, &tv);
if ((s = wp->mode->init(wp)) != NULL)
wp->screen = s;
wp->flags |= (PANE_REDRAW|PANE_CHANGED);
@@ -1084,6 +1108,8 @@ window_pane_reset_mode(struct window_pane *wp)
if (wp->mode == NULL)
return;
evtimer_del(&wp->modetimer);
wp->mode->free(wp);
wp->mode = NULL;
@@ -1103,6 +1129,7 @@ window_pane_key(struct window_pane *wp, struct client *c, struct session *s,
return;
if (wp->mode != NULL) {
wp->modelast = time(NULL);
if (wp->mode->key != NULL)
wp->mode->key(wp, c, s, key, m);
return;