10 files changed, 33 insertions(+), 15 deletions(-)

M gnot/fns.h
M gnot/screen.c
M pc/fns.h
M pc/vga.c
M port/devbit.c
M port/devdk.c
M port/portfns.h
M power/fns.h
M ss/fns.h
M ss/screen.c

@@ 47,7 47,6 @@ void	spldone(void);
 int	splduart(void);
 int	tas(char*);
 void	touser(void*);
-#define	screenupdate(a)
 #define	waserror()	(u->nerrlab++, setlabel(&u->errlab[u->nerrlab-1]))
 #define	kmapperm(x)	kmap(x)
 #define getcallerpc(x)	(*(ulong*)(x))

@@ 23,7 23,6 @@ struct{
 }out;
 
 Lock	screenlock;
-void	screenupdate(void);
 
 GBitmap	gscreen =
 {


@@ 185,3 184,9 @@ mousectl(char *x)
 {
 	USED(x);
 }
+
+void
+screenupdate(Rectangle r)
+{
+	USED(r);
+}

@@ 66,7 66,6 @@ void	uartclock(void);
 void	uartintr0(Ureg*);
 void	uartspecial(int, IOQ*, IOQ*, int);
 void	vgainit(void);
-#define	screenupdate(a)
 #define	waserror()	(u->nerrlab++, setlabel(&u->errlab[u->nerrlab-1]))
 #define	kmapperm(x)	kmap(x)
 #define getcallerpc(x)	(*(ulong*)(x))

@@ 381,3 381,9 @@ bigcursor(void)
 
 	memmove(&arrow, &fatarrow, sizeof(fatarrow));
 }
+
+void
+screenupdate(Rectangle r)
+{
+	USED(r);
+}

@@ 1,5 1,7 @@
 #include	"u.h"
 #include	"../port/lib.h"
+#include	<libg.h>
+#include	<gnot.h>
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"


@@ 7,8 9,6 @@
 
 #include	"devtab.h"
 
-#include	<libg.h>
-#include	<gnot.h>
 #include	"screen.h"
 
 /*


@@ 103,7 103,6 @@ void	arenafree(Arena*);
 void	bitstring(GBitmap*, Point, GFont*, uchar*, long, Fcode);
 void	bitloadchar(GFont*, int, GSubfont*, int);
 extern	GBitmap	gscreen;
-extern	islcd;
 
 Mouseinfo	mouse;
 Cursorinfo	cursor;


@@ 268,6 267,7 @@ lcdmousep(void *a)
 			continue;
 		}
 		screenupdate(mbb);
+		mbb = Rect(10000, 10000, -10000, -10000);
 		qunlock(&bit);
 		poperror();
 	}


@@ 1591,7 1591,7 @@ bitwrite(Chan *c, void *va, long n, ulong offset)
 				error(Ebadblt);
 			ok = 1;
 			for(i = 0; i < nw; i++){
-				ok &= setcolor(i, BGLONG(p), BGLONG(p+4), BGLONG(p+8));
+				ok &= setcolor(flipping ? ~i : i, BGLONG(p), BGLONG(p+4), BGLONG(p+8));
 				p += 12;
 				m -= 12;
 			}

@@ 947,7 947,7 @@ static void
 dkcall(int type, Chan *c, char *addr, char *nuser, char *machine)
 {
  	char dialstr[66];
-	int line;
+	int line, win;
 	char dialtone;
 	int t_val, d_val;
 	Dk *dp;


@@ 1031,7 1031,10 @@ dkcall(int type, Chan *c, char *addr, char *nuser, char *machine)
 		close(csc);
 		nexterror();
 	}
-	dkmesg(csc, t_val, d_val, line, W_WINDOW(dp->urpwindow,dp->urpwindow,2));
+	for(win = 0; ; win++)
+		if(W_VALUE(win) >= dp->urpwindow || win == 15)
+			break;
+	dkmesg(csc, t_val, d_val, line, W_WINDOW(win, win, 2));
 	poperror();
 	close(csc);
 

@@ 200,6 200,7 @@ void		sccspecial(int, IOQ*, IOQ*, int);
 void		sched(void);
 void		schedinit(void);
 int		screenbits(void);
+void		screenupdate(Rectangle);
 Scsibuf*	scsialloc(ulong);
 int		scsibread(int, Scsibuf*, long, long, long);
 Scsibuf*	scsibuf(void);

@@ 71,7 71,6 @@ void	vector0(void);
 void	vector80(void);
 void	vmereset(void);
 void	wbflush(void);
-#define	screenupdate(a)
 #define	waserror()	setlabel(&u->errlab[u->nerrlab++])
 #define	kmapperm(x)	kmap(x)
 #define KADDR(a)	((void*)((ulong)(a)|KZERO))

@@ 67,7 67,6 @@ ulong	tas(ulong*);
 void	touser(ulong);
 void	trap(Ureg*);
 void	trapinit(void);
-#define	screenupdate(a)
 #define	wbflush()	/* mips compatibility */
 #define	waserror()	(u->nerrlab++, setlabel(&u->errlab[u->nerrlab-1]))
 #define getcallerpc(x)	_getcallerpc()

@@ 23,7 23,6 @@ struct{
 
 static ulong	rep(ulong, int);
 void		(*kprofp)(ulong);
-void	screenupdate(void);
 
 typedef struct	Video Video;
 struct Video


@@ 546,9 545,17 @@ rep(ulong v, int n)
 	return rv;
 }
 
-/* only 1 flavor mouse */
+/*
+ *  set/change mouse configuration
+ */
+void
+mousectl(char *arg)
+{
+	USED(arg);
+}
+
 void
-mousectl(char *x)
+screenupdate(Rectangle r)
 {
-	USED(x);
+	USED(r);
 }