diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2001-03-14 02:49:24 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2001-03-14 02:49:24 +0000 |
| commit | 1be35009bec0e46defcd8a4b5a1871168f30c735 (patch) | |
| tree | a8635fd6acc5a39cc0637c05d2efcad369d548c4 /sys/dev/wscons/wsconsio.h | |
| parent | 2c3adfcd84a6da21234471ee88fbd3f02560cae2 (diff) | |
allow listing and soon deleting fonts; aaron@ ok
Diffstat (limited to 'sys/dev/wscons/wsconsio.h')
| -rw-r--r-- | sys/dev/wscons/wsconsio.h | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/sys/dev/wscons/wsconsio.h b/sys/dev/wscons/wsconsio.h index 784806831e8..983a595bc4c 100644 --- a/sys/dev/wscons/wsconsio.h +++ b/sys/dev/wscons/wsconsio.h @@ -1,4 +1,4 @@ -/* $OpenBSD: wsconsio.h,v 1.7 2001/03/03 08:53:46 maja Exp $ */ +/* $OpenBSD: wsconsio.h,v 1.8 2001/03/14 02:49:22 mickey Exp $ */ /* $NetBSD: wsconsio.h,v 1.31.2.1 2000/07/07 09:49:17 hannken Exp $ */ /* @@ -48,6 +48,9 @@ #include <sys/ioccom.h> #include <dev/wscons/wsksymvar.h> +#define WSSCREEN_NAME_SIZE 16 +#define WSEMUL_NAME_SIZE 16 +#define WSFONT_NAME_SIZE 16 /* * Common event structure (used by keyboard and mouse) @@ -299,7 +302,8 @@ struct wsdisplay_cursor { * XXX to be changed without care about backwards compatibility! */ struct wsdisplay_font { - char *name; + char name[WSFONT_NAME_SIZE]; + int index; int firstchar, numchars; int encoding; #define WSDISPLAY_FONTENC_ISO 0 @@ -312,28 +316,27 @@ struct wsdisplay_font { #define WSDISPLAY_FONTORDER_KNOWN 0 /* i.e, no need to convert */ #define WSDISPLAY_FONTORDER_L2R 1 #define WSDISPLAY_FONTORDER_R2L 2 + void *cookie; void *data; }; -#define WSDISPLAYIO_LDFONT _IOW('W', 77, struct wsdisplay_font) +#define WSDISPLAYIO_LDFONT _IOW ('W', 77, struct wsdisplay_font) +#define WSDISPLAYIO_LSFONT _IOWR('W', 78, struct wsdisplay_font) +#define WSDISPLAYIO_DELFONT _IOW ('W', 79, struct wsdisplay_font) +#define WSDISPLAYIO_USEFONT _IOW ('W', 80, struct wsdisplay_font) struct wsdisplay_addscreendata { int idx; /* screen index */ - char *screentype; - char *emul; + char screentype[WSSCREEN_NAME_SIZE]; + char emul[WSEMUL_NAME_SIZE]; }; -#define WSDISPLAYIO_ADDSCREEN _IOW('W', 78, struct wsdisplay_addscreendata) +#define WSDISPLAYIO_ADDSCREEN _IOW('W', 82, struct wsdisplay_addscreendata) struct wsdisplay_delscreendata { int idx; /* screen index */ int flags; #define WSDISPLAY_DELSCR_FORCE 1 }; -#define WSDISPLAYIO_DELSCREEN _IOW('W', 79, struct wsdisplay_delscreendata) - -struct wsdisplay_usefontdata { - char *name; -}; -#define WSDISPLAYIO_USEFONT _IOW('W', 80, struct wsdisplay_usefontdata) +#define WSDISPLAYIO_DELSCREEN _IOW('W', 83, struct wsdisplay_delscreendata) /* Display information: number of bytes per row, may be same as pixels */ #define WSDISPLAYIO_LINEBYTES _IOR('W', 95, u_int) |