src/usr.bin/tmux/server-client.c - diff

Return to server-client.c CVS log

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

Diff for /src/usr.bin/tmux/server-client.c between version 1.187 and 1.188

-version 1.187, 2016/06/16 10:55:47
+version 1.188, 2016/09/28 08:30:44
 Line 765
 Line 765
 Line 765
          }
  }
- /* Check if pane should be resized. */
+ static void
- void
+ server_client_resize_event(__unused int fd, __unused short events, void *data)
- server_client_check_resize(struct window_pane *wp)
  {
-         struct winsize  ws;
+         struct window_pane      *wp = data;
+         struct winsize           ws;
+         evtimer_del(&wp->resize_timer);
          if (!(wp->flags & PANE_RESIZE))
                  return;
-Line 782
+Line 784
 Line 782
 Line 784
                  fatal("ioctl failed");
          wp->flags &= ~PANE_RESIZE;
+ }
+ /* Check if pane should be resized. */
+ void
+ server_client_check_resize(struct window_pane *wp)
+ {
+         struct timeval   tv = { .tv_usec = 250000 };
+         if (!(wp->flags & PANE_RESIZE))
+                 return;
+         if (!event_initialized(&wp->resize_timer))
+                 evtimer_set(&wp->resize_timer, server_client_resize_event, wp);
+         /*
+          * The first resize should happen immediately, so if the timer is not
+          * running, do it now.
+          */
+         if (!evtimer_pending(&wp->resize_timer, NULL))
+                 server_client_resize_event(-1, 0, wp);
+         /*
+          * If the pane is in the alternate screen, let the timer expire and
+          * resize to give the application a chance to redraw. If not, keep
+          * pushing the timer back.
+          */
+         if (wp->saved_grid != NULL && evtimer_pending(&wp->resize_timer, NULL))
+                 return;
+         evtimer_del(&wp->resize_timer);
+         evtimer_add(&wp->resize_timer, &tv);
  }
  /* Check whether pane should be focused. */