[src/trunk]: src/sys/dev/wsfb support anti-aliased fonts in 8 bit, generate a...

[macallan <macallan%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5c6800fa6cc8
branches:  trunk
changeset: 772472:5c6800fa6cc8
user:      macallan <macallan%NetBSD.org@localhost>
date:      Wed Jan 04 20:18:28 2012 +0000

description:
support anti-aliased fonts in 8 bit, generate an appropriate colour map

diffstat:

 sys/dev/wsfb/genfb.c |  64 +++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 53 insertions(+), 11 deletions(-)

diffs (145 lines):

diff -r d45f3d51edb9 -r 5c6800fa6cc8 sys/dev/wsfb/genfb.c
--- a/sys/dev/wsfb/genfb.c      Wed Jan 04 20:17:05 2012 +0000
+++ b/sys/dev/wsfb/genfb.c      Wed Jan 04 20:18:28 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: genfb.c,v 1.44 2011/12/28 18:37:58 macallan Exp $ */
+/*     $NetBSD: genfb.c,v 1.45 2012/01/04 20:18:28 macallan Exp $ */
 
 /*-
  * Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.44 2011/12/28 18:37:58 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.45 2012/01/04 20:18:28 macallan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -74,6 +74,7 @@
 static int     genfb_getcmap(struct genfb_softc *, struct wsdisplay_cmap *);
 static int     genfb_putpalreg(struct genfb_softc *, uint8_t, uint8_t,
                            uint8_t, uint8_t);
+static void    genfb_init_palette(struct genfb_softc *);
 
 static void    genfb_brightness_up(device_t);
 static void    genfb_brightness_down(device_t);
@@ -196,9 +197,9 @@
        struct rasops_info *ri;
        uint16_t crow;
        long defattr;
-       int i, j;
        bool console;
 #ifdef SPLASHSCREEN
+       int i, j;
        int error = ENXIO;
 #endif
 
@@ -280,14 +281,9 @@
        if (sc->sc_want_clear)
                (*ri->ri_ops.eraserows)(ri, 0, ri->ri_rows, defattr);
 
+#ifdef SPLASHSCREEN
        j = 0;
        for (i = 0; i < min(1 << sc->sc_depth, 256); i++) {
-#ifndef SPLASHSCREEN
-               sc->sc_cmap_red[i] = rasops_cmap[j];
-               sc->sc_cmap_green[i] = rasops_cmap[j + 1];
-               sc->sc_cmap_blue[i] = rasops_cmap[j + 2];
-               j += 3;
-#else
                if (i >= SPLASH_CMAP_OFFSET &&
                    i < SPLASH_CMAP_OFFSET + SPLASH_CMAP_SIZE) {
                        splash_get_cmap(i,
@@ -300,11 +296,9 @@
                        sc->sc_cmap_blue[i] = rasops_cmap[j + 2];
                }
                j += 3;
-#endif
        }
        genfb_restore_palette(sc);
 
-#ifdef SPLASHSCREEN
        sc->sc_splash.si_depth = sc->sc_depth;
        sc->sc_splash.si_bits = sc->sc_console_screen.scr_ri.ri_bits;
        sc->sc_splash.si_hwbits = sc->sc_fbaddr;
@@ -317,10 +311,12 @@
                    SPLASH_F_CENTER|SPLASH_F_FILL);
                if (error) {
                        SCREEN_ENABLE_DRAWING(&sc->sc_console_screen);
+                       genfb_init_palette(sc);
                        vcons_replay_msgbuf(&sc->sc_console_screen);
                }
        }
 #else
+       genfb_init_palette(sc);
        vcons_replay_msgbuf(&sc->sc_console_screen);
 #endif
 
@@ -406,6 +402,7 @@
                                                SPLASH_F_CENTER|SPLASH_F_FILL);
                        } else {
                                SCREEN_ENABLE_DRAWING(&sc->sc_console_screen);
+                               genfb_init_palette(sc);
                        }
                        vcons_redraw_screen(ms);
                        return 0;
@@ -513,6 +510,10 @@
        if (ri->ri_depth == 32)
                ri->ri_flg |= RI_ENABLE_ALPHA;
 
+       if (ri->ri_depth == 8)
+               ri->ri_flg |= RI_ENABLE_ALPHA | RI_8BIT_IS_RGB;
+
+
        rasops_init(ri, sc->sc_height / 8, sc->sc_width / 8);
        ri->ri_caps = WSSCREEN_WSCOLORS;
 
@@ -605,6 +606,47 @@
        }
 }
 
+static void
+genfb_init_palette(struct genfb_softc *sc)
+{
+       int i, j, tmp;
+
+       if (sc->sc_depth == 8) {
+               /* generate an r3g3b2 colour map */
+               for (i = 0; i < 256; i++) {
+                       tmp = i & 0xe0;
+                       /*
+                        * replicate bits so 0xe0 maps to a red value of 0xff
+                        * in order to make white look actually white
+                        */
+                       tmp |= (tmp >> 3) | (tmp >> 6);
+                       sc->sc_cmap_red[i] = tmp;
+
+                       tmp = (i & 0x1c) << 3;
+                       tmp |= (tmp >> 3) | (tmp >> 6);
+                       sc->sc_cmap_green[i] = tmp;
+
+                       tmp = (i & 0x03) << 6;
+                       tmp |= tmp >> 2;
+                       tmp |= tmp >> 4;
+                       sc->sc_cmap_blue[i] = tmp;
+
+                       genfb_putpalreg(sc, i, sc->sc_cmap_red[i],
+                                      sc->sc_cmap_green[i],
+                                      sc->sc_cmap_blue[i]);
+               }
+       } else {
+               /* steal rasops' ANSI cmap */
+               j = 0;
+               for (i = 0; i < 256; i++) {
+                       sc->sc_cmap_red[i] = rasops_cmap[j];
+                       sc->sc_cmap_green[i] = rasops_cmap[j + 1];
+                       sc->sc_cmap_blue[i] = rasops_cmap[j + 2];
+                       j += 3;
+               }
+       }
+}
+
 static int
 genfb_putpalreg(struct genfb_softc *sc, uint8_t idx, uint8_t r, uint8_t g,
     uint8_t b)