From 0a33ec8f8a04e6cfefdf305f5c41425b2224c425 Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Fri, 30 Oct 1992 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 1992-10-30

---
 gnot/fns.h     |  1 -
 gnot/screen.c  |  7 ++++++-
 pc/fns.h       |  1 -
 pc/vga.c       |  6 ++++++
 port/devbit.c  |  8 ++++----
 port/devdk.c   |  7 +++++--
 port/portfns.h |  1 +
 power/fns.h    |  1 -
 ss/fns.h       |  1 -
 ss/screen.c    | 15 +++++++++++----
 10 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/gnot/fns.h b/gnot/fns.h
index f746e8fe7958c5c86734a3517978adf0847853e9..924b972bbe21c5e11ae5c973b321cd526320fcdf 100644
--- a/gnot/fns.h
+++ b/gnot/fns.h
@@ -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))
diff --git a/gnot/screen.c b/gnot/screen.c
index 519052ee22703b0c531ed96945de71d4064e711b..b045ec0886689671171b3ffaf37ecb245b557585 100644
--- a/gnot/screen.c
+++ b/gnot/screen.c
@@ -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);
+}
diff --git a/pc/fns.h b/pc/fns.h
index c1bae1cd96c381f3f1b1b83eb18e6aba2921fcec..853a1b447134bc2c4aac1ab4816357eed074e5c8 100644
--- a/pc/fns.h
+++ b/pc/fns.h
@@ -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))
diff --git a/pc/vga.c b/pc/vga.c
index 00a51b2e74d3d223db1052c610faf3db45798f33..f875741302b1ad39ab7f6b5f994b808ef6d12c04 100644
--- a/pc/vga.c
+++ b/pc/vga.c
@@ -381,3 +381,9 @@ bigcursor(void)
 
 	memmove(&arrow, &fatarrow, sizeof(fatarrow));
 }
+
+void
+screenupdate(Rectangle r)
+{
+	USED(r);
+}
diff --git a/port/devbit.c b/port/devbit.c
index 014f024ffb4418b4dac9c6d9220a920d3a6edae5..cb80f0ee12003bdaaa6422344023640dbf850dca 100644
--- a/port/devbit.c
+++ b/port/devbit.c
@@ -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;
 			}
diff --git a/port/devdk.c b/port/devdk.c
index a4265f88161ec00d351ce5ffa02c975e1965fe71..474d774816c792ef76d940a437a81bfd0464794a 100644
--- a/port/devdk.c
+++ b/port/devdk.c
@@ -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);
 
diff --git a/port/portfns.h b/port/portfns.h
index d84e37638df2f080567ce56e45a662137220964c..82687cbe8a06cb65b3010dd012841fae16fd523f 100644
--- a/port/portfns.h
+++ b/port/portfns.h
@@ -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);
diff --git a/power/fns.h b/power/fns.h
index d1d8a9eed468dac7cc9bcc8a9410c899e3924524..bc7a1f36350698ed1ae2bd3c8dfcf222c7647aa2 100644
--- a/power/fns.h
+++ b/power/fns.h
@@ -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))
diff --git a/ss/fns.h b/ss/fns.h
index e04665e8829ebd7fad1d688cca390173ea97916d..35593e3811e3f1cb62454fc208aa7b84f236f82b 100644
--- a/ss/fns.h
+++ b/ss/fns.h
@@ -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()
diff --git a/ss/screen.c b/ss/screen.c
index e5eff90445b959cb79a4988e2f03757e51679869..dc4b29732b43ae758cdd7d87d6b1ded9aa58bca4 100644
--- a/ss/screen.c
+++ b/ss/screen.c
@@ -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);
 }