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.129 and 1.130

-version 1.129, 2015/05/07 11:42:56
+version 1.130, 2015/05/11 10:10:16
 Line 58
 Line 58
 Line 58
  u_int   next_window_id;
  u_int   next_active_point;
- void    window_pane_timer_callback(int, short, void *);
  void    window_pane_read_callback(struct bufferevent *, void *);
  void    window_pane_error_callback(struct bufferevent *, short, void *);
-Line 741
+Line 740
 Line 741
 Line 740
  {
          window_pane_reset_mode(wp);
-         if (event_initialized(&wp->changes_timer))
-                 evtimer_del(&wp->changes_timer);
          if (wp->fd != -1) {
                  bufferevent_free(wp->event);
                  close(wp->fd);
-Line 875
+Line 871
 Line 875
 Line 871
          free(cmd);
          return (0);
- }
- void
- window_pane_timer_start(struct window_pane *wp)
- {
-         struct timeval  tv;
-         tv.tv_sec = 0;
-         tv.tv_usec = 1000;
-         evtimer_del(&wp->changes_timer);
-         evtimer_set(&wp->changes_timer, window_pane_timer_callback, wp);
-         evtimer_add(&wp->changes_timer, &tv);
- }
- void
- window_pane_timer_callback(unused int fd, unused short events, void *data)
- {
-         struct window_pane      *wp = data;
-         struct window           *w = wp->window;
-         u_int                    interval, trigger;
-         interval = options_get_number(&w->options, "c0-change-interval");
-         trigger = options_get_number(&w->options, "c0-change-trigger");
-         if (wp->changes_redraw++ == interval) {
-                 wp->flags |= PANE_REDRAW;
-                 wp->changes_redraw = 0;
-         }
-         if (trigger == 0 || wp->changes < trigger) {
-                 wp->flags |= PANE_REDRAW;
-                 wp->flags &= ~PANE_DROP;
-         } else
-                 window_pane_timer_start(wp);
-         wp->changes = 0;
  }
  void