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

Diff for /src/usr.bin/tmux/tmux.h between version 1.575 and 1.576

version 1.575, 2015/11/12 12:43:36 version 1.576, 2015/11/13 08:09:28
Line 621 
Line 621 
 struct utf8_data {  struct utf8_data {
         u_char  data[UTF8_SIZE];          u_char  data[UTF8_SIZE];
   
         size_t  have;          u_char  have;
         size_t  size;          u_char  size;
   
         u_int   width;          u_char  width;
 };  } __packed;
   
 /* Grid attributes. */  /* Grid attributes. */
 #define GRID_ATTR_BRIGHT 0x1  #define GRID_ATTR_BRIGHT 0x1
Line 641 
Line 641 
 #define GRID_FLAG_FG256 0x1  #define GRID_FLAG_FG256 0x1
 #define GRID_FLAG_BG256 0x2  #define GRID_FLAG_BG256 0x2
 #define GRID_FLAG_PADDING 0x4  #define GRID_FLAG_PADDING 0x4
   #define GRID_FLAG_EXTENDED 0x8
   
 /* Grid line flags. */  /* Grid line flags. */
 #define GRID_LINE_WRAPPED 0x1  #define GRID_LINE_WRAPPED 0x1
   
 /* Grid cell data. */  /* Grid cell data. */
 struct grid_cell {  struct grid_cell {
         u_char  attr;          u_char                  flags;
         u_char  flags;          u_char                  attr;
         u_char  fg;          u_char                  fg;
         u_char  bg;          u_char                  bg;
           struct utf8_data        data;
   
         u_char  xstate; /* top 4 bits width, bottom 4 bits size */  };
         u_char  xdata[UTF8_SIZE];  struct grid_cell_entry {
           u_char                  flags;
           union {
                   u_int           offset;
                   struct {
                           u_char  attr;
                           u_char  fg;
                           u_char  bg;
                           u_char  data;
                   } data;
           };
 } __packed;  } __packed;
   
 /* Grid line. */  /* Grid line. */
 struct grid_line {  struct grid_line {
         u_int   cellsize;          u_int                    cellsize;
         struct grid_cell *celldata;          struct grid_cell_entry  *celldata;
   
         int     flags;          u_int                    extdsize;
           struct grid_cell        *extddata;
   
           int                      flags;
 } __packed;  } __packed;
   
 /* Entire grid of cells. */  /* Entire grid of cells. */
 struct grid {  struct grid {
         int     flags;          int                      flags;
 #define GRID_HISTORY 0x1        /* scroll lines into history */  #define GRID_HISTORY 0x1 /* scroll lines into history */
   
         u_int   sx;          u_int                    sx;
         u_int   sy;          u_int                    sy;
   
         u_int   hsize;          u_int                    hsize;
         u_int   hlimit;          u_int                    hlimit;
   
         struct grid_line *linedata;          struct grid_line        *linedata;
 };  };
   
 /* Option data structures. */  /* Option data structures. */
Line 1854 
Line 1869 
 void     grid_scroll_history_region(struct grid *, u_int, u_int);  void     grid_scroll_history_region(struct grid *, u_int, u_int);
 void     grid_clear_history(struct grid *);  void     grid_clear_history(struct grid *);
 void     grid_expand_line(struct grid *, u_int, u_int);  void     grid_expand_line(struct grid *, u_int, u_int);
 const struct grid_cell *grid_peek_cell(struct grid *, u_int, u_int);  
 const struct grid_line *grid_peek_line(struct grid *, u_int);  const struct grid_line *grid_peek_line(struct grid *, u_int);
 struct grid_cell *grid_get_cell(struct grid *, u_int, u_int);  void     grid_get_cell(struct grid *, u_int, u_int, struct grid_cell *);
 void     grid_set_cell(struct grid *, u_int, u_int, const struct grid_cell *);  void     grid_set_cell(struct grid *, u_int, u_int, const struct grid_cell *);
 void     grid_clear(struct grid *, u_int, u_int, u_int, u_int);  void     grid_clear(struct grid *, u_int, u_int, u_int, u_int);
 void     grid_clear_lines(struct grid *, u_int, u_int);  void     grid_clear_lines(struct grid *, u_int, u_int);
Line 1868 
Line 1882 
              struct grid *, u_int, struct grid *, u_int, u_int);               struct grid *, u_int, struct grid *, u_int, u_int);
 u_int    grid_reflow(struct grid *, struct grid *, u_int);  u_int    grid_reflow(struct grid *, struct grid *, u_int);
   
 /* grid-cell.c */  
 u_int    grid_cell_width(const struct grid_cell *);  
 void     grid_cell_get(const struct grid_cell *, struct utf8_data *);  
 void     grid_cell_set(struct grid_cell *, const struct utf8_data *);  
 void     grid_cell_one(struct grid_cell *, u_char);  
   
 /* grid-view.c */  /* grid-view.c */
 const struct grid_cell *grid_view_peek_cell(struct grid *, u_int, u_int);  void     grid_view_get_cell(struct grid *, u_int, u_int, struct grid_cell *);
 struct grid_cell *grid_view_get_cell(struct grid *, u_int, u_int);  void     grid_view_set_cell(struct grid *, u_int, u_int,
 void     grid_view_set_cell(               const struct grid_cell *);
              struct grid *, u_int, u_int, const struct grid_cell *);  
 void     grid_view_clear_history(struct grid *);  void     grid_view_clear_history(struct grid *);
 void     grid_view_clear(struct grid *, u_int, u_int, u_int, u_int);  void     grid_view_clear(struct grid *, u_int, u_int, u_int, u_int);
 void     grid_view_scroll_region_up(struct grid *, u_int, u_int);  void     grid_view_scroll_region_up(struct grid *, u_int, u_int);
Line 2183 
Line 2190 
 /* utf8.c */  /* utf8.c */
 u_int            utf8_width(u_int);  u_int            utf8_width(u_int);
 void             utf8_set(struct utf8_data *, u_char);  void             utf8_set(struct utf8_data *, u_char);
   void             utf8_copy(struct utf8_data *, const struct utf8_data *);
 int              utf8_open(struct utf8_data *, u_char);  int              utf8_open(struct utf8_data *, u_char);
 int              utf8_append(struct utf8_data *, u_char);  int              utf8_append(struct utf8_data *, u_char);
 u_int            utf8_combine(const struct utf8_data *);  u_int            utf8_combine(const struct utf8_data *);

Legend:
Removed from v.1.575  
changed lines
  Added in v.1.576