[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.434 and 1.435

version 1.434, 2014/01/28 22:19:17 version 1.435, 2014/01/28 23:07:09
Line 726 
Line 726 
         enum {          enum {
                 OPTIONS_STRING,                  OPTIONS_STRING,
                 OPTIONS_NUMBER,                  OPTIONS_NUMBER,
                 OPTIONS_DATA,                  OPTIONS_STYLE
         } type;          } type;
   
         char            *str;          char                    *str;
         long long        num;          long long                num;
           struct grid_cell         style;
   
         RB_ENTRY(options_entry) entry;          RB_ENTRY(options_entry) entry;
 };  };
Line 1453 
Line 1454 
         OPTIONS_TABLE_COLOUR,          OPTIONS_TABLE_COLOUR,
         OPTIONS_TABLE_ATTRIBUTES,          OPTIONS_TABLE_ATTRIBUTES,
         OPTIONS_TABLE_FLAG,          OPTIONS_TABLE_FLAG,
         OPTIONS_TABLE_CHOICE          OPTIONS_TABLE_CHOICE,
           OPTIONS_TABLE_STYLE
 };  };
   
 struct options_table_entry {  struct options_table_entry {
Line 1466 
Line 1468 
   
         const char             *default_str;          const char             *default_str;
         long long               default_num;          long long               default_num;
   
           const char             *style;
 };  };
   
 /* Tree of format entries. */  /* Tree of format entries. */
Line 1577 
Line 1581 
 struct options_entry *options_find1(struct options *, const char *);  struct options_entry *options_find1(struct options *, const char *);
 struct options_entry *options_find(struct options *, const char *);  struct options_entry *options_find(struct options *, const char *);
 void    options_remove(struct options *, const char *);  void    options_remove(struct options *, const char *);
 struct options_entry *printflike3 options_set_string(  struct options_entry *printflike3 options_set_string(struct options *,
             struct options *, const char *, const char *, ...);              const char *, const char *, ...);
 char   *options_get_string(struct options *, const char *);  char   *options_get_string(struct options *, const char *);
 struct options_entry *options_set_number(  struct options_entry *options_set_number(struct options *, const char *,
             struct options *, const char *, long long);              long long);
 long long options_get_number(struct options *, const char *);  long long options_get_number(struct options *, const char *);
   struct options_entry *options_set_style(struct options *, const char *,
               const char *, int);
   struct grid_cell *options_get_style(struct options *, const char *);
   
 /* options-table.c */  /* options-table.c */
 extern const struct options_table_entry server_options_table[];  extern const struct options_table_entry server_options_table[];
Line 2042 
Line 2049 
              ssize_t, struct grid_cell *, int, const char *, ...);               ssize_t, struct grid_cell *, int, const char *, ...);
 void     screen_write_vnputs(struct screen_write_ctx *,  void     screen_write_vnputs(struct screen_write_ctx *,
              ssize_t, struct grid_cell *, int, const char *, va_list);               ssize_t, struct grid_cell *, int, const char *, va_list);
 void     screen_write_parsestyle(  
              struct grid_cell *, struct grid_cell *, const char *);  
 void     screen_write_putc(  void     screen_write_putc(
              struct screen_write_ctx *, struct grid_cell *, u_char);               struct screen_write_ctx *, struct grid_cell *, u_char);
 void     screen_write_copy(struct screen_write_ctx *,  void     screen_write_copy(struct screen_write_ctx *,
Line 2173 
Line 2178 
 void             window_set_name(struct window *, const char *);  void             window_set_name(struct window *, const char *);
 void             window_remove_ref(struct window *);  void             window_remove_ref(struct window *);
 void             winlink_clear_flags(struct winlink *);  void             winlink_clear_flags(struct winlink *);
 void             window_mode_attrs(struct grid_cell *, struct options *);  
   
 /* layout.c */  /* layout.c */
 u_int            layout_count_cells(struct layout_cell *);  u_int            layout_count_cells(struct layout_cell *);
Line 2344 
Line 2348 
 int              xvasprintf(char **, const char *, va_list);  int              xvasprintf(char **, const char *, va_list);
 int printflike3  xsnprintf(char *, size_t, const char *, ...);  int printflike3  xsnprintf(char *, size_t, const char *, ...);
 int              xvsnprintf(char *, size_t, const char *, va_list);  int              xvsnprintf(char *, size_t, const char *, va_list);
   
   /* style.c */
   int              style_parse(const struct grid_cell *,
                        struct grid_cell *, const char *);
   const char      *style_tostring(struct grid_cell *);
   void             style_update_new(struct options *, const char *, const char *);
   void             style_update_old(struct options *, const char *,
                        struct grid_cell *);
   void    style_apply(struct grid_cell *, struct options *, const char *);
   void    style_apply_update(struct grid_cell *, struct options *, const char *);
   
 #endif /* TMUX_H */  #endif /* TMUX_H */
Legend:
Removed from v.1.434  
changed lines
  Added in v.1.435