 @@ -1,14 +1,14 @@
-/*	$NetBSD: wsemul_vt100.c,v 1.50 2023/02/23 02:48:06 riastradh Exp $	*/
+/*	$NetBSD: wsemul_vt100.c,v 1.51 2023/07/16 17:43:50 christos Exp $	*/
 /*
  * Copyright (c) 1998
  *	Matthias Drochner.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,27 +17,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsemul_vt100.c,v 1.50 2023/02/23 02:48:06 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsemul_vt100.c,v 1.51 2023/07/16 17:43:50 christos Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_wsmsgattrs.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/time.h>
 #include <sys/malloc.h>
 #include <sys/fcntl.h>
 #include <dev/wscons/wsconsio.h>
 #include <dev/wscons/wsdisplayvar.h>
 @@ -618,27 +618,27 @@ wsemul_vt100_output_esc(struct wsemul_vt
 	case '#':
 		return VT100_EMUL_STATE_ESC_HASH;
 	case ' ': /* 7/8 bit */
 		return VT100_EMUL_STATE_ESC_SPC;
 	case ']': /* OSC operating system command */
 	case '^': /* PM privacy message */
 	case '_': /* APC application program command */
 		/* ignored */
 		return VT100_EMUL_STATE_STRING;
 	case '<': /* exit VT52 mode - ignored */
 		break;
 	default:
 #ifdef VT100_PRINTUNKNOWN
-		printf("ESC%c unknown\n", c);
+		printf("%s: ESC%c unknown\n", __func__, c);
 #endif
 		break;
+	}
 	return VT100_EMUL_STATE_NORMAL;
+}
 static u_int
 wsemul_vt100_output_scs94(struct wsemul_vt100_emuldata *edp, u_char c)
+{
 	switch (c) {
 	case '%': /* probably DEC supplemental graphic */
 		return VT100_EMUL_STATE_SCS94_PERCENT;
 	case 'A': /* british / national */
 @@ -649,44 +649,46 @@ wsemul_vt100_output_scs94(struct wsemul_
 		break;
 	case '<': /* user preferred supplemental */
 		/* XXX not really "user" preferred */
 		edp->chartab_G[edp->designating] = edp->isolatin1tab;
 		break;
 	case '0': /* DEC special graphic */
 		edp->chartab_G[edp->designating] = edp->decgraphtab;
 		break;
 	case '>': /* DEC tech */
 		edp->chartab_G[edp->designating] = edp->dectechtab;
 		break;
 	default:
 #ifdef VT100_PRINTUNKNOWN
-		printf("ESC%c%c unknown\n", edp->designating + '(', c);
+		printf("%s: ESC%c%c unknown\n", __func__,
 		    edp->designating + '(', c);
 #endif
 		break;
+	}
 	return VT100_EMUL_STATE_NORMAL;
+}
 static u_int
 wsemul_vt100_output_scs94_percent(struct wsemul_vt100_emuldata *edp, u_char c)
+{
 	switch (c) {
 	case '5': /* DEC supplemental graphic */
 		/* XXX there are differences */
 		edp->chartab_G[edp->designating] = edp->isolatin1tab;
 		break;
 	default:
 #ifdef VT100_PRINTUNKNOWN
-		printf("ESC%c%%%c unknown\n", edp->designating + '(', c);
+		printf("%s: ESC%c%%%c unknown\n",
 		    __func__, edp->designating + '(', c);
 #endif
 		break;
+	}
 	return VT100_EMUL_STATE_NORMAL;
+}
 static u_int
 wsemul_vt100_output_scs96(struct wsemul_vt100_emuldata *edp, u_char c)
+{
 	int nrc;
 	switch (c) {
 	case '%': /* probably portuguese */
 @@ -718,63 +720,65 @@ wsemul_vt100_output_scs96(struct wsemul_
 	case 'Z': /* spanish */
 		nrc = 9;
 		goto setnrc;
 	case '7': case 'H': /* swedish */
 		nrc = 10;
 		goto setnrc;
 	case '=': /* swiss */
 		nrc = 11;
 setnrc:
 		vt100_setnrc(edp, nrc); /* what table ??? */
 		break;
 	default:
 #ifdef VT100_PRINTUNKNOWN
-		printf("ESC%c%c unknown\n", edp->designating + '-' - 1, c);
+		printf("%s: ESC%c%c unknown\n",
 		    __func__, edp->designating + '-' - 1, c);
 #endif
 		break;
+	}
 	return VT100_EMUL_STATE_NORMAL;
+}
 static u_int
 wsemul_vt100_output_scs96_percent(struct wsemul_vt100_emuldata *edp, u_char c)
+{
 	switch (c) {
 	case '6': /* portuguese */
 		vt100_setnrc(edp, 8);
 		break;
 	default:
 #ifdef VT100_PRINTUNKNOWN
-		printf("ESC%c%%%c unknown\n", edp->designating + '-', c);
+		printf("%s: ESC%c%%%c unknown\n",
 		    __func__, edp->designating + '-', c);
 #endif
 		break;
+	}
 	return VT100_EMUL_STATE_NORMAL;
+}
 static u_int
 wsemul_vt100_output_esc_spc(struct wsemul_vt100_emuldata *edp,
     u_char c)
+{
 	switch (c) {
 	case 'F': /* 7-bit controls */
 	case 'G': /* 8-bit controls */
 #ifdef VT100_PRINTNOTIMPL
-		printf("ESC<SPC>%c ignored\n", c);
+		printf("%s: ESC<SPC>%c ignored\n", __func__, c);
 #endif
 		break;
 	default:
 #ifdef VT100_PRINTUNKNOWN
-		printf("ESC<SPC>%c unknown\n", c);
+		printf("%s: ESC<SPC>%c unknown\n", __func__, c);
 #endif
 		break;
+	}
 	return VT100_EMUL_STATE_NORMAL;
+}
 static u_int
 wsemul_vt100_output_string(struct wsemul_vt100_emuldata *edp, u_char c)
+{
 	struct vt100base_data *vd = &edp->bd;
 	if (vd->dcstype && vd->dcspos < DCS_MAXLEN)
 		vd->dcsarg[vd->dcspos++] = c;
 @@ -797,95 +801,96 @@ static u_int
 wsemul_vt100_output_dcs(struct wsemul_vt100_emuldata *edp, u_char c)
+{
 	struct vt100base_data *vd = &edp->bd;
 	switch (c) {
 	case '0': case '1': case '2': case '3': case '4':
 	case '5': case '6': case '7': case '8': case '9':
 		/* argument digit */
 		if (vd->nargs > VT100_EMUL_NARGS - 1)
 			break;
 		vd->args[vd->nargs] = (vd->args[vd->nargs] * 10) +
 		    (c - '0');
 		break;
 	case ';': /* argument terminator */
 		vd->nargs++;
 		break;
 	default:
 		vd->nargs++;
 		if (vd->nargs > VT100_EMUL_NARGS) {
 #ifdef VT100_DEBUG
-			printf("vt100: too many arguments\n");
+			printf("%s: too many arguments\n", __func__);
 #endif
 			vd->nargs = VT100_EMUL_NARGS;
+		}
 		if (c == ';')	/* argument terminator */
 			break;
 		switch (c) {
 		case '$':
 			return VT100_EMUL_STATE_DCS_DOLLAR;
 		case '{': /* DECDLD soft charset */
 		case '!': /* DECRQUPSS user preferred supplemental set */
 			/* 'u' must follow - need another state */
 		case '|': /* DECUDK program F6..F20 */
 #ifdef VT100_PRINTNOTIMPL
-			printf("DCS%c ignored\n", c);
+			printf("%s: DCS%c ignored\n", __func__, c);
 #endif
 			break;
 		default:
 #ifdef VT100_PRINTUNKNOWN
-			printf("DCS%c (%d, %d) unknown\n", c, ARG(vd, 0), ARG(vd, 1));
+			printf("%s: DCS%c (%d, %d) unknown\n",
 			    __func__, c, ARG(vd, 0), ARG(vd, 1));
 #endif
 			break;
+		}
 		return VT100_EMUL_STATE_STRING;
+	}
 	return VT100_EMUL_STATE_DCS;
+}
 static u_int
 wsemul_vt100_output_dcs_dollar(struct wsemul_vt100_emuldata *edp, u_char c)
+{
 	struct vt100base_data *vd = &edp->bd;
 	switch (c) {
 	case 'p': /* DECRSTS terminal state restore */
 	case 'q': /* DECRQSS control function request */
 #ifdef VT100_PRINTNOTIMPL
-		printf("DCS$%c ignored\n", c);
+		printf("%s: DCS$%c ignored\n", __func__, c);
 #endif
 		break;
 	case 't': /* DECRSPS restore presentation state */
 		switch (ARG(vd, 0)) {
 		case 0: /* error */
 			break;
 		case 1: /* cursor information restore */
 #ifdef VT100_PRINTNOTIMPL
-			printf("DCS1$t ignored\n");
+			printf("%s: DCS1$t ignored\n", __func__);
 #endif
 			break;
 		case 2: /* tab stop restore */
 			vd->dcspos = 0;
 			vd->dcstype = DCSTYPE_TABRESTORE;
 			break;
 		default:
 #ifdef VT100_PRINTUNKNOWN
-			printf("DCS%d$t unknown\n", ARG(vd, 0));
+			printf("%s: DCS%d$t unknown\n", __func__, ARG(vd, 0));
 #endif
 			break;
+		}
 		break;
 	default:
 #ifdef VT100_PRINTUNKNOWN
-		printf("DCS$%c (%d, %d) unknown\n", c, ARG(vd, 0), ARG(vd, 1));
+		printf("%s: DCS$%c (%d, %d) unknown\n",
 		    __func__, c, ARG(vd, 0), ARG(vd, 1));
 #endif
 		break;
+	}
 	return VT100_EMUL_STATE_STRING;
+}
 static u_int
 wsemul_vt100_output_esc_hash(struct wsemul_vt100_emuldata *edp, u_char c)
+{
 	struct vt100base_data *vd = &edp->bd;
 	int i, j;
 	switch (c) {
 @@ -921,68 +926,67 @@ wsemul_vt100_output_esc_hash(struct wsem
 				vd->ccol = (vd->ncols >> 1) - 1;
+		}
 		break;
 	case '8': /* DECALN */
 		for (i = 0; i < vd->nrows; i++)
 			for (j = 0; j < vd->ncols; j++)
 				(*vd->emulops->putchar)(vd->emulcookie, i, j,
 							 'E', vd->curattr);
 		vd->ccol = 0;
 		vd->crow = 0;
 		break;
 	default:
 #ifdef VT100_PRINTUNKNOWN
-		printf("ESC#%c unknown\n", c);
+		printf("%s: ESC#%c unknown\n", __func__, c);
 #endif
 		break;
+	}
 	return VT100_EMUL_STATE_NORMAL;
+}
 static u_int
 wsemul_vt100_output_csi(struct wsemul_vt100_emuldata *edp, u_char c)
+{
 	struct vt100base_data *vd = &edp->bd;
 	switch (c) {
 	case '0': case '1': case '2': case '3': case '4':
 	case '5': case '6': case '7': case '8': case '9':
 		/* argument digit */
 		if (vd->nargs > VT100_EMUL_NARGS - 1)
 			break;
 		vd->args[vd->nargs] = (vd->args[vd->nargs] * 10) +
 		    (c - '0');
 		break;
 	case ';': /* argument terminator */
 		vd->nargs++;
 		break;
 	case '?': /* DEC specific */
 	case '>': /* DA query */
 		vd->modif1 = c;
 		break;
 	case '!':
 	case '"':
 	case '$':
 	case '&':
 		vd->modif2 = c;
 		break;
-	default: /* end of escape sequence */
+	default: /* end of escape sequence, argument terminator */
 		vd->nargs++;
 		if (vd->nargs > VT100_EMUL_NARGS) {
 #ifdef VT100_DEBUG
-			printf("vt100: too many arguments\n");
+			printf("%s: too many arguments\n", __func__);
 #endif
 			vd->nargs = VT100_EMUL_NARGS;
+		}
 		if (c == ';')	/* argument terminator */
 			break;
 		wsemul_vt100_handle_csi(vd, c);
 		return VT100_EMUL_STATE_NORMAL;
+	}
 	return VT100_EMUL_STATE_CSI;
+}
 static void
 wsemul_vt100_output(void *cookie, const u_char *data, u_int count, int kernel)
+{
 	struct wsemul_vt100_emuldata *edp = cookie;
 	struct vt100base_data *vd = &edp->bd;
 #ifdef DIAGNOSTIC
 @@ -1038,28 +1042,28 @@ wsemul_vt100_setmsgattrs(void *cookie, c
 		vd->msgattrs.default_bg = vd->msgattrs.kernel_bg = 0;
 		vd->msgattrs.default_fg = vd->msgattrs.kernel_fg = 0;
+	}
 	error = (*vd->emulops->allocattr)(vd->emulcookie,
 	                                   vd->msgattrs.default_fg,
 					   vd->msgattrs.default_bg,
 	                                   vd->msgattrs.default_attrs,
 	                                   &tmp);
 #ifndef VT100_DEBUG
 	__USE(error);
 #else
 	if (error)
-		printf("vt100: failed to allocate attribute for default "
+		printf("%s: failed to allocate attribute for default "
-		       "messages\n");
+		    "messages\n", __func__);
 	else
 #endif
+	{
 		if (vd->curattr == vd->defattr) {
 			vd->bkgdattr = vd->curattr = tmp;
 			vd->attrflags = vd->msgattrs.default_attrs;
 			vd->bgcol = vd->msgattrs.default_bg;
 			vd->fgcol = vd->msgattrs.default_fg;
 		} else {
 			edp->savedbkgdattr = edp->savedattr = tmp;
 			edp->savedattrflags = vd->msgattrs.default_attrs;
 			edp->savedbgcol = vd->msgattrs.default_bg;
 			edp->savedfgcol = vd->msgattrs.default_fg;
 @@ -1067,25 +1071,25 @@ wsemul_vt100_setmsgattrs(void *cookie, c
 		if (vd->emulops->replaceattr != NULL)
 			(*vd->emulops->replaceattr)(vd->emulcookie,
 			                             vd->defattr, tmp);
 		vd->defattr = tmp;
+	}
 	error = (*vd->emulops->allocattr)(vd->emulcookie,
 	                                   vd->msgattrs.kernel_fg,
 					   vd->msgattrs.kernel_bg,
 	                                   vd->msgattrs.kernel_attrs,
 	                                   &tmp);
 #ifdef VT100_DEBUG
 	if (error)
-		printf("vt100: failed to allocate attribute for kernel "
+		printf("%s: failed to allocate attribute for kernel "
-		       "messages\n");
+		    "messages\n", __func__);
 	else
 #endif
+	{
 		if (vd->emulops->replaceattr != NULL)
 			(*vd->emulops->replaceattr)(vd->emulcookie,
 			                             edp->kernattr, tmp);
 		edp->kernattr = tmp;
+	}
+}
 #endif /* WSDISPLAY_CUSTOM_OUTPUT */