Fixed style bugs.

1 files changed, 568 insertions, 553 deletions

diff --git a/sys/pc98/cbus/scterm-sck.c b/sys/pc98/cbus/scterm-sck.c
index f00250b..ec09274 100644
--- a/sys/pc98/cbus/scterm-sck.c
+++ b/sys/pc98/cbus/scterm-sck.c
@@ -110,10 +110,10 @@ static sc_term_input_t	scterm_input;
 
 static sc_term_sw_t sc_term_sc = {
 	{ NULL, NULL },
-	"sck",				/* emulator name */
-	"syscons kanji terminal",	/* description */
-	"*",				/* matching renderer, any :-) */
-	sizeof(term_stat),		/* softc size */
+	"sck",					/* emulator name */
+	"syscons kanji terminal",		/* description */
+	"*",					/* matching renderer, any :-) */
+	sizeof(term_stat),			/* softc size */
 	0,
 	scterm_init,
 	scterm_term,
@@ -210,423 +210,437 @@ scterm_scan_esc(scr_stat *scp, term_stat *tcp, u_char c)
 		FG_BLUE,      FG_MAGENTA,      FG_CYAN,       FG_LIGHTGREY,
 		FG_DARKGREY,  FG_LIGHTRED,     FG_LIGHTGREEN, FG_YELLOW,
 		FG_LIGHTBLUE, FG_LIGHTMAGENTA, FG_LIGHTCYAN,  FG_WHITE
-	    };
+	};
 	sc_softc_t *sc;
 	int i, n;
 
-    i = n = 0;
-    sc = scp->sc; 
-    if (tcp->esc == 1) {	/* seen ESC */
-	switch (c) {
-
-	case '7':   /* Save cursor position */
-	    tcp->saved_xpos = scp->xpos;
-	    tcp->saved_ypos = scp->ypos;
-	    break;
-
-	case '8':   /* Restore saved cursor position */
-	    if (tcp->saved_xpos >= 0 && tcp->saved_ypos >= 0)
-		sc_move_cursor(scp, tcp->saved_xpos, tcp->saved_ypos);
-	    break;
-
-	case '[':   /* Start ESC [ sequence */
-	    tcp->esc = 2;
-	    tcp->last_param = -1;
-	    for (i = tcp->num_param; i < MAX_ESC_PAR; i++)
-		tcp->param[i] = 1;
-	    tcp->num_param = 0;
-	    return;
+	i = n = 0;
+	sc = scp->sc; 
+	if (tcp->esc == 1) {	/* seen ESC */
+		switch (c) {
+
+		case '7':	/* Save cursor position */
+			tcp->saved_xpos = scp->xpos;
+			tcp->saved_ypos = scp->ypos;
+			break;
+
+		case '8':	/* Restore saved cursor position */
+			if (tcp->saved_xpos >= 0 && tcp->saved_ypos >= 0)
+				sc_move_cursor(scp, tcp->saved_xpos,
+					       tcp->saved_ypos);
+			break;
+
+		case '[':	/* Start ESC [ sequence */
+			tcp->esc = 2;
+			tcp->last_param = -1;
+			for (i = tcp->num_param; i < MAX_ESC_PAR; i++)
+				tcp->param[i] = 1;
+			tcp->num_param = 0;
+			return;
 
 #ifdef KANJI
-	case '$':	/* Kanji Invoke sequence */
-	    tcp->kanji_type = KTYPE_KANIN;
-	    return;
+		case '$':	/* Kanji Invoke sequence */
+			tcp->kanji_type = KTYPE_KANIN;
+			return;
 #endif
 
-	case 'M':   /* Move cursor up 1 line, scroll if at top */
-	    sc_term_up_scroll(scp, 1, sc->scr_map[0x20], tcp->cur_attr, 0, 0);
-	    break;
+		case 'M':	/* Move cursor up 1 line, scroll if at top */
+			sc_term_up_scroll(scp, 1, sc->scr_map[0x20],
+					  tcp->cur_attr, 0, 0);
+			break;
 #if notyet
-	case 'Q':
-	    tcp->esc = 4;
-	    return;
+		case 'Q':
+			tcp->esc = 4;
+			return;
 #endif
-	case 'c':   /* Clear screen & home */
-	    sc_clear_screen(scp);
-	    break;
+		case 'c':	/* Clear screen & home */
+			sc_clear_screen(scp);
+			break;
 
-	case '(':   /* iso-2022: designate 94 character set to G0 */
+		case '(':	/* iso-2022: designate 94 character set to G0 */
 #ifdef KANJI
-	    tcp->kanji_type = KTYPE_ASCIN;
+			tcp->kanji_type = KTYPE_ASCIN;
 #else
-	    tcp->esc = 5;
+			tcp->esc = 5;
 #endif
-	    return;
-	}
-    }
-    else if (tcp->esc == 2) {	/* seen ESC [ */
-	if (c >= '0' && c <= '9') {
-	    if (tcp->num_param < MAX_ESC_PAR) {
-		if (tcp->last_param != tcp->num_param) {
-		    tcp->last_param = tcp->num_param;
-		    tcp->param[tcp->num_param] = 0;
-		} else {
-		    tcp->param[tcp->num_param] *= 10;
+			return;
 		}
-		tcp->param[tcp->num_param] += c - '0';
-		return;
-	    }
-	}
-	tcp->num_param = tcp->last_param + 1;
-	switch (c) {
-
-	case ';':
-	    if (tcp->num_param < MAX_ESC_PAR)
-		return;
-	    break;
-
-	case '=':
-	    tcp->esc = 3;
-	    tcp->last_param = -1;
-	    for (i = tcp->num_param; i < MAX_ESC_PAR; i++)
-		tcp->param[i] = 1;
-	    tcp->num_param = 0;
-	    return;
-
-	case 'A':   /* up n rows */
-	    sc_term_up(scp, tcp->param[0], 0);
-	    break;
-
-	case 'B':   /* down n rows */
-	    sc_term_down(scp, tcp->param[0], 0);
-	    break;
-
-	case 'C':   /* right n columns */
-	    sc_term_right(scp, tcp->param[0]);
-	    break;
-
-	case 'D':   /* left n columns */
-	    sc_term_left(scp, tcp->param[0]);
-	    break;
-
-	case 'E':   /* cursor to start of line n lines down */
-	    n = tcp->param[0]; if (n < 1) n = 1;
-	    sc_move_cursor(scp, 0, scp->ypos + n);
-	    break;
-
-	case 'F':   /* cursor to start of line n lines up */
-	    n = tcp->param[0]; if (n < 1) n = 1;
-	    sc_move_cursor(scp, 0, scp->ypos - n);
-	    break;
-
-	case 'f':   /* Cursor move */
-	case 'H':
-	    if (tcp->num_param == 0)
-		sc_move_cursor(scp, 0, 0);
-	    else if (tcp->num_param == 2)
-		sc_move_cursor(scp, tcp->param[1] - 1, tcp->param[0] - 1);
-	    break;
-
-	case 'J':   /* Clear all or part of display */
-	    if (tcp->num_param == 0)
-		n = 0;
-	    else
-		n = tcp->param[0];
-	    sc_term_clr_eos(scp, n, sc->scr_map[0x20], tcp->cur_attr);
-	    break;
-
-	case 'K':   /* Clear all or part of line */
-	    if (tcp->num_param == 0)
-		n = 0;
-	    else
-		n = tcp->param[0];
-	    sc_term_clr_eol(scp, n, sc->scr_map[0x20], tcp->cur_attr);
-	    break;
-
-	case 'L':   /* Insert n lines */
-	    sc_term_ins_line(scp, scp->ypos, tcp->param[0],
-			     sc->scr_map[0x20], tcp->cur_attr, 0);
-	    break;
-
-	case 'M':   /* Delete n lines */
-	    sc_term_del_line(scp, scp->ypos, tcp->param[0],
-			     sc->scr_map[0x20], tcp->cur_attr, 0);
-	    break;
-
-	case 'P':   /* Delete n chars */
-	    sc_term_del_char(scp, tcp->param[0],
-			     sc->scr_map[0x20], tcp->cur_attr);
-	    break;
-
-	case '@':   /* Insert n chars */
-	    sc_term_ins_char(scp, tcp->param[0],
-			     sc->scr_map[0x20], tcp->cur_attr);
-	    break;
-
-	case 'S':   /* scroll up n lines */
-	    sc_term_del_line(scp, 0, tcp->param[0],
-			     sc->scr_map[0x20], tcp->cur_attr, 0);
-	    break;
-
-	case 'T':   /* scroll down n lines */
-	    sc_term_ins_line(scp, 0, tcp->param[0],
-			     sc->scr_map[0x20], tcp->cur_attr, 0);
-	    break;
-
-	case 'X':   /* erase n characters in line */
-	    n = tcp->param[0]; if (n < 1)  n = 1;
-	    if (n > scp->xsize - scp->xpos)
-		n = scp->xsize - scp->xpos;
-	    sc_vtb_erase(&scp->vtb, scp->cursor_pos, n,
-			 sc->scr_map[0x20], tcp->cur_attr);
-	    mark_for_update(scp, scp->cursor_pos);
-	    mark_for_update(scp, scp->cursor_pos + n - 1);
-	    break;
-
-	case 'Z':   /* move n tabs backwards */
-	    sc_term_backtab(scp, tcp->param[0]);
-	    break;
-
-	case '`':   /* move cursor to column n */
-	    sc_term_col(scp, tcp->param[0]);
-	    break;
-
-	case 'a':   /* move cursor n columns to the right */
-	    sc_term_right(scp, tcp->param[0]);
-	    break;
-
-	case 'd':   /* move cursor to row n */
-	    sc_term_row(scp, tcp->param[0]);
-	    break;
-
-	case 'e':   /* move cursor n rows down */
-	    sc_term_down(scp, tcp->param[0], 0);
-	    break;
-
-	case 'm':   /* change attribute */
-	    if (tcp->num_param == 0) {
-		tcp->attr_mask = NORMAL_ATTR;
-		tcp->cur_color = tcp->std_color;
-		tcp->cur_attr = mask2attr(tcp);
-		break;
-	    }
-	    for (i = 0; i < tcp->num_param; i++) {
-		switch (n = tcp->param[i]) {
-		case 0: /* back to normal */
-		    tcp->attr_mask = NORMAL_ATTR;
-		    tcp->cur_color = tcp->std_color;
-		    tcp->cur_attr = mask2attr(tcp);
-		    break;
-		case 1: /* bold */
-		    tcp->attr_mask |= BOLD_ATTR;
-		    tcp->cur_attr = mask2attr(tcp);
-		    break;
-		case 4: /* underline */
-		    tcp->attr_mask |= UNDERLINE_ATTR;
-		    tcp->cur_attr = mask2attr(tcp);
-		    break;
-		case 5: /* blink */
-		    tcp->attr_mask |= BLINK_ATTR;
-		    tcp->cur_attr = mask2attr(tcp);
-		    break;
-		case 7: /* reverse video */
-		    tcp->attr_mask |= REVERSE_ATTR;
-		    tcp->cur_attr = mask2attr(tcp);
-		    break;
-		case 30: case 31: /* set fg color */
-		case 32: case 33: case 34:
-		case 35: case 36: case 37:
-		    tcp->attr_mask |= FG_CHANGED;
-		    tcp->cur_color.fg = ansi_col[n - 30];
-		    tcp->cur_attr = mask2attr(tcp);
-		    break;
-		case 40: case 41: /* set bg color */
-		case 42: case 43: case 44:
-		case 45: case 46: case 47:
-		    tcp->attr_mask |= BG_CHANGED;
-		    tcp->cur_color.bg = ansi_col[n - 40];
-		    tcp->cur_attr = mask2attr(tcp);
-		    break;
+	} else if (tcp->esc == 2) {	/* seen ESC [ */
+		if (c >= '0' && c <= '9') {
+			if (tcp->num_param < MAX_ESC_PAR) {
+				if (tcp->last_param != tcp->num_param) {
+					tcp->last_param = tcp->num_param;
+					tcp->param[tcp->num_param] = 0;
+				} else {
+					tcp->param[tcp->num_param] *= 10;
+				}
+				tcp->param[tcp->num_param] += c - '0';
+				return;
+			}
 		}
-	    }
-	    break;
-
-	case 's':   /* Save cursor position */
-	    tcp->saved_xpos = scp->xpos;
-	    tcp->saved_ypos = scp->ypos;
-	    break;
-
-	case 'u':   /* Restore saved cursor position */
-	    if (tcp->saved_xpos >= 0 && tcp->saved_ypos >= 0)
-		sc_move_cursor(scp, tcp->saved_xpos, tcp->saved_ypos);
-	    break;
-
-	case 'x':
-	    if (tcp->num_param == 0)
-		n = 0;
-	    else
-		n = tcp->param[0];
-	    switch (n) {
-	    case 0:     /* reset attributes */
-		tcp->attr_mask = NORMAL_ATTR;
-		tcp->cur_color = tcp->std_color = tcp->dflt_std_color;
-		tcp->rev_color = tcp->dflt_rev_color;
-		tcp->cur_attr = mask2attr(tcp);
-		break;
-	    case 1:     /* set ansi background */
-		tcp->attr_mask &= ~BG_CHANGED;
-		tcp->cur_color.bg = tcp->std_color.bg =
-		    ansi_col[tcp->param[1] & 0x0f];
-		tcp->cur_attr = mask2attr(tcp);
-		break;
-	    case 2:     /* set ansi foreground */
-		tcp->attr_mask &= ~FG_CHANGED;
-		tcp->cur_color.fg = tcp->std_color.fg =
-		    ansi_col[tcp->param[1] & 0x0f];
-		tcp->cur_attr = mask2attr(tcp);
-		break;
-	    case 3:     /* set ansi attribute directly */
-		tcp->attr_mask &= ~(FG_CHANGED | BG_CHANGED);
-		tcp->cur_color.fg = tcp->std_color.fg =
-		    tcp->param[1] & 0x0f;
-		tcp->cur_color.bg = tcp->std_color.bg =
-		    (tcp->param[1] >> 4) & 0x0f;
-		tcp->cur_attr = mask2attr(tcp);
-		break;
-	    case 5:     /* set ansi reverse video background */
-		tcp->rev_color.bg = ansi_col[tcp->param[1] & 0x0f];
-		tcp->cur_attr = mask2attr(tcp);
-		break;
-	    case 6:     /* set ansi reverse video foreground */
-		tcp->rev_color.fg = ansi_col[tcp->param[1] & 0x0f];
-		tcp->cur_attr = mask2attr(tcp);
-		break;
-	    case 7:     /* set ansi reverse video directly */
-		tcp->rev_color.fg = tcp->param[1] & 0x0f;
-		tcp->rev_color.bg = (tcp->param[1] >> 4) & 0x0f;
-		tcp->cur_attr = mask2attr(tcp);
-		break;
-	    }
-	    break;
-
-	case 'z':   /* switch to (virtual) console n */
-	    if (tcp->num_param == 1)
-		sc_switch_scr(sc, tcp->param[0]);
-	    break;
-	}
-    }
-    else if (tcp->esc == 3) {	/* seen ESC [0-9]+ = */
-	if (c >= '0' && c <= '9') {
-	    if (tcp->num_param < MAX_ESC_PAR) {
-		if (tcp->last_param != tcp->num_param) {
-		    tcp->last_param = tcp->num_param;
-		    tcp->param[tcp->num_param] = 0;
-		} else {
-		    tcp->param[tcp->num_param] *= 10;
+		tcp->num_param = tcp->last_param + 1;
+		switch (c) {
+
+		case ';':
+			if (tcp->num_param < MAX_ESC_PAR)
+				return;
+			break;
+
+		case '=':
+			tcp->esc = 3;
+			tcp->last_param = -1;
+			for (i = tcp->num_param; i < MAX_ESC_PAR; i++)
+				tcp->param[i] = 1;
+			tcp->num_param = 0;
+			return;
+
+		case 'A':	/* up n rows */
+			sc_term_up(scp, tcp->param[0], 0);
+			break;
+
+		case 'B':	/* down n rows */
+			sc_term_down(scp, tcp->param[0], 0);
+			break;
+
+		case 'C':	/* right n columns */
+			sc_term_right(scp, tcp->param[0]);
+			break;
+
+		case 'D':	/* left n columns */
+			sc_term_left(scp, tcp->param[0]);
+			break;
+
+		case 'E':	/* cursor to start of line n lines down */
+			n = tcp->param[0];
+			if (n < 1)
+				n = 1;
+			sc_move_cursor(scp, 0, scp->ypos + n);
+			break;
+
+		case 'F':	/* cursor to start of line n lines up */
+			n = tcp->param[0];
+			if (n < 1)
+				n = 1;
+			sc_move_cursor(scp, 0, scp->ypos - n);
+			break;
+
+		case 'f':	/* Cursor move */
+		case 'H':
+			if (tcp->num_param == 0)
+				sc_move_cursor(scp, 0, 0);
+			else if (tcp->num_param == 2)
+				sc_move_cursor(scp, tcp->param[1] - 1,
+					       tcp->param[0] - 1);
+			break;
+
+		case 'J':	/* Clear all or part of display */
+			if (tcp->num_param == 0)
+				n = 0;
+			else
+				n = tcp->param[0];
+			sc_term_clr_eos(scp, n, sc->scr_map[0x20],
+					tcp->cur_attr);
+			break;
+
+		case 'K':	/* Clear all or part of line */
+			if (tcp->num_param == 0)
+				n = 0;
+			else
+				n = tcp->param[0];
+			sc_term_clr_eol(scp, n, sc->scr_map[0x20],
+					tcp->cur_attr);
+			break;
+
+		case 'L':	/* Insert n lines */
+			sc_term_ins_line(scp, scp->ypos, tcp->param[0],
+					 sc->scr_map[0x20], tcp->cur_attr, 0);
+			break;
+
+		case 'M':	/* Delete n lines */
+			sc_term_del_line(scp, scp->ypos, tcp->param[0],
+					 sc->scr_map[0x20], tcp->cur_attr, 0);
+			break;
+
+		case 'P':	/* Delete n chars */
+			sc_term_del_char(scp, tcp->param[0],
+					 sc->scr_map[0x20], tcp->cur_attr);
+			break;
+
+		case '@':	/* Insert n chars */
+			sc_term_ins_char(scp, tcp->param[0],
+					 sc->scr_map[0x20], tcp->cur_attr);
+			break;
+
+		case 'S':	/* scroll up n lines */
+			sc_term_del_line(scp, 0, tcp->param[0],
+					 sc->scr_map[0x20], tcp->cur_attr, 0);
+			break;
+
+		case 'T':	/* scroll down n lines */
+			sc_term_ins_line(scp, 0, tcp->param[0],
+					 sc->scr_map[0x20], tcp->cur_attr, 0);
+			break;
+
+		case 'X':	/* erase n characters in line */
+			n = tcp->param[0];
+			if (n < 1)
+				n = 1;
+			if (n > scp->xsize - scp->xpos)
+				n = scp->xsize - scp->xpos;
+			sc_vtb_erase(&scp->vtb, scp->cursor_pos, n,
+				     sc->scr_map[0x20], tcp->cur_attr);
+			mark_for_update(scp, scp->cursor_pos);
+			mark_for_update(scp, scp->cursor_pos + n - 1);
+			break;
+
+		case 'Z':	/* move n tabs backwards */
+			sc_term_backtab(scp, tcp->param[0]);
+			break;
+
+		case '`':	/* move cursor to column n */
+			sc_term_col(scp, tcp->param[0]);
+			break;
+
+		case 'a':	/* move cursor n columns to the right */
+			sc_term_right(scp, tcp->param[0]);
+			break;
+
+		case 'd':	/* move cursor to row n */
+			sc_term_row(scp, tcp->param[0]);
+			break;
+
+		case 'e':	/* move cursor n rows down */
+			sc_term_down(scp, tcp->param[0], 0);
+			break;
+
+		case 'm':	/* change attribute */
+			if (tcp->num_param == 0) {
+				tcp->attr_mask = NORMAL_ATTR;
+				tcp->cur_color = tcp->std_color;
+				tcp->cur_attr = mask2attr(tcp);
+				break;
+			}
+			for (i = 0; i < tcp->num_param; i++) {
+				switch (n = tcp->param[i]) {
+				case 0:	/* back to normal */
+					tcp->attr_mask = NORMAL_ATTR;
+					tcp->cur_color = tcp->std_color;
+					tcp->cur_attr = mask2attr(tcp);
+					break;
+				case 1:	/* bold */
+					tcp->attr_mask |= BOLD_ATTR;
+					tcp->cur_attr = mask2attr(tcp);
+					break;
+				case 4:	/* underline */
+					tcp->attr_mask |= UNDERLINE_ATTR;
+					tcp->cur_attr = mask2attr(tcp);
+					break;
+				case 5:	/* blink */
+					tcp->attr_mask |= BLINK_ATTR;
+					tcp->cur_attr = mask2attr(tcp);
+					break;
+				case 7:	/* reverse video */
+					tcp->attr_mask |= REVERSE_ATTR;
+					tcp->cur_attr = mask2attr(tcp);
+					break;
+				case 30: case 31: /* set fg color */
+				case 32: case 33: case 34:
+				case 35: case 36: case 37:
+					tcp->attr_mask |= FG_CHANGED;
+					tcp->cur_color.fg = ansi_col[n - 30];
+					tcp->cur_attr = mask2attr(tcp);
+					break;
+				case 40: case 41: /* set bg color */
+				case 42: case 43: case 44:
+				case 45: case 46: case 47:
+					tcp->attr_mask |= BG_CHANGED;
+					tcp->cur_color.bg = ansi_col[n - 40];
+					tcp->cur_attr = mask2attr(tcp);
+					break;
+				}
+			}
+			break;
+
+		case 's':	/* Save cursor position */
+			tcp->saved_xpos = scp->xpos;
+			tcp->saved_ypos = scp->ypos;
+			break;
+
+		case 'u':	/* Restore saved cursor position */
+			if (tcp->saved_xpos >= 0 && tcp->saved_ypos >= 0)
+				sc_move_cursor(scp, tcp->saved_xpos,
+					       tcp->saved_ypos);
+			break;
+
+		case 'x':
+			if (tcp->num_param == 0)
+				n = 0;
+			else
+				n = tcp->param[0];
+			switch (n) {
+			case 0:	/* reset attributes */
+				tcp->attr_mask = NORMAL_ATTR;
+				tcp->cur_color = tcp->std_color =
+				    tcp->dflt_std_color;
+				tcp->rev_color = tcp->dflt_rev_color;
+				tcp->cur_attr = mask2attr(tcp);
+				break;
+			case 1:	/* set ansi background */
+				tcp->attr_mask &= ~BG_CHANGED;
+				tcp->cur_color.bg = tcp->std_color.bg =
+				    ansi_col[tcp->param[1] & 0x0f];
+				tcp->cur_attr = mask2attr(tcp);
+				break;
+			case 2:	/* set ansi foreground */
+				tcp->attr_mask &= ~FG_CHANGED;
+				tcp->cur_color.fg = tcp->std_color.fg =
+				    ansi_col[tcp->param[1] & 0x0f];
+				tcp->cur_attr = mask2attr(tcp);
+				break;
+			case 3:	/* set ansi attribute directly */
+				tcp->attr_mask &= ~(FG_CHANGED | BG_CHANGED);
+				tcp->cur_color.fg = tcp->std_color.fg =
+				    tcp->param[1] & 0x0f;
+				tcp->cur_color.bg = tcp->std_color.bg =
+				    (tcp->param[1] >> 4) & 0x0f;
+				tcp->cur_attr = mask2attr(tcp);
+				break;
+			case 5:	/* set ansi reverse video background */
+				tcp->rev_color.bg =
+				    ansi_col[tcp->param[1] & 0x0f];
+				tcp->cur_attr = mask2attr(tcp);
+				break;
+			case 6:	/* set ansi reverse video foreground */
+				tcp->rev_color.fg =
+				    ansi_col[tcp->param[1] & 0x0f];
+				tcp->cur_attr = mask2attr(tcp);
+				break;
+			case 7:	/* set ansi reverse video directly */
+				tcp->rev_color.fg = tcp->param[1] & 0x0f;
+				tcp->rev_color.bg = (tcp->param[1] >> 4) & 0x0f;
+				tcp->cur_attr = mask2attr(tcp);
+				break;
+			}
+			break;
+
+		case 'z':	/* switch to (virtual) console n */
+			if (tcp->num_param == 1)
+				sc_switch_scr(sc, tcp->param[0]);
+			break;
+		}
+	} else if (tcp->esc == 3) {	/* seen ESC [0-9]+ = */
+		if (c >= '0' && c <= '9') {
+			if (tcp->num_param < MAX_ESC_PAR) {
+				if (tcp->last_param != tcp->num_param) {
+					tcp->last_param = tcp->num_param;
+					tcp->param[tcp->num_param] = 0;
+				} else {
+					tcp->param[tcp->num_param] *= 10;
+				}
+				tcp->param[tcp->num_param] += c - '0';
+				return;
+			}
+		}
+		tcp->num_param = tcp->last_param + 1;
+		switch (c) {
+
+		case ';':
+			if (tcp->num_param < MAX_ESC_PAR)
+				return;
+			break;
+
+		case 'A':   /* set display border color */
+			if (tcp->num_param == 1) {
+				scp->border=tcp->param[0] & 0xff;
+				if (scp == sc->cur_scp)
+					sc_set_border(scp, scp->border);
+			}
+			break;
+
+		case 'B':   /* set bell pitch and duration */
+			if (tcp->num_param == 2) {
+				scp->bell_pitch = tcp->param[0];
+				scp->bell_duration = tcp->param[1];
+			}
+			break;
+
+		case 'C':   /* set cursor type & shape */
+			i = spltty();
+			if (!ISGRAPHSC(sc->cur_scp))
+				sc_remove_cursor_image(sc->cur_scp);
+			if (tcp->num_param == 1) {
+				if (tcp->param[0] & 0x01)
+					sc->flags |= SC_BLINK_CURSOR;
+				else
+					sc->flags &= ~SC_BLINK_CURSOR;
+				if (tcp->param[0] & 0x02) 
+					sc->flags |= SC_CHAR_CURSOR;
+				else
+					sc->flags &= ~SC_CHAR_CURSOR;
+			} else if (tcp->num_param == 2) {
+				sc->cursor_base = scp->font_size 
+						- (tcp->param[1] & 0x1F) - 1;
+				sc->cursor_height = (tcp->param[1] & 0x1F) 
+						- (tcp->param[0] & 0x1F) + 1;
+			}
+			/* 
+			 * The cursor shape is global property;
+			 * all virtual consoles are affected.
+			 * Update the cursor in the current console...
+			 */
+			if (!ISGRAPHSC(sc->cur_scp)) {
+				sc_set_cursor_image(sc->cur_scp);
+				sc_draw_cursor_image(sc->cur_scp);
+			}
+			splx(i);
+			break;
+
+		case 'F':   /* set ansi foreground */
+			if (tcp->num_param == 1) {
+				tcp->attr_mask &= ~FG_CHANGED;
+				tcp->cur_color.fg = tcp->std_color.fg =
+				    tcp->param[0] & 0x0f;
+				tcp->cur_attr = mask2attr(tcp);
+			}
+			break;
+
+		case 'G':   /* set ansi background */
+			if (tcp->num_param == 1) {
+				tcp->attr_mask &= ~BG_CHANGED;
+				tcp->cur_color.bg = tcp->std_color.bg = 
+				    tcp->param[0] & 0x0f;
+				tcp->cur_attr = mask2attr(tcp);
+			}
+			break;
+
+		case 'H':   /* set ansi reverse video foreground */
+			if (tcp->num_param == 1) {
+				tcp->rev_color.fg = tcp->param[0] & 0x0f;
+				tcp->cur_attr = mask2attr(tcp);
+			}
+			break;
+
+		case 'I':   /* set ansi reverse video background */
+			if (tcp->num_param == 1) {
+				tcp->rev_color.bg = tcp->param[0] & 0x0f;
+				tcp->cur_attr = mask2attr(tcp);
+			}
+			break;
 		}
-		tcp->param[tcp->num_param] += c - '0';
-		return;
-	    }
-	}
-	tcp->num_param = tcp->last_param + 1;
-	switch (c) {
-
-	case ';':
-	    if (tcp->num_param < MAX_ESC_PAR)
-		return;
-	    break;
-
-	case 'A':   /* set display border color */
-	    if (tcp->num_param == 1) {
-		scp->border=tcp->param[0] & 0xff;
-		if (scp == sc->cur_scp)
-		    sc_set_border(scp, scp->border);
-            }
-	    break;
-
-	case 'B':   /* set bell pitch and duration */
-	    if (tcp->num_param == 2) {
-		scp->bell_pitch = tcp->param[0];
-		scp->bell_duration = tcp->param[1];
-	    }
-	    break;
-
-	case 'C':   /* set cursor type & shape */
-	    i = spltty();
-	    if (!ISGRAPHSC(sc->cur_scp))
-		sc_remove_cursor_image(sc->cur_scp);
-	    if (tcp->num_param == 1) {
-		if (tcp->param[0] & 0x01)
-		    sc->flags |= SC_BLINK_CURSOR;
-		else
-		    sc->flags &= ~SC_BLINK_CURSOR;
-		if (tcp->param[0] & 0x02) 
-		    sc->flags |= SC_CHAR_CURSOR;
-		else
-		    sc->flags &= ~SC_CHAR_CURSOR;
-	    } else if (tcp->num_param == 2) {
-		sc->cursor_base = scp->font_size 
-					- (tcp->param[1] & 0x1F) - 1;
-		sc->cursor_height = (tcp->param[1] & 0x1F) 
-					- (tcp->param[0] & 0x1F) + 1;
-	    }
-	    /* 
-	     * The cursor shape is global property; all virtual consoles
-	     * are affected. Update the cursor in the current console...
-	     */
-	    if (!ISGRAPHSC(sc->cur_scp)) {
-		sc_set_cursor_image(sc->cur_scp);
-		sc_draw_cursor_image(sc->cur_scp);
-	    }
-	    splx(i);
-	    break;
-
-	case 'F':   /* set ansi foreground */
-	    if (tcp->num_param == 1) {
-		tcp->attr_mask &= ~FG_CHANGED;
-		tcp->cur_color.fg = tcp->std_color.fg = tcp->param[0] & 0x0f;
-		tcp->cur_attr = mask2attr(tcp);
-	    }
-	    break;
-
-	case 'G':   /* set ansi background */
-	    if (tcp->num_param == 1) {
-		tcp->attr_mask &= ~BG_CHANGED;
-		tcp->cur_color.bg = tcp->std_color.bg = tcp->param[0] & 0x0f;
-		tcp->cur_attr = mask2attr(tcp);
-	    }
-	    break;
-
-	case 'H':   /* set ansi reverse video foreground */
-	    if (tcp->num_param == 1) {
-		tcp->rev_color.fg = tcp->param[0] & 0x0f;
-		tcp->cur_attr = mask2attr(tcp);
-	    }
-	    break;
-
-	case 'I':   /* set ansi reverse video background */
-	    if (tcp->num_param == 1) {
-		tcp->rev_color.bg = tcp->param[0] & 0x0f;
-		tcp->cur_attr = mask2attr(tcp);
-	    }
-	    break;
-	}
-    }
 #if notyet
-    else if (tcp->esc == 4) {	/* seen ESC Q */
-	/* to be filled */
-    }
+	} else if (tcp->esc == 4) {	/* seen ESC Q */
+		/* to be filled */
 #endif
-    else if (tcp->esc == 5) {	/* seen ESC ( */
-	switch (c) {
-	case 'B':   /* iso-2022: desginate ASCII into G0 */
-	    break;
-	/* other items to be filled */
-	default:
-	    break;
+	} else if (tcp->esc == 5) {	/* seen ESC ( */
+		switch (c) {
+		case 'B':   /* iso-2022: desginate ASCII into G0 */
+			break;
+		/* other items to be filled */
+		default:
+			break;
+		}
 	}
-    }
-    tcp->esc = 0;
+	tcp->esc = 0;
 }
 
 static void
@@ -639,178 +653,179 @@ scterm_puts(scr_stat *scp, u_char *buf, int len)
 #endif
 
 outloop:
-    scp->sc->write_in_progress++;
-
-    if (tcp->esc) {
-	scterm_scan_esc(scp, tcp, *ptr++);
-	len--;
-    }
-    else if (PRINTABLE(*ptr)) {     /* Print only printables */
-	vm_offset_t p;
-	u_char *map;
-	int attr;
-	int i;
+	scp->sc->write_in_progress++;
+
+	if (tcp->esc) {
+		scterm_scan_esc(scp, tcp, *ptr++);
+		len--;
+	} else if (PRINTABLE(*ptr)) {     /* Print only printables */
+		vm_offset_t p;
+		u_char *map;
+		int attr;
+		int i;
 #ifdef KANJI
-	u_char c;
+		u_char c;
 #else
- 	int cnt;
+		int cnt;
 #endif
 
-	p = sc_vtb_pointer(&scp->vtb, scp->cursor_pos);
-	map = scp->sc->scr_map;
-	attr = tcp->cur_attr;
+		p = sc_vtb_pointer(&scp->vtb, scp->cursor_pos);
+		map = scp->sc->scr_map;
+		attr = tcp->cur_attr;
 
 #ifdef KANJI
-	c = *ptr;
-	if (tcp->kanji_1st_char == 0) {
-	    tcp->kanji_type = iskanji1(tcp->kanji_type, c);
-	    if (!IS_KTYPE_ASCII_or_HANKAKU(tcp->kanji_type)) {
-		/* not Ascii & not HANKAKU */
-		tcp->kanji_1st_char = c;
-		goto kanji_end;
-	    } else {
-		tcp->kanji_1st_char = 0;
-	    }
-	} else {
-	    if ((tcp->kanji_type = iskanji2(tcp->kanji_type, c)) & 0xee) {
-		/* print kanji on TEXT VRAM */
-		kanji_code = kanji_convert(tcp->kanji_type, c, tcp->kanji_1st_char);
-		mark_for_update(scp, scp->cursor_pos);
-		for (i=0; i<2; i++){
-		    /* *cursor_pos = (kanji_code | (i*0x80)); */
-		    p = sc_vtb_putchar(&scp->vtb, p,
-		   		       kanji_code | ((i == 0) ? 0x00 : 0x80),
-				       attr);
-		    ++scp->cursor_pos;
-		    if (++scp->xpos >= scp->xsize) {
-			scp->xpos = 0;
-			scp->ypos++;
+		c = *ptr;
+		if (tcp->kanji_1st_char == 0) {
+		    tcp->kanji_type = iskanji1(tcp->kanji_type, c);
+		    if (!IS_KTYPE_ASCII_or_HANKAKU(tcp->kanji_type)) {
+			/* not Ascii & not HANKAKU */
+			tcp->kanji_1st_char = c;
+			goto kanji_end;
+		    } else {
+			tcp->kanji_1st_char = 0;
 		    }
-		}
-		mark_for_update(scp, scp->cursor_pos - 1);
+		} else {
+		    if ((tcp->kanji_type =
+			 iskanji2(tcp->kanji_type, c)) & 0xee) {
+			/* print kanji on TEXT VRAM */
+			kanji_code = kanji_convert(tcp->kanji_type, c,
+						   tcp->kanji_1st_char);
+			mark_for_update(scp, scp->cursor_pos);
+			for (i = 0; i < 2; i++) {
+			    /* *cursor_pos = (kanji_code | (i*0x80)); */
+			    p = sc_vtb_putchar(&scp->vtb, p,
+			       kanji_code | ((i == 0) ? 0x00 : 0x80), attr);
+			    ++scp->cursor_pos;
+			    if (++scp->xpos >= scp->xsize) {
+				scp->xpos = 0;
+				scp->ypos++;
+			    }
+			}
+			mark_for_update(scp, scp->cursor_pos - 1);
+			KTYPE_MASK_CTRL(tcp->kanji_type);
+			tcp->kanji_1st_char = 0;
+			goto kanji_end;
+		    } else {
+			tcp->kanji_1st_char = 0;
+		    }
+		}				
+		if (IS_KTYPE_KANA(tcp->kanji_type))
+		    c |= 0x80;
 		KTYPE_MASK_CTRL(tcp->kanji_type);
-		tcp->kanji_1st_char = 0;
-		goto kanji_end;
-	    } else {
-		tcp->kanji_1st_char = 0;
-	    }
-	}				
-	if (IS_KTYPE_KANA(tcp->kanji_type))
-		c |= 0x80;
-	KTYPE_MASK_CTRL(tcp->kanji_type);
-	sc_vtb_putchar(&scp->vtb, p, map[c], attr);
-	mark_for_update(scp, scp->cursor_pos);
-	mark_for_update(scp, scp->cursor_pos);
-	++scp->cursor_pos;
-	++scp->xpos;
+		sc_vtb_putchar(&scp->vtb, p, map[c], attr);
+		mark_for_update(scp, scp->cursor_pos);
+		mark_for_update(scp, scp->cursor_pos);
+		++scp->cursor_pos;
+		++scp->xpos;
 kanji_end:
-	++ptr;
-	--len;
+		++ptr;
+		--len;
 #else /* !KANJI */
-	cnt = imin(len, scp->xsize - scp->xpos);
-	i = cnt;
-	do {
-	    /*
-	     * gcc-2.6.3 generates poor (un)sign extension code.  Casting the
-	     * pointers in the following to volatile should have no effect,
-	     * but in fact speeds up this inner loop from 26 to 18 cycles
-	     * (+ cache misses) on i486's.
-	     */
+		cnt = imin(len, scp->xsize - scp->xpos);
+		i = cnt;
+		do {
+		    /*
+		     * gcc-2.6.3 generates poor (un)sign extension code.
+		     * Casting the pointers in the following to volatile should
+		     * have no effect, but in fact speeds up this inner loop
+		     * from 26 to 18 cycles (+ cache misses) on i486's.
+		     */
 #define	UCVP(ucp)	((u_char volatile *)(ucp))
-	    p = sc_vtb_putchar(&scp->vtb, p, UCVP(map)[*UCVP(ptr)], attr);
-	    ++ptr;
-	    --i;
-	} while (i > 0 && PRINTABLE(*ptr));
-
-	len -= cnt - i;
-	mark_for_update(scp, scp->cursor_pos);
-	scp->cursor_pos += cnt - i;
-	mark_for_update(scp, scp->cursor_pos - 1);
-	scp->xpos += cnt - i;
-#endif /* !KANJI */
+		    p = sc_vtb_putchar(&scp->vtb, p, UCVP(map)[*UCVP(ptr)],
+				       attr);
+		    ++ptr;
+		    --i;
+		} while (i > 0 && PRINTABLE(*ptr));
 
-	if (scp->xpos >= scp->xsize) {
-	    scp->xpos = 0;
-	    scp->ypos++;
-	}
-    }
-    else  {
-	switch (*ptr) {
-	case 0x07:
-	    sc_bell(scp, scp->bell_pitch, scp->bell_duration);
-	    break;
-
-	case 0x08:      /* non-destructive backspace */
-	    if (scp->cursor_pos > 0) {
+		len -= cnt - i;
 		mark_for_update(scp, scp->cursor_pos);
-		scp->cursor_pos--;
-		mark_for_update(scp, scp->cursor_pos);
-		if (scp->xpos > 0)
-		    scp->xpos--;
-		else {
-		    scp->xpos += scp->xsize - 1;
-		    scp->ypos--;
+		scp->cursor_pos += cnt - i;
+		mark_for_update(scp, scp->cursor_pos - 1);
+		scp->xpos += cnt - i;
+#endif /* !KANJI */
+
+		if (scp->xpos >= scp->xsize) {
+			scp->xpos = 0;
+			scp->ypos++;
 		}
-	    }
-	    break;
-
-	case 0x09:  /* non-destructive tab */
-	    mark_for_update(scp, scp->cursor_pos);
-	    scp->cursor_pos += (8 - scp->xpos % 8u);
-	    scp->xpos += (8 - scp->xpos % 8u);
-	    if (scp->xpos >= scp->xsize) {
-	        scp->xpos = 0;
-	        scp->ypos++;
-		scp->cursor_pos = scp->xsize * scp->ypos;
-	    }
-	    mark_for_update(scp, scp->cursor_pos);
-	    break;
-
-	case 0x0a:  /* newline, same pos */
-	    mark_for_update(scp, scp->cursor_pos);
-	    scp->cursor_pos += scp->xsize;
-	    mark_for_update(scp, scp->cursor_pos);
-	    scp->ypos++;
-	    break;
-
-	case 0x0c:  /* form feed, clears screen */
-	    sc_clear_screen(scp);
-	    break;
-
-	case 0x0d:  /* return, return to pos 0 */
-	    mark_for_update(scp, scp->cursor_pos);
-	    scp->cursor_pos -= scp->xpos;
-	    mark_for_update(scp, scp->cursor_pos);
-	    scp->xpos = 0;
-	    break;
+	} else {
+		switch (*ptr) {
+		case 0x07:
+			sc_bell(scp, scp->bell_pitch, scp->bell_duration);
+			break;
+
+		case 0x08:	/* non-destructive backspace */
+			if (scp->cursor_pos > 0) {
+				mark_for_update(scp, scp->cursor_pos);
+				scp->cursor_pos--;
+				mark_for_update(scp, scp->cursor_pos);
+				if (scp->xpos > 0)
+					scp->xpos--;
+				else {
+					scp->xpos += scp->xsize - 1;
+					scp->ypos--;
+				}
+			}
+			break;
+
+		case 0x09:	/* non-destructive tab */
+			mark_for_update(scp, scp->cursor_pos);
+			scp->cursor_pos += (8 - scp->xpos % 8u);
+			scp->xpos += (8 - scp->xpos % 8u);
+			if (scp->xpos >= scp->xsize) {
+				scp->xpos = 0;
+				scp->ypos++;
+				scp->cursor_pos = scp->xsize * scp->ypos;
+			}
+			mark_for_update(scp, scp->cursor_pos);
+			break;
+
+		case 0x0a:	/* newline, same pos */
+			mark_for_update(scp, scp->cursor_pos);
+			scp->cursor_pos += scp->xsize;
+			mark_for_update(scp, scp->cursor_pos);
+			scp->ypos++;
+			break;
+
+		case 0x0c:	/* form feed, clears screen */
+			sc_clear_screen(scp);
+			break;
+
+		case 0x0d:	/* return, return to pos 0 */
+			mark_for_update(scp, scp->cursor_pos);
+			scp->cursor_pos -= scp->xpos;
+			mark_for_update(scp, scp->cursor_pos);
+			scp->xpos = 0;
+			break;
 
 #ifdef PC98
-	case 0x0e:		/* ^N */
-	    tcp->kanji_type = KTYPE_JKANA;
-	    tcp->esc = 0;
-	    tcp->kanji_1st_char = 0;
-	    break;
-
-	case 0x0f:		/* ^O */
-	    tcp->kanji_type = KTYPE_ASCII;
-	    tcp->esc = 0;
-	    tcp->kanji_1st_char = 0;
-	    break;
+		case 0x0e:	/* ^N */
+		tcp->kanji_type = KTYPE_JKANA;
+		tcp->esc = 0;
+		tcp->kanji_1st_char = 0;
+		break;
+
+		case 0x0f:	/* ^O */
+			tcp->kanji_type = KTYPE_ASCII;
+			tcp->esc = 0;
+			tcp->kanji_1st_char = 0;
+			break;
 #endif /* PC98 */
 
-	case 0x1b:  /* start escape sequence */
-	    tcp->esc = 1;
-	    tcp->num_param = 0;
-	    break;
+		case 0x1b:	/* start escape sequence */
+			tcp->esc = 1;
+			tcp->num_param = 0;
+			break;
+		}
+		ptr++;
+		len--;
 	}
-	ptr++; len--;
-    }
 
-    sc_term_gen_scroll(scp, scp->sc->scr_map[0x20], tcp->cur_attr);
+	sc_term_gen_scroll(scp, scp->sc->scr_map[0x20], tcp->cur_attr);
 
-    scp->sc->write_in_progress--;
-    if (len)
-	goto outloop;
+	scp->sc->write_in_progress--;
+	if (len)
+		goto outloop;
 }
 
 static int