summaryrefslogtreecommitdiff
path: root/sys/dev/wscons
diff options
context:
space:
mode:
authorFrederic Cambus <fcambus@cvs.openbsd.org>2017-08-18 20:19:37 +0000
committerFrederic Cambus <fcambus@cvs.openbsd.org>2017-08-18 20:19:37 +0000
commit2c2f39062eb4351fc9fba3074f4b0e79a8ebaed1 (patch)
tree67d2eb5863ade7887d0b77aa8ffc787001a7f5eb /sys/dev/wscons
parent8da62c95a9dc6861d981c6398f9098ab87fb116d (diff)
Add compressed fonts support in the kernel.
The wsdisplay_font structure has been modified to add two new members (zdata and zdata_len) to store compressed font data and its size. We define compressed fonts by setting the data field to NULL and populating the zdata and zdata_len fields. In wsfont_lock(), we check if the selected font needs to be inflated, and we call the newly introduced wsfont_inflate() if required. OK kettenis@
Diffstat (limited to 'sys/dev/wscons')
-rw-r--r--sys/dev/wscons/wsconsio.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/dev/wscons/wsconsio.h b/sys/dev/wscons/wsconsio.h
index de79bd627ff..62f0c4706c1 100644
--- a/sys/dev/wscons/wsconsio.h
+++ b/sys/dev/wscons/wsconsio.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsconsio.h,v 1.83 2017/06/15 11:48:49 fcambus Exp $ */
+/* $OpenBSD: wsconsio.h,v 1.84 2017/08/18 20:19:36 fcambus Exp $ */
/* $NetBSD: wsconsio.h,v 1.74 2005/04/28 07:15:44 martin Exp $ */
/*
@@ -514,6 +514,8 @@ struct wsdisplay_font {
#define WSDISPLAY_FONTORDER_R2L 2
void *cookie;
void *data;
+ void *zdata;
+ u_int zdata_len;
};
#define WSDISPLAYIO_LDFONT _IOW ('W', 77, struct wsdisplay_font)
#define WSDISPLAYIO_LSFONT _IOWR('W', 78, struct wsdisplay_font)