diff options
author | yokota <yokota@FreeBSD.org> | 2001-07-10 14:13:34 +0000 |
---|---|---|
committer | yokota <yokota@FreeBSD.org> | 2001-07-10 14:13:34 +0000 |
commit | e375c956b03f3921f222598f5bc28a44268826b3 (patch) | |
tree | ab090e7ac820364b8bdd44a724c1e6b46b1d9331 /sys/dev/syscons/scgfbrndr.c | |
parent | d4e648feb225797ea93f7f5948f780f1d93a3f6b (diff) | |
download | FreeBSD-src-e375c956b03f3921f222598f5bc28a44268826b3.zip FreeBSD-src-e375c956b03f3921f222598f5bc28a44268826b3.tar.gz |
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
Diffstat (limited to 'sys/dev/syscons/scgfbrndr.c')
-rw-r--r-- | sys/dev/syscons/scgfbrndr.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sys/dev/syscons/scgfbrndr.c b/sys/dev/syscons/scgfbrndr.c index 6767610..5dd4d60 100644 --- a/sys/dev/syscons/scgfbrndr.c +++ b/sys/dev/syscons/scgfbrndr.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 |