Move font defs back into machine-dependent area (per Jonathan Stone).
Integrate patches from der Mouse (8-bit cleanliness, FULLSCREEN option, SMALLFONT option). The (MD) caller of rcons_init() is now responsible for initialising `rc_font'.
This commit is contained in:
pk
parent
859b799130
commit
6a7edf0b56
File diff suppressed because it is too large
Load Diff
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: raster.h,v 1.1 1995/09/17 19:56:32 pk Exp $ */
|
||||
/* $NetBSD: raster.h,v 1.2 1995/10/04 23:57:19 pk Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1991, 1993
|
||||
|
|
@ -115,7 +115,7 @@ struct raster_fontcache {
|
|||
|
||||
/* Font struct. */
|
||||
struct raster_font {
|
||||
int width, height; /* nominal character size */
|
||||
int width, height, ascent; /* nominal character size */
|
||||
int flags;
|
||||
#define RASFONT_FIXEDWIDTH 0x1
|
||||
#define RASFONT_NOVERTICALMOVEMENT 0x2
|
||||
|
|
@ -212,10 +212,10 @@ extern int raster_replsrc ARGS(( struct raster* dst, int dx, int dy, int w, int
|
|||
extern struct raster_font* raster_fontopen ARGS(( char* fontname ));
|
||||
/* Opens a font. Returns (struct raster_font*) 0 on failure. */
|
||||
|
||||
extern int raster_text ARGS(( struct raster* r, int x, int y, int rop, struct raster_font* rf, char* text ));
|
||||
extern int raster_text ARGS(( struct raster* r, int x, int y, int rop, struct raster_font* rf, unsigned char* text ));
|
||||
/* Draws text. Returns 0 on success, -1 on failure. */
|
||||
|
||||
extern int raster_textn ARGS(( struct raster* r, int x, int y, int rop, struct raster_font* rf, char* text, int len ));
|
||||
extern int raster_textn ARGS(( struct raster* r, int x, int y, int rop, struct raster_font* rf, unsigned char* text, int len ));
|
||||
/* Draws n characters of text. Returns 0 on success, -1 on failure. */
|
||||
|
||||
extern void raster_fontclose ARGS(( struct raster_font* rf ));
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: raster_text.c,v 1.1 1995/09/17 19:56:35 pk Exp $ */
|
||||
/* $NetBSD: raster_text.c,v 1.2 1995/10/04 23:57:22 pk Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1991, 1993
|
||||
|
|
@ -67,7 +67,7 @@ raster_text( r, x, y, rop, rf, text )
|
|||
int x, y;
|
||||
int rop;
|
||||
struct raster_font* rf;
|
||||
char* text;
|
||||
unsigned char* text;
|
||||
{
|
||||
return raster_textn( r, x, y, rop, rf, text, strlen( text ) );
|
||||
}
|
||||
|
|
@ -79,7 +79,7 @@ raster_textn( r, x, y, rop, rf, text, n )
|
|||
int x, y;
|
||||
int rop;
|
||||
struct raster_font* rf;
|
||||
char* text;
|
||||
unsigned char* text;
|
||||
int n;
|
||||
{
|
||||
int clip;
|
||||
|
|
@ -87,7 +87,7 @@ raster_textn( r, x, y, rop, rf, text, n )
|
|||
struct raster_char* c;
|
||||
struct raster* charrast;
|
||||
int i;
|
||||
register char ch;
|
||||
register unsigned char ch;
|
||||
int thisx, thisy;
|
||||
int phase;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: rcons.h,v 1.1 1995/09/17 19:56:36 pk Exp $ */
|
||||
/* $NetBSD: rcons.h,v 1.2 1995/10/04 23:57:23 pk Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1992, 1993
|
||||
|
|
@ -44,6 +44,8 @@
|
|||
* @(#)fbvar.h 8.1 (Berkeley) 6/11/93
|
||||
*/
|
||||
|
||||
#include <dev/rcons/raster.h>
|
||||
|
||||
struct rconsole {
|
||||
/* Raster console emulator state */
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: rcons_kern.c,v 1.1 1995/09/17 19:56:40 pk Exp $ */
|
||||
/* $NetBSD: rcons_kern.c,v 1.2 1995/10/04 23:57:25 pk Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1991, 1993
|
||||
|
|
@ -57,8 +57,7 @@ extern struct tty *fbconstty;
|
|||
|
||||
static void rcons_belltmr(void *);
|
||||
|
||||
extern void rcons_puts(struct rconsole *, char *, int);
|
||||
extern void rcons_font(struct rconsole *);
|
||||
#include "rcons_subr.h"
|
||||
|
||||
static struct rconsole *mydevicep;
|
||||
|
||||
|
|
@ -91,8 +90,6 @@ rcons_output(tp)
|
|||
tp->t_state |= TS_BUSY;
|
||||
splx(s);
|
||||
n = q_to_b(&tp->t_outq, buf, sizeof(buf));
|
||||
for (i = 0; i < n; ++i)
|
||||
buf[i] &= 0177; /* strip parity (argh) */
|
||||
rcons_puts(mydevicep, buf, n);
|
||||
|
||||
s = spltty();
|
||||
|
|
@ -192,9 +189,6 @@ rcons_init(rc)
|
|||
|
||||
rc->rc_ras_blank = RAS_CLEAR;
|
||||
|
||||
/* Setup the static font */
|
||||
rcons_font(rc);
|
||||
|
||||
/* Impose upper bounds on rc_max{row,col} */
|
||||
i = rc->rc_height / rc->rc_font->height;
|
||||
if (rc->rc_maxrow > i)
|
||||
|
|
@ -227,12 +221,24 @@ rcons_init(rc)
|
|||
}
|
||||
rc->rc_emuheight = rc->rc_maxrow * rc->rc_font->height;
|
||||
|
||||
#ifdef RASTERCONS_WONB
|
||||
rc->rc_ras_blank = RAS_NOT(rc->rc_ras_blank);
|
||||
rc->rc_bits |= FB_INVERT;
|
||||
#endif
|
||||
|
||||
if (rc->rc_row == NULL || rc->rc_col == NULL) {
|
||||
/* No address passed; use private copies */
|
||||
/*
|
||||
* No address passed; use private copies
|
||||
* go to LL corner and scroll.
|
||||
*/
|
||||
rc->rc_row = &row;
|
||||
rc->rc_col = &col;
|
||||
row = col = 0;
|
||||
row = rc->rc_maxrow;
|
||||
col = 0;
|
||||
#if 0
|
||||
rcons_clear2eop(rc); /* clear the display */
|
||||
#endif
|
||||
rcons_scroll(rc, 1);
|
||||
rcons_cursor(rc); /* and draw the initial cursor */
|
||||
} else {
|
||||
/* Prom emulator cursor is currently visible */
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: rcons_subr.c,v 1.1 1995/09/17 19:56:41 pk Exp $ */
|
||||
/* $NetBSD: rcons_subr.c,v 1.2 1995/10/04 23:57:26 pk Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1991, 1993
|
||||
|
|
@ -55,34 +55,22 @@
|
|||
#include <dev/rcons/rcons.h>
|
||||
#include <dev/rcons/raster.h>
|
||||
|
||||
void rcons_text(struct rconsole *, char *, int);
|
||||
void rcons_pctrl(struct rconsole *, int);
|
||||
void rcons_esc(struct rconsole *, int);
|
||||
void rcons_doesc(struct rconsole *, int);
|
||||
void rcons_cursor(struct rconsole *);
|
||||
void rcons_invert(struct rconsole *, int);
|
||||
void rcons_clear2eop(struct rconsole *);
|
||||
void rcons_clear2eol(struct rconsole *);
|
||||
void rcons_scroll(struct rconsole *, int);
|
||||
void rcons_delchar(struct rconsole *, int);
|
||||
void rcons_delline(struct rconsole *, int);
|
||||
void rcons_insertchar(struct rconsole *, int);
|
||||
void rcons_insertline(struct rconsole *, int);
|
||||
#include "rcons_subr.h"
|
||||
|
||||
extern void rcons_bell(struct rconsole *);
|
||||
|
||||
#define RCONS_ISPRINT(c) ((c) >= ' ' && (c) <= '~')
|
||||
#define RCONS_ISPRINT(c) ((((c) >= ' ') && ((c) <= '~')) || ((c) > 160))
|
||||
#define RCONS_ISDIGIT(c) ((c) >= '0' && (c) <= '9')
|
||||
|
||||
/* Output (or at least handle) a string sent to the console */
|
||||
void
|
||||
rcons_puts(rc, str, n)
|
||||
register struct rconsole *rc;
|
||||
register char *str;
|
||||
register unsigned char *str;
|
||||
register int n;
|
||||
{
|
||||
register int c, i, j;
|
||||
register char *cp;
|
||||
register unsigned char *cp;
|
||||
|
||||
/* Jump scroll */
|
||||
/* XXX maybe this should be an option? */
|
||||
|
|
@ -150,14 +138,14 @@ rcons_puts(rc, str, n)
|
|||
void
|
||||
rcons_text(rc, str, n)
|
||||
register struct rconsole *rc;
|
||||
register char *str;
|
||||
register unsigned char *str;
|
||||
register int n;
|
||||
{
|
||||
register int x, y, op;
|
||||
|
||||
x = *rc->rc_col * rc->rc_font->width + rc->rc_xorigin;
|
||||
y = *rc->rc_row * rc->rc_font->height +
|
||||
rc->rc_font_ascent + rc->rc_yorigin;
|
||||
rc->rc_font->ascent + rc->rc_yorigin;
|
||||
op = RAS_SRC;
|
||||
if (((rc->rc_bits & FB_STANDOUT) != 0) ^
|
||||
((rc->rc_bits & FB_INVERT) != 0))
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: rcons_font.c,v 1.1 1995/09/17 19:56:38 pk Exp $ */
|
||||
/* $NetBSD: rcons_subr.h,v 1.1 1995/10/04 23:57:28 pk Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1991, 1993
|
||||
|
|
@ -41,30 +41,21 @@
|
|||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)rcons_font.c 8.1 (Berkeley) 6/11/93
|
||||
* extracted from: @(#)rcons_subr.c 8.1 (Berkeley) 6/11/93
|
||||
*/
|
||||
|
||||
#ifdef _KERNEL
|
||||
#include <sys/param.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/device.h>
|
||||
#else
|
||||
#include <sys/types.h>
|
||||
#include "myfbdevice.h"
|
||||
#endif
|
||||
|
||||
#include <dev/rcons/raster.h>
|
||||
#include <dev/rcons/rcons.h>
|
||||
#include <dev/rcons/gallant19.h>
|
||||
|
||||
void
|
||||
rcons_font(rc)
|
||||
register struct rconsole *rc;
|
||||
{
|
||||
|
||||
/* XXX really rather get this from the prom */
|
||||
rc->rc_font = &gallant19;
|
||||
|
||||
/* Get distance to top and bottom of font from font origin */
|
||||
rc->rc_font_ascent = -(rc->rc_font->chars)['a'].homey;
|
||||
}
|
||||
extern void rcons_puts __P((struct rconsole *, unsigned char *, int));
|
||||
extern void rcons_font __P((struct rconsole *));
|
||||
extern void rcons_text __P((struct rconsole *, unsigned char *, int));
|
||||
extern void rcons_pctrl __P((struct rconsole *, int));
|
||||
extern void rcons_esc __P((struct rconsole *, int));
|
||||
extern void rcons_doesc __P((struct rconsole *, int));
|
||||
extern void rcons_cursor __P((struct rconsole *));
|
||||
extern void rcons_invert __P((struct rconsole *, int));
|
||||
extern void rcons_clear2eop __P((struct rconsole *));
|
||||
extern void rcons_clear2eol __P((struct rconsole *));
|
||||
extern void rcons_scroll __P((struct rconsole *, int));
|
||||
extern void rcons_delchar __P((struct rconsole *, int));
|
||||
extern void rcons_delline __P((struct rconsole *, int));
|
||||
extern void rcons_insertchar __P((struct rconsole *, int));
|
||||
extern void rcons_insertline __P((struct rconsole *, int));
|
||||
Loading…
Reference in New Issue