diff options
| author | Aaron Campbell <aaron@cvs.openbsd.org> | 2001-02-11 19:14:07 +0000 |
|---|---|---|
| committer | Aaron Campbell <aaron@cvs.openbsd.org> | 2001-02-11 19:14:07 +0000 |
| commit | 41f61e86935c2a727422df5a4abfd76a818783f4 (patch) | |
| tree | 2350b887db02832dab7f669d208d25971cee9306 /sys | |
| parent | 3e65c0cd9c1d210c0d82370949ecaf138d93a954 (diff) | |
Allow up to 12 virtual terminals (CTRL-ALT-F1 through CTRL-ALT-F12). Only
6 are enabled by default. After these changes, to enable more you must
change the "option WSDISPLAY_DEFAULTSCREENS" in the kernel config file and
edit /etc/ttys to switch the new ones from 'off' to 'on'.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pckbc/wskbdmap_mfii.c | 6 | ||||
| -rw-r--r-- | sys/dev/usb/ukbdmap.c | 6 | ||||
| -rw-r--r-- | sys/dev/wscons/wskbd.c | 4 | ||||
| -rw-r--r-- | sys/dev/wscons/wsksymdef.h | 4 |
4 files changed, 12 insertions, 8 deletions
diff --git a/sys/dev/pckbc/wskbdmap_mfii.c b/sys/dev/pckbc/wskbdmap_mfii.c index 2aed8987583..ad9e2f3c135 100644 --- a/sys/dev/pckbc/wskbdmap_mfii.c +++ b/sys/dev/pckbc/wskbdmap_mfii.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wskbdmap_mfii.c,v 1.2 2000/11/15 19:53:58 aaron Exp $ */ +/* $OpenBSD: wskbdmap_mfii.c,v 1.3 2001/02/11 19:14:05 aaron Exp $ */ /* $NetBSD: wskbdmap_mfii.c,v 1.15 2000/05/19 16:40:04 drochner Exp $ */ /*- @@ -129,8 +129,8 @@ static const keysym_t pckbd_keydesc_us[] = { KC(81), KS_KP_Next, KS_KP_3, KC(82), KS_KP_Insert, KS_KP_0, KC(83), KS_KP_Delete, KS_KP_Decimal, - KC(87), KS_f11, - KC(88), KS_f12, + KC(87), KS_Cmd_Screen10, KS_f11, + KC(88), KS_Cmd_Screen11, KS_f12, KC(127), KS_Pause, /* Break */ KC(156), KS_KP_Enter, KC(157), KS_Control_R, diff --git a/sys/dev/usb/ukbdmap.c b/sys/dev/usb/ukbdmap.c index 561f1d4baba..6939a8942f5 100644 --- a/sys/dev/usb/ukbdmap.c +++ b/sys/dev/usb/ukbdmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ukbdmap.c,v 1.3 2001/02/04 01:26:07 aaron Exp $ */ +/* $OpenBSD: ukbdmap.c,v 1.4 2001/02/11 19:14:06 aaron Exp $ */ /* $NetBSD: ukbdmap.c,v 1.5 2000/04/27 15:26:49 augustss Exp $ */ /* @@ -112,8 +112,8 @@ Static const keysym_t ukbd_keydesc_us[] = { KC(65), KS_Cmd_Screen7, KS_f8, KC(66), KS_Cmd_Screen8, KS_f9, KC(67), KS_Cmd_Screen9, KS_f10, - KC(68), KS_f11, - KC(69), KS_f12, + KC(68), KS_Cmd_Screen10, KS_f11, + KC(69), KS_Cmd_Screen11, KS_f12, KC(70), KS_Print_Screen, KC(71), KS_Hold_Screen, KC(72), KS_Pause, diff --git a/sys/dev/wscons/wskbd.c b/sys/dev/wscons/wskbd.c index bc92a5bcf68..40a99327a9c 100644 --- a/sys/dev/wscons/wskbd.c +++ b/sys/dev/wscons/wskbd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wskbd.c,v 1.8 2001/02/10 19:42:06 mickey Exp $ */ +/* $OpenBSD: wskbd.c,v 1.9 2001/02/11 19:14:06 aaron Exp $ */ /* $NetBSD: wskbd.c,v 1.38 2000/03/23 07:01:47 thorpej Exp $ */ /* @@ -1381,6 +1381,8 @@ internal_command(sc, type, ksym, ksym2) case KS_Cmd_Screen7: case KS_Cmd_Screen8: case KS_Cmd_Screen9: + case KS_Cmd_Screen10: + case KS_Cmd_Screen11: wsdisplay_switch(sc->sc_displaydv, ksym - KS_Cmd_Screen0, 0); return (1); case KS_Cmd_ResetEmul: diff --git a/sys/dev/wscons/wsksymdef.h b/sys/dev/wscons/wsksymdef.h index ca29402bb27..5ec6f310105 100644 --- a/sys/dev/wscons/wsksymdef.h +++ b/sys/dev/wscons/wsksymdef.h @@ -1,4 +1,4 @@ -/* $OpenBSD: wsksymdef.h,v 1.6 2001/02/10 19:42:06 mickey Exp $ */ +/* $OpenBSD: wsksymdef.h,v 1.7 2001/02/11 19:14:06 aaron Exp $ */ /* $NetBSD: wsksymdef.h,v 1.34.4.1 2000/07/07 09:49:54 hannken Exp $ */ /*- @@ -423,6 +423,8 @@ #define KS_Cmd_Screen7 0xf407 #define KS_Cmd_Screen8 0xf408 #define KS_Cmd_Screen9 0xf409 +#define KS_Cmd_Screen10 0xf40a +#define KS_Cmd_Screen11 0xf40b #define KS_Cmd_Debugger 0xf420 #define KS_Cmd_ResetEmul 0xf421 #define KS_Cmd_ResetClose 0xf422 |