From owner-svn-src-all@freebsd.org Wed Aug 16 10:59:38 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id CF077DD3EC6;
Wed, 16 Aug 2017 10:59:38 +0000 (UTC) (envelope-from bde@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 9B87B7E2BA;
Wed, 16 Aug 2017 10:59:38 +0000 (UTC) (envelope-from bde@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7GAxbRD086064;
Wed, 16 Aug 2017 10:59:37 GMT (envelope-from bde@FreeBSD.org)
Received: (from bde@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7GAxbal086062;
Wed, 16 Aug 2017 10:59:37 GMT (envelope-from bde@FreeBSD.org)
Message-Id: <201708161059.v7GAxbal086062@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bde set sender to bde@FreeBSD.org
using -f
From: Bruce Evans <bde@FreeBSD.org>
Date: Wed, 16 Aug 2017 10:59:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r322575 - in head/sys: dev/syscons sys
X-SVN-Group: head
X-SVN-Commit-Author: bde
X-SVN-Commit-Paths: in head/sys: dev/syscons sys
X-SVN-Commit-Revision: 322575
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 16 Aug 2017 10:59:38 -0000
Author: bde
Date: Wed Aug 16 10:59:37 2017
New Revision: 322575
URL: https://svnweb.freebsd.org/changeset/base/322575
Log:
Undeprecate the CONS_CURSORTYPE ioctl. It was "deprecated" in 2001,
but it was actually extended then and it is still used (just once) in
/usr/src by its primary user (vidcontrol), while its replacement is
still not used in /usr/src.
yokota became inactive soon after deprecating CONS_CURSORTYPE (this
was part of a large change to make cursor attributes per-vty).
vidcontrol has incomplete support even for the old ioctl. I will
update it soon. Then there are many broken escape sequences to fix.
This is just to prepare for setting cursor colors using vidcontrol.
Modified:
head/sys/dev/syscons/syscons.c
head/sys/sys/consio.h
Modified: head/sys/dev/syscons/syscons.c
==============================================================================
--- head/sys/dev/syscons/syscons.c Wed Aug 16 10:38:06 2017 (r322574)
+++ head/sys/dev/syscons/syscons.c Wed Aug 16 10:59:37 2017 (r322575)
@@ -934,7 +934,7 @@ sctty_ioctl(struct tty *tp, u_long cmd, caddr_t data,
splx(s);
return 0;
- case CONS_CURSORTYPE: /* set cursor type (obsolete) */
+ case CONS_CURSORTYPE: /* set cursor type (old interface + HIDDEN) */
s = spltty();
*(int *)data &= CONS_CURSOR_ATTRS;
sc_change_cursor_shape(scp, *(int *)data, -1, -1);
Modified: head/sys/sys/consio.h
==============================================================================
--- head/sys/sys/consio.h Wed Aug 16 10:38:06 2017 (r322574)
+++ head/sys/sys/consio.h Wed Aug 16 10:59:37 2017 (r322575)
@@ -103,11 +103,15 @@ typedef struct ssaver ssaver_t;
#define CONS_SSAVER _IOW('c', 5, ssaver_t)
#define CONS_GSAVER _IOWR('c', 6, ssaver_t)
-/* set the text cursor type (obsolete, see CONS_CURSORSHAPE below) */
/*
-#define CONS_BLINK_CURSOR (1 << 0)
-#define CONS_CHAR_CURSOR (1 << 1)
-*/
+ * Set the text cursor type.
+ *
+ * This is an old interface extended to support the CONS_HIDDEN_CURSOR bit.
+ * New code should use CONS_CURSORSHAPE. CONS_CURSOR_ATTRS gives the 3
+ * bits supported by the (extended) old interface. The old interface is
+ * especially unusable for hiding the cursor (even with its extension)
+ * since it changes the cursor on all vtys.
+ */
#define CONS_CURSORTYPE _IOW('c', 7, int)
/* set the bell type to audible or visual */