src/usr.bin/tmux/window.c - diff

Return to window.c CVS log

Up to [local] / src / usr.bin / tmux

Diff for /src/usr.bin/tmux/window.c between version 1.161 and 1.162

version 1.161, 2016/06/06 07:24:31

version 1.162, 2016/06/15 09:13:46

Line 17

#include <sys/types.h>

#include <sys/ioctl.h>

#include <errno.h>

#include <fcntl.h>

Line 1046

Line 1047

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);

Line 1069

Line 1093

if (wp->mode == NULL)

return;

evtimer_del(&wp->modetimer);

wp->mode->free(wp);

wp->mode = NULL;

Line 1088

Line 1114

return;

if (wp->mode != NULL) {

wp->modelast = time(NULL);

if (wp->mode->key != NULL)

wp->mode->key(wp, c, s, key, m);

return;