1
0
mirror of https://github.com/dschmenk/PLASMA.git synced 2026-04-19 09:23:06 +00:00

Make new editor the default

This commit is contained in:
David Schmenk
2025-03-02 21:13:07 -08:00
parent 82d4633d28
commit 279123fd68
9 changed files with 1184 additions and 1216 deletions
Binary file not shown.
+1
View File
@@ -1,4 +1,5 @@
import vblank
const VBLUNIMPL = $AAAA
predef waitVBL#1
predef statusVBL#1
end
+6 -34
View File
@@ -92,13 +92,9 @@ const showcurs = $01
const shiftlock = $02
const echo = $04
const txt80 = $08
const uppercase = $80
const uppercase = $10
byte flags
//
// Apple 2 disable 80 column string
//
char disable80[] = 5, 13, 26, '1', 13, 21
//
// Apple 2 KSW snd CSW values
//
word kswsave, cswsave
@@ -109,9 +105,6 @@ byte textbwmode[] = 2, 16, 0
byte textclrmode[] = 2, 16, 1
byte grcharset[] = 1, 0, $7F, $7F, $7F, $7F, $00, $00, $00, $00
byte a3keyqueue = 0
byte a3echoflag = $80
byte a3noechoflag = $00
byte curschar = ' '
//
// Random number for Apple 1 and III.
//
@@ -717,9 +710,8 @@ def a2ctrl80v(code, param)#1
return handled
end
def a2textmode(columns)
call($FB39, 0, 0, 0, 0) // textmode()
if columns == 0
columns = cmdsys:_sysflags_ & vid80col ?? 80 :: 40
columns = (cmdsys:_sysflags_ & vid80col) ?? 80 :: 40
fin
if columns > 40 and MACHID & MACHID_80COL
cswsave = *CSW
@@ -740,7 +732,7 @@ def a2textmode(columns)
else
if flags & txt80
if MACHID & $C0 == MACHID_IIE
cout(@disable80)
cout(21)
else // Videx disable
^$C058 // 80 column output softswitch
*CSW = cswsave
@@ -755,6 +747,7 @@ def a2textmode(columns)
conio:gotoxy = @a2gotoxy
conio:textctrl = @a2ctrl
flags = flags & ~txt80
call($FB39, 0, 0, 0, 0) // textmode()
a2clear(cls)
fin
return flags & txt80 ?? 80 :: 40
@@ -804,28 +797,6 @@ def dev_status(devnum, code, list)
params:3 = list
return syscall($82, @params)
end
def cons_keyavail
byte params[5]
byte count
params.0 = 3
params.1 = cmdsys.devcons
params.2 = 5
params:3 = @count
return syscall($82, @params) ?? 0 :: count
end
def cons_keyread
byte params[8]
byte key
params.0 = 4
params.1 = cmdsys.refcons
params:2 = @key
params:4 = 1
params:6 = 0
syscall($CA, @params)
return params:6 ?? key :: 0
end
def a3keypressed
byte count
@@ -908,7 +879,8 @@ def a3ctrl(code, param)#1
is ctrlattr
break
is ctrlecho
dev_control(cmdsys.devcons, 11, param ?? @a3echoflag :: @a3noechoflag)
param = param & $80
dev_control(cmdsys.devcons, 11, @param)
handled = TRUE
break
is ctrlcursor
+5 -5
View File
@@ -35,7 +35,7 @@ asm _vbl2e#1
RTS
end
asm _vblnop#1
LDA #$00 ; NOP version
LDA #$AA ; NOP version
DEX ; return FALSE
STA ESTKL,X
STA ESTKH,X
@@ -44,11 +44,10 @@ end
asm _vblend#1
end
export asm statusVBL#1
!SOURCE "vmsrc/plvmzp.inc"
PHP ; //c version first because its largest
SEI
STA $C07F ; Enable IOU access and reset VBL int on //c
LDA $C041 ; Save VBL int state MSB = BVL int enebaled
LDA $C041 ; Save VBL int state MSB = VBL int enebaled
STA $C05B ; Enable VBL int
LDY #$00
BIT $C019
@@ -77,8 +76,8 @@ asm _stat2e#1
RTS
end
asm _statnop#1
LDA #$00 ; NOP version
DEX ; return FALSE
LDA #$AA ; NOP version
DEX ; return UNIMPL
STA ESTKL,X
STA ESTKH,X
RTS
@@ -88,6 +87,7 @@ end
//
// Check for machine specific VLB handling
//
memcpy(@statusVBL, @_stat2e, @_statnop-@_stat2e)
if MACHID & MACHID_MODEL == MACHID_IIE
memcpy(@waitVBL, @_vbl2e, @_vblnop-@_vbl2e)
memcpy(@statusVBL, @_stat2e, @_statnop-@_stat2e)
+2 -7
View File
@@ -15,7 +15,6 @@ CMDJIT = rel/apple/CMD.128\#061000
PLVMZP_C64 = vmsrc/c64/plvmzp.inc
PLVMC64 = rel/c64/PLASMA
ED = rel/ED\#FE1000
ED80 = rel/ED80\#FE1000
ZIPCHIP = rel/apple/ZIPCHIP\#FE1000
JIT = rel/apple/JIT\#FE1000
JIT16 = rel/apple/JIT16\#FE1000
@@ -120,7 +119,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) $(SEXPR) $(SMATH) $(DRAWL) $(ZIPCHIP) $(MATCHFILES) $(ARGS) $(MEMMGR) $(MEMTEST) $(FIBER) $(FIBERTEST) $(LONGJMP) $(ED) $(ED80) $(MON) $(COPY) $(DEL) $(REN) $(CAT) $(NEWDIR) $(TYPE) $(INITSLOT) $(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) $(VBLANK) $(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) $(SEXPR) $(SMATH) $(DRAWL) $(ZIPCHIP) $(MATCHFILES) $(ARGS) $(MEMMGR) $(MEMTEST) $(FIBER) $(FIBERTEST) $(LONGJMP) $(ED) $(MON) $(COPY) $(DEL) $(REN) $(CAT) $(NEWDIR) $(TYPE) $(INITSLOT) $(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) $(VBLANK) $(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
@@ -269,14 +268,10 @@ test: samplesrc/test.pla samplesrc/testlib.pla $(PLVM) $(PLASM)
acme --setpc 4094 -o $(TESTLIB) samplesrc/testlib.a
./$(PLVM) test
$(ED): toolsrc/ed.pla $(PLVM02) $(PLASM)
$(ED): toolsrc/ed.pla inc/conio.plh libsrc/apple/conio.pla $(PLVM02) $(PLASM)
./$(PLASM) -AMOW toolsrc/ed.pla
acme --setpc 4094 -o $(ED) toolsrc/ed.a
$(ED80): toolsrc/ed80.pla inc/conio.plh libsrc/apple/conio.pla $(PLVM02) $(PLASM)
./$(PLASM) -AMOW toolsrc/ed80.pla
acme --setpc 4094 -o $(ED80) toolsrc/ed80.a
$(MATCHFILES): libsrc/apple/matchfiles.pla $(PLVM02) $(PLASM)
./$(PLASM) -AMOW libsrc/apple/matchfiles.pla
acme --setpc 4094 -o $(MATCHFILES) libsrc/apple/matchfiles.a
-1
View File
@@ -32,7 +32,6 @@ cp rel/apple/MATCHFILES#FE1000 prodos/sys/MATCHFILES.REL
cp rel/LZ4CAT#FE1000 prodos/sys/LZ4CAT.REL
cp rel/ARGS#FE1000 prodos/sys/ARGS.REL
cp rel/ED#FE1000 prodos/sys/ED.REL
cp rel/ED80#FE1000 prodos/sys/ED80.REL
cp rel/FIBER#FE1000 prodos/sys/FIBER.REL
cp rel/LONGJMP#FE1000 prodos/sys/LONGJMP.REL
cp rel/MEMMGR#FE1000 prodos/sys/MEMMGR.REL
+4 -4
View File
@@ -1,12 +1,12 @@
' CONIOAPI ?ENDSRC
LOOKUP CONIO CONSTANT CONIOAPI
CONIOAPI 3 IFACE PLASMA _HOME : HOME _HOME DROP ;
CONIOAPI 3 IFACE PLASMA _HOME : HOME 3 _HOME DROP ;
CONIOAPI 4 IFACE PLASMA _GOTOXY : GOTOXY _GOTOXY DROP ;
CONIOAPI 5 IFACE PLASMA _VIEWPORT : VIEWPORT _VIEWPORT DROP ;
CONIOAPI 6 IFACE PLASMA _TEXTTYPE
: NORMALTEXT $FF _TEXTTYPE DROP ;
: INVERSETEXT $3F _TEXTTYPE DROP ;
: FLASHTEXT $7F _TEXTTYPE DROP ;
: NORMALTEXT 1 $FF _TEXTTYPE DROP ;
: INVERSETEXT 1 $3F _TEXTTYPE DROP ;
: FLASHTEXT 1 $7F _TEXTTYPE DROP ;
CONIOAPI 7 IFACE PLASMA _TEXT : TEXT 40 _TEXT DROP ;
CONIOAPI 8 IFACE PLASMA _GR : GR 1 _GR DROP ;
CONIOAPI 9 IFACE PLASMA _COLOR : COLOR _COLOR DROP ;
File diff suppressed because it is too large Load Diff
+409 -766
View File
File diff suppressed because it is too large Load Diff