Add support for percentage sizes for resize-pane ("-x 10%"). Also change

split-window and join-pane -l to accept similar percentages and
deprecate -p. From Anindya Mukherjee.

1 files changed, 54 insertions, 15 deletions

diff --git a/cmd-resize-pane.c b/cmd-resize-pane.c
index 8d35d96f..3962546d 100644
--- a/cmd-resize-pane.c
+++ b/cmd-resize-pane.c
@@ -19,6 +19,7 @@
 #include <sys/types.h>
 
 #include <stdlib.h>
+#include <string.h>
 
 #include "tmux.h"
 
@@ -55,10 +56,11 @@ cmd_resize_pane_exec(struct cmd *self, struct cmdq_item *item)
 	struct window		*w = wl->window;
 	struct client		*c = item->client;
 	struct session		*s = item->target.s;
-	const char	       	*errstr;
-	char			*cause;
+	const char	       	*errstr, *p;
+	char			*cause, *copy;
 	u_int			 adjust;
-	int			 x, y;
+	int			 x, y, percentage;
+	size_t			 plen;
 
 	if (args_has(args, 'M')) {
 		if (cmd_mouse_window(&shared->mouse, &s) == NULL)
@@ -91,21 +93,58 @@ cmd_resize_pane_exec(struct cmd *self, struct cmdq_item *item)
 		}
 	}
 
-	if (args_has(args, 'x')) {
-		x = args_strtonum(args, 'x', PANE_MINIMUM, INT_MAX, &cause);
-		if (cause != NULL) {
-			cmdq_error(item, "width %s", cause);
-			free(cause);
-			return (CMD_RETURN_ERROR);
+	if ((p = args_get(args, 'x')) != NULL) {
+		plen = strlen(p);
+		if (p[plen - 1] == '%') {
+			copy = xstrdup(p);
+			copy[plen - 1] = '\0';
+			percentage = strtonum(copy, 0, INT_MAX, &errstr);
+			free(copy);
+			if (errstr != NULL) {
+				cmdq_error(item, "width %s", errstr);
+				return (CMD_RETURN_ERROR);
+			}
+			x = (w->sx * percentage) / 100;
+			if (x < PANE_MINIMUM)
+				x = PANE_MINIMUM;
+			if (x > INT_MAX)
+				x = INT_MAX;
+		} else {
+			x = args_strtonum(args, 'x', PANE_MINIMUM, INT_MAX,
+			    &cause);
+			if (cause != NULL) {
+				cmdq_error(item, "width %s", cause);
+				free(cause);
+				return (CMD_RETURN_ERROR);
+			}
 		}
 		layout_resize_pane_to(wp, LAYOUT_LEFTRIGHT, x);
 	}
-	if (args_has(args, 'y')) {
-		y = args_strtonum(args, 'y', PANE_MINIMUM, INT_MAX, &cause);
-		if (cause != NULL) {
-			cmdq_error(item, "height %s", cause);
-			free(cause);
-			return (CMD_RETURN_ERROR);
+	if ((p = args_get(args, 'y')) != NULL) {
+		plen = strlen(p);
+		if (p[plen - 1] == '%') {
+			copy = xstrdup(p);
+			copy[plen - 1] = '\0';
+			percentage = strtonum(copy, 0, INT_MAX, &errstr);
+			free(copy);
+			if (errstr != NULL) {
+				cmdq_error(item, "height %s", errstr);
+				return (CMD_RETURN_ERROR);
+			}
+			y = (w->sy * percentage) / 100;
+			if (y < PANE_MINIMUM)
+				y = PANE_MINIMUM;
+			if (y > INT_MAX)
+				y = INT_MAX;
+		}
+		else {
+			y = args_strtonum(args, 'y', PANE_MINIMUM, INT_MAX,
+			    &cause);
+			if (cause != NULL) {
+				cmdq_error(item, "height %s", cause);
+				free(cause);
+				return (CMD_RETURN_ERROR);
+			}
 		}
 		layout_resize_pane_to(wp, LAYOUT_TOPBOTTOM, y);
 	}