From 0d8f473f64be86ebb54a2b69ea68ab6c4cd52322 Mon Sep 17 00:00:00 2001 From: Devine Lu Linvega Date: Tue, 16 Jul 2024 14:49:54 -0700 Subject: [PATCH] Cleanup --- src/manifest.tal | 12 ++++---- src/nasu.tal | 74 +++++++++++++++++++++++++++--------------------- 2 files changed, 47 insertions(+), 39 deletions(-) diff --git a/src/manifest.tal b/src/manifest.tal index 4f17bac..0878dfc 100644 --- a/src/manifest.tal +++ b/src/manifest.tal @@ -226,7 +226,7 @@ JMP2r [ LIT2 &manifest =manifest ] &cat ( theme ) #0b03 [ LIT &sel ff ] [ LIT &id $1 ] EQU [ JMP SWP POP ] ;/color STA - INC2k draw-str POP2 #20 + INC2k POP2 #20 skip-sub ,&id LDR INC ,&id STR LDAk ?&cat @@ -266,11 +266,11 @@ JMP2r .Screen/y DEO2 ( mod ) STH2k #0078 ADD2 .Screen/x DEO2 - LDA2k get-modkey-str draw-str-right POP2 + LDA2k get-modkey-str POP2 STH2r .Screen/x DEO2 #0004 ADD2 -!draw-str +! @get-modkey-str ( mod key -- str* ) @@ -357,12 +357,12 @@ JMP2r ( fill ) STH2r .Screen/y DEO2 STH2r .Screen/x DEO2 - #1c #0351 ;fill-icn draw-fill-fast + #1c #0351 ;fill-icn .Screen/x DEI2k #00e0 SUB2 ROT DEO2 ( icon ) .Screen/x DEI2k #0008 ADD2 ROT DEO2 .Screen/y DEI2k #000c ADD2 ROT DEO2 - #03 #8526 ;appicon draw-fill-fast + #03 #8526 ;appicon .Screen/x DEI2k #0020 ADD2 ROT DEO2 .Screen/y DEI2k #001c SUB2 ROT DEO2 #0a ;/color STA @@ -397,7 +397,7 @@ JMP2r #80 .Screen/pixel DEO .Screen/width DEI2 #01 SFT2 #0088 SUB2 .Screen/x DEO2 .Screen/height DEI2 #01 SFT2 #0028 SUB2 .Screen/y DEO2 - #22 #0091 draw-fill-fast/blank + #22 #0091 /blank ! diff --git a/src/nasu.tal b/src/nasu.tal index 6c04f05..1353a62 100644 --- a/src/nasu.tal +++ b/src/nasu.tal @@ -73,8 +73,8 @@ ( date ) "16 20 "Jul 20 "2024 00 01 ( icon ) 83 =appicon -@manifest ( >>> ) - 09 "Nasu $1 +@manifest ( ... ) + ( >>> ) 09 "Nasu $1 ( - ) 00 00 =about/toggle "About $1 ( - ) 01 "n =file-new "New $1 ( - ) 01 "r =trap "Rename $1 @@ -95,8 +95,7 @@ ( - ) 00 00 =edit-flipx "Horizontal $1 ( - ) 00 00 =edit-flipy "Veritcal $1 ( >>> ) 01 "View $1 - ( - ) 02 00 = - "Zoom $1 + ( - ) 02 00 =toggle-zoom "Zoom $1 ( >>> ) 0a "Move $1 ( - ) 10 00 =move-up "Up $1 ( - ) 20 00 =move-down "Down $1 @@ -175,8 +174,8 @@ BRK @on-button ( -> ) - .Controller/button DEI2 find-modkey ORAk #00 EQU ?&skip - DUP2 JSR2 &skip POP2 BRK + .Controller/button DEI2 find-modkey ORAk #00 EQU ?{ DUP2 JSR2 } + POP2 BRK @on-mouse ( -> ) .Mouse/y DEI2 #000c LTH2 ?trap-menu @@ -203,7 +202,7 @@ #01 .settings/tool LDZ EQU ?&select ( | paint ) .settings/color LDZ .Mouse/state DEI #01 EQU MUL - #01 .state/changed STZ + [ LIT2 01 -state/changed ] STZ BRK @@ -211,14 +210,13 @@ &zoom ( x* y* -> ) #33 SFT2 NIP STH #33 SFT2 NIP STHr - - + toggle-zoom ( release mouse ) [ LIT2 00 -Mouse/state ] DEO BRK &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 - #01 .state/changed STZ + [ LIT2 01 -state/changed ] STZ BRK @@ -239,7 +237,7 @@ .settings/focus LDZ2 ;spritesheet SUB2 STH2kr STA2 .settings/blend LDZ INC2r INC2r STH2r STA - #01 .state/changed STZ + [ LIT2 01 -state/changed ] STZ BRK @@ -271,7 +269,7 @@ POP ( 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/y DEI2 .zoomview/y1 LDZ2 SUB2 #02 SFT2 #00 .selection/y1 LDZ #30 SFT2 ADD2 .settings/color LDZ .Mouse/state DEI #01 EQU MUL &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 &finish [ LIT2 01 -state/changed ] STZ BRK @@ -319,7 +317,7 @@ ( @|helpers ) -@ ( -- ) +@toggle-zoom ( -- ) .settings/zoom LDZk #00 EQU SWP STZ ! @@ -455,7 +453,7 @@ ( @|filter ) -@filter ( op* -- ) +@ ( op* -- ) ,&fn STR2 .selection/y2 LDZ INC #30 SFT .selection/y1 LDZ #30 SFT &>ver ( -- ) @@ -584,7 +582,8 @@ @op-write ( addr* -- ) [ LIT2 &length $2 ] ( ) DUP2 .File/length DEO2 - ( ) ;&buf SWP2 mcpy ;&buf .File/write DEO2 + ( ) ;&buf SWP2 + ;&buf .File/write DEO2 JMP2r &buf $10 @@ -663,13 +662,15 @@ ( | guide hor ) #0007 .selection/zy LDZ SUB #0007 AND2 #30 SFT2 #0001 SUB2 #0008 ADD2 STH2 .tileview/x1 LDZ2 .tileview/y1 LDZ2 STH2kr ADD2 #0a - .selection/zy LDZ #07 AND #00 EQU ?&skip-hor - .tileview/x1 LDZ2 .tileview/y1 LDZ2 STH2kr ADD2 #0040 ADD2 #0a &skip-hor POP2r + .selection/zy LDZ #07 AND #00 EQU ?{ + .tileview/x1 LDZ2 .tileview/y1 LDZ2 STH2kr ADD2 #0040 ADD2 #0a } + POP2r ( | guide ver ) #0007 .selection/zx LDZ SUB #0007 AND2 #30 SFT2 #0001 SUB2 #0008 ADD2 STH2 .tileview/x1 LDZ2 STH2kr ADD2 .tileview/y1 LDZ2 #0a - .selection/zx LDZ #07 AND #00 EQU ?&skip-ver - .tileview/x1 LDZ2 STH2kr ADD2 #0040 ADD2 .tileview/y1 LDZ2 #0a &skip-ver POP2r JMP2r + .selection/zx LDZ #07 AND #00 EQU ?{ + .tileview/x1 LDZ2 STH2kr ADD2 #0040 ADD2 .tileview/y1 LDZ2 #0a } + POP2r JMP2r @ ( -- ) [ LIT2 00 -Screen/auto ] DEO @@ -685,7 +686,8 @@ ( color ) INC2 INC2 LDA .Screen/sprite DEO INC GTHk ?&>hor POP2 POPr .nametableview/x LDZ2 .Screen/x DEO2 - INC GTHk ?&>ver + + INC GTHk ?&>ver POP2 JMP2r @ ( -- ) @@ -817,7 +819,8 @@ ( ch2 ) #0008 ADD2 LDA2 ( | skip line ) .dataview/x1 LDZ2 .Screen/x DEO2 - INC GTHk ?&>loop + + INC GTHk ?&>loop POP2 JMP2r @ ( -- ) @@ -864,7 +867,7 @@ ;/color STA ;filepath ( | 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 POP2 JMP2r @ ( color -- ) POP ;fill-icn .Screen/addr DEO2 @@ -875,7 +878,7 @@ INC GTHk ?&>l POP2 JMP2r -@draw-fill-fast ( width color auto addr* -- ) +@ ( width color auto addr* -- ) .Screen/addr DEO2 &blank .Screen/auto DEO STH #00 @@ -895,11 +898,11 @@ JMP2r ( drawing primitives ) -@draw-str-right ( text* -- ) +@ ( text* -- ) DUP2 get-strw STH2 .Screen/x DEI2k STH2r SUB2 ROT DEO2 -@draw-str ( str* -- str* ) +@ ( str* -- str* ) LDAk #00 EQU ?{ [ LIT2 01 -Screen/auto ] DEO &>while ( -- ) @@ -999,7 +1002,8 @@ #1000 .File/length DEO2 ;spritesheet .File/read DEO2 ( | nametable ) - ;nametable-ext ;filepath scap #0004 mcpy ;filepath .File/name DEO2 + ;nametable-ext ;filepath scap #0004 + ;filepath .File/name DEO2 #0300 .File/length DEO2 ;nametable .File/read DEO2 ;filepath scap #0004 SUB2 #0004 @@ -1026,7 +1030,8 @@ ;spritesheet .File/write DEO2 ( | nametable ) has-nametable #00 EQU ?{ - ;nametable-ext ;filepath scap #0004 mcpy ;filepath .File/name DEO2 + ;nametable-ext ;filepath scap #0004 + ;filepath .File/name DEO2 #0300 .File/length DEO2 ;nametable .File/write DEO2 ;filepath scap #0004 SUB2 #0004 } @@ -1072,24 +1077,27 @@ @edit-erase ( -- ) ;op-erase - #01 .state/changed STZ + [ LIT2 01 -state/changed ] STZ ! @edit-invert ( -- ) ;op-invert - #01 .state/changed STZ + [ LIT2 01 -state/changed ] STZ ! @edit-colorize ( -- ) - ;filter-colorize filter #01 .state/changed STZ + ;filter-colorize + [ LIT2 01 -state/changed ] STZ ! @edit-flipx ( -- ) - ;filter-flipx filter #01 .state/changed STZ + ;filter-flipx + [ LIT2 01 -state/changed ] STZ ! @edit-flipy ( -- ) - ;filter-flipy filter #01 .state/changed STZ + ;filter-flipy + [ LIT2 01 -state/changed ] STZ ! @tool-brush ( -- ) @@ -1175,7 +1183,7 @@ @ror ( byte -- byte ) DUP #70 SFT SWP #01 SFT ADD JMP2r -@mcpy ( src* dst* len* -- ) +@ ( src* dst* len* -- ) SWP2 STH2 OVR2 ADD2 SWP2 &>loop ( -- )