From owner-cvs-ports@FreeBSD.ORG Fri Jun 17 14:17:20 2011 Return-Path: Delivered-To: cvs-ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E02931065676; Fri, 17 Jun 2011 14:17:20 +0000 (UTC) (envelope-from inyaoo@gmail.com) Received: from mail-wy0-f182.google.com (mail-wy0-f182.google.com [74.125.82.182]) by mx1.freebsd.org (Postfix) with ESMTP id 22A0F8FC16; Fri, 17 Jun 2011 14:17:19 +0000 (UTC) Received: by wyb33 with SMTP id 33so1526423wyb.13 for ; Fri, 17 Jun 2011 07:17:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-type; bh=qvhBr8esRH76U6vZOQH6nf2tP+r6WWJPw1ySAsJe+fg=; b=T6K6Wa3hgfPSlpg9+XahpxZPypRPCMRrR3tlBi9KKWcmfSgJAUEMKxYWwIXfq3bU3s gr+iucW+JyP8A7yjAjUhZQ+2lX4l4rC8sHii/3TvCmP93K3wZ1ujq4AL0Zzpyt4iRbs/ BpSKWVOwokrMA5EgcHxd1VoLBLMrF3Kim6uBg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-type; b=S9CUrSMPlIXUNjERfjTscRc7pkOBc4PgcbhfrFIZSlkhw5pIjNjZbeidQL2ZmDk+bA BEEVEXTDBWDW4uajODlqu/MJaMIC5cx2RcNfl/P5HDDpRoYpXmpF/0bZCRjvSnvmdvz4 VFPOk4uYjAGvOB5ZvbSuXeY7GrlRBMdKZv1ec= Received: by 10.227.203.145 with SMTP id fi17mr2136316wbb.106.1308320238736; Fri, 17 Jun 2011 07:17:18 -0700 (PDT) Received: from localhost ([87.236.194.158]) by mx.google.com with ESMTPS id fm14sm993563wbb.24.2011.06.17.07.17.15 (version=SSLv3 cipher=OTHER); Fri, 17 Jun 2011 07:17:17 -0700 (PDT) From: Pan Tsu To: Wen Heping References: <201105250029.p4P0TXhA008979__41653.1806732111$1306283404$gmane$org@repoman.freebsd.org> Date: Fri, 17 Jun 2011 18:17:05 +0400 In-Reply-To: <201105250029.p4P0TXhA008979__41653.1806732111$1306283404$gmane$org@repoman.freebsd.org> (Wen Heping's message of "Wed, 25 May 2011 00:29:33 +0000 (UTC)") Message-ID: <861uys7db2.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain Cc: cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org, ports-committers@FreeBSD.org Subject: Re: cvs commit: ports/sysutils/tmux Makefile ports/sysutils/tmux/files extra-patch-tty-keys.c patch-tty-keys.c X-BeenThere: cvs-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jun 2011 14:17:21 -0000 Wen Heping writes: [...] > Log: > - Add an option to use patch-tty-key.c [2] [...] > Revision Changes Path > 1.1 +11 -0 ports/sysutils/tmux/files/extra-patch-tty-keys.c (new) > 1.2 +0 -11 ports/sysutils/tmux/files/patch-tty-keys.c (dead) Wouldn't providing alternate backspace character be better? %% Index: sysutils/tmux/Makefile =================================================================== RCS file: /a/.cvsup/ports/sysutils/tmux/Makefile,v retrieving revision 1.28 diff -u -p -r1.28 Makefile --- sysutils/tmux/Makefile 16 Jun 2011 08:42:28 -0000 1.28 +++ sysutils/tmux/Makefile 17 Jun 2011 13:52:15 -0000 @@ -26,7 +26,7 @@ PORTEXAMPLES= * OPTIONS= KQUEUE "Build without define HAVE_BROKEN_KQUEUE " On \ LIBEVENT2 "Use libevent version 2" Off \ LIBEVENT_STATIC "Build with static libevent" Off \ - BACKSPACE "Build with tty/keys patch" Off + BACKSPACE "Use BS for termios(4) ERASE (default is DEL)" Off # Now I set tmux build without #define HAVE_BROKEN_KQUEUE as default and an option, # If it still hang the system or other run error, try as upstream suggest: @@ -73,7 +73,7 @@ EXTRA_PATCHES= ${PATCHDIR}/extra-patch-f .endif .if defined(WITH_BACKSPACE) -EXTRA_PATCHES= ${PATCHDIR}/extra-patch-tty-keys.c +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-bspace .endif post-patch: Index: sysutils/tmux/files/extra-patch-bspace =================================================================== RCS file: sysutils/tmux/files/extra-patch-bspace diff -N sysutils/tmux/files/extra-patch-bspace --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ sysutils/tmux/files/extra-patch-bspace 17 Jun 2011 13:46:00 -0000 @@ -0,0 +1,26 @@ +Index: input-keys.c +=================================================================== +--- input-keys.c (revision 2525) ++++ input-keys.c (working copy) +@@ -41,7 +41,7 @@ + + const struct input_key_ent input_keys[] = { + /* Backspace key. */ +- { KEYC_BSPACE, "\177", 0 }, ++ { KEYC_BSPACE, "\010", 0 }, + + /* Function keys. */ + { KEYC_F1, "\033OP", 0 }, +Index: window.c +=================================================================== +--- window.c (revision 2525) ++++ window.c (working copy) +@@ -634,7 +634,7 @@ + fatal("tcgetattr failed"); + if (tio != NULL) + memcpy(tio2.c_cc, tio->c_cc, sizeof tio2.c_cc); +- tio2.c_cc[VERASE] = '\177'; ++ tio2.c_cc[VERASE] = '\010'; + if (tcsetattr(STDIN_FILENO, TCSANOW, &tio2) != 0) + fatal("tcgetattr failed"); + Index: sysutils/tmux/files/extra-patch-tty-keys.c =================================================================== RCS file: sysutils/tmux/files/extra-patch-tty-keys.c diff -N sysutils/tmux/files/extra-patch-tty-keys.c --- sysutils/tmux/files/extra-patch-tty-keys.c 25 May 2011 00:29:33 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- tty-keys.c.orig 2010-06-04 08:45:52.000000000 +0800 -+++ tty-keys.c 2010-06-04 08:46:45.000000000 +0800 -@@ -456,8 +456,6 @@ - * used. termios should have a better idea. - */ - bspace = tty->tio.c_cc[VERASE]; -- if (bspace != _POSIX_VDISABLE && key == bspace) -- key = KEYC_BSPACE; - goto handle_key; - } - %%