From 60869fa4c37815b1fd020cbe730ae457d105a0e0 Mon Sep 17 00:00:00 2001 From: Tiago Cunha Date: Tue, 10 Nov 2009 23:34:03 +0000 Subject: [PATCH] Sync OpenBSD patchset 526: 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. --- tmux.1 | 5 +++-- tmux.c | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tmux.1 b/tmux.1 index 3a65005b..1a4c1999 100644 --- a/tmux.1 +++ b/tmux.1 @@ -1,4 +1,4 @@ -.\" $Id: tmux.1,v 1.199 2009-11-04 22:46:25 tcunha Exp $ +.\" $Id: tmux.1,v 1.200 2009-11-10 23:34:03 tcunha Exp $ .\" .\" Copyright (c) 2007 Nicholas Marriott .\" @@ -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/tmux.c b/tmux.c index 621b0b91..bb93d12a 100644 --- a/tmux.c +++ b/tmux.c @@ -1,4 +1,4 @@ -/* $Id: tmux.c,v 1.186 2009-11-08 22:53:13 tcunha Exp $ */ +/* $Id: tmux.c,v 1.187 2009-11-10 23:34:03 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -393,7 +393,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);