summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2009-11-10 18:53:12 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2009-11-10 18:53:12 +0000
commitf965c318d58e05b7e3f063d67a214f9e6778da9e (patch)
treeb0fac32308a5f8084f06ece11c40f6006b794ec2 /usr.bin
parentd508efd776548d510819a519ab30f4c5cecfd3ce (diff)
There is no real standard for modifier plus function keys. Previously, tmux
output some from rxvt but in other ways did the same as xterm or other terminals, but this is a bit inconsistent. xterm's method is fairly sensible and we already support it (xterm-keys), so enable it by default instead.
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/tmux/tmux.15
-rw-r--r--usr.bin/tmux/tmux.c4
2 files changed, 5 insertions, 4 deletions
diff --git a/usr.bin/tmux/tmux.1 b/usr.bin/tmux/tmux.1
index fbf2815a22e..9314debbe1d 100644
--- a/usr.bin/tmux/tmux.1
+++ b/usr.bin/tmux/tmux.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tmux.1,v 1.117 2009/11/03 22:40:40 nicm Exp $
+.\" $OpenBSD: tmux.1,v 1.118 2009/11/10 18:53:11 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: November 3 2009 $
+.Dd $Mdocdate: November 10 2009 $
.Dt TMUX 1
.Os
.Sh NAME
@@ -1788,6 +1788,7 @@ will generate
.Xr xterm 1 -style
function key sequences; these have a number included to indicate modifiers such
as Shift, Alt or Ctrl.
+The default is on.
.El
.It Xo Ic show-options
.Op Fl g
diff --git a/usr.bin/tmux/tmux.c b/usr.bin/tmux/tmux.c
index 23d9b59ea6d..62a983063c1 100644
--- a/usr.bin/tmux/tmux.c
+++ b/usr.bin/tmux/tmux.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.c,v 1.56 2009/11/04 20:59:22 nicm Exp $ */
+/* $OpenBSD: tmux.c,v 1.57 2009/11/10 18:53:11 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -390,7 +390,7 @@ main(int argc, char **argv)
options_set_number(wo, "window-status-current-bg", 8);
options_set_number(wo, "window-status-current-fg", 8);
options_set_number(wo, "window-status-fg", 8);
- options_set_number(wo, "xterm-keys", 0);
+ options_set_number(wo, "xterm-keys", 1);
options_set_number(wo, "remain-on-exit", 0);
options_set_number(wo, "synchronize-panes", 0);