From 2f7c1b3e59a4c68e211e9b9698db6d1e0dac1768 Mon Sep 17 00:00:00 2001
From: David Schmenk <dschmenk@gmail.com>
Date: Sat, 17 Feb 2024 18:48:03 -0800
Subject: [PATCH] First pass at DHGR toolkit

---
 images/apple/DHGR-TK.po      | Bin 143360 -> 143360 bytes
 src/libsrc/apple/dhgrlib.pla | 152 +++++++++++++++++++++++++++++++++++
 src/makefile                 |   7 +-
 src/vmsrc/apple/cmd.pla      |   2 +-
 src/vmsrc/apple/cmdjit.pla   |  14 ++--
 5 files changed, 166 insertions(+), 9 deletions(-)
 create mode 100644 src/libsrc/apple/dhgrlib.pla

diff --git a/images/apple/DHGR-TK.po b/images/apple/DHGR-TK.po
index 5462a4e31eefa1b38da4e14ef9d86ce714c8598a..b549e12d824fce78a73581f7383377e149e8a9b7 100755
GIT binary patch
delta 4062
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

delta 4876
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

diff --git a/src/libsrc/apple/dhgrlib.pla b/src/libsrc/apple/dhgrlib.pla
new file mode 100644
index 0000000..af98ff0
--- /dev/null
+++ b/src/libsrc/apple/dhgrlib.pla
@@ -0,0 +1,152 @@
+include "inc/cmdsys.plh"
+
+sysflags restxt1|reshgr1|resxhgr1
+
+//
+// Apple II graphics soft switches
+//
+const store80dis   = $C000
+const store80ena   = $C001
+const show40col    = $C00C
+const show80col    = $C00D
+const showgraphics = $C050
+const showtext     = $C051
+const showfull     = $C052
+const showmix      = $C053
+const page1m       = $C054
+const page1x       = $C055
+const showhires    = $C057
+const dhresena     = $C05E
+const dhresdis     = $C05F
+const IOUdis       = $C07E
+const IOUena       = $C07F
+//
+// HiRes scanline addresses
+//
+word hgrscan[] = $2000,$2400,$2800,$2C00,$3000,$3400,$3800,$3C00
+word           = $2080,$2480,$2880,$2C80,$3080,$3480,$3880,$3C80
+word           = $2100,$2500,$2900,$2D00,$3100,$3500,$3900,$3D00
+word           = $2180,$2580,$2980,$2D80,$3180,$3580,$3980,$3D80
+word           = $2200,$2600,$2A00,$2E00,$3200,$3600,$3A00,$3E00
+word           = $2280,$2680,$2A80,$2E80,$3280,$3680,$3A80,$3E80
+word           = $2300,$2700,$2B00,$2F00,$3300,$3700,$3B00,$3F00
+word           = $2380,$2780,$2B80,$2F80,$3380,$3780,$3B80,$3F80
+word           = $2028,$2428,$2828,$2C28,$3028,$3428,$3828,$3C28
+word           = $20A8,$24A8,$28A8,$2CA8,$30A8,$34A8,$38A8,$3CA8
+word           = $2128,$2528,$2928,$2D28,$3128,$3528,$3928,$3D28
+word           = $21A8,$25A8,$29A8,$2DA8,$31A8,$35A8,$39A8,$3DA8
+word           = $2228,$2628,$2A28,$2E28,$3228,$3628,$3A28,$3E28
+word           = $22A8,$26A8,$2AA8,$2EA8,$32A8,$36A8,$3AA8,$3EA8
+word           = $2328,$2728,$2B28,$2F28,$3328,$3728,$3B28,$3F28
+word           = $23A8,$27A8,$2BA8,$2FA8,$33A8,$37A8,$3BA8,$3FA8
+word           = $2050,$2450,$2850,$2C50,$3050,$3450,$3850,$3C50
+word           = $20D0,$24D0,$28D0,$2CD0,$30D0,$34D0,$38D0,$3CD0
+word           = $2150,$2550,$2950,$2D50,$3150,$3550,$3950,$3D50
+word           = $21D0,$25D0,$29D0,$2DD0,$31D0,$35D0,$39D0,$3DD0
+word           = $2250,$2650,$2A50,$2E50,$3250,$3650,$3A50,$3E50
+word           = $22D0,$26D0,$2AD0,$2ED0,$32D0,$36D0,$3AD0,$3ED0
+word           = $2350,$2750,$2B50,$2F50,$3350,$3750,$3B50,$3F50
+word           = $23D0,$27D0,$2BD0,$2FD0,$33D0,$37D0,$3BD0,$3FD0
+//
+// Pixel masks for 7 contiguous pixels
+//
+byte masks[] = $0F, $00, $00, $00 // $78, $00, $00, $00
+byte         = $70, $01, $00, $00 // $03, $40, $00, $00
+byte         = $00, $1E ,$00, $00 // $00, $3C, $00, $00
+byte         = $00, $60, $03, $00 // $00, $03, $60, $00
+byte         = $00, $00, $3C, $00 // $00, $00, $1E, $00
+byte         = $00, $00, $40, $07 // $00, $00, $01, $70
+byte         = $00, $00, $00, $78 // $00, $00, $00, $0F
+//
+// Solid colors
+//
+byte colors[] = $00, $00, $00, $00 // black
+byte          = $08, $11, $22, $44 // magenta
+byte          = $44, $08, $11, $22 // brown
+byte          = $4C, $19, $33, $66 // orange
+byte          = $22, $44, $08, $11 // dark green
+byte          = $2A, $55, $2A, $55 // gray 1
+byte          = $66, $4C, $19, $33 // green
+byte          = $6E, $5D, $3B, $77 // yellow
+byte          = $11, $22, $44, $08 // dark blue
+byte          = $19, $33, $66, $4C // purple
+byte          = $55, $2A, $55, $2A // gray 2
+byte          = $5D, $3B, $77, $6E // pink
+byte          = $33, $66, $4C, $19 // medium blue
+byte          = $3B, $77, $6E, $5D // light blue
+byte          = $77, $6E, $5D, $3B // aqua
+byte          = $7F, $7F, $7F, $7F // white
+word clr = @colors
+
+def dhgrcolor(c)#0
+  clr = @colors + ((c & $0F) << 2)
+end
+def dhgrplot(x, y)#0
+  word scanaddr, maskblk
+  byte pixblk, pixofst, pixbyte
+
+  pixblk, pixofst = divmod(x, 7)
+  maskblk  = @masks + pixofst * 4
+  scanaddr = hgrscan[y] + pixblk * 2
+  if ^maskblk
+    ^page1x
+    pixbyte = ^scanaddr & ~(^maskblk)
+    ^scanaddr = pixbyte | (^maskblk & ^clr)
+  fin
+  if ^(maskblk + 1)
+    ^page1m
+    pixbyte = ^scanaddr & ~(^(maskblk + 1))
+    ^scanaddr = pixbyte | (^(maskblk + 1) & ^(clr + 1))
+  fin
+  scanaddr++
+  if ^(maskblk + 2)
+    ^page1x
+    pixbyte = ^scanaddr & ~(^(maskblk + 2))
+    ^scanaddr = pixbyte | (^(maskblk + 2) & ^(clr + 2))
+  fin
+  if ^(maskblk + 3)
+    ^page1m
+    pixbyte = ^scanaddr & ~(^(maskblk + 3))
+    ^scanaddr = pixbyte | (^(maskblk + 3) & ^(clr + 3))
+  fin
+end
+def dhgrmode(mode)
+  if mode == 0
+    ^page1m
+    ^showfull
+    ^showhires
+    ^showgraphics
+    ^IOUdis     = 0
+    ^show80col  = 0
+    ^dhresena
+    ^store80ena = 0
+    ^page1m
+    memset($2000, 0, $2000)
+    ^page1x
+    memset($2000, 0, $2000)
+  else
+    ^store80dis = 0
+    ^dhresdis
+    ^show40col  = 0
+    ^showtext
+    ^page1m
+  fin
+  return mode
+end
+
+def dhgrtest#0
+  byte i
+
+  dhgrcolor(15)
+  for i = 0 to 139
+    dhgrplot(i, i)
+  next
+  while ^$C000 < 128
+  loop
+  ^$C010
+end
+
+dhgrmode(0)
+dhgrtest
+dhgrmode(-1)
+done
diff --git a/src/makefile b/src/makefile
index 0caaac2..3578dbd 100755
--- a/src/makefile
+++ b/src/makefile
@@ -60,6 +60,7 @@ DHCP       = rel/DHCP\#FE1000
 HTTPD      = rel/HTTPD\#FE1000
 TFTPD      = rel/TFTPD\#FE1000
 HGRLIB     = rel/apple/HGRLIB\#FE1000
+DHGRLIB    = rel/apple/DHGRLIB\#FE1000
 GRLIB      = rel/apple/GRLIB\#FE1000
 DGRLIB     = rel/apple/DGRLIB\#FE1000
 HGRSPRITE  = rel/apple/HGRSPRITE\#FE1000
@@ -114,7 +115,7 @@ TXTTYPE	= .TXT
 #SYSTYPE	= \#FF2000
 #TXTTYPE	= \#040000
 
-apple: $(PLVMZP_APL) $(PLASM) $(PLVM) $(PLVM01) $(PLVM02) $(PLVMJIT) $(PLVM802) $(PLVM03) $(PLVMJIT03) $(CMD) $(CMDJIT) $(JIT) $(JIT16) $(JITUNE) $(SOSCMD) $(SOSCMDJIT) $(PLASMAPLASM) $(CODEOPT) $(PLFORTH) $(HRFORTH) $(HR2FORTH) $(TX2FORTH) $(ZIPCHIP) $(MATCHFILES) $(ARGS) $(MEMMGR) $(MEMTEST) $(FIBER) $(FIBERTEST) $(LONGJMP) $(ED) $(MON) $(COPY) $(DEL) $(REN) $(CAT) $(NEWDIR) $(TYPE) $(SOS) $(ROD) $(SIEVE) $(PRIMEGAP) $(MOUSE) $(UTHERNET2) $(UTHERNET) $(ETHERIP) $(INET) $(DHCP) $(HTTPD) $(TFTPD) $(ROGUE) $(ROGUEMAP) $(ROGUECOMBAT) $(SFM) $(SFMSPRT) $(GRAFIX) $(GFXDEMO) $(LINES) $(HGRTILE) $(HGRFONT) $(HGRSPRITE) $(HGRLIB) $(TILETEST) $(HGRTEST) $(GRLIB) $(DGRLIB) $(GRTEST) $(DGRTEST) $(HGRTEST) $(FILEIO_APL) $(CONIO_APL) $(JOYBUZZ) $(PORTIO) $(SPIPORT) $(SDFAT) $(FATCAT) $(FATGET) $(FATPUT) $(FATWDSK) $(FATRDSK) $(INT32) $(INT32TEST) $(SANE) $(FPSTR) $(FPU) $(SANITY) $(LZ4) $(LZ4CAT) $(RPNCALC) $(SNDSEQ) $(PLAYSEQ) $(CONIOTEST)
+apple: $(PLVMZP_APL) $(PLASM) $(PLVM) $(PLVM01) $(PLVM02) $(PLVMJIT) $(PLVM802) $(PLVM03) $(PLVMJIT03) $(CMD) $(CMDJIT) $(JIT) $(JIT16) $(JITUNE) $(SOSCMD) $(SOSCMDJIT) $(PLASMAPLASM) $(CODEOPT) $(PLFORTH) $(HRFORTH) $(HR2FORTH) $(TX2FORTH) $(ZIPCHIP) $(MATCHFILES) $(ARGS) $(MEMMGR) $(MEMTEST) $(FIBER) $(FIBERTEST) $(LONGJMP) $(ED) $(MON) $(COPY) $(DEL) $(REN) $(CAT) $(NEWDIR) $(TYPE) $(SOS) $(ROD) $(SIEVE) $(PRIMEGAP) $(MOUSE) $(UTHERNET2) $(UTHERNET) $(ETHERIP) $(INET) $(DHCP) $(HTTPD) $(TFTPD) $(ROGUE) $(ROGUEMAP) $(ROGUECOMBAT) $(SFM) $(SFMSPRT) $(GRAFIX) $(GFXDEMO) $(LINES) $(HGRTILE) $(HGRFONT) $(HGRSPRITE) $(HGRLIB) $(TILETEST) $(HGRTEST) $(DHGRLIB) $(GRLIB) $(DGRLIB) $(GRTEST) $(DGRTEST) $(HGRTEST) $(FILEIO_APL) $(CONIO_APL) $(JOYBUZZ) $(PORTIO) $(SPIPORT) $(SDFAT) $(FATCAT) $(FATGET) $(FATPUT) $(FATWDSK) $(FATRDSK) $(INT32) $(INT32TEST) $(SANE) $(FPSTR) $(FPU) $(SANITY) $(LZ4) $(LZ4CAT) $(RPNCALC) $(SNDSEQ) $(PLAYSEQ) $(CONIOTEST)
 
 	-rm vmsrc/plvmzp.inc
 
@@ -465,6 +466,10 @@ $(HGRLIB): libsrc/apple/hgrlib.pla $(PLVM02) $(PLASM)
 	./$(PLASM) -AMOW libsrc/apple/hgrlib.pla
 	acme --setpc 4094 -o $(HGRLIB) libsrc/apple/hgrlib.a
 
+$(DHGRLIB): libsrc/apple/dhgrlib.pla $(PLVM02) $(PLASM)
+	./$(PLASM) -AMOW libsrc/apple/dhgrlib.pla
+	acme --setpc 4094 -o $(DHGRLIB) libsrc/apple/dhgrlib.a
+
 $(GRLIB): libsrc/apple/grlib.pla $(PLVM02) $(PLASM)
 	./$(PLASM) -AMOW libsrc/apple/grlib.pla
 	acme --setpc 4094 -o $(GRLIB) libsrc/apple/grlib.a
diff --git a/src/vmsrc/apple/cmd.pla b/src/vmsrc/apple/cmd.pla
index ee9c276..33d25cc 100755
--- a/src/vmsrc/apple/cmd.pla
+++ b/src/vmsrc/apple/cmd.pla
@@ -1352,7 +1352,7 @@ def docmds#0
             if perr
                 prstr("ERR:$")
                 prbyte(perr)
-        crout()
+                crout()
             fin
         fin
         prstr(pfxop(prefix, GET_PFX))
diff --git a/src/vmsrc/apple/cmdjit.pla b/src/vmsrc/apple/cmdjit.pla
index fa8a0a1..76fc232 100755
--- a/src/vmsrc/apple/cmdjit.pla
+++ b/src/vmsrc/apple/cmdjit.pla
@@ -930,26 +930,26 @@ def allocxheap(size)#1
     word xaddr
     xaddr = xheap
     xheap = xheap + size
-    if systemflags & restxt1
-        if uword_isle(xaddr, $0800) and uword_isgt(xheap, $0400)
+    if systemflags & (restxt1 | resxtxt1)
+        if uword_islt(xaddr, $0800) and uword_isgt(xheap, $0400)
             xaddr = $0800
             xheap = xaddr + size
         fin
     fin
-    if systemflags & restxt2
-        if uword_isle(xaddr, $0C00) and uword_isgt(xheap, $0800)
+    if systemflags & (restxt2 | resxtxt2)
+        if uword_islt(xaddr, $0C00) and uword_isgt(xheap, $0800)
             xaddr = $0C00
             xheap = xaddr + size
         fin
     fin
     if systemflags & resxhgr1
-        if uword_isle(xaddr, $4000) and uword_isgt(xheap, $2000)
+        if uword_islt(xaddr, $4000) and uword_isgt(xheap, $2000)
             xaddr = $4000
             xheap = xaddr + size
         fin
     fin
     if systemflags & resxhgr2
-        if uword_isle(xaddr, $6000) and uword_isgt(xheap, $4000)
+        if uword_islt(xaddr, $6000) and uword_isgt(xheap, $4000)
             xaddr = $6000
             xheap = xaddr + size
         fin
@@ -1437,7 +1437,7 @@ def docmds#0
             if perr
                 prstr("ERR:$")
                 prbyte(perr)
-        crout()
+                crout()
             fin
         fin
         prstr(pfxop(prefix, GET_PFX))