From 870503895961693451a6689267a5bb3685efa5bd Mon Sep 17 00:00:00 2001 From: Devine Lu Linvega Date: Tue, 5 Jul 2022 18:20:46 -0700 Subject: [PATCH] Moved a few things in nasu.tal --- src/manifest.tal | 51 ------------------------------------------------ src/nasu.tal | 44 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 43 insertions(+), 52 deletions(-) diff --git a/src/manifest.tal b/src/manifest.tal index 14c6704..7584e27 100644 --- a/src/manifest.tal +++ b/src/manifest.tal @@ -1,58 +1,7 @@ -@manifest - - &name "Nasu $1 - &date "2022-07-03 $1 - &menu - 07 "File $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 - 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 - 04 00 :view-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 - -@menu-init ( -- ) - - #ff ;draw-menu/sel STA - #ff ;draw-sub/sel STA - #0701 ;draw-menu/theme STA2 - #0d07 ;draw-sub/theme STA2 - ;draw-menu JSR2 - -JMP2r - @trap-menu ( -> ) ;on-mouse-menu .Mouse/vector DEO2 ;on-control-menu .Controller/vector DEO2 - ,menu-init JSR BRK diff --git a/src/nasu.tal b/src/nasu.tal index 1e69dd6..e900867 100644 --- a/src/nasu.tal +++ b/src/nasu.tal @@ -76,10 +76,52 @@ ;draw-once JSR2 ( let's begin! ) ;file-new JSR2 - ;menu-init JSR2 + #0701 ;draw-menu/theme STA2 + #0d07 ;draw-sub/theme STA2 + ;draw-menu JSR2 BRK +@manifest + + &name "Nasu $1 + &date "2022-07-03 $1 + &menu + 07 "File $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 + 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 + 04 00 :view-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 ( -- ) ;on-frame .Screen/vector DEO2