From 27bc1c917b1d0dcedd1ae30237a25dcbe7056ac1 Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Fri, 21 Apr 2000 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 2000-04-21

---
 pc/devarch.c   |  6 +++---
 port/devdraw.c | 16 ++++++++++++----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/pc/devarch.c b/pc/devarch.c
index 3d65e917d922d8b7156c5c4d40637bdf6888b6ba..b4fd363dfe4f60f0f444150a393fa0be8fa9f651 100644
--- a/pc/devarch.c
+++ b/pc/devarch.c
@@ -406,13 +406,12 @@ static X86type x86intel[] =
 	{ 5,	3,	23,	"P24T", },
 	{ 5,	4,	23,	"P55C MMX", },
 	{ 5,	7,	23,	"P54C VRT", },
-	{ 5,	8,	11,	"AMD-K6 3D", },	/* Kenji Arisawa arisawa@aichi-u.ac.jp */
-	{ 5,	9,	11,	"AMD-K6 3D+", },/* Kenji Arisawa arisawa@aichi-u.ac.jp */
-	{ 6,	1,	16,	"PentiumPro", },/* determined by trial and error */
+	{ 6,	1,	16,	"PentiumPro", },/* trial and error */
 	{ 6,	3,	16,	"PentiumII", },
 	{ 6,	5,	16,	"PentiumII/Xeon", },
 	{ 6,	6,	16,	"Celeron", },
 	{ 6,	7,	16,	"PentiumIII/Xeon", },
+	{ 6,	8,	16,	"PentiumIII/Xeon", },
 
 	{ 3,	-1,	32,	"386", },	/* family defaults */
 	{ 4,	-1,	22,	"486", },
@@ -448,6 +447,7 @@ static X86type x86amd[] =
 
 	{ 4,	-1,	22,	"Am486", },	/* guesswork */
 	{ 5,	-1,	23,	"AMD-K5/K6", },	/* guesswork */
+	{ 6,	-1,	11,	"AMD-Athlon", },/* guesswork */
 
 	{ -1,	-1,	23,	"unknown", },	/* total default */
 };
diff --git a/port/devdraw.c b/port/devdraw.c
index d68d3b7100fca0f7f7a6ef72f629d62c653b0e00..3335d7ccd3af0c1927f5c88f63cfc50f512fbee3 100644
--- a/port/devdraw.c
+++ b/port/devdraw.c
@@ -291,6 +291,16 @@ drawrefactive(void *a)
 	return c->refreshme || c->refresh!=0;
 }
 
+static
+void
+drawrefreshscreen(DImage *l, Client *client)
+{
+	while(l != nil && l->dscreen == nil)
+		l = l->fromname;
+	if(l != nil && l->dscreen->owner != client)
+		l->dscreen->owner->refreshme = 1;
+}
+
 static
 void
 drawrefresh(Memimage *l, Rectangle r, void *v)
@@ -1651,8 +1661,7 @@ drawmesg(Client *client, void *av, int n)
 					addflush(r);
 					addflush(dst->layer->screenr);
 					ll = drawlookup(client, BGLONG(a+1), 1);
-					if(ll->dscreen->owner != client)
-						ll->dscreen->owner->refreshme = 1;
+					drawrefreshscreen(ll, client);
 				}
 			}
 			continue;
@@ -1870,8 +1879,7 @@ drawmesg(Client *client, void *av, int n)
 				for(j=0; j<nw; j++)
 					addflush(lp[j]->layer->screenr);
 			ll = drawlookup(client, BGLONG(a+1+1+2), 1);
-			if(ll->dscreen->owner != client)
-				ll->dscreen->owner->refreshme = 1;
+			drawrefreshscreen(ll, client);
 			poperror();
 			free(lp);
 			continue;