Remove the keyboard mouse emulator, HP emulation mode, and PCVT_SHOWKEYS

debugging cruft. Also fix a bug where you were not able to hold down the
scrollback hotkeys.

2 files changed, 9 insertions, 56 deletions

diff --git a/sys/arch/i386/isa/pcvt/Util/scon/scon.1 b/sys/arch/i386/isa/pcvt/Util/scon/scon.1
index 37f9387ed11..f503ef40ec3 100644
--- a/sys/arch/i386/isa/pcvt/Util/scon/scon.1
+++ b/sys/arch/i386/isa/pcvt/Util/scon/scon.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: scon.1,v 1.10 1999/10/16 18:56:37 aaron Exp $
+.\"	$OpenBSD: scon.1,v 1.11 1999/11/25 20:24:20 aaron Exp $
 .\"
 .\" Copyright (c) 1992, 1995 Hellmuth Michaelis and Joerg Wunsch
 .\"
@@ -46,12 +46,10 @@
 .Op Fl d Ar device
 .Op Fl f Ar on|off
 .Op Fl h
-.Op Fl H
 .Op Fl l
 .Op Fl m
 .Op Fl o
 .Op Fl v
-.Op Fl V
 .Op Fl s Ar lines
 .br
 .Nm scon
@@ -99,7 +97,7 @@ the command line should be applied to.
 Some programs which silently assume 24 lines when they run on a VT220 show
 incorrect behaviour when the terminal has really 25 lines. To support full
 VT220 behaviour, it is possible to force pcvt to select only 24 lines when
-it is running in 25-lines pure VT mode and/or in 28-lines HP-mode. The
+it is running in 25-lines pure VT mode. The
 .Fl f
 option requires one additional parameter, the string 'on' or 'off' to switch
 this mode for a virtual screen on or off respectively. This mode has no effect
@@ -116,13 +114,6 @@ Returns a string describing the connected display monitor type found by pcvt,
 the string returned can be MONO, COLOR or UNKNOWN.
 .It Fl v
 Specify verbose operation of the program.
-.It Fl V
-Switch the specified/current screen into a pure VT220 mode without recognizing
-any HP escape sequences and without displaying function key labels.
-.It Fl H
-Switch the specified/current screen into a mixed HP/VT220 mode. That is, that
-in addition to the full VT220 emulation, the HP function key labels and the
-escape sequences for handling the labels are available to the user.
 .It Fl o
 Toggle
 .Dq legacy
@@ -142,11 +133,8 @@ Modify VGA palette
 .Pq DAC .
 The
 .Fl p
-is mutually exclusive with
-.Fl s ,
-.Fl H ,
-and
-.Fl V .
+option is mutually exclusive with
+.Fl s .
 Naturally, option
 .Fl p
 is available only for VGA boards. Three flavors are available.
@@ -202,15 +190,11 @@ Sets 132 columns mode
 Sets 80 columns mode.
 .El
 .Pp
-When switching between HP and VT mode, when switching the force 24 lines
-mode on and off, or when switching between 80 and 132 columns operation,
+When switching the force 24 lines mode on and off,
+or when switching between 80 and 132 columns operation,
 the screen is cleared, the scrolling
 region is reset and the cursor is placed in the home position.
 .Sh EXAMPLES
-The command
-.Dq Li scon Fl H s Ar 28
-places the current screen into HP mode and sets the screen size to 28x80.
-
 Invoking
 .Do
 .Li scon Fl p
diff --git a/sys/arch/i386/isa/pcvt/Util/scon/scon.c b/sys/arch/i386/isa/pcvt/Util/scon/scon.c
index 250439b2525..51d6f670544 100644
--- a/sys/arch/i386/isa/pcvt/Util/scon/scon.c
+++ b/sys/arch/i386/isa/pcvt/Util/scon/scon.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scon.c,v 1.16 1999/10/16 18:56:37 aaron Exp $	*/
+/*	$OpenBSD: scon.c,v 1.17 1999/11/25 20:24:20 aaron Exp $	*/
 
 /*
  * Copyright (c) 1992, 1995 Hellmuth Michaelis and Joerg Wunsch
@@ -74,8 +74,6 @@ int lflag = -1;
 int mflag = -1;
 int oflag = -1;
 int current = -1;
-int pflag = -1;
-int hflag = -1;
 int res = -1;
 char *device;
 int dflag = -1;
@@ -244,14 +242,6 @@ char *argv[];
 				fflag = 1;
 				break;
 				
-			case 'V':
-				pflag = 1;
-				break;
-
-			case 'H':
-				hflag = 1;
-				break;
-
 			case 's':
 				if     (!strncmp(optarg, "25", 2))
 					res = SIZ_25ROWS;
@@ -343,11 +333,8 @@ char *argv[];
 		}
 	}
 
-	if((pflag == 1) && (hflag == 1))
-		usage();
-
-	if(dflag == -1 && lflag == -1 && current == -1 && pflag == -1 &&
-	   hflag == -1 && res == -1 && Pflag == 0 && tflag == 0 && fflag == -1
+	if(dflag == -1 && lflag == -1 && current == -1 &&
+	   res == -1 && Pflag == 0 && tflag == 0 && fflag == -1
 	   && colms == 0 && mflag == -1 && bflag == -1 && oflag == -1)
 	{
 		lflag = 1;
@@ -508,24 +495,6 @@ char *argv[];
 		exit(0);
 	}
 
-	if(pflag == 1)
-	{
-		if(vflag)
-			printf("processing option -V, setting emulation to pure VT220\n");
-		screeninfo.pure_vt_mode = M_PUREVT;
-	}
-	else if(hflag == 1)
-	{
-		if(vflag)
-			printf("processing option -H, setting emulation to VT220 + HP Labels\n");
-		screeninfo.pure_vt_mode = M_HPVT;
-	}
-	else
-	{
-		if(vflag)
-			printf("no change in terminal emulation\n");
-	}
-
 	if(vflag)
 	{
 		if(res == -1)