===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-split-window.c,v
retrieving revision 1.111
retrieving revision 1.112
diff -c -r1.111 -r1.112
*** src/usr.bin/tmux/cmd-split-window.c	2021/10/07 07:52:13	1.111
--- src/usr.bin/tmux/cmd-split-window.c	2022/03/08 22:14:25	1.112
***************
*** 1,4 ****
! /* $OpenBSD: cmd-split-window.c,v 1.111 2021/10/07 07:52:13 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-split-window.c,v 1.112 2022/03/08 22:14:25 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 61,66 ****
--- 61,67 ----
  	struct client		*tc = cmdq_get_target_client(item);
  	struct session		*s = target->s;
  	struct winlink		*wl = target->wl;
+ 	struct window		*w = wl->window;
  	struct window_pane	*wp = target->wp, *new_wp;
  	enum layout_type	 type;
  	struct layout_cell	*lc;
***************
*** 87,96 ****
  				cmdq_error(item, "percentage %s", errstr);
  				return (CMD_RETURN_ERROR);
  			}
! 			if (type == LAYOUT_TOPBOTTOM)
! 				size = (wp->sy * percentage) / 100;
! 			else
! 				size = (wp->sx * percentage) / 100;
  		} else {
  			size = args_strtonum(args, 'l', 0, INT_MAX, &cause);
  			if (cause != NULL) {
--- 88,104 ----
  				cmdq_error(item, "percentage %s", errstr);
  				return (CMD_RETURN_ERROR);
  			}
! 			if (args_has(args, 'f')) {
! 				if (type == LAYOUT_TOPBOTTOM)
! 					size = (w->sy * percentage) / 100;
! 				else
! 					size = (w->sx * percentage) / 100;
! 			} else {
! 				if (type == LAYOUT_TOPBOTTOM)
! 					size = (wp->sy * percentage) / 100;
! 				else
! 					size = (wp->sx * percentage) / 100;
! 			}
  		} else {
  			size = args_strtonum(args, 'l', 0, INT_MAX, &cause);
  			if (cause != NULL) {
***************
*** 106,115 ****
  			free(cause);
  			return (CMD_RETURN_ERROR);
  		}
! 		if (type == LAYOUT_TOPBOTTOM)
! 			size = (wp->sy * percentage) / 100;
! 		else
! 			size = (wp->sx * percentage) / 100;
  	} else
  		size = -1;
  
--- 114,130 ----
  			free(cause);
  			return (CMD_RETURN_ERROR);
  		}
! 		if (args_has(args, 'f')) {
! 			if (type == LAYOUT_TOPBOTTOM)
! 				size = (w->sy * percentage) / 100;
! 			else
! 				size = (w->sx * percentage) / 100;
! 		} else {
! 			if (type == LAYOUT_TOPBOTTOM)
! 				size = (wp->sy * percentage) / 100;
! 			else
! 				size = (wp->sx * percentage) / 100;
! 		}
  	} else
  		size = -1;