From owner-svn-src-head@FreeBSD.ORG Fri Nov 13 11:28:55 2009 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 35BAD106566B; Fri, 13 Nov 2009 11:28:55 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1975D8FC15; Fri, 13 Nov 2009 11:28:55 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nADBSsll064783; Fri, 13 Nov 2009 11:28:55 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nADBSsx8064775; Fri, 13 Nov 2009 11:28:54 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <200911131128.nADBSsx8064775@svn.freebsd.org> From: Ed Schouten Date: Fri, 13 Nov 2009 11:28:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r199250 - in head: . etc/etc.i386 sys/conf sys/dev/syscons usr.sbin/sade usr.sbin/sysinstall X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Nov 2009 11:28:55 -0000 Author: ed Date: Fri Nov 13 11:28:54 2009 New Revision: 199250 URL: http://svn.freebsd.org/changeset/base/199250 Log: Convert syscons on i386 to TERM=xterm. TEKEN_XTERM is now gone. Because we always use xterm mode now, we only need a TEKEN_CONS25 switch to go back to cons25. Modified: head/UPDATING head/etc/etc.i386/ttys head/sys/conf/NOTES head/sys/conf/options head/sys/dev/syscons/scterm-teken.c head/usr.sbin/sade/termcap.c head/usr.sbin/sysinstall/termcap.c Modified: head/UPDATING ============================================================================== --- head/UPDATING Fri Nov 13 11:26:44 2009 (r199249) +++ head/UPDATING Fri Nov 13 11:28:54 2009 (r199250) @@ -24,14 +24,14 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 9. 20091113: The default terminal emulation for syscons(4) has been changed - from cons25 to xterm on all platforms except i386 and pc98. - This means that the /etc/ttys file needs to be updated to ensure - correct operation of applications on the console. + from cons25 to xterm on all platforms except pc98. This means + that the /etc/ttys file needs to be updated to ensure correct + operation of applications on the console. The terminal emulation style can be toggled per window by using - vidcontrol(1)'s -T flag. The TEKEN_XTERM and TEKEN_CONS25 - kernel configuration options can be used to change the - compile-time default. + vidcontrol(1)'s -T flag. The TEKEN_CONS25 kernel configuration + options can be used to change the compile-time default back to + cons25. To prevent graphical artifacts, make sure the TERM environment variable is set to match the terminal emulation that is being Modified: head/etc/etc.i386/ttys ============================================================================== --- head/etc/etc.i386/ttys Fri Nov 13 11:26:44 2009 (r199249) +++ head/etc/etc.i386/ttys Fri Nov 13 11:28:54 2009 (r199250) @@ -15,7 +15,7 @@ # # type The initial terminal type for this port. For hardwired # terminal lines, this will contain the type of terminal used. -# For virtual consoles, the correct type is typically cons25. +# For virtual consoles, the correct type is typically xterm. # Other common values include network for network connections on # pseudo-terminals, dialup for incoming modem ports, and unknown # when the terminal type cannot be predetermined. @@ -30,15 +30,15 @@ # when going to single-user mode. console none unknown off secure # -ttyv0 "/usr/libexec/getty Pc" cons25 on secure +ttyv0 "/usr/libexec/getty Pc" xterm on secure # Virtual terminals -ttyv1 "/usr/libexec/getty Pc" cons25 on secure -ttyv2 "/usr/libexec/getty Pc" cons25 on secure -ttyv3 "/usr/libexec/getty Pc" cons25 on secure -ttyv4 "/usr/libexec/getty Pc" cons25 on secure -ttyv5 "/usr/libexec/getty Pc" cons25 on secure -ttyv6 "/usr/libexec/getty Pc" cons25 on secure -ttyv7 "/usr/libexec/getty Pc" cons25 on secure +ttyv1 "/usr/libexec/getty Pc" xterm on secure +ttyv2 "/usr/libexec/getty Pc" xterm on secure +ttyv3 "/usr/libexec/getty Pc" xterm on secure +ttyv4 "/usr/libexec/getty Pc" xterm on secure +ttyv5 "/usr/libexec/getty Pc" xterm on secure +ttyv6 "/usr/libexec/getty Pc" xterm on secure +ttyv7 "/usr/libexec/getty Pc" xterm on secure ttyv8 "/usr/local/bin/xdm -nodaemon" xterm off secure # Serial terminals # The 'dialup' keyword identifies dialin lines to login, fingerd etc. Modified: head/sys/conf/NOTES ============================================================================== --- head/sys/conf/NOTES Fri Nov 13 11:26:44 2009 (r199249) +++ head/sys/conf/NOTES Fri Nov 13 11:28:54 2009 (r199250) @@ -1412,7 +1412,6 @@ options SC_NO_SUSPEND_VTYSWITCH # Enable experimental features of the syscons terminal emulator (teken). options TEKEN_CONS25 # cons25-style terminal emulation options TEKEN_UTF8 # UTF-8 output handling -#options TEKEN_XTERM # xterm-style terminal emulation # # Optional devices: Modified: head/sys/conf/options ============================================================================== --- head/sys/conf/options Fri Nov 13 11:26:44 2009 (r199249) +++ head/sys/conf/options Fri Nov 13 11:28:54 2009 (r199250) @@ -734,7 +734,6 @@ SC_TWOBUTTON_MOUSE opt_syscons.h # teken terminal emulator options TEKEN_CONS25 opt_teken.h TEKEN_UTF8 opt_teken.h -TEKEN_XTERM opt_teken.h # options for printf PRINTF_BUFR_SIZE opt_printf.h Modified: head/sys/dev/syscons/scterm-teken.c ============================================================================== --- head/sys/dev/syscons/scterm-teken.c Fri Nov 13 11:26:44 2009 (r199249) +++ head/sys/dev/syscons/scterm-teken.c Fri Nov 13 11:28:54 2009 (r199250) @@ -50,15 +50,6 @@ __FBSDID("$FreeBSD$"); #include -#if defined(TEKEN_XTERM) && defined(TEKEN_CONS25) -#error "xterm and cons25 are mutually exclusive." -#endif - -/* XXX: Use cons25 on i386, for compatibility with pc98. */ -#if defined(__i386__) && !defined(TEKEN_XTERM) && !defined(TEKEN_CONS25) -#define TEKEN_CONS25 -#endif - static void scteken_revattr(unsigned char, teken_attr_t *); static unsigned int scteken_attr(const teken_attr_t *); Modified: head/usr.sbin/sade/termcap.c ============================================================================== --- head/usr.sbin/sade/termcap.c Fri Nov 13 11:26:44 2009 (r199249) +++ head/usr.sbin/sade/termcap.c Fri Nov 13 11:28:54 2009 (r199250) @@ -83,17 +83,13 @@ set_termcap(void) #else if (ColorDisplay) { if (!term) { -#ifdef __i386__ - if (setenv("TERM", "cons25", 1) < 0) -#else if (setenv("TERM", "xterm", 1) < 0) -#endif return -1; } } else { if (!term) { - if (setenv("TERM", "cons25-m", 1) < 0) + if (setenv("TERM", "vt100", 1) < 0) return -1; } } Modified: head/usr.sbin/sysinstall/termcap.c ============================================================================== --- head/usr.sbin/sysinstall/termcap.c Fri Nov 13 11:26:44 2009 (r199249) +++ head/usr.sbin/sysinstall/termcap.c Fri Nov 13 11:28:54 2009 (r199250) @@ -125,24 +125,17 @@ set_termcap(void) #else if (ColorDisplay) { if (!term) { -#ifdef __i386__ - if (setenv("TERM", "cons25", 1) < 0) - return -1; - if (setenv("TERMCAP", termcap_cons25, 1) < 0) - return -1; -#else if (setenv("TERM", "xterm", 1) < 0) return -1; if (setenv("TERMCAP", termcap_xterm, 1) < 0) return -1; -#endif } } else { if (!term) { - if (setenv("TERM", "cons25-m", 1) < 0) + if (setenv("TERM", "vt100", 1) < 0) return -1; - if (setenv("TERMCAP", termcap_cons25_m, 1) < 0) + if (setenv("TERMCAP", termcap_vt100, 1) < 0) return -1; } }