human.equivalent
/
nasu
mirror of https://git.sr.ht/~rabbits/nasu
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Cleanup

main
Devine Lu Linvega 2 years ago
parent
6e2788bc42
commit
0d8f473f64
2 changed files with 47 additions and 39 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      src/manifest.tal
  2. 74
      src/nasu.tal

12
src/manifest.tal
Unescape View File

@ -226,7 +226,7 @@ JMP2r
[ LIT2 &manifest =manifest ] [ LIT2 &manifest =manifest ]
&cat &cat
( theme ) #0b03 [ LIT &sel ff ] [ LIT &id $1 ] EQU [ JMP SWP POP ] ;<draw-chr>/color STA ( theme ) #0b03 [ LIT &sel ff ] [ LIT &id $1 ] EQU [ JMP SWP POP ] ;<draw-chr>/color STA
INC2k draw-str POP2 #20 <draw-chr> INC2k <draw-str> POP2 #20 <draw-chr>
skip-sub skip-sub
,&id LDR INC ,&id STR ,&id LDR INC ,&id STR
LDAk ?&cat LDAk ?&cat
@ -266,11 +266,11 @@ JMP2r
.Screen/y DEO2 .Screen/y DEO2
( mod ) ( mod )
STH2k #0078 ADD2 .Screen/x DEO2 STH2k #0078 ADD2 .Screen/x DEO2
LDA2k get-modkey-str draw-str-right POP2 LDA2k get-modkey-str <draw-str-right> POP2
STH2r .Screen/x DEO2 STH2r .Screen/x DEO2
#0004 ADD2 #0004 ADD2
!draw-str !<draw-str>
@get-modkey-str ( mod key -- str* ) @get-modkey-str ( mod key -- str* )
@ -357,12 +357,12 @@ JMP2r
( fill ) ( fill )
STH2r .Screen/y DEO2 STH2r .Screen/y DEO2
STH2r .Screen/x DEO2 STH2r .Screen/x DEO2
#1c #0351 ;fill-icn draw-fill-fast #1c #0351 ;fill-icn <draw-fill-fast>
.Screen/x DEI2k #00e0 SUB2 ROT DEO2 .Screen/x DEI2k #00e0 SUB2 ROT DEO2
( icon ) ( icon )
.Screen/x DEI2k #0008 ADD2 ROT DEO2 .Screen/x DEI2k #0008 ADD2 ROT DEO2
.Screen/y DEI2k #000c ADD2 ROT DEO2 .Screen/y DEI2k #000c ADD2 ROT DEO2
#03 #8526 ;appicon draw-fill-fast #03 #8526 ;appicon <draw-fill-fast>
.Screen/x DEI2k #0020 ADD2 ROT DEO2 .Screen/x DEI2k #0020 ADD2 ROT DEO2
.Screen/y DEI2k #001c SUB2 ROT DEO2 .Screen/y DEI2k #001c SUB2 ROT DEO2
#0a ;<draw-chr>/color STA #0a ;<draw-chr>/color STA
@ -397,7 +397,7 @@ JMP2r
#80 .Screen/pixel DEO #80 .Screen/pixel DEO
.Screen/width DEI2 #01 SFT2 #0088 SUB2 .Screen/x DEO2 .Screen/width DEI2 #01 SFT2 #0088 SUB2 .Screen/x DEO2
.Screen/height DEI2 #01 SFT2 #0028 SUB2 .Screen/y DEO2 .Screen/height DEI2 #01 SFT2 #0028 SUB2 .Screen/y DEO2
#22 #0091 draw-fill-fast/blank #22 #0091 <draw-fill-fast>/blank
<redraw-all> <redraw-all>
!<draw-menu> !<draw-menu>

74
src/nasu.tal
Unescape View File

@ -73,8 +73,8 @@
( date ) "16 20 "Jul 20 "2024 00 01 ( date ) "16 20 "Jul 20 "2024 00 01
( icon ) 83 =appicon ( icon ) 83 =appicon
@manifest ( >>> ) @manifest ( ... )
09 "Nasu $1 ( >>> ) 09 "Nasu $1
( - ) 00 00 =about/toggle "About $1 ( - ) 00 00 =about/toggle "About $1
( - ) 01 "n =file-new "New $1 ( - ) 01 "n =file-new "New $1
( - ) 01 "r =trap "Rename $1 ( - ) 01 "r =trap "Rename $1
@ -95,8 +95,7 @@
( - ) 00 00 =edit-flipx "Horizontal $1 ( - ) 00 00 =edit-flipx "Horizontal $1
( - ) 00 00 =edit-flipy "Veritcal $1 ( - ) 00 00 =edit-flipy "Veritcal $1
( >>> ) 01 "View $1 ( >>> ) 01 "View $1
( - ) 02 00 =<toggle-zoom> ( - ) 02 00 =toggle-zoom "Zoom $1
"Zoom $1
( >>> ) 0a "Move $1 ( >>> ) 0a "Move $1
( - ) 10 00 =move-up "Up $1 ( - ) 10 00 =move-up "Up $1
( - ) 20 00 =move-down "Down $1 ( - ) 20 00 =move-down "Down $1
@ -175,8 +174,8 @@
BRK BRK
@on-button ( -> ) @on-button ( -> )
.Controller/button DEI2 find-modkey ORAk #00 EQU ?&skip .Controller/button DEI2 find-modkey ORAk #00 EQU ?{ DUP2 JSR2 }
DUP2 JSR2 &skip POP2 BRK POP2 BRK
@on-mouse ( -> ) @on-mouse ( -> )
.Mouse/y DEI2 #000c LTH2 ?trap-menu .Mouse/y DEI2 #000c LTH2 ?trap-menu
@ -203,7 +202,7 @@
#01 .settings/tool LDZ EQU ?&select #01 .settings/tool LDZ EQU ?&select
( | paint ) ( | paint )
.settings/color LDZ .Mouse/state DEI #01 EQU MUL <put-pixel> .settings/color LDZ .Mouse/state DEI #01 EQU MUL <put-pixel>
#01 .state/changed STZ [ LIT2 01 -state/changed ] STZ
<draw-state> <draw-state>
<redraw> <redraw>
BRK BRK
@ -211,14 +210,13 @@
&zoom ( x* y* -> ) &zoom ( x* y* -> )
#33 SFT2 NIP STH #33 SFT2 NIP STH
#33 SFT2 NIP STHr <set-selection-zoom> #33 SFT2 NIP STHr <set-selection-zoom>
<toggle-zoom> toggle-zoom <redraw>
<redraw>
( release mouse ) [ LIT2 00 -Mouse/state ] DEO ( release mouse ) [ LIT2 00 -Mouse/state ] DEO
BRK BRK
&zoomed ( x* y* -> ) &zoomed ( x* y* -> )
SWP2 #03 SFT2 #00 .selection/zx LDZ ADD2 SWP2 #03 SFT2 #00 .selection/zy LDZ ADD2 .settings/color LDZ .Mouse/state DEI #01 EQU MUL <put-pixel> SWP2 #03 SFT2 #00 .selection/zx LDZ ADD2 SWP2 #03 SFT2 #00 .selection/zy LDZ ADD2 .settings/color LDZ .Mouse/state DEI #01 EQU MUL <put-pixel>
#01 .state/changed STZ [ LIT2 01 -state/changed ] STZ
<draw-state> <draw-state>
<redraw> <redraw>
BRK BRK
@ -239,7 +237,7 @@
.settings/focus LDZ2 ;spritesheet SUB2 STH2kr STA2 .settings/focus LDZ2 ;spritesheet SUB2 STH2kr STA2
.settings/blend LDZ INC2r INC2r STH2r STA .settings/blend LDZ INC2r INC2r STH2r STA
<draw-nametable> <draw-nametable>
#01 .state/changed STZ [ LIT2 01 -state/changed ] STZ
<draw-state> <draw-state>
BRK BRK
@ -271,7 +269,7 @@
POP POP
( release mouse ) [ LIT2 00 -Mouse/state ] DEO !&finish } ( release mouse ) [ LIT2 00 -Mouse/state ] DEO !&finish }
.Mouse/x DEI2 .zoomview/x1 LDZ2 SUB2 #02 SFT2 #00 .selection/x1 LDZ #30 SFT2 ADD2 .Mouse/x DEI2 .zoomview/x1 LDZ2 SUB2 #02 SFT2 #00 .selection/x1 LDZ #30 SFT2 ADD2
( ) .Mouse/y DEI2 .zoomview/y1 LDZ2 SUB2 #02 SFT2 #00 .selection/y1 LDZ #30 SFT2 ADD2 .settings/color LDZ .Mouse/state DEI #01 EQU MUL <put-pixel> &finish #01 .state/changed STZ ( ) .Mouse/y DEI2 .zoomview/y1 LDZ2 SUB2 #02 SFT2 #00 .selection/y1 LDZ #30 SFT2 ADD2 .settings/color LDZ .Mouse/state DEI #01 EQU MUL <put-pixel> &finish [ LIT2 01 -state/changed ] STZ
<draw-state> <draw-state>
<redraw> <redraw>
BRK BRK
@ -319,7 +317,7 @@
( (
@|helpers ) @|helpers )
@<toggle-zoom> ( -- ) @toggle-zoom ( -- )
.settings/zoom LDZk #00 EQU SWP STZ .settings/zoom LDZk #00 EQU SWP STZ
<draw-tileview> !<draw-toolview> <draw-tileview> !<draw-toolview>
@ -455,7 +453,7 @@
( (
@|filter ) @|filter )
@filter ( op* -- ) @<filter> ( op* -- )
,&fn STR2 ,&fn STR2
.selection/y2 LDZ INC #30 SFT .selection/y1 LDZ #30 SFT .selection/y2 LDZ INC #30 SFT .selection/y1 LDZ #30 SFT
&>ver ( -- ) &>ver ( -- )
@ -584,7 +582,8 @@
@op-write ( addr* -- ) @op-write ( addr* -- )
[ LIT2 &length $2 ] [ LIT2 &length $2 ]
( ) DUP2 .File/length DEO2 ( ) DUP2 .File/length DEO2
( ) ;&buf SWP2 mcpy ;&buf .File/write DEO2 ( ) ;&buf SWP2 <mcpy>
;&buf .File/write DEO2
JMP2r JMP2r
&buf $10 &buf $10
@ -663,13 +662,15 @@
( | guide hor ) ( | guide hor )
#0007 .selection/zy LDZ SUB #0007 AND2 #30 SFT2 #0001 SUB2 #0008 ADD2 STH2 #0007 .selection/zy LDZ SUB #0007 AND2 #30 SFT2 #0001 SUB2 #0008 ADD2 STH2
.tileview/x1 LDZ2 .tileview/y1 LDZ2 STH2kr ADD2 #0a <line-hor-dashed> .tileview/x1 LDZ2 .tileview/y1 LDZ2 STH2kr ADD2 #0a <line-hor-dashed>
.selection/zy LDZ #07 AND #00 EQU ?&skip-hor .selection/zy LDZ #07 AND #00 EQU ?{
.tileview/x1 LDZ2 .tileview/y1 LDZ2 STH2kr ADD2 #0040 ADD2 #0a <line-hor-dashed> &skip-hor POP2r .tileview/x1 LDZ2 .tileview/y1 LDZ2 STH2kr ADD2 #0040 ADD2 #0a <line-hor-dashed> }
POP2r
( | guide ver ) ( | guide ver )
#0007 .selection/zx LDZ SUB #0007 AND2 #30 SFT2 #0001 SUB2 #0008 ADD2 STH2 #0007 .selection/zx LDZ SUB #0007 AND2 #30 SFT2 #0001 SUB2 #0008 ADD2 STH2
.tileview/x1 LDZ2 STH2kr ADD2 .tileview/y1 LDZ2 #0a <line-ver-dashed> .tileview/x1 LDZ2 STH2kr ADD2 .tileview/y1 LDZ2 #0a <line-ver-dashed>
.selection/zx LDZ #07 AND #00 EQU ?&skip-ver .selection/zx LDZ #07 AND #00 EQU ?{
.tileview/x1 LDZ2 STH2kr ADD2 #0040 ADD2 .tileview/y1 LDZ2 #0a <line-ver-dashed> &skip-ver POP2r JMP2r .tileview/x1 LDZ2 STH2kr ADD2 #0040 ADD2 .tileview/y1 LDZ2 #0a <line-ver-dashed> }
POP2r JMP2r
@<draw-nametable> ( -- ) @<draw-nametable> ( -- )
[ LIT2 00 -Screen/auto ] DEO [ LIT2 00 -Screen/auto ] DEO
@ -685,7 +686,8 @@
( color ) INC2 INC2 LDA .Screen/sprite DEO ( color ) INC2 INC2 LDA .Screen/sprite DEO
INC GTHk ?&>hor INC GTHk ?&>hor
POP2 POPr .nametableview/x LDZ2 .Screen/x DEO2 POP2 POPr .nametableview/x LDZ2 .Screen/x DEO2
<draw-lb> INC GTHk ?&>ver <draw-lb>
INC GTHk ?&>ver
POP2 JMP2r POP2 JMP2r
@<draw-zoomview> ( -- ) @<draw-zoomview> ( -- )
@ -817,7 +819,8 @@
( ch2 ) #0008 ADD2 LDA2 <draw-short> ( ch2 ) #0008 ADD2 LDA2 <draw-short>
( | skip line ) ( | skip line )
.dataview/x1 LDZ2 .Screen/x DEO2 .dataview/x1 LDZ2 .Screen/x DEO2
<draw-lb> INC GTHk ?&>loop <draw-lb>
INC GTHk ?&>loop
POP2 JMP2r POP2 JMP2r
@<draw-toolview> ( -- ) @<draw-toolview> ( -- )
@ -864,7 +867,7 @@
;<draw-chr>/color STA ;<draw-chr>/color STA
;filepath ;filepath
( | scroll ) ( | scroll )
DUP2 slen #0013 GTH2 #00 SWP ;filepath slen #0013 SUB2 MUL2 ADD2 draw-str POP2 JMP2r DUP2 slen #0013 GTH2 #00 SWP ;filepath slen #0013 SUB2 MUL2 ADD2 <draw-str> POP2 JMP2r
@<clear-filepath> ( color -- ) @<clear-filepath> ( color -- )
POP ;fill-icn .Screen/addr DEO2 POP ;fill-icn .Screen/addr DEO2
@ -875,7 +878,7 @@
INC GTHk ?&>l INC GTHk ?&>l
POP2 JMP2r POP2 JMP2r
@draw-fill-fast ( width color auto addr* -- ) @<draw-fill-fast> ( width color auto addr* -- )
.Screen/addr DEO2 &blank .Screen/auto DEO .Screen/addr DEO2 &blank .Screen/auto DEO
STH STH
#00 #00
@ -895,11 +898,11 @@
JMP2r JMP2r
( drawing primitives ) ( drawing primitives )
@draw-str-right ( text* -- ) @<draw-str-right> ( text* -- )
DUP2 get-strw STH2 DUP2 get-strw STH2
.Screen/x DEI2k STH2r SUB2 ROT DEO2 .Screen/x DEI2k STH2r SUB2 ROT DEO2
@draw-str ( str* -- str* ) @<draw-str> ( str* -- str* )
LDAk #00 EQU ?{ LDAk #00 EQU ?{
[ LIT2 01 -Screen/auto ] DEO [ LIT2 01 -Screen/auto ] DEO
&>while ( -- ) &>while ( -- )
@ -999,7 +1002,8 @@
#1000 .File/length DEO2 #1000 .File/length DEO2
;spritesheet .File/read DEO2 ;spritesheet .File/read DEO2
( | nametable ) ( | nametable )
;nametable-ext ;filepath scap #0004 mcpy ;filepath .File/name DEO2 ;nametable-ext ;filepath scap #0004 <mcpy>
;filepath .File/name DEO2
#0300 .File/length DEO2 #0300 .File/length DEO2
;nametable .File/read DEO2 ;nametable .File/read DEO2
;filepath scap #0004 SUB2 #0004 <mclr> ;filepath scap #0004 SUB2 #0004 <mclr>
@ -1026,7 +1030,8 @@
;spritesheet .File/write DEO2 ;spritesheet .File/write DEO2
( | nametable ) ( | nametable )
has-nametable #00 EQU ?{ has-nametable #00 EQU ?{
;nametable-ext ;filepath scap #0004 mcpy ;filepath .File/name DEO2 ;nametable-ext ;filepath scap #0004 <mcpy>
;filepath .File/name DEO2
#0300 .File/length DEO2 #0300 .File/length DEO2
;nametable .File/write DEO2 ;nametable .File/write DEO2
;filepath scap #0004 SUB2 #0004 <mclr> } ;filepath scap #0004 SUB2 #0004 <mclr> }
@ -1072,24 +1077,27 @@
@edit-erase ( -- ) @edit-erase ( -- )
;op-erase <run> ;op-erase <run>
#01 .state/changed STZ [ LIT2 01 -state/changed ] STZ
<draw-state> !<redraw> <draw-state> !<redraw>
@edit-invert ( -- ) @edit-invert ( -- )
;op-invert <run> ;op-invert <run>
#01 .state/changed STZ [ LIT2 01 -state/changed ] STZ
<draw-state> !<redraw> <draw-state> !<redraw>
@edit-colorize ( -- ) @edit-colorize ( -- )
;filter-colorize filter #01 .state/changed STZ ;filter-colorize <filter>
[ LIT2 01 -state/changed ] STZ
<draw-state> !<redraw> <draw-state> !<redraw>
@edit-flipx ( -- ) @edit-flipx ( -- )
;filter-flipx filter #01 .state/changed STZ ;filter-flipx <filter>
[ LIT2 01 -state/changed ] STZ
<draw-state> !<redraw> <draw-state> !<redraw>
@edit-flipy ( -- ) @edit-flipy ( -- )
;filter-flipy filter #01 .state/changed STZ ;filter-flipy <filter>
[ LIT2 01 -state/changed ] STZ
<draw-state> !<redraw> <draw-state> !<redraw>
@tool-brush ( -- ) @tool-brush ( -- )
@ -1175,7 +1183,7 @@
@ror ( byte -- byte ) @ror ( byte -- byte )
DUP #70 SFT SWP #01 SFT ADD JMP2r DUP #70 SFT SWP #01 SFT ADD JMP2r
@mcpy ( src* dst* len* -- ) @<mcpy> ( src* dst* len* -- )
SWP2 STH2 SWP2 STH2
OVR2 ADD2 SWP2 OVR2 ADD2 SWP2
&>loop ( -- ) &>loop ( -- )

Write Preview
Loading…
Cancel
Save