From 1c0557154dd9da99ca78eea5be2939045765917f Mon Sep 17 00:00:00 2001 From: nicm Date: Fri, 10 Jul 2009 05:50:54 +0000 Subject: Add a default-terminal option to set the starting value of $TERM in new windows. This is "screen" by default and must be either that or something closely related. This does makes it easier to customise it if necessary. --- usr.bin/tmux/server-fn.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'usr.bin/tmux/server-fn.c') diff --git a/usr.bin/tmux/server-fn.c b/usr.bin/tmux/server-fn.c index e6003d98607..2226b7ccf97 100644 --- a/usr.bin/tmux/server-fn.c +++ b/usr.bin/tmux/server-fn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server-fn.c,v 1.3 2009/06/30 13:40:30 nicm Exp $ */ +/* $OpenBSD: server-fn.c,v 1.4 2009/07/10 05:50:54 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -29,8 +29,8 @@ int server_lock_callback(void *, const char *); const char ** server_fill_environ(struct session *s) { - static const char *env[] = { NULL /* TMUX= */, "TERM=screen", NULL }; - static char tmuxvar[MAXPATHLEN + 256]; + static const char *env[] = { NULL /* TMUX= */, NULL /* TERM */, NULL }; + static char tmuxvar[MAXPATHLEN + 256], termvar[256]; u_int idx; if (session_index(s, &idx) != 0) @@ -40,6 +40,10 @@ server_fill_environ(struct session *s) "TMUX=%s,%ld,%u", socket_path, (long) getpid(), idx); env[0] = tmuxvar; + xsnprintf(termvar, sizeof termvar, + "TERM=%s", options_get_string(&s->options, "default-terminal")); + env[1] = termvar; + return (env); } -- cgit v1.2.3-59-g8ed1b