[src/trunk]: src/usr.sbin/screenblank add "-i input-device", to specify anoth...

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

details:   https://anonhg.NetBSD.org/src/rev/51bbe70e29ef
branches:  trunk
changeset: 521113:51bbe70e29ef
user:      lukem <lukem%NetBSD.org@localhost>
date:      Thu Jan 24 01:34:13 2002 +0000

description:
add "-i input-device", to specify another device to monitor for activity

diffstat:

 usr.sbin/screenblank/screenblank.1 |  19 ++++++++++++-------
 usr.sbin/screenblank/screenblank.c |  13 +++++++++----
 2 files changed, 21 insertions(+), 11 deletions(-)

diffs (100 lines):

diff -r ef6961c6cb31 -r 51bbe70e29ef usr.sbin/screenblank/screenblank.1
--- a/usr.sbin/screenblank/screenblank.1        Thu Jan 24 01:21:44 2002 +0000
+++ b/usr.sbin/screenblank/screenblank.1        Thu Jan 24 01:34:13 2002 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: screenblank.1,v 1.10 2002/01/23 16:57:51 lukem Exp $
+.\"    $NetBSD: screenblank.1,v 1.11 2002/01/24 01:34:13 lukem Exp $
 .\"
 .\" Copyright (c) 1996-2002 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -43,9 +43,10 @@
 .Sh SYNOPSIS
 .Nm screenblank
 .Op Fl k | Fl m
-.Op Fl d Ar timeout
-.Op Fl e Ar timeout
+.Op Fl d Ar inactivity-timeout
+.Op Fl e Ar wakeup-delay
 .Op Fl f Ar framebuffer
+.Op Fl i Ar input-device
 .Sh DESCRIPTION
 .Nm
 disables the framebuffer if the keyboard and mouse are idle for a period
@@ -63,14 +64,14 @@
 Do not check the keyboard for activity.
 .It Fl m
 Do not check the mouse for activity.
-.It Fl d Ar timeout
+.It Fl d Ar inactivity-timeout
 Wait the number of seconds specified by
-.Ar timeout ,
+.Ar inactivity-timeout ,
 expressed in the format `xxx.xxx', before disabling the framebuffer due to
 inactivity.  The default is 600 seconds (10 minutes).
-.It Fl e Ar timeout
+.It Fl e Ar wakeup-delay
 Wait the number of seconds specified by
-.Ar timeout ,
+.Ar wakeup-delay ,
 expressed in the format `xxx.xxx', before re-enabling the framebuffer once
 activity resumes.  The default is .25 seconds.
 .It Fl f Ar framebuffer
@@ -78,6 +79,10 @@
 .Ar framebuffer
 instead of the default
 .Pa /dev/fb .
+.It Fl i Ar input-device
+Add
+.Ar input-device
+to the list of devices to monitor for activity.
 .El
 .Pp
 Note that the
diff -r ef6961c6cb31 -r 51bbe70e29ef usr.sbin/screenblank/screenblank.c
--- a/usr.sbin/screenblank/screenblank.c        Thu Jan 24 01:21:44 2002 +0000
+++ b/usr.sbin/screenblank/screenblank.c        Thu Jan 24 01:34:13 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: screenblank.c,v 1.17 2002/01/23 17:30:17 lukem Exp $   */
+/*     $NetBSD: screenblank.c,v 1.18 2002/01/24 01:34:13 lukem Exp $   */
 
 /*-
  * Copyright (c) 1996-2002 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
 __COPYRIGHT(
 "@(#) Copyright (c) 1996-2002 \
        The NetBSD Foundation, Inc.  All rights reserved.");
-__RCSID("$NetBSD: screenblank.c,v 1.17 2002/01/23 17:30:17 lukem Exp $");
+__RCSID("$NetBSD: screenblank.c,v 1.18 2002/01/24 01:34:13 lukem Exp $");
 #endif
 
 #include <sys/types.h>
@@ -116,7 +116,7 @@
        timo_off.tv_sec = 0;
        timo_off.tv_usec = 250000;
 
-       while ((ch = getopt(argc, argv, "d:e:f:km")) != -1) {
+       while ((ch = getopt(argc, argv, "d:e:f:i:km")) != -1) {
                switch (ch) {
                case 'd':
                        cvt_arg(optarg, &timo_on);
@@ -131,6 +131,10 @@
                        add_dev(optarg, 1);
                        break;
 
+               case 'i':
+                       add_dev(optarg, 0);
+                       break;
+
                case 'k':
                        if (mflag || kflag)
                                usage();
@@ -387,7 +391,8 @@
 {
 
        (void)fprintf(stderr,
-           "Usage: %s [-k | -m] [-d timeout] [-e timeout] [-f framebuffer]\n",
+           "Usage: %s [-k | -m] [-d inactivity-timeout] [-e wakeup-delay]\n"
+           "\t\t[-f framebuffer] [-i input-device]\n",
            getprogname());
        exit(1);
 }