[BACK]Return to server-client.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / tmux

Diff for /src/usr.bin/tmux/server-client.c between version 1.296 and 1.297

version 1.296, 2019/11/01 20:26:21 version 1.297, 2019/11/28 09:45:16
Line 1321 
Line 1321 
 server_client_resize_force(struct window_pane *wp)  server_client_resize_force(struct window_pane *wp)
 {  {
         struct timeval  tv = { .tv_usec = 100000 };          struct timeval  tv = { .tv_usec = 100000 };
         struct winsize  ws;  
   
         /*          /*
          * If we are resizing to the same size as when we entered the loop           * If we are resizing to the same size as when we entered the loop
Line 1342 
Line 1341 
             wp->sy <= 1)              wp->sy <= 1)
                 return (0);                  return (0);
   
         memset(&ws, 0, sizeof ws);  
         ws.ws_col = wp->sx;  
         ws.ws_row = wp->sy - 1;  
         if (wp->fd != -1 && ioctl(wp->fd, TIOCSWINSZ, &ws) == -1)  
                 fatal("ioctl failed");  
         log_debug("%s: %%%u forcing resize", __func__, wp->id);          log_debug("%s: %%%u forcing resize", __func__, wp->id);
           window_pane_send_resize(wp, -1);
   
         evtimer_add(&wp->resize_timer, &tv);          evtimer_add(&wp->resize_timer, &tv);
         wp->flags |= PANE_RESIZEFORCE;          wp->flags |= PANE_RESIZEFORCE;
Line 1358 
Line 1353 
 static void  static void
 server_client_resize_pane(struct window_pane *wp)  server_client_resize_pane(struct window_pane *wp)
 {  {
         struct winsize  ws;  
   
         memset(&ws, 0, sizeof ws);  
         ws.ws_col = wp->sx;  
         ws.ws_row = wp->sy;  
         if (wp->fd != -1 && ioctl(wp->fd, TIOCSWINSZ, &ws) == -1)  
                 fatal("ioctl failed");  
         log_debug("%s: %%%u resize to %u,%u", __func__, wp->id, wp->sx, wp->sy);          log_debug("%s: %%%u resize to %u,%u", __func__, wp->id, wp->sx, wp->sy);
           window_pane_send_resize(wp, 0);
   
         wp->flags &= ~PANE_RESIZE;          wp->flags &= ~PANE_RESIZE;
   

Legend:
Removed from v.1.296  
changed lines
  Added in v.1.297