Moved manifest tools in manifest file

4 years ago · 0d2883f4e9
3 changed files with 69 additions and 75 deletions
--- a/src/ecosystem.tal
+++ b/src/ecosystem.tal
@ -1,74 +0,0 @@
-@print-manifest ( -- )
-
-	;manifest/name ;print-str JSR2
-	LIT '( #18 DEO ;print-str JSR2 LIT ') #18 DEO
-	#0a18 DEOk DEO
-	( menu )
-	;manifest/menu
-	&cat
-		LDAk STH INC2 ;print-str JSR2 #0a18 DEO
-		STHr #00
-		&subcat
-			SWP2 
-			( modkey ) #0918 DEO ;print-mod JSR2 ;print-key JSR2
-			( spacer ) #2018 DEOk LIT ': #18 DEO DEO
-			( name ) INC2 INC2 ;print-str JSR2 #0a18 DEO 
-			SWP2
-			INC GTHk ,&subcat JCN
-		POP2
-		LDAk ,&cat JCN
-	POP2
-
-JMP2r
-
-@print-mod ( addr* -- addr* )
-
-	LDAk
-	DUP #10 AND #00 EQU ,&no-a JCN LIT 'A ,&ab JSR &no-a
-	DUP #20 AND #00 EQU ,&no-b JCN LIT 'B ,&ab JSR &no-b
-	DUP #40 AND #00 EQU ,&no-sel JCN ;&sel ,&ss JSR &no-sel
-	DUP #80 AND #00 EQU ,&no-sta JCN ;&sta ,&ss JSR &no-sta
-	DUP #01 AND #00 EQU ,&no-u JCN ;&u ,&arrow JSR &no-u
-	DUP #02 AND #00 EQU ,&no-d JCN ;&d ,&arrow JSR &no-d
-	DUP #04 AND #00 EQU ,&no-l JCN ;&l ,&arrow JSR &no-l
-	DUP #08 AND #00 EQU ,&no-r JCN ;&r ,&arrow JSR &no-r
-	POP
-	INC2
-
-JMP2r
-	&ab #18 DEO LIT '+ #18 DEO JMP2r
-	&ss ;print-str JSR2 POP2 LIT '+ #18 DEO JMP2r
-	&arrow ;print-str JSR2 POP2 JMP2r
-	&sel "sel $1
-	&sta "sta $1
-	&u "up $1
-	&d "down $1
-	&l "left $1
-	&r "right $1
-
-@print-key ( addr* -- addr* )
-
-	LDAk 
-	DUP #08 NEQ ,&no-del JCN ;&del ,&inv JMP &no-del
-	DUP #09 NEQ ,&no-tab JCN ;&tab ,&inv JMP &no-tab
-	DUP #20 NEQ ,&no-spc JCN ;&spc ,&inv JMP &no-spc
-	DUP #1b NEQ ,&no-esc JCN ;&esc ,&inv JMP &no-esc
-	#18 DEO
-	INC2
-
-JMP2r
-	&inv ROT POP ;print-str JSR2 POP2 INC2 JMP2r
-	&del "del $1
-	&tab "tab $1
-	&spc "spc $1
-	&esc "esc $1
-
-@print-str ( addr* -- addr* )
-
-	&while
-		LDAk #18 DEO
-		INC2 LDAk ,&while JCN
-	INC2
-
-JMP2r
-
--- a/src/manifest.tal
+++ b/src/manifest.tal
@ -38,3 +38,72 @@
 			00 1b :option-deselect "Deselect $1
 		$1

+@print-manifest ( -- )
+
+	;manifest/name ;print-str JSR2
+	LIT '( #18 DEO ;print-str JSR2 LIT ') #18 DEO
+	#0a18 DEOk DEO
+	( menu )
+	;manifest/menu
+	&cat
+		LDAk STH INC2 ;print-str JSR2 #0a18 DEO
+		STHr #00
+		&subcat
+			SWP2
+			( modkey ) #0918 DEO ;print-mod JSR2 ;print-key JSR2
+			( spacer ) #2018 DEOk LIT ': #18 DEO DEO
+			( name ) INC2 INC2 ;print-str JSR2 #0a18 DEO
+			SWP2
+			INC GTHk ,&subcat JCN
+		POP2
+		LDAk ,&cat JCN
+	POP2
+
+JMP2r
+
+@print-mod ( addr* -- addr* )
+
+	LDAk STH
+	#0800
+	&loop
+		STHkr OVR #07 SWP SUB SFT #01 AND #00 EQU ,&no-button JCN
+			#00 OVR ;&buttons ADD2 LDA #18 DEO
+			DUP #03 GTH ,&no-mod JCN
+				LIT '+ #18 DEO
+				&no-mod
+			&no-button
+		INC GTHk ,&loop JCN
+	POP2
+	POPr
+	INC2
+
+JMP2r
+	&buttons
+		"SsBARLDU $1
+
+@print-key ( addr* -- addr* )
+
+	LDAk
+	DUP #08 NEQ ,&no-del JCN ;&del ,&inv JMP &no-del
+	DUP #09 NEQ ,&no-tab JCN ;&tab ,&inv JMP &no-tab
+	DUP #20 NEQ ,&no-spc JCN ;&spc ,&inv JMP &no-spc
+	DUP #1b NEQ ,&no-esc JCN ;&esc ,&inv JMP &no-esc
+	#18 DEO
+	INC2
+
+JMP2r
+	&inv ROT POP ;print-str JSR2 POP2 INC2 JMP2r
+	&del "del $1
+	&tab "tab $1
+	&spc "spc $1
+	&esc "esc $1
+
+@print-str ( addr* -- addr* )
+
+	&while
+		LDAk #18 DEO
+		INC2 LDAk ,&while JCN
+	INC2
+
+JMP2r
+
--- a/src/nasu.tal
+++ b/src/nasu.tal
@ -1470,7 +1470,6 @@ JMP2r
 	1010 1010 1010 1000 0804 0402 0404 0800
 	0000 0032 4c00 0000 0000 0000 0000 0000

-~src/ecosystem.tal
 ~src/manifest.tal

 |8000