diff options
| author | macallan <macallan@NetBSD.org> | 2018-01-19 23:37:36 +0000 |
|---|---|---|
| committer | macallan <macallan@NetBSD.org> | 2018-01-19 23:37:36 +0000 |
| commit | aed05db965843cf6af101d61c97d70df92e7c29e (patch) | |
| tree | b86ad634c751ea2ae6574cfdde413fee606e9530 /sys/dev | |
| parent | 7c765996ff297d7f4c16d955053635ec379727d0 (diff) | |
enable font loading
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/voyager/voyagerfb.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/sys/dev/pci/voyager/voyagerfb.c b/sys/dev/pci/voyager/voyagerfb.c index 705ddab3b06..157132e6deb 100644 --- a/sys/dev/pci/voyager/voyagerfb.c +++ b/sys/dev/pci/voyager/voyagerfb.c @@ -1,4 +1,4 @@ -/* $NetBSD: voyagerfb.c,v 1.28 2016/01/13 15:56:05 macallan Exp $ */ +/* $NetBSD: voyagerfb.c,v 1.29 2018/01/19 23:37:36 macallan Exp $ */ /* * Copyright (c) 2009, 2011 Michael Lorenz @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: voyagerfb.c,v 1.28 2016/01/13 15:56:05 macallan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: voyagerfb.c,v 1.29 2018/01/19 23:37:36 macallan Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -287,7 +287,8 @@ voyagerfb_attach(device_t parent, device_t self, void *aux) 0, 0, NULL, 8, 16, - WSSCREEN_WSCOLORS | WSSCREEN_HILIT, + WSSCREEN_WSCOLORS | WSSCREEN_HILIT | WSSCREEN_UNDERLINE | + WSSCREEN_RESIZE, NULL }; sc->sc_screens[0] = &sc->sc_defaultscreen_descr; @@ -298,6 +299,8 @@ voyagerfb_attach(device_t parent, device_t self, void *aux) vcons_init(&sc->vd, sc, &sc->sc_defaultscreen_descr, &voyagerfb_accessops); sc->vd.init_screen = voyagerfb_init_screen; + sc->vd.show_screen_cookie = &sc->sc_gc; + sc->vd.show_screen_cb = glyphcache_adapt; /* backlight control */ voyagerfb_setup_backlight(sc); @@ -586,7 +589,7 @@ voyagerfb_init_screen(void *cookie, struct vcons_screen *scr, if (sc->sc_depth == 8) { ri->ri_flg |= RI_8BIT_IS_RGB; #ifdef VOYAGERFB_ANTIALIAS - ri->ri_flg |= RI_ENABLE_ALPHA; + ri->ri_flg |= RI_ENABLE_ALPHA | RI_PREFER_ALPHA; #endif } if (sc->sc_depth == 32) { @@ -602,8 +605,11 @@ voyagerfb_init_screen(void *cookie, struct vcons_screen *scr, ri->ri_bpos = 0; } + scr->scr_flags |= VCONS_LOADFONT; + rasops_init(ri, 0, 0); - ri->ri_caps = WSSCREEN_WSCOLORS; + ri->ri_caps = WSSCREEN_WSCOLORS | WSSCREEN_HILIT | WSSCREEN_UNDERLINE | + WSSCREEN_RESIZE; rasops_reconfig(ri, sc->sc_height / ri->ri_font->fontheight, sc->sc_width / ri->ri_font->fontwidth); |
