[src/trunk]: src/usr.sbin/screenblank - check framebuffers for input, because...

[lukem <lukem%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/35300699c98f
branches:  trunk
changeset: 521094:35300699c98f
user:      lukem <lukem%NetBSD.org@localhost>
date:      Wed Jan 23 16:57:51 2002 +0000

description:
- check framebuffers for input, because /dev/ttyE0 (wscons framebuffer)
  gets modified, not /dev/console or /dev/wskbd
- use /dev/wskbd instead of /dev/wskbd0
- use /dev/wsmouse instead of /dev/wsmouse0

diffstat:

 usr.sbin/screenblank/pathnames.h   |   6 +++---
 usr.sbin/screenblank/screenblank.1 |  10 +++++-----
 usr.sbin/screenblank/screenblank.c |  12 +++++++-----
 3 files changed, 15 insertions(+), 13 deletions(-)

diffs (95 lines):

diff -r 5d994438a69f -r 35300699c98f usr.sbin/screenblank/pathnames.h
--- a/usr.sbin/screenblank/pathnames.h  Wed Jan 23 16:14:45 2002 +0000
+++ b/usr.sbin/screenblank/pathnames.h  Wed Jan 23 16:57:51 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pathnames.h,v 1.5 1999/06/06 03:35:36 thorpej Exp $    */
+/*     $NetBSD: pathnames.h,v 1.6 2002/01/23 16:57:51 lukem Exp $      */
 
 /*-
  * Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
@@ -42,6 +42,6 @@
 #define _PATH_FB               "/dev/fb"
 #endif
 
-#define        _PATH_WSKBD             "/dev/wskbd0"
-#define        _PATH_WSMOUSE           "/dev/wsmouse0"
+#define        _PATH_WSKBD             "/dev/wskbd"
+#define        _PATH_WSMOUSE           "/dev/wsmouse"
 #define        _PATH_WSDISPLAY         "/dev/ttyE0"
diff -r 5d994438a69f -r 35300699c98f usr.sbin/screenblank/screenblank.1
--- a/usr.sbin/screenblank/screenblank.1        Wed Jan 23 16:14:45 2002 +0000
+++ b/usr.sbin/screenblank/screenblank.1        Wed Jan 23 16:57:51 2002 +0000
@@ -1,6 +1,6 @@
-.\"    $NetBSD: screenblank.1,v 1.9 2002/01/19 11:45:01 wiz Exp $
+.\"    $NetBSD: screenblank.1,v 1.10 2002/01/23 16:57:51 lukem Exp $
 .\"
-.\" Copyright (c) 1996 The NetBSD Foundation, Inc.
+.\" Copyright (c) 1996-2002 The NetBSD Foundation, Inc.
 .\" All rights reserved.
 .\"
 .\" This code is derived from software contributed to The NetBSD Foundation
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd June 7, 1995
+.Dd January 24, 2002
 .Dt SCREENBLANK 1
 .Os
 .Sh NAME
@@ -95,9 +95,9 @@
 The console device.
 .It /dev/fb
 The default framebuffer.
-.It /dev/wskbd0
+.It /dev/wskbd
 The keyboard for wscons machines.
-.It /dev/wsmouse0
+.It /dev/wsmouse
 The mouse device for wscons machines.
 .It /dev/ttyE0
 The console device for wscons machines.
diff -r 5d994438a69f -r 35300699c98f usr.sbin/screenblank/screenblank.c
--- a/usr.sbin/screenblank/screenblank.c        Wed Jan 23 16:14:45 2002 +0000
+++ b/usr.sbin/screenblank/screenblank.c        Wed Jan 23 16:57:51 2002 +0000
@@ -1,7 +1,7 @@
-/*     $NetBSD: screenblank.c,v 1.15 2001/11/06 22:56:02 augustss Exp $        */
+/*     $NetBSD: screenblank.c,v 1.16 2002/01/23 16:57:51 lukem Exp $   */
 
 /*-
- * Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
+ * Copyright (c) 1996-2002 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
  * This code is derived from software contributed to The NetBSD Foundation
@@ -37,15 +37,15 @@
  */
 
 /*
- * Screensaver daemon for the Sun 3 and SPARC.
+ * Screensaver daemon for the Sun 3 and SPARC, and platforms using WSCONS.
  */
 
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT(
-"@(#) Copyright (c) 1996, 1998 \
+"@(#) Copyright (c) 1996-2002 \
        The NetBSD Foundation, Inc.  All rights reserved.");
-__RCSID("$NetBSD: screenblank.c,v 1.15 2001/11/06 22:56:02 augustss Exp $");
+__RCSID("$NetBSD: screenblank.c,v 1.16 2002/01/23 16:57:51 lukem Exp $");
 #endif
 
 #include <sys/types.h>
@@ -224,9 +224,11 @@
                change = 0;
                for (dsp = ds_list.lh_first; dsp != NULL;
                    dsp = dsp->ds_link.le_next) {
+#if 0          /* XXXLUKEM - doesn't make sense for wscons framebuffers */
                        /* Don't check framebuffers. */
                        if (dsp->ds_isfb)
                                continue;
+#endif
                        if (stat(dsp->ds_path, &st) == -1) {
                                syslog(LOG_CRIT,
                                    "Can't stat `%s' (%m)", dsp->ds_path);