From dedfe97911744f4bb95b97eb0856e58bc785ffc5 Mon Sep 17 00:00:00 2001 From: Frederic Cambus Date: Mon, 18 Mar 2019 16:10:40 +0000 Subject: Modify rasops_list_font_cb() to not filter out fonts with different sizes than the currently used one. This allows getting a list of all loaded fonts when using the WSDISPLAYIO_LSFONT ioctl. On top of allowing to see all fonts which are currently loaded when invoking the -l option of wsfontload(8), it also removes the confusion as to why we might reach the WSDISPLAY_MAXFONTCOUNT limit faster than expected when loading more fonts. OK sthen@ --- sys/dev/rasops/rasops.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/sys/dev/rasops/rasops.c b/sys/dev/rasops/rasops.c index f9a017214cf..6bb38705211 100644 --- a/sys/dev/rasops/rasops.c +++ b/sys/dev/rasops/rasops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rasops.c,v 1.58 2019/01/09 11:23:32 fcambus Exp $ */ +/* $OpenBSD: rasops.c,v 1.59 2019/03/18 16:10:39 fcambus Exp $ */ /* $NetBSD: rasops.c,v 1.35 2001/02/02 06:01:01 marcus Exp $ */ /*- @@ -1899,10 +1899,6 @@ rasops_list_font_cb(void *cbarg, struct wsdisplay_font *font) { struct rasops_list_font_ctx *ctx = cbarg; - if (font->fontheight != ctx->ri->ri_font->fontheight || - font->fontwidth != ctx->ri->ri_font->fontwidth) - return 0; - if (ctx->cnt-- == 0) { ctx->font = font; return 1; -- cgit v1.2.3