If default-terminal is set to "screen" or "screen-*", emulate screen's

historical (incorrect) behaviour for SGR 3 and send smso
(standout). Previously, we would send sitm (italics) if the terminal
outside had it and smso otherwise. This was acceptably until recently
because xterm's terminfo entry lacked sitm, so most users got smso.

People who want italics should set default-terminal to the forthcoming
"tmux" entry (and be prepared to deal with it being missing on older
hosts).

As a side-effect this changes default-terminal to be a server rather
than a session option.

suggested by and ok naddy

diff --git a/usr.bin/tmux/options-table.c b/usr.bin/tmux/options-table.c
index d8af5e3..99fbbca 100644 (file)
--- a/usr.bin/tmux/options-table.c
+++ b/usr.bin/tmux/options-table.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: options-table.c,v 1.55 2015/04/19 21:34:21 nicm Exp $ */
+/* $OpenBSD: options-table.c,v 1.56 2015/04/29 15:59:08 nicm Exp $ */
 
 /*
  * Copyright (c) 2011 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -61,6 +61,11 @@ const struct options_table_entry server_options_table[] = {
          .default_num = 20
        },
 
+       { .name = "default-terminal",
+         .type = OPTIONS_TABLE_STRING,
+         .default_str = "screen"
+       },
+
        { .name = "escape-time",
          .type = OPTIONS_TABLE_NUMBER,
          .minimum = 0,
@@ -143,11 +148,6 @@ const struct options_table_entry session_options_table[] = {
          .default_str = _PATH_BSHELL
        },
 
-       { .name = "default-terminal",
-         .type = OPTIONS_TABLE_STRING,
-         .default_str = "screen"
-       },
-
        { .name = "destroy-unattached",
          .type = OPTIONS_TABLE_FLAG,
          .default_num = 0

diff --git a/usr.bin/tmux/server-fn.c b/usr.bin/tmux/server-fn.c
index 6059677..8f7a019 100644 (file)
--- a/usr.bin/tmux/server-fn.c
+++ b/usr.bin/tmux/server-fn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: server-fn.c,v 1.84 2015/04/24 23:17:11 nicm Exp $ */
+/* $OpenBSD: server-fn.c,v 1.85 2015/04/29 15:59:08 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -36,7 +36,7 @@ server_fill_environ(struct session *s, struct environ *env)
        long    pid;
 
        if (s != NULL) {
-               term = options_get_string(&s->options, "default-terminal");
+               term = options_get_string(&global_options, "default-terminal");
                environ_set(env, "TERM", term);
 
                idx = s->id;

diff --git a/usr.bin/tmux/tmux.1 b/usr.bin/tmux/tmux.1
index d774816..dc3b498 100644 (file)
--- a/usr.bin/tmux/tmux.1
+++ b/usr.bin/tmux/tmux.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tmux.1,v 1.424 2015/04/28 10:43:14 nicm Exp $
+.\" $OpenBSD: tmux.1,v 1.425 2015/04/29 15:59:08 nicm Exp $
 .\"
 .\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
 .\"
@@ -14,7 +14,7 @@
 .\" IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: April 28 2015 $
+.Dd $Mdocdate: April 29 2015 $
 .Dt TMUX 1
 .Os
 .Sh NAME
@@ -2266,6 +2266,19 @@ Available server options are:
 Set the number of buffers; as new buffers are added to the top of the stack,
 old ones are removed from the bottom if necessary to maintain this maximum
 length.
+.It Ic default-terminal Ar terminal
+Set the default terminal for new windows created in this session - the
+default value of the
+.Ev TERM
+environment variable.
+For
+.Nm
+to work correctly, this
+.Em must
+be set to
+.Ql screen ,
+.Ql tmux
+or a derivative of them.
 .It Ic escape-time Ar time
 Set the time in milliseconds for which
 .Nm
@@ -2405,18 +2418,6 @@ or
 This option should be configured when
 .Nm
 is used as a login shell.
-.It Ic default-terminal Ar terminal
-Set the default terminal for new windows created in this session - the
-default value of the
-.Ev TERM
-environment variable.
-For
-.Nm
-to work correctly, this
-.Em must
-be set to
-.Ql screen
-or a derivative of it.
 .It Xo Ic destroy-unattached
 .Op Ic on | off
 .Xc

diff --git a/usr.bin/tmux/tty.c b/usr.bin/tmux/tty.c
index 3f335ed..4b27e41 100644 (file)
--- a/usr.bin/tmux/tty.c
+++ b/usr.bin/tmux/tty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tty.c,v 1.179 2015/04/25 15:57:48 nicm Exp $ */
+/* $OpenBSD: tty.c,v 1.180 2015/04/29 15:59:08 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -34,6 +34,7 @@
 void   tty_read_callback(struct bufferevent *, void *);
 void   tty_error_callback(struct bufferevent *, short, void *);
 
+void   tty_set_italics(struct tty *);
 int    tty_try_256(struct tty *, u_char, const char *);
 
 void   tty_colours(struct tty *, const struct grid_cell *);
@@ -456,6 +457,21 @@ tty_putn(struct tty *tty, const void *buf, size_t len, u_int width)
        tty->cx += width;
 }
 
+void
+tty_set_italics(struct tty *tty)
+{
+       const char      *s;
+
+       if (tty_term_has(tty->term, TTYC_SITM)) {
+               s = options_get_string(&global_options, "default-terminal");
+               if (strcmp(s, "screen") != 0 && strncmp(s, "screen-", 7) != 0) {
+                       tty_putcode(tty, TTYC_SITM);
+                       return;
+               }
+       }
+       tty_putcode(tty, TTYC_SMSO);
+}
+
 void
 tty_set_title(struct tty *tty, const char *title)
 {
@@ -1396,12 +1412,8 @@ tty_attributes(struct tty *tty, const struct grid_cell *gc,
                tty_putcode(tty, TTYC_BOLD);
        if (changed & GRID_ATTR_DIM)
                tty_putcode(tty, TTYC_DIM);
-       if (changed & GRID_ATTR_ITALICS) {
-               if (tty_term_has(tty->term, TTYC_SITM))
-                       tty_putcode(tty, TTYC_SITM);
-               else
-                       tty_putcode(tty, TTYC_SMSO);
-       }
+       if (changed & GRID_ATTR_ITALICS)
+               tty_set_italics(tty);
        if (changed & GRID_ATTR_UNDERSCORE)
                tty_putcode(tty, TTYC_SMUL);
        if (changed & GRID_ATTR_BLINK)