===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/format-draw.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -c -r1.22 -r1.23
*** src/usr.bin/tmux/format-draw.c	2020/12/01 08:12:58	1.22
--- src/usr.bin/tmux/format-draw.c	2021/03/11 06:41:04	1.23
***************
*** 1,4 ****
! /* $OpenBSD: format-draw.c,v 1.22 2020/12/01 08:12:58 nicm Exp $ */
  
  /*
   * Copyright (c) 2019 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: format-draw.c,v 1.23 2021/03/11 06:41:04 nicm Exp $ */
  
  /*
   * Copyright (c) 2019 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 157,169 ****
  static void
  format_draw_none(struct screen_write_ctx *octx, u_int available, u_int ocx,
      u_int ocy, struct screen *left, struct screen *centre, struct screen *right,
!     struct format_ranges *frs)
  {
! 	u_int	width_left, width_centre, width_right;
  
  	width_left = left->cx;
  	width_centre = centre->cx;
  	width_right = right->cx;
  
  	/*
  	 * Try to keep as much of the left and right as possible at the expense
--- 157,170 ----
  static void
  format_draw_none(struct screen_write_ctx *octx, u_int available, u_int ocx,
      u_int ocy, struct screen *left, struct screen *centre, struct screen *right,
!     struct screen *abs_centre, struct format_ranges *frs)
  {
! 	u_int	width_left, width_centre, width_right, width_abs_centre;
  
  	width_left = left->cx;
  	width_centre = centre->cx;
  	width_right = right->cx;
+ 	width_abs_centre = abs_centre->cx;
  
  	/*
  	 * Try to keep as much of the left and right as possible at the expense
***************
*** 199,221 ****
  	    - width_centre / 2,
  	    centre->cx / 2 - width_centre / 2,
  	    width_centre);
  }
  
  /* Draw format with list on the left. */
  static void
  format_draw_left(struct screen_write_ctx *octx, u_int available, u_int ocx,
      u_int ocy, struct screen *left, struct screen *centre, struct screen *right,
!     struct screen *list, struct screen *list_left, struct screen *list_right,
!     struct screen *after, int focus_start, int focus_end,
!     struct format_ranges *frs)
  {
  	u_int			width_left, width_centre, width_right;
! 	u_int			width_list, width_after;
  	struct screen_write_ctx	ctx;
  
  	width_left = left->cx;
  	width_centre = centre->cx;
  	width_right = right->cx;
  	width_list = list->cx;
  	width_after = after->cx;
  
--- 200,233 ----
  	    - width_centre / 2,
  	    centre->cx / 2 - width_centre / 2,
  	    width_centre);
+ 
+ 	/*
+ 	 * Write abs_centre in the perfect centre of all horizontal space.
+ 	 */
+ 	if (width_abs_centre > available)
+ 		width_abs_centre = available;
+ 	format_draw_put(octx, ocx, ocy, abs_centre, frs,
+ 	    (available - width_abs_centre) / 2,
+ 	    0,
+ 	    width_abs_centre);
  }
  
  /* Draw format with list on the left. */
  static void
  format_draw_left(struct screen_write_ctx *octx, u_int available, u_int ocx,
      u_int ocy, struct screen *left, struct screen *centre, struct screen *right,
!     struct screen *abs_centre, struct screen *list, struct screen *list_left,
!     struct screen *list_right, struct screen *after, int focus_start,
!     int focus_end, struct format_ranges *frs)
  {
  	u_int			width_left, width_centre, width_right;
! 	u_int			width_list, width_after, width_abs_centre;
  	struct screen_write_ctx	ctx;
  
  	width_left = left->cx;
  	width_centre = centre->cx;
  	width_right = right->cx;
+ 	width_abs_centre = abs_centre->cx;
  	width_list = list->cx;
  	width_after = after->cx;
  
***************
*** 247,253 ****
  		screen_write_stop(&ctx);
  
  		format_draw_none(octx, available, ocx, ocy, left, centre,
! 		    right, frs);
  		return;
  	}
  
--- 259,265 ----
  		screen_write_stop(&ctx);
  
  		format_draw_none(octx, available, ocx, ocy, left, centre,
! 		    right, abs_centre, frs);
  		return;
  	}
  
***************
*** 291,313 ****
  		focus_start = focus_end = 0;
  	format_draw_put_list(octx, ocx, ocy, width_left, width_list, list,
  	    list_left, list_right, focus_start, focus_end, frs);
  }
  
  /* Draw format with list in the centre. */
  static void
  format_draw_centre(struct screen_write_ctx *octx, u_int available, u_int ocx,
      u_int ocy, struct screen *left, struct screen *centre, struct screen *right,
!     struct screen *list, struct screen *list_left, struct screen *list_right,
!     struct screen *after, int focus_start, int focus_end,
!     struct format_ranges *frs)
  {
! 	u_int			width_left, width_centre, width_right;
! 	u_int			width_list, width_after, middle;
  	struct screen_write_ctx	ctx;
  
  	width_left = left->cx;
  	width_centre = centre->cx;
  	width_right = right->cx;
  	width_list = list->cx;
  	width_after = after->cx;
  
--- 303,336 ----
  		focus_start = focus_end = 0;
  	format_draw_put_list(octx, ocx, ocy, width_left, width_list, list,
  	    list_left, list_right, focus_start, focus_end, frs);
+ 
+ 	/*
+ 	 * Write abs_centre in the perfect centre of all horizontal space.
+ 	 */
+ 	if (width_abs_centre > available)
+ 		width_abs_centre = available;
+ 	format_draw_put(octx, ocx, ocy, abs_centre, frs,
+ 	    (available - width_abs_centre) / 2,
+ 	    0,
+ 	    width_abs_centre);
  }
  
  /* Draw format with list in the centre. */
  static void
  format_draw_centre(struct screen_write_ctx *octx, u_int available, u_int ocx,
      u_int ocy, struct screen *left, struct screen *centre, struct screen *right,
!     struct screen *abs_centre, struct screen *list, struct screen *list_left,
!     struct screen *list_right, struct screen *after, int focus_start,
!     int focus_end, struct format_ranges *frs)
  {
! 	u_int			width_left, width_centre, width_right, middle;
! 	u_int			width_list, width_after, width_abs_centre;
  	struct screen_write_ctx	ctx;
  
  	width_left = left->cx;
  	width_centre = centre->cx;
  	width_right = right->cx;
+ 	width_abs_centre = abs_centre->cx;
  	width_list = list->cx;
  	width_after = after->cx;
  
***************
*** 339,345 ****
  		screen_write_stop(&ctx);
  
  		format_draw_none(octx, available, ocx, ocy, left, centre,
! 		    right, frs);
  		return;
  	}
  
--- 362,368 ----
  		screen_write_stop(&ctx);
  
  		format_draw_none(octx, available, ocx, ocy, left, centre,
! 		    right, abs_centre, frs);
  		return;
  	}
  
***************
*** 388,410 ****
  	format_draw_put_list(octx, ocx, ocy, middle - width_list / 2,
  	    width_list, list, list_left, list_right, focus_start, focus_end,
  	    frs);
  }
  
  /* Draw format with list on the right. */
  static void
  format_draw_right(struct screen_write_ctx *octx, u_int available, u_int ocx,
      u_int ocy, struct screen *left, struct screen *centre, struct screen *right,
!     struct screen *list, struct screen *list_left, struct screen *list_right,
!     struct screen *after, int focus_start, int focus_end,
!     struct format_ranges *frs)
  {
  	u_int			width_left, width_centre, width_right;
! 	u_int			width_list, width_after;
  	struct screen_write_ctx	ctx;
  
  	width_left = left->cx;
  	width_centre = centre->cx;
  	width_right = right->cx;
  	width_list = list->cx;
  	width_after = after->cx;
  
--- 411,444 ----
  	format_draw_put_list(octx, ocx, ocy, middle - width_list / 2,
  	    width_list, list, list_left, list_right, focus_start, focus_end,
  	    frs);
+ 
+ 	/*
+ 	 * Write abs_centre in the perfect centre of all horizontal space.
+ 	 */
+ 	if (width_abs_centre > available)
+ 		width_abs_centre = available;
+ 	format_draw_put(octx, ocx, ocy, abs_centre, frs,
+ 	    (available - width_abs_centre) / 2,
+ 	    0,
+ 	    width_abs_centre);
  }
  
  /* Draw format with list on the right. */
  static void
  format_draw_right(struct screen_write_ctx *octx, u_int available, u_int ocx,
      u_int ocy, struct screen *left, struct screen *centre, struct screen *right,
!     struct screen *abs_centre,     struct screen *list,
!     struct screen *list_left, struct screen *list_right, struct screen *after,
!     int focus_start, int focus_end, struct format_ranges *frs)
  {
  	u_int			width_left, width_centre, width_right;
! 	u_int			width_list, width_after, width_abs_centre;
  	struct screen_write_ctx	ctx;
  
  	width_left = left->cx;
  	width_centre = centre->cx;
  	width_right = right->cx;
+ 	width_abs_centre = abs_centre->cx;
  	width_list = list->cx;
  	width_after = after->cx;
  
***************
*** 436,442 ****
  		screen_write_stop(&ctx);
  
  		format_draw_none(octx, available, ocx, ocy, left, centre,
! 		    right, frs);
  		return;
  	}
  
--- 470,476 ----
  		screen_write_stop(&ctx);
  
  		format_draw_none(octx, available, ocx, ocy, left, centre,
! 		    right, abs_centre, frs);
  		return;
  	}
  
***************
*** 484,491 ****
--- 518,637 ----
  	format_draw_put_list(octx, ocx, ocy, available - width_list -
  	    width_after, width_list, list, list_left, list_right, focus_start,
  	    focus_end, frs);
+ 
+ 	/*
+ 	 * Write abs_centre in the perfect centre of all horizontal space.
+ 	 */
+ 	if (width_abs_centre > available)
+ 		width_abs_centre = available;
+ 	format_draw_put(octx, ocx, ocy, abs_centre, frs,
+ 	    (available - width_abs_centre) / 2,
+ 	    0,
+ 	    width_abs_centre);
  }
  
+ static void
+ format_draw_absolute_centre(struct screen_write_ctx *octx, u_int available,
+     u_int ocx, u_int ocy, struct screen *left, struct screen *centre,
+     struct screen *right, struct screen *abs_centre, struct screen *list,
+     struct screen *list_left, struct screen *list_right, struct screen *after,
+     int focus_start, int focus_end, struct format_ranges *frs)
+ {
+ 	u_int	width_left, width_centre, width_right, width_abs_centre;
+ 	u_int	width_list, width_after, middle, abs_centre_offset;
+ 
+ 	width_left = left->cx;
+ 	width_centre = centre->cx;
+ 	width_right = right->cx;
+ 	width_abs_centre = abs_centre->cx;
+ 	width_list = list->cx;
+ 	width_after = after->cx;
+ 
+ 	/*
+ 	 * Trim first centre, then the right, then the left.
+ 	 */
+ 	while (width_left +
+ 	    width_centre +
+ 	    width_right > available) {
+ 		if (width_centre > 0)
+ 			width_centre--;
+ 		else if (width_right > 0)
+ 			width_right--;
+ 		else
+ 			width_left--;
+ 	}
+ 
+ 	/*
+ 	 * We trim list after and abs_centre independently, as we are drawing
+ 	 * them over the rest. Trim first the list, then after the list, then
+ 	 * abs_centre.
+ 	 */
+ 	while (width_list + width_after + width_abs_centre > available) {
+ 		if (width_list > 0)
+ 			width_list--;
+ 		else if (width_after > 0)
+ 			width_after--;
+ 		else
+ 			width_abs_centre--;
+ 	}
+ 
+ 	/* Write left at 0. */
+ 	format_draw_put(octx, ocx, ocy, left, frs, 0, 0, width_left);
+ 
+ 	/* Write right at available - width_right. */
+ 	format_draw_put(octx, ocx, ocy, right, frs,
+ 	    available - width_right,
+ 	    right->cx - width_right,
+ 	    width_right);
+ 
+ 	/*
+ 	 * Keep writing centre at the relative centre. Only the list is written
+ 	 * in the absolute centre of the horizontal space.
+ 	 */
+ 	middle = (width_left + ((available - width_right) - width_left) / 2);
+ 
+ 	/*
+ 	 * Write centre at
+ 	 *     middle - width_centre.
+ 	 */
+ 	format_draw_put(octx, ocx, ocy, centre, frs,
+ 		middle - width_centre,
+ 		0,
+ 		width_centre);
+ 
+ 	/*
+ 	 * If there is no focus given, keep the centre in focus.
+ 	 */
+ 	if (focus_start == -1 || focus_end == -1)
+ 		focus_start = focus_end = list->cx / 2;
+ 
+ 	/*
+ 	 * We centre abs_centre and the list together, so their shared centre is
+ 	 * in the perfect centre of horizontal space.
+ 	 */
+ 	abs_centre_offset = (available - width_list - width_abs_centre) / 2;
+ 
+ 	/*
+ 	 * Write abs_centre before the list.
+ 	 */
+ 	format_draw_put(octx, ocx, ocy, abs_centre, frs, abs_centre_offset,
+ 	    0, width_abs_centre);
+ 	abs_centre_offset += width_abs_centre;
+ 
+ 	/*
+ 	 * Draw the list in the absolute centre
+ 	 */
+ 	format_draw_put_list(octx, ocx, ocy, abs_centre_offset, width_list,
+ 	    list, list_left, list_right, focus_start, focus_end, frs);
+ 	abs_centre_offset += width_list;
+ 
+ 	/*
+ 	 * Write after at the end of the centre
+ 	 */
+ 	format_draw_put(octx, ocx, ocy, after, frs, abs_centre_offset, 0,
+ 	    width_after);
+ }
+ 
  /* Draw multiple characters. */
  static void
  format_draw_many(struct screen_write_ctx *ctx, struct style *sy, char ch,
***************
*** 506,511 ****
--- 652,658 ----
  	enum { LEFT,
  	       CENTRE,
  	       RIGHT,
+ 	       ABSOLUTE_CENTRE,
  	       LIST,
  	       LIST_LEFT,
  	       LIST_RIGHT,
***************
*** 514,519 ****
--- 661,667 ----
  	const char	        *names[] = { "LEFT",
  					     "CENTRE",
  					     "RIGHT",
+ 					     "ABSOLUTE_CENTRE",
  					     "LIST",
  					     "LIST_LEFT",
  					     "LIST_RIGHT",
***************
*** 522,528 ****
  	struct screen		*os = octx->s, s[TOTAL];
  	struct screen_write_ctx	 ctx[TOTAL];
  	u_int			 ocx = os->cx, ocy = os->cy, n, i, width[TOTAL];
! 	u_int			 map[] = { LEFT, LEFT, CENTRE, RIGHT };
  	int			 focus_start = -1, focus_end = -1;
  	int			 list_state = -1, fill = -1, even;
  	enum style_align	 list_align = STYLE_ALIGN_DEFAULT;
--- 670,680 ----
  	struct screen		*os = octx->s, s[TOTAL];
  	struct screen_write_ctx	 ctx[TOTAL];
  	u_int			 ocx = os->cx, ocy = os->cy, n, i, width[TOTAL];
! 	u_int			 map[] = { LEFT,
! 					   LEFT,
! 					   CENTRE,
! 					   RIGHT,
! 					   ABSOLUTE_CENTRE };
  	int			 focus_start = -1, focus_end = -1;
  	int			 list_state = -1, fill = -1, even;
  	enum style_align	 list_align = STYLE_ALIGN_DEFAULT;
***************
*** 789,813 ****
  	case STYLE_ALIGN_DEFAULT:
  		/* No list. */
  		format_draw_none(octx, available, ocx, ocy, &s[LEFT],
! 		    &s[CENTRE], &s[RIGHT], &frs);
  		break;
  	case STYLE_ALIGN_LEFT:
  		/* List is part of the left. */
  		format_draw_left(octx, available, ocx, ocy, &s[LEFT],
! 		    &s[CENTRE], &s[RIGHT], &s[LIST], &s[LIST_LEFT],
! 		    &s[LIST_RIGHT], &s[AFTER], focus_start, focus_end, &frs);
  		break;
  	case STYLE_ALIGN_CENTRE:
  		/* List is part of the centre. */
  		format_draw_centre(octx, available, ocx, ocy, &s[LEFT],
! 		    &s[CENTRE], &s[RIGHT], &s[LIST], &s[LIST_LEFT],
! 		    &s[LIST_RIGHT], &s[AFTER], focus_start, focus_end, &frs);
  		break;
  	case STYLE_ALIGN_RIGHT:
  		/* List is part of the right. */
  		format_draw_right(octx, available, ocx, ocy, &s[LEFT],
! 		    &s[CENTRE], &s[RIGHT], &s[LIST], &s[LIST_LEFT],
! 		    &s[LIST_RIGHT], &s[AFTER], focus_start, focus_end, &frs);
  		break;
  	}
  
--- 941,975 ----
  	case STYLE_ALIGN_DEFAULT:
  		/* No list. */
  		format_draw_none(octx, available, ocx, ocy, &s[LEFT],
! 		    &s[CENTRE], &s[RIGHT], &s[ABSOLUTE_CENTRE], &frs);
  		break;
  	case STYLE_ALIGN_LEFT:
  		/* List is part of the left. */
  		format_draw_left(octx, available, ocx, ocy, &s[LEFT],
! 		    &s[CENTRE], &s[RIGHT], &s[ABSOLUTE_CENTRE], &s[LIST],
! 		    &s[LIST_LEFT], &s[LIST_RIGHT], &s[AFTER],
! 		    focus_start, focus_end, &frs);
  		break;
  	case STYLE_ALIGN_CENTRE:
  		/* List is part of the centre. */
  		format_draw_centre(octx, available, ocx, ocy, &s[LEFT],
! 		    &s[CENTRE], &s[RIGHT], &s[ABSOLUTE_CENTRE], &s[LIST],
! 		    &s[LIST_LEFT], &s[LIST_RIGHT], &s[AFTER],
! 		    focus_start, focus_end, &frs);
  		break;
  	case STYLE_ALIGN_RIGHT:
  		/* List is part of the right. */
  		format_draw_right(octx, available, ocx, ocy, &s[LEFT],
! 		    &s[CENTRE], &s[RIGHT], &s[ABSOLUTE_CENTRE], &s[LIST],
! 		    &s[LIST_LEFT], &s[LIST_RIGHT], &s[AFTER],
! 		    focus_start, focus_end, &frs);
! 		break;
! 	case STYLE_ALIGN_ABSOLUTE_CENTRE:
! 		/* List is in the centre of the entire horizontal space. */
! 		format_draw_absolute_centre(octx, available, ocx, ocy, &s[LEFT],
! 		    &s[CENTRE], &s[RIGHT], &s[ABSOLUTE_CENTRE], &s[LIST],
! 		    &s[LIST_LEFT], &s[LIST_RIGHT], &s[AFTER],
! 		    focus_start, focus_end, &frs);
  		break;
  	}