From yuri.pankov@gmail.com  Sun Jan 10 16:54:13 2010
Return-Path: <yuri.pankov@gmail.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2F381106566B
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 10 Jan 2010 16:54:13 +0000 (UTC)
	(envelope-from yuri.pankov@gmail.com)
Received: from fg-out-1718.google.com (fg-out-1718.google.com [72.14.220.152])
	by mx1.freebsd.org (Postfix) with ESMTP id AFECE8FC20
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 10 Jan 2010 16:54:12 +0000 (UTC)
Received: by fg-out-1718.google.com with SMTP id 16so319970fgg.13
        for <FreeBSD-gnats-submit@freebsd.org>; Sun, 10 Jan 2010 08:54:04 -0800 (PST)
Received: by 10.87.42.6 with SMTP id u6mr142901fgj.9.1263142444488;
        Sun, 10 Jan 2010 08:54:04 -0800 (PST)
Received: from darklight.org.ru ([213.132.76.16])
        by mx.google.com with ESMTPS id d6sm4551538fga.9.2010.01.10.08.54.03
        (version=TLSv1/SSLv3 cipher=RC4-MD5);
        Sun, 10 Jan 2010 08:54:04 -0800 (PST)
Received: from darklight.org.ru (yuri@darklight.org.ru [127.0.0.1])
	by darklight.org.ru (8.14.3/8.14.3) with ESMTP id o0AGs0uH000366
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 10 Jan 2010 19:54:01 +0300 (MSK)
	(envelope-from yuri.pankov@gmail.com)
Received: (from yuri@localhost)
	by darklight.org.ru (8.14.3/8.14.3/Submit) id o0AGs02l000365;
	Sun, 10 Jan 2010 19:54:00 +0300 (MSK)
	(envelope-from yuri.pankov@gmail.com)
Message-Id: <201001101654.o0AGs02l000365@darklight.org.ru>
Date: Sun, 10 Jan 2010 19:54:00 +0300 (MSK)
From: Yuri Pankov <yuri.pankov@gmail.com>
Reply-To: Yuri Pankov <yuri.pankov@gmail.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [termcap] [patch] Re-apply changes from r175161 (making End work in ncurses apps)
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         142578
>Category:       conf
>Synopsis:       [termcap] [patch] Re-apply changes from r175161 (making End work in ncurses apps)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jan 10 17:00:16 UTC 2010
>Closed-Date:    Sun Jan 10 20:22:06 UTC 2010
>Last-Modified:  Sun Jan 10 21:50:03 UTC 2010
>Originator:     Yuri Pankov
>Release:        FreeBSD 9.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD darklight.org.ru 9.0-CURRENT FreeBSD 9.0-CURRENT #3 r201546: Tue Jan 5 09:53:26 MSK 2010 yuri@darklight.org.ru:/usr/obj/home/yuri/src/head/sys/DARKLIGHT amd64
>Description:
Re-apply changes from r175161. Log:
- Remove kH and *6 from xterm. They are defined to the same key as @7 (kp_end).
  As ncurses has the limitation that it returns the first matched key symbol,
  you can not use END in ncurses based program, like mutt, with xterm.
- Add @8 (kp_enter) definition for xterm so you can use ENTER in xterm with
  ncurses based program.

I also found that NetBSD's xterm does the same thing.

PR:		100150
Reported by:	Arseny Nasokin <tarc at tarc.po.cs.msu.su>
Discussed with:	Thomas Dickey, Ulrich Spoerlein <uspoerlein at gmail.com>
Reviewed by:	freebsd-arch@
MFC after:	2 month
>How-To-Repeat:
>Fix:

--- termcap.diff.txt begins here ---
Index: share/termcap/termcap.src
===================================================================
--- share/termcap/termcap.src	(revision 201968)
+++ share/termcap/termcap.src	(working copy)
@@ -2807,9 +2807,9 @@
 	:te=\E[?1049l:ti=\E[?1049h:\
 	:tc=xterm-new:
 xterm-new|modern xterm:\
-	:*6=\EOF:@7=\EOF:F1=\E[23~:F2=\E[24~:K2=\EOE:Km=\E[M:\
+	:@7=\EOF:@8=\EOM:F1=\E[23~:F2=\E[24~:K2=\EOE:Km=\E[M:\
 	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\E[15~:k6=\E[17~:\
-	:k7=\E[18~:k8=\E[19~:k9=\E[20~:k;=\E[21~:kH=\EOF:kI=\E[2~:\
+	:k7=\E[18~:k8=\E[19~:k9=\E[20~:k;=\E[21~:kI=\E[2~:\
 	:kN=\E[6~:kP=\E[5~:kd=\EOB:kh=\EOH:kl=\EOD:kr=\EOC:ku=\EOA:\
 	:tc=xterm-basic:
 #
--- termcap.diff.txt ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: ed 
State-Changed-When: Sun Jan 10 20:22:05 UTC 2010 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=142578 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: conf/142578: commit references a PR
Date: Sun, 10 Jan 2010 21:41:46 +0000 (UTC)

 Author: ed
 Date: Sun Jan 10 21:41:37 2010
 New Revision: 202048
 URL: http://svn.freebsd.org/changeset/base/202048
 
 Log:
   Properly make the end key work again for TERM=xterm.
   
   I've been so busy hacking on utmpx the last couple of days, out of
   reflex, I committed it to the wrong source tree. Note to myself: don't
   hack on FreeBSD while watching TV at the same time.
   
   PR:		conf/142578
   Submitted by:	Yuri Pankov <yuri pankov gmail com>
   Reminded by:	stefanf
 
 Modified:
   head/etc/termcap.small
   head/share/termcap/termcap.src
 
 Modified: head/etc/termcap.small
 ==============================================================================
 --- head/etc/termcap.small	Sun Jan 10 21:00:52 2010	(r202047)
 +++ head/etc/termcap.small	Sun Jan 10 21:41:37 2010	(r202048)
 @@ -294,9 +294,9 @@ pc3|ibmpc3|IBM PC 386BSD Console:\
  # $XTermId: termcap,v 1.78 2009/11/09 00:24:26 tom Exp $
  #
  xterm-new|modern xterm:\
 -	:*6=\EOF:@7=\EOF:F1=\E[23~:F2=\E[24~:K2=\EOE:Km=\E[M:\
 +	:@7=\EOF:@8=\EOM:F1=\E[23~:F2=\E[24~:K2=\EOE:Km=\E[M:\
  	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\E[15~:k6=\E[17~:\
 -	:k7=\E[18~:k8=\E[19~:k9=\E[20~:k;=\E[21~:kH=\EOF:kI=\E[2~:\
 +	:k7=\E[18~:k8=\E[19~:k9=\E[20~:k;=\E[21~:kI=\E[2~:\
  	:kN=\E[6~:kP=\E[5~:kd=\EOB:kh=\EOH:kl=\EOD:kr=\EOC:ku=\EOA:\
  	:tc=xterm-basic:
  #
 
 Modified: head/share/termcap/termcap.src
 ==============================================================================
 --- head/share/termcap/termcap.src	Sun Jan 10 21:00:52 2010	(r202047)
 +++ head/share/termcap/termcap.src	Sun Jan 10 21:41:37 2010	(r202048)
 @@ -2807,9 +2807,9 @@ xterm-clear:\
  	:te=\E[?1049l:ti=\E[?1049h:\
  	:tc=xterm-new:
  xterm-new|modern xterm:\
 -	:*6=\EOF:@7=\EOF:F1=\E[23~:F2=\E[24~:K2=\EOE:Km=\E[M:\
 +	:@7=\EOF:@8=\EOM:F1=\E[23~:F2=\E[24~:K2=\EOE:Km=\E[M:\
  	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\E[15~:k6=\E[17~:\
 -	:k7=\E[18~:k8=\E[19~:k9=\E[20~:k;=\E[21~:kH=\EOF:kI=\E[2~:\
 +	:k7=\E[18~:k8=\E[19~:k9=\E[20~:k;=\E[21~:kI=\E[2~:\
  	:kN=\E[6~:kP=\E[5~:kd=\EOB:kh=\EOH:kl=\EOD:kr=\EOC:ku=\EOA:\
  	:tc=xterm-basic:
  #
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
>Unformatted:
