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

Diff for /src/usr.bin/tmux/window.c between version 1.168 and 1.169

version 1.168, 2016/10/11 07:23:34 version 1.169, 2016/10/11 13:21:59
Line 60 
Line 60 
 static u_int    next_window_id;  static u_int    next_window_id;
 static u_int    next_active_point;  static u_int    next_active_point;
   
   static struct window_pane *window_pane_create(struct window *, u_int, u_int,
                       u_int);
   static void     window_pane_destroy(struct window_pane *);
   
 static void     window_pane_set_watermark(struct window_pane *, size_t);  static void     window_pane_set_watermark(struct window_pane *, size_t);
   
 static void     window_pane_read_callback(struct bufferevent *, void *);  static void     window_pane_read_callback(struct bufferevent *, void *);
 static void     window_pane_error_callback(struct bufferevent *, short, void *);  static void     window_pane_error_callback(struct bufferevent *, short, void *);
   
   static int      winlink_next_index(struct winlinks *, int);
   
 static struct window_pane *window_pane_choose_best(struct window_pane **,  static struct window_pane *window_pane_choose_best(struct window_pane **,
                     u_int);                      u_int);
   
 RB_GENERATE(windows, window, entry, window_cmp);  RB_GENERATE(windows, window, entry, window_cmp);
   RB_GENERATE(winlinks, winlink, entry, winlink_cmp);
   RB_GENERATE(window_pane_tree, window_pane, tree_entry, window_pane_cmp);
   
 int  int
 window_cmp(struct window *w1, struct window *w2)  window_cmp(struct window *w1, struct window *w2)
Line 76 
Line 84 
         return (w1->id - w2->id);          return (w1->id - w2->id);
 }  }
   
 RB_GENERATE(winlinks, winlink, entry, winlink_cmp);  
   
 int  int
 winlink_cmp(struct winlink *wl1, struct winlink *wl2)  winlink_cmp(struct winlink *wl1, struct winlink *wl2)
 {  {
         return (wl1->idx - wl2->idx);          return (wl1->idx - wl2->idx);
 }  }
   
 RB_GENERATE(window_pane_tree, window_pane, tree_entry, window_pane_cmp);  
   
 int  int
 window_pane_cmp(struct window_pane *wp1, struct window_pane *wp2)  window_pane_cmp(struct window_pane *wp1, struct window_pane *wp2)
 {  {
Line 129 
Line 133 
         return (NULL);          return (NULL);
 }  }
   
 int  static int
 winlink_next_index(struct winlinks *wwl, int idx)  winlink_next_index(struct winlinks *wwl, int idx)
 {  {
         int     i;          int     i;
Line 731 
Line 735 
         return (RB_FIND(window_pane_tree, &all_window_panes, &wp));          return (RB_FIND(window_pane_tree, &all_window_panes, &wp));
 }  }
   
 struct window_pane *  static struct window_pane *
 window_pane_create(struct window *w, u_int sx, u_int sy, u_int hlimit)  window_pane_create(struct window *w, u_int sx, u_int sy, u_int hlimit)
 {  {
         struct window_pane      *wp;          struct window_pane      *wp;
Line 782 
Line 786 
         return (wp);          return (wp);
 }  }
   
 void  static void
 window_pane_destroy(struct window_pane *wp)  window_pane_destroy(struct window_pane *wp)
 {  {
         window_pane_reset_mode(wp);          window_pane_reset_mode(wp);
Legend:
Removed from v.1.168  
changed lines
  Added in v.1.169