6 files changed, 67 insertions(+), 11 deletions(-)

M gnot/screen.c
A gnot/screen.h
M port/devbit.c
M power/main.c
M ss/screen.c
A ss/screen.h

@@ 9,7 9,10 @@
 
 #include	<libg.h>
 #include	<gnot.h>
-#include	"mouse.h"
+#include	"screen.h"
+
+/* gnot screen.h defines gbitblt to use balu; doesn't work here */
+#undef gbitblt
 
 #define	MINX	8
 


@@ 78,13 81,6 @@ screenputc(int c)
 	}
 }
 
-/* Use the balu version */
-void
-gbitblt(GBitmap *d, Point p, GBitmap *s, Rectangle r, Fcode f)
-{
-	balubitblt(d, p, s, r, f);
-}
-
 void
 screenputs(char *s, int n)
 {

@@ 0,0 1,31 @@
+typedef struct Mouseinfo	Mouseinfo;
+typedef struct Cursorinfo	Cursorinfo;
+
+struct Mouseinfo{
+	/*
+	 * First three fields are known in some l.s's
+	 */
+	int	dx;		/* interrupt-time delta */
+	int	dy;
+	int	track;		/* update cursor on screen */
+	Mouse;
+	int	changed;	/* mouse structure changed since last read */
+	Rendez	r;
+	int	newbuttons;	/* interrupt time access only */
+	int	clock;		/* check mouse.track on RTE */
+};
+
+struct Cursorinfo{
+	Cursor;
+	Lock;
+	int	visible;	/* on screen */
+	Rectangle r;		/* location */
+};
+
+
+extern Mouseinfo	mouse;
+extern Cursorinfo	cursor;
+
+extern void		mouseupdate(int);
+
+#define gbitblt(d,p,s,r,f) balubitblt(d,p,s,r,f)

@@ 9,7 9,7 @@
 
 #include	<libg.h>
 #include	<gnot.h>
-#include	"mouse.h"
+#include	"screen.h"
 
 extern GFont	*defont;
 

@@ 377,7 377,7 @@ exit(void)
 	splhi();
 	for(i=0; i<2000000; i++)
 		;
-/*	duartreset(); /**/
+	duartenable0();
 	firmware();
 }
 

@@ 9,7 9,7 @@
 
 #include	<libg.h>
 #include	<gnot.h>
-#include	"mouse.h"
+#include	"screen.h"
 
 #define	MINX	8
 

@@ 0,0 1,29 @@
+typedef struct Mouseinfo	Mouseinfo;
+typedef struct Cursorinfo	Cursorinfo;
+
+struct Mouseinfo{
+	/*
+	 * First three fields are known in some l.s's
+	 */
+	int	dx;		/* interrupt-time delta */
+	int	dy;
+	int	track;		/* update cursor on screen */
+	Mouse;
+	int	changed;	/* mouse structure changed since last read */
+	Rendez	r;
+	int	newbuttons;	/* interrupt time access only */
+	int	clock;		/* check mouse.track on RTE */
+};
+
+struct Cursorinfo{
+	Cursor;
+	Lock;
+	int	visible;	/* on screen */
+	Rectangle r;		/* location */
+};
+
+
+extern Mouseinfo	mouse;
+extern Cursorinfo	cursor;
+
+extern void		mouseupdate(int);