===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.h,v
retrieving revision 1.873
retrieving revision 1.874
diff -c -r1.873 -r1.874
*** src/usr.bin/tmux/tmux.h	2019/03/18 14:10:25	1.873
--- src/usr.bin/tmux/tmux.h	2019/03/18 20:53:33	1.874
***************
*** 1,4 ****
! /* $OpenBSD: tmux.h,v 1.873 2019/03/18 14:10:25 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: tmux.h,v 1.874 2019/03/18 20:53:33 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 635,643 ****
  	struct grid_line	*linedata;
  };
  
  /* Style option. */
  struct style {
! 	struct grid_cell	 gc;
  };
  
  /* Hook data structures. */
--- 635,684 ----
  	struct grid_line	*linedata;
  };
  
+ /* Style alignment. */
+ enum style_align {
+ 	STYLE_ALIGN_DEFAULT,
+ 	STYLE_ALIGN_LEFT,
+ 	STYLE_ALIGN_CENTRE,
+ 	STYLE_ALIGN_RIGHT
+ };
+ 
+ /* Style list. */
+ enum style_list {
+ 	STYLE_LIST_OFF,
+ 	STYLE_LIST_ON,
+ 	STYLE_LIST_FOCUS,
+ 	STYLE_LIST_LEFT_MARKER,
+ 	STYLE_LIST_RIGHT_MARKER,
+ };
+ 
+ /* Style range. */
+ enum style_range_type {
+ 	STYLE_RANGE_NONE,
+ 	STYLE_RANGE_LEFT,
+ 	STYLE_RANGE_RIGHT,
+ 	STYLE_RANGE_WINDOW
+ };
+ struct style_range {
+ 	enum style_range_type	 type;
+ 	u_int			 argument;
+ 
+ 	u_int			 start;
+ 	u_int			 end; /* not included */
+ 
+ 	TAILQ_ENTRY(style_range) entry;
+ };
+ TAILQ_HEAD(style_ranges, style_range);
+ 
  /* Style option. */
  struct style {
! 	struct grid_cell	gc;
! 
! 	enum style_align	align;
! 	enum style_list		list;
! 
! 	enum style_range_type	range_type;
! 	u_int			range_argument;
  };
  
  /* Hook data structures. */
***************
*** 869,878 ****
  	struct session	*session;
  	struct window	*window;
  
- 	size_t		 status_width;
- 	struct grid_cell status_cell;
- 	char		*status_text;
- 
  	int		 flags;
  #define WINLINK_BELL 0x1
  #define WINLINK_ACTIVITY 0x2
--- 910,915 ----
***************
*** 954,959 ****
--- 991,997 ----
  	struct winlinks	 windows;
  
  	int		 statusat;
+ 	u_int		 statuslines;
  
  	struct hooks	*hooks;
  	struct options	*options;
***************
*** 998,1004 ****
--- 1036,1044 ----
  	int		valid;
  
  	key_code	key;
+ 
  	int		statusat;
+ 	u_int		statuslines;
  
  	u_int		x;
  	u_int		y;
***************
*** 1313,1329 ****
  };
  
  /* Status line. */
  struct status_line {
! 	struct event	 timer;
  
! 	struct screen	 screen;
! 	struct screen	*active;
! 	int		 references;
  
! 	int		 window_list_offset;
! 
! 	u_int            left_size;
! 	u_int            right_size;
  };
  
  /* Client connection. */
--- 1353,1372 ----
  };
  
  /* Status line. */
+ #define STATUS_LINES_LIMIT 5
+ struct status_line_entry {
+ 	char			*expanded;
+ 	struct style_ranges	 ranges;
+ };
  struct status_line {
! 	struct event		 timer;
  
! 	struct screen		 screen;
! 	struct screen		*active;
! 	int			 references;
  
! 	struct grid_cell	 style;
! 	struct status_line_entry entries[STATUS_LINES_LIMIT];
  };
  
  /* Client connection. */
***************
*** 1582,1587 ****
--- 1625,1631 ----
  #define FORMAT_PANE 0x80000000U
  #define FORMAT_WINDOW 0x40000000U
  struct format_tree;
+ const char	*format_skip(const char *s, const char *end);
  int		 format_true(const char *);
  struct format_tree *format_create(struct client *, struct cmdq_item *, int,
  		     int);
***************
*** 1604,1609 ****
--- 1648,1661 ----
  		     struct paste_buffer *);
  void		 format_lost_client(struct client *);
  
+ /* format-draw.c */
+ void		 format_draw(struct screen_write_ctx *,
+ 		     const struct grid_cell *, u_int, const char *,
+ 		     struct style_ranges *);
+ u_int		 format_width(const char *);
+ char		*format_trim_left(const char *, u_int);
+ char		*format_trim_right(const char *, u_int);
+ 
  /* hooks.c */
  struct hook;
  struct hooks	*hooks_get(struct session *);
***************
*** 1979,1985 ****
  void	 status_update_cache(struct session *);
  int	 status_at_line(struct client *);
  u_int	 status_line_size(struct client *);
! struct window *status_get_window_at(struct client *, u_int);
  void	 status_init(struct client *);
  void	 status_free(struct client *);
  int	 status_redraw(struct client *);
--- 2031,2037 ----
  void	 status_update_cache(struct session *);
  int	 status_at_line(struct client *);
  u_int	 status_line_size(struct client *);
! struct style_range *status_get_range(struct client *, u_int, u_int);
  void	 status_init(struct client *);
  void	 status_free(struct client *);
  int	 status_redraw(struct client *);
***************
*** 2079,2087 ****
  	     struct screen *);
  void	 screen_write_stop(struct screen_write_ctx *);
  void	 screen_write_reset(struct screen_write_ctx *);
- size_t printflike(1, 2) screen_write_cstrlen(const char *, ...);
- void printflike(4, 5) screen_write_cnputs(struct screen_write_ctx *,
- 	     ssize_t, const struct grid_cell *, const char *, ...);
  size_t printflike(1, 2) screen_write_strlen(const char *, ...);
  void printflike(3, 4) screen_write_puts(struct screen_write_ctx *,
  	     const struct grid_cell *, const char *, ...);
--- 2131,2136 ----
***************
*** 2418,2425 ****
  struct utf8_data *utf8_fromcstr(const char *);
  char		*utf8_tocstr(struct utf8_data *);
  u_int		 utf8_cstrwidth(const char *);
- char		*utf8_rtrimcstr(const char *, u_int);
- char		*utf8_trimcstr(const char *, u_int);
  char		*utf8_padcstr(const char *, u_int);
  
  /* procname.c */
--- 2467,2472 ----