From cc3d97d52a72d7eaceb5b636bcdf81c3e19f7a2e Mon Sep 17 00:00:00 2001
From: Russ Cox <rsc@swtch.com>
Date: Wed, 8 Jan 2020 22:49:36 -0500
Subject: devdraw: update drawclient test program to run again

---
 src/cmd/devdraw/mkfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/cmd/devdraw/mkfile')

diff --git a/src/cmd/devdraw/mkfile b/src/cmd/devdraw/mkfile
index 7f0c2a20..e60b427f 100644
--- a/src/cmd/devdraw/mkfile
+++ b/src/cmd/devdraw/mkfile
@@ -20,7 +20,7 @@ HFILES=\
 
 <$PLAN9/src/mkone
 
-$O.drawclient: drawclient.$O drawfcall.$O
+$O.drawclient: drawclient.$O
 	$LD -o $target $prereq
 
 $O.snarf: x11-alloc.$O x11-cload.$O x11-draw.$O x11-fill.$O x11-get.$O x11-init.$O x11-itrans.$O x11-keysym2ucs.$O x11-load.$O x11-pixelbits.$O x11-unload.$O x11-wsys.$O snarf.$O latin1.$O devdraw.$O
-- 
cgit v1.2.3


From db20f89c3286f277945ac4307f789a9980d31bf6 Mon Sep 17 00:00:00 2001
From: Russ Cox <rsc@swtch.com>
Date: Wed, 8 Jan 2020 19:54:43 -0500
Subject: devdraw: simplify mac file names

Now that we only have Metal, we can drop the -metal.
Also now that Carbon is gone we can drop the macargv.c,
and then the -objc from object file names.
---
 src/cmd/devdraw/mkfile | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'src/cmd/devdraw/mkfile')

diff --git a/src/cmd/devdraw/mkfile b/src/cmd/devdraw/mkfile
index e60b427f..27613239 100644
--- a/src/cmd/devdraw/mkfile
+++ b/src/cmd/devdraw/mkfile
@@ -37,13 +37,10 @@ latin1.h: $PLAN9/lib/keyboard $O.mklatinkbd
 $O.macargv: $MACARGV
 	$LD -o $target $prereq
 
-cocoa-screen-metal-objc.$O: cocoa-screen-metal.m
-	$CC $CFLAGS $OBJCFLAGS -o $target cocoa-screen-metal.m
+%.$O: %.m
+	$CC $CFLAGS $OBJCFLAGS -o $target $stem.m
 
-%-objc.$O: %.m
-	$CC $CFLAGS -o $target $stem.m
-
-CLEANFILES=$O.macargv $O.mklatinkbd latin1.h
+CLEANFILES=$O.devdraw $O.macargv $O.mklatinkbd latin1.h
 
 install: mklatinkbd.install
 install:Q: 
-- 
cgit v1.2.3


From 88ed92aa40ab5aa0f563624c488ba2a120990329 Mon Sep 17 00:00:00 2001
From: Russ Cox <rsc@swtch.com>
Date: Wed, 8 Jan 2020 20:28:17 -0500
Subject: devdraw: move Client into devdraw.h and move global state in

---
 src/cmd/devdraw/mkfile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/cmd/devdraw/mkfile')

diff --git a/src/cmd/devdraw/mkfile b/src/cmd/devdraw/mkfile
index 27613239..6546b590 100644
--- a/src/cmd/devdraw/mkfile
+++ b/src/cmd/devdraw/mkfile
@@ -16,7 +16,11 @@ WSYSOFILES=\
 OFILES=$WSYSOFILES
 
 HFILES=\
+	bigarrow.h\
 	devdraw.h\
+	glendapng.h\
+	latin1.h\
+	$WSYSHFILES\
 
 <$PLAN9/src/mkone
 
@@ -40,7 +44,7 @@ $O.macargv: $MACARGV
 %.$O: %.m
 	$CC $CFLAGS $OBJCFLAGS -o $target $stem.m
 
-CLEANFILES=$O.devdraw $O.macargv $O.mklatinkbd latin1.h
+CLEANFILES=$O.devdraw $O.macargv $O.drawclient $O.mklatinkbd latin1.h
 
 install: mklatinkbd.install
 install:Q: 
-- 
cgit v1.2.3


From b1a086dee9bf5846b31323ba2c438f8853a9c87f Mon Sep 17 00:00:00 2001
From: Russ Cox <rsc@swtch.com>
Date: Thu, 9 Jan 2020 21:47:14 -0500
Subject: devdraw: refactor, clean up mac screen

Also turn mac-srv.c into a generic srv.c,
so we can remove the duplication with x11-srv.c.
---
 src/cmd/devdraw/mkfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/cmd/devdraw/mkfile')

diff --git a/src/cmd/devdraw/mkfile b/src/cmd/devdraw/mkfile
index 6546b590..7ecf7dc1 100644
--- a/src/cmd/devdraw/mkfile
+++ b/src/cmd/devdraw/mkfile
@@ -9,6 +9,7 @@ WSYSOFILES=\
 	devdraw.$O\
 	latin1.$O\
 	mouseswap.$O\
+	srv.$O\
 	winsize.$O\
 
 <|sh ./mkwsysrules.sh
@@ -42,7 +43,7 @@ $O.macargv: $MACARGV
 	$LD -o $target $prereq
 
 %.$O: %.m
-	$CC $CFLAGS $OBJCFLAGS -o $target $stem.m
+	$CC $CFLAGS $OBJCFLAGS -fobjc-arc -o $target $stem.m
 
 CLEANFILES=$O.devdraw $O.macargv $O.drawclient $O.mklatinkbd latin1.h
 
-- 
cgit v1.2.3


From 50923426bf684402160dd7748f14560afd447b73 Mon Sep 17 00:00:00 2001
From: Russ Cox <rsc@golang.org>
Date: Sun, 12 Jan 2020 14:53:46 -0500
Subject: devdraw: x11 working again

Need to think a bit more about locking,
but overall it's a working devdraw.

Multiclient mode may not be working
but nothing is using it yet.
---
 src/cmd/devdraw/mkfile | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'src/cmd/devdraw/mkfile')

diff --git a/src/cmd/devdraw/mkfile b/src/cmd/devdraw/mkfile
index 7ecf7dc1..6bcf1890 100644
--- a/src/cmd/devdraw/mkfile
+++ b/src/cmd/devdraw/mkfile
@@ -28,9 +28,6 @@ HFILES=\
 $O.drawclient: drawclient.$O
 	$LD -o $target $prereq
 
-$O.snarf: x11-alloc.$O x11-cload.$O x11-draw.$O x11-fill.$O x11-get.$O x11-init.$O x11-itrans.$O x11-keysym2ucs.$O x11-load.$O x11-pixelbits.$O x11-unload.$O x11-wsys.$O snarf.$O latin1.$O devdraw.$O
-	$LD -o $target $prereq
-
 $O.mklatinkbd: mklatinkbd.$O
 	$LD -o $target $prereq
 
@@ -48,7 +45,7 @@ $O.macargv: $MACARGV
 CLEANFILES=$O.devdraw $O.macargv $O.drawclient $O.mklatinkbd latin1.h
 
 install: mklatinkbd.install
-install:Q: 
+install:Q:
 	if [ $MACARGV ]; then
 		mk $MKFLAGS macargv.install
 	fi
-- 
cgit v1.2.3