From 8f4005b3a753ed909c88125f753f0a672bd581f9 Mon Sep 17 00:00:00 2001 From: Devine Lu Linvega Date: Tue, 9 Aug 2022 03:09:03 -0700 Subject: [PATCH] Moving toward the latest manifest update --- src/manifest.tal | 18 ---------- src/nasu.tal | 89 ++++++++++++++++++++++++++++-------------------- 2 files changed, 53 insertions(+), 54 deletions(-) diff --git a/src/manifest.tal b/src/manifest.tal index e21516b..c664daa 100644 --- a/src/manifest.tal +++ b/src/manifest.tal @@ -312,23 +312,6 @@ JMP2r &cat ;&buf ;scat JSR2 ,&end JMP &bsp "bsp $1 &tab "tab $1 &ent "ent $1 &spc "spc $1 &esc "esc $1 &del "del $1 -@draw-str-right ( text* -- ) - - DUP2 ;get-strw JSR2 STH2 - .Screen/x DEI2k STH2r SUB2 ROT DEO2 - -@draw-str ( str* -- str* ) - - LDAk #00 EQU ,&skip JCN - menu-auto .Screen/auto DEO - &while - LDAk ;draw-chr JSR2 - INC2 LDAk ,&while JCN - &skip - INC2 - -JMP2r - @update-cursor ( color addr* -- ) #00 .Screen/auto DEO @@ -374,7 +357,6 @@ JMP2r @scat ( src* dst* -- ) DUP2 ,slen JSR ADD2 @scpy ( src* dst* -- ) STH2 &w LDAk STH2kr STA INC2r INC2 LDAk ,&w JCN POP2 #00 STH2r STA JMP2r @mclr ( src* len* -- ) OVR2 ADD2 SWP2 &l STH2k #00 STH2r STA INC2 GTH2k ,&l JCN POP2 POP2 JMP2r -@mcpy ( src* dst* len* -- ) SWP2 STH2 OVR2 ADD2 SWP2 &loop LDAk STH2kr STA INC2r INC2 GTH2k ,&loop JCN POP2 POP2 POP2r JMP2r @print ( short* -- ) diff --git a/src/nasu.tal b/src/nasu.tal index 9fbbb0c..0c29968 100644 --- a/src/nasu.tal +++ b/src/nasu.tal @@ -91,42 +91,41 @@ BRK @manifest - &menu - 08 "Nasu $1 - 01 'n :file-new "New $1 - 01 'r :file-rename "Rename $1 - 01 'o :file-open "Open $1 - 00 00 :file-open-mono "OpenMono $1 - 01 's :file-save "Save $1 - 00 00 :file-save-mono "SaveMono $1 - 01 'p :save-theme "SaveTheme $1 - 01 'q :exit "Exit $1 - 04 "Edit $1 - 01 'c :edit-copy "Copy $1 - 01 'v :edit-paste "Paste $1 - 01 'x :edit-cut "Cut $1 - 00 08 :edit-erase "Erase $1 - 01 "View $1 - 02 00 :toggle-zoom "Zoom $1 - 09 "Move $1 - 10 00 :move-up "Up $1 - 20 00 :move-down "Down $1 - 40 00 :move-left "Left $1 - 80 00 :move-right "Right $1 - 14 00 :move-dech "Decr.H $1 - 24 00 :move-inch "Incr.H $1 - 44 00 :move-decw "Decr.W $1 - 84 00 :move-incw "Incr.W $1 - 00 1b :move-reset "Reset $1 - 07 "Tool $1 - 00 'q :tool-brush "Brush $1 - 00 'w :tool-selector "Selector $1 - 00 'e :tool-zoom "Zoom $1 - 00 '1 :pick-color1 "Background $1 - 00 '2 :pick-color2 "ColorA $1 - 00 '3 :pick-color3 "ColorB $1 - 00 '4 :pick-color4 "ColorC $1 - $1 + 08 "Nasu $1 + 01 'n :file-new "New $1 + 01 'r :file-rename "Rename $1 + 01 'o :file-open "Open $1 + 00 00 :file-open-mono "OpenMono $1 + 01 's :file-save "Save $1 + 00 00 :file-save-mono "SaveMono $1 + 01 'p :save-theme "SaveTheme $1 + 01 'q :exit "Exit $1 + 04 "Edit $1 + 01 'c :edit-copy "Copy $1 + 01 'v :edit-paste "Paste $1 + 01 'x :edit-cut "Cut $1 + 00 08 :edit-erase "Erase $1 + 01 "View $1 + 02 00 :toggle-zoom "Zoom $1 + 09 "Move $1 + 10 00 :move-up "Up $1 + 20 00 :move-down "Down $1 + 40 00 :move-left "Left $1 + 80 00 :move-right "Right $1 + 14 00 :move-dech "Decr.H $1 + 24 00 :move-inch "Incr.H $1 + 44 00 :move-decw "Decr.W $1 + 84 00 :move-incw "Incr.W $1 + 00 1b :move-reset "Reset $1 + 07 "Tool $1 + 00 'q :tool-brush "Brush $1 + 00 'w :tool-selector "Selector $1 + 00 'e :tool-zoom "Zoom $1 + 00 '1 :pick-color1 "Background $1 + 00 '2 :pick-color2 "ColorA $1 + 00 '3 :pick-color3 "ColorB $1 + 00 '4 :pick-color4 "ColorC $1 + $1 @untrap ( -- ) @@ -1029,6 +1028,23 @@ JMP2r ( drawing primitives ) +@draw-str-right ( text* -- ) + + DUP2 ;get-strw JSR2 STH2 + .Screen/x DEI2k STH2r SUB2 ROT DEO2 + +@draw-str ( str* -- str* ) + + LDAk #00 EQU ,&skip JCN + menu-auto .Screen/auto DEO + &while + LDAk ;draw-chr JSR2 + INC2 LDAk ,&while JCN + &skip + INC2 + +JMP2r + @draw-short ( short* -- ) SWP ,draw-byte JSR @@ -1339,6 +1355,7 @@ JMP2r @rol ( byte -- byte ) DUP #07 SFT SWP DUP ADD ADD JMP2r @ror ( byte -- byte ) DUP #70 SFT SWP #01 SFT ADD JMP2r +@mcpy ( src* dst* len* -- ) SWP2 STH2 OVR2 ADD2 SWP2 &loop LDAk STH2kr STA INC2r INC2 GTH2k ,&loop JCN POP2 POP2 POP2r JMP2r @untitled-txt "untitled.chr $1 @nametable-ext ".nmt $1