Merge branch 'obsd-master'

1 files changed, 11 insertions, 9 deletions

diff --git a/tmux.c b/tmux.c
index e16642fd..40872eca 100644
--- a/tmux.c
+++ b/tmux.c
@@ -55,7 +55,7 @@ usage(void)
 {
 	fprintf(stderr,
 	    "usage: %s [-2CluvV] [-c shell-command] [-f file] [-L socket-name]\n"
-	    "            [-S socket-path] [command [flags]]\n",
+	    "            [-S socket-path] [-T features] [command [flags]]\n",
 	    getprogname());
 	exit(1);
 }
@@ -233,9 +233,11 @@ getversion(void)
 int
 main(int argc, char **argv)
 {
-	char					*path, *label, *cause, **var;
+	char					*path = NULL, *label = NULL;
+	char					*cause, **var;
 	const char				*s, *shell, *cwd;
-	int					 opt, flags, keys;
+	int					 opt, flags = 0, keys;
+	int					 feat = 0;
 	const struct options_table_entry	*oe;
 
 	if (setlocale(LC_CTYPE, "en_US.UTF-8") == NULL &&
@@ -252,14 +254,11 @@ main(int argc, char **argv)
 
 	if (**argv == '-')
 		flags = CLIENT_LOGIN;
-	else
-		flags = 0;
 
-	label = path = NULL;
-	while ((opt = getopt(argc, argv, "2c:Cdf:lL:qS:uUvV")) != -1) {
+	while ((opt = getopt(argc, argv, "2c:Cdf:lL:qS:T:uUvV")) != -1) {
 		switch (opt) {
 		case '2':
-			flags |= CLIENT_256COLOURS;
+			tty_add_features(&feat, "256", ":,");
 			break;
 		case 'c':
 			shell_command = optarg;
@@ -289,6 +288,9 @@ main(int argc, char **argv)
 			free(path);
 			path = xstrdup(optarg);
 			break;
+		case 'T':
+			tty_add_features(&feat, optarg, ":,");
+			break;
 		case 'u':
 			flags |= CLIENT_UTF8;
 			break;
@@ -396,5 +398,5 @@ main(int argc, char **argv)
 	free(label);
 
 	/* Pass control to the client. */
-	exit(client_main(osdep_event_init(), argc, argv, flags));
+	exit(client_main(event_init(), argc, argv, flags, feat));
 }