Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add cookie for wsfont to rasops_info.

Browse Source
This commit is contained in:
ad 1999-04-29 02:49:40 +00:00
parent e2db3e3f25
commit 34480e41c4
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/dev/rasops/rasops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rasops.c,v 1.4 1999/04/26 04:27:47 ad Exp $ */
/* $NetBSD: rasops.c,v 1.5 1999/04/29 02:49:40 ad Exp $ */
/*
* Copyright (c) 1999 Andy Doran <ad@NetBSD.org>
@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: rasops.c,v 1.4 1999/04/26 04:27:47 ad Exp $");
__KERNEL_RCSID(0, "$NetBSD: rasops.c,v 1.5 1999/04/29 02:49:40 ad Exp $");
#include "rasops_glue.h"
@ -120,6 +120,8 @@ rasops_init(ri, wantrows, wantcols, clear, center)
printf("rasops_init: couldn't lock font\n");
return (-1);
}
ri->ri_wsfcookie = cookie;
}
#endif
@ -218,7 +220,13 @@ rasops_setfont(ri, wantrows, wantcols, clear, center)
ri->ri_bits += ((ri->ri_stride - ri->ri_emustride) >> 1) & ~3;
ri->ri_bits += ((ri->ri_height - ri->ri_emuheight) >> 1) *
ri->ri_stride;
}
ri->ri_yorigin = (int)(ri->ri_bits - ri->ri_origbits)
/ ri->ri_stride;
ri->ri_xorigin = (((int)(ri->ri_bits - ri->ri_origbits)
% ri->ri_stride) * bpp) >> 3;
} else
ri->ri_xorigin = ri->ri_yorigin = 0;
/*
* Fill in defaults for operations set. XXX this nukes private

13
sys/dev/rasops/rasops.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: rasops.h,v 1.4 1999/04/26 04:27:47 ad Exp $ */
/* $NetBSD: rasops.h,v 1.5 1999/04/29 02:49:40 ad Exp $ */
/*
* Copyright (c) 1999 Andy Doran <ad@NetBSD.org>
@ -41,8 +41,12 @@ struct rasops_info {
int ri_height; /* height (pels) */
int ri_stride; /* stride in bytes */
/* These can optionally be left empty */
/*
* These can optionally be left empty. If you fill ri_font,
* but aren't using wsfont, set ri_wsfcookie to -1.
*/
struct wsdisplay_font *ri_font;
int ri_wsfcookie;
void *ri_priv; /* driver private data */
u_char ri_forcemono; /* force monochrome operation */
u_char ri_swab; /* swap bytes for 15/16/32 bit depths? */
@ -74,6 +78,8 @@ struct rasops_info {
int ri_xscale; /* fontwidth * pelbytes */
int ri_yscale; /* fontheight * stride */
u_char *ri_origbits; /* where screen bits actually start */
int ri_xorigin; /* where ri_bits begins (x) */
int ri_yorigin; /* where ri_bits begins (y) */
/* For 15, 16, 24, 32 bits */
int32_t ri_devcmap[16]; /* device colormap (WSCOL_*) */
@ -105,7 +111,8 @@ struct rasops_info {
* rasops_init() takes care of rasops_setfont(). You only need to use this
* when you want to switch fonts later on. The integer parameters to both
* are the same. Before calling rasops_setfont(), set ri.ri_font. This
* should happen at _splhigh_.
* should happen at _splhigh_. If (ri_wsfcookie >= 0), you must call
* wsfont_unlock() on it first.
*/
/* rasops.c */