diff options
| author | Dale Rahn <drahn@cvs.openbsd.org> | 2002-06-08 02:43:57 +0000 |
|---|---|---|
| committer | Dale Rahn <drahn@cvs.openbsd.org> | 2002-06-08 02:43:57 +0000 |
| commit | 20d741f4306f14d5f115a8c480edf61b26f1de73 (patch) | |
| tree | d0ec05577500b70617c5372141b66d00af4d87fa /sys/dev/wscons | |
| parent | 3a1635ad1d5e2687b3f260ad2917e762a8edf688 (diff) | |
Disable the screen burner if it is enabled and X starts, and reinable upon
leaving X, if it was enabled. looked at by miod, mickey.
Diffstat (limited to 'sys/dev/wscons')
| -rw-r--r-- | sys/dev/wscons/wsdisplay.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sys/dev/wscons/wsdisplay.c b/sys/dev/wscons/wsdisplay.c index f8cc5532367..e327bdaf6ab 100644 --- a/sys/dev/wscons/wsdisplay.c +++ b/sys/dev/wscons/wsdisplay.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsdisplay.c,v 1.45 2002/05/05 17:16:39 matthieu Exp $ */ +/* $OpenBSD: wsdisplay.c,v 1.46 2002/06/08 02:43:56 drahn Exp $ */ /* $NetBSD: wsdisplay.c,v 1.37.4.1 2000/06/30 16:27:53 simonb Exp $ */ /* @@ -1093,8 +1093,16 @@ wsdisplay_internal_ioctl(sc, scr, cmd, data, flag, p) * X-Window is starting */ wsmoused_release(sc); + + /* disable the burner while X is running */ + if (sc->sc_burnout) + timeout_del(&sc->sc_burner); } else { + /* reenable the burner after exiting from X */ + if (sc->sc_burnout) + timeout_add(&sc->sc_burner, sc->sc_burnout); + /* * wsmoused cohabitation with X-Window support * X-Window is ending |