summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authormacallan <macallan@NetBSD.org>2016-11-20 15:44:40 +0000
committermacallan <macallan@NetBSD.org>2016-11-20 15:44:40 +0000
commitbb8e484fbbb9dc5c31dd9bc9abf737b4c3ad53b7 (patch)
treee241af6e37d8ab65c13e6289ecb92816e1aade95 /sys/dev
parentec70ca9e5859e315fce49a82349c9939d54cd1de (diff)
add WSFONT_PREFER_ALPHA - for drivers that would rather render anti-aliased
fonts
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/wsfont/wsfont.c6
-rw-r--r--sys/dev/wsfont/wsfont.h4
2 files changed, 7 insertions, 3 deletions
diff --git a/sys/dev/wsfont/wsfont.c b/sys/dev/wsfont/wsfont.c
index 46c6799989b..305cf813e00 100644
--- a/sys/dev/wsfont/wsfont.c
+++ b/sys/dev/wsfont/wsfont.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wsfont.c,v 1.59 2015/05/09 16:40:37 mlelstv Exp $ */
+/* $NetBSD: wsfont.c,v 1.60 2016/11/20 15:44:40 macallan Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.59 2015/05/09 16:40:37 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.60 2016/11/20 15:44:40 macallan Exp $");
#include "opt_wsfont.h"
@@ -574,6 +574,8 @@ wsfont_matches(struct wsdisplay_font *font, const char *name,
/* first weed out fonts the caller doesn't claim support for */
if (FONT_IS_ALPHA(font)) {
+ if (flags & WSFONT_PREFER_ALPHA)
+ score++;
if ((flags & WSFONT_FIND_ALPHA) == 0)
return 0;
} else {
diff --git a/sys/dev/wsfont/wsfont.h b/sys/dev/wsfont/wsfont.h
index 332e6ed9dbc..a9b8adfe46e 100644
--- a/sys/dev/wsfont/wsfont.h
+++ b/sys/dev/wsfont/wsfont.h
@@ -1,4 +1,4 @@
-/* $NetBSD: wsfont.h,v 1.25 2015/04/18 11:23:58 mlelstv Exp $ */
+/* $NetBSD: wsfont.h,v 1.26 2016/11/20 15:44:40 macallan Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002 The NetBSD Foundation, Inc.
@@ -66,6 +66,8 @@ int wsfont_find(const char *, int, int, int, int, int, int);
#define WSFONT_FIND_ALPHA 0x02
#define WSFONT_FIND_ALL 0xff
#define WSFONT_FIND_BESTWIDTH 0x1000
+#define WSFONT_PREFER_ALPHA 0x2000
+
void wsfont_walk(void (*)(struct wsdisplay_font *, void *, int), void *);
int wsfont_add(struct wsdisplay_font *, int);