diff options
| author | Andrey A. Chernov <ache@FreeBSD.org> | 1996-02-05 14:08:39 +0000 |
|---|---|---|
| committer | Andrey A. Chernov <ache@FreeBSD.org> | 1996-02-05 14:08:39 +0000 |
| commit | f2b4163c2aa7211e097ad8c9a4e332c0f3f83d09 (patch) | |
| tree | c47cb777567a503e5d70bf95820375e7b8ed09c8 /sys | |
| parent | f29e1bd62931706b9fbe34801e33f8be2f7a0bde (diff) | |
Notes
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/syscons/syscons.c | 24 | ||||
| -rw-r--r-- | sys/i386/isa/syscons.c | 24 | ||||
| -rw-r--r-- | sys/isa/syscons.c | 24 |
3 files changed, 39 insertions, 33 deletions
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c index b868dd9b1b9e8..d4eb364d4adc8 100644 --- a/sys/dev/syscons/syscons.c +++ b/sys/dev/syscons/syscons.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: syscons.c,v 1.138 1995/12/14 22:03:03 bde Exp $ + * $Id: syscons.c,v 1.139 1996/01/04 21:11:43 wollman Exp $ */ #include "sc.h" @@ -3162,16 +3162,18 @@ load_palette(void) static void do_bell(scr_stat *scp, int pitch, int duration) { - if (scp == cur_console) { - if (configuration & VISUAL_BELL) { - if (blink_in_progress) - return; - blink_in_progress = 4; - blink_screen(scp); - timeout((timeout_func_t)blink_screen, scp, hz/10); - } - else - sysbeep(pitch, duration); + if (configuration & VISUAL_BELL) { + if (blink_in_progress) + return; + blink_in_progress = 4; + if (scp != cur_console) + blink_in_progress += 2; + blink_screen(cur_console); + timeout((timeout_func_t)blink_screen, cur_console, hz/10); + } else { + if (scp != cur_console) + pitch *= 2; + sysbeep(pitch, duration); } } diff --git a/sys/i386/isa/syscons.c b/sys/i386/isa/syscons.c index b868dd9b1b9e8..d4eb364d4adc8 100644 --- a/sys/i386/isa/syscons.c +++ b/sys/i386/isa/syscons.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: syscons.c,v 1.138 1995/12/14 22:03:03 bde Exp $ + * $Id: syscons.c,v 1.139 1996/01/04 21:11:43 wollman Exp $ */ #include "sc.h" @@ -3162,16 +3162,18 @@ load_palette(void) static void do_bell(scr_stat *scp, int pitch, int duration) { - if (scp == cur_console) { - if (configuration & VISUAL_BELL) { - if (blink_in_progress) - return; - blink_in_progress = 4; - blink_screen(scp); - timeout((timeout_func_t)blink_screen, scp, hz/10); - } - else - sysbeep(pitch, duration); + if (configuration & VISUAL_BELL) { + if (blink_in_progress) + return; + blink_in_progress = 4; + if (scp != cur_console) + blink_in_progress += 2; + blink_screen(cur_console); + timeout((timeout_func_t)blink_screen, cur_console, hz/10); + } else { + if (scp != cur_console) + pitch *= 2; + sysbeep(pitch, duration); } } diff --git a/sys/isa/syscons.c b/sys/isa/syscons.c index b868dd9b1b9e8..d4eb364d4adc8 100644 --- a/sys/isa/syscons.c +++ b/sys/isa/syscons.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: syscons.c,v 1.138 1995/12/14 22:03:03 bde Exp $ + * $Id: syscons.c,v 1.139 1996/01/04 21:11:43 wollman Exp $ */ #include "sc.h" @@ -3162,16 +3162,18 @@ load_palette(void) static void do_bell(scr_stat *scp, int pitch, int duration) { - if (scp == cur_console) { - if (configuration & VISUAL_BELL) { - if (blink_in_progress) - return; - blink_in_progress = 4; - blink_screen(scp); - timeout((timeout_func_t)blink_screen, scp, hz/10); - } - else - sysbeep(pitch, duration); + if (configuration & VISUAL_BELL) { + if (blink_in_progress) + return; + blink_in_progress = 4; + if (scp != cur_console) + blink_in_progress += 2; + blink_screen(cur_console); + timeout((timeout_func_t)blink_screen, cur_console, hz/10); + } else { + if (scp != cur_console) + pitch *= 2; + sysbeep(pitch, duration); } } |