From 2c6c3a1d27d3665a47d037965955d2bad1f81bcc Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Sat, 1 Jun 2019 16:21:37 +0000
Subject: If only one of -x or -y is given, use the calculated size for the
 other. Pointed out by Ben Boeckel.

---
 cmd-new-session.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'cmd-new-session.c')

diff --git a/cmd-new-session.c b/cmd-new-session.c
index 2fd13420..559c268c 100644
--- a/cmd-new-session.c
+++ b/cmd-new-session.c
@@ -242,8 +242,13 @@ cmd_new_session_exec(struct cmd *self, struct cmdq_item *item)
 
 	/* Create the new session. */
 	oo = options_create(global_s_options);
-	if (args_has(args, 'x') || args_has(args, 'y'))
+	if (args_has(args, 'x') || args_has(args, 'y')) {
+		if (!args_has(args, 'x'))
+			dsx = sx;
+		if (!args_has(args, 'y'))
+			dsy = sy;
 		options_set_string(oo, "default-size", 0, "%ux%u", dsx, dsy);
+	}
 	env = environ_create();
 	if (c != NULL && !args_has(args, 'E'))
 		environ_update(global_s_options, c->environ, env);
-- 
cgit 


From 4ca1de1b8bc10dca47d2cf7399df41845c902c9e Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 3 Jun 2019 18:28:37 +0000
Subject: Add new-session -X and attach-session -x to send SIGHUP to parent
 when detaching (like detach-client -P). From Colin Watson in GitHub issue
 1773.

---
 cmd-new-session.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'cmd-new-session.c')

diff --git a/cmd-new-session.c b/cmd-new-session.c
index 559c268c..e0540815 100644
--- a/cmd-new-session.c
+++ b/cmd-new-session.c
@@ -39,8 +39,8 @@ const struct cmd_entry cmd_new_session_entry = {
 	.name = "new-session",
 	.alias = "new",
 
-	.args = { "Ac:dDEF:n:Ps:t:x:y:", 0, -1 },
-	.usage = "[-AdDEP] [-c start-directory] [-F format] [-n window-name] "
+	.args = { "Ac:dDEF:n:Ps:t:x:Xy:", 0, -1 },
+	.usage = "[-AdDEPX] [-c start-directory] [-F format] [-n window-name] "
 		 "[-s session-name] " CMD_TARGET_SESSION_USAGE " [-x width] "
 		 "[-y height] [command]",
 
@@ -105,7 +105,8 @@ cmd_new_session_exec(struct cmd *self, struct cmdq_item *item)
 			if (args_has(args, 'A')) {
 				retval = cmd_attach_session(item,
 				    newname, args_has(args, 'D'),
-				    0, NULL, args_has(args, 'E'));
+				    args_has(args, 'X'), 0, NULL,
+				    args_has(args, 'E'));
 				free(newname);
 				return (retval);
 			}
-- 
cgit