Fix dependencies between kernel options:

- When both SC_PIXEL_MODE and SC_NO_FONT_LOADING are defined,
  quietly drop SC_NO_FONT_LOADING, because the pixel(raster)
  console requires font.
- When SC_NO_FONT_LOADING is defined, force SC_ALT_MOUSE_IMAGE.
  Without font, the arrow-shaped mouse cursor cannot be drawn.
- Fiddle and simplify some internal macros.
MFC after:	2 weeks

1 files changed, 5 insertions, 2 deletions

diff --git a/sys/dev/syscons/scvgarndr.c b/sys/dev/syscons/scvgarndr.c
index 6767610..5dd4d60 100644
--- a/sys/dev/syscons/scvgarndr.c
+++ b/sys/dev/syscons/scvgarndr.c
@@ -325,6 +325,7 @@ static void
 draw_txtmouse(scr_stat *scp, int x, int y)
 {
 #ifndef SC_ALT_MOUSE_IMAGE
+    if (ISMOUSEAVAIL(scp->sc->adp->va_flags)) {
 	u_char font_buf[128];
 	u_short cursor[32];
 	u_char c;
@@ -384,7 +385,9 @@ draw_txtmouse(scr_stat *scp, int x, int y)
 		sc_vtb_putc(&scp->scr, pos + scp->xsize + 1, c + 3,
 			    sc_vtb_geta(&scp->scr, pos + scp->xsize + 1));
 	}
-#else /* SC_ALT_MOUSE_IMAGE */
+    } else
+#endif /* SC_ALT_MOUSE_IMAGE */
+    {
 	/* Red, magenta and brown are mapped to green to to keep it readable */
 	static const int col_conv[16] = {
 		6, 6, 6, 6, 2, 2, 2, 6, 14, 14, 14, 14, 10, 10, 10, 14
@@ -401,7 +404,7 @@ draw_txtmouse(scr_stat *scp, int x, int y)
 	else
 		color = ((a & 0xf000) >> 4) | ((a & 0x0f00) << 4);
 	sc_vtb_putc(&scp->scr, pos, sc_vtb_getc(&scp->scr, pos), color);
-#endif /* SC_ALT_MOUSE_IMAGE */
+    }
 }
 
 static void