Standardized controls

src/manifest.tal

@@ -16,24 +16,26 @@
 			00 08 :edit-erase "Erase $1
 		01 "View $1
 			04 00 :view-zoom "Zoom $1
-		04 "Pick $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
+		03 "Tool $1
+			00 'q :tool-brush "Brush $1
+			00 'w :tool-selector "Selector $1
+			00 'e :tool-zoom "Zoom $1
+		04 "Color $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
-		0c "Select $1
-			00 'q :select-brush "Brush $1
-			00 'w :select-selector "Selector $1
-			00 'e :select-zoom "Zoom $1
-			10 00 :select-up "Up $1
-			20 00 :select-down "Down $1
-			40 00 :select-left "Left $1
-			80 00 :select-right "Right $1
-			14 00 :select-dech "Decr.H $1
-			24 00 :select-inch "Incr.H $1
-			44 00 :select-decw "Decr.W $1
-			84 00 :select-incw "Incr.W $1
-			00 1b :select-reset "Reset $1
+
 		$1
 
 

src/nasu.tal

@@ -931,7 +931,7 @@ JMP2r
 	#03 .Screen/sprite DEO
 	( tools )
 	STH2kr #0020 ADD2 .Screen/x DEO2
-	;tool-brush .Screen/addr DEO2
+	;brush-icn .Screen/addr DEO2
 	#01 [ .settings/tool LDZ #00 EQU ] ADD .Screen/sprite DEO
 	STH2kr #0029 ADD2 .Screen/x DEO2
 	;tool-selector .Screen/addr DEO2
@@ -962,7 +962,7 @@ JMP2r
 	.Mouse/x DEI2 DUP2 .cursor/x STZ2 .Screen/x DEO2
 	.Mouse/y DEI2 DUP2 .cursor/y STZ2 .Screen/y DEO2
 	( draw new cursor )
-	;tool-brush #00 .settings/tool LDZ #30 SFT ADD2 .Screen/addr DEO2
+	;brush-icn #00 .settings/tool LDZ #30 SFT ADD2 .Screen/addr DEO2
 	#42 .Mouse/state DEI #00 NEQ ADD .Screen/sprite DEO
 
 JMP2r
@@ -1169,19 +1169,20 @@ JMP2r
 
 ( select )
 
-@select-brush ( -- ) #00 ;set-tool JSR2 JMP2r
-@select-selector ( -- ) #01 ;set-tool JSR2 JMP2r
-@select-zoom ( -- ) #02 ;set-tool JSR2 JMP2r
-@select-up ( -- ) #00ff ;mod-selection JSR2 JMP2r
-@select-down ( -- ) #0001 ;mod-selection JSR2 JMP2r
-@select-left ( -- ) #ff00 ;mod-selection JSR2 JMP2r
-@select-right ( -- ) #0100 ;mod-selection JSR2 JMP2r
-@select-dech ( -- ) #00ff ;scale-selection JSR2 JMP2r
-@select-inch ( -- ) #0001 ;scale-selection JSR2 JMP2r
-@select-decw ( -- ) #ff00 ;scale-selection JSR2 JMP2r
-@select-incw ( -- ) #0100 ;scale-selection JSR2 JMP2r
+@tool-brush ( -- ) #00 ;set-tool JSR2 JMP2r
+@tool-selector ( -- ) #01 ;set-tool JSR2 JMP2r
+@tool-zoom ( -- ) #02 ;set-tool JSR2 JMP2r
 
-@select-reset ( -- )
+@move-up ( -- ) #00ff ;mod-selection JSR2 JMP2r
+@move-down ( -- ) #0001 ;mod-selection JSR2 JMP2r
+@move-left ( -- ) #ff00 ;mod-selection JSR2 JMP2r
+@move-right ( -- ) #0100 ;mod-selection JSR2 JMP2r
+@move-dech ( -- ) #00ff ;scale-selection JSR2 JMP2r
+@move-inch ( -- ) #0001 ;scale-selection JSR2 JMP2r
+@move-decw ( -- ) #ff00 ;scale-selection JSR2 JMP2r
+@move-incw ( -- ) #0100 ;scale-selection JSR2 JMP2r
+
+@move-reset ( -- )
 
 	.selection/x1 LDZ2 .selection/x2 STZ2
 	;redraw JSR2
@@ -1375,9 +1376,9 @@ JMP2r
 @halftone-icn aa55 aa55 aa55 aa55
 
 @hand-icn 2020 20b8 7c7c 3838
-@tool-brush 0070 6844 2211 0906
-@tool-selector 0040 6070 787c 7008
-@tool-zoom 0030 4884 8448 3402
+@brush-icn 0070 6844 2211 0906
+@select-icn 0040 6070 787c 7008
+@zoom-icn 0030 4884 8448 3402
 @pixel-icn 7cfe fefe fefe 7c00
 @save-icn 0008 2a14 6314 2a08
 @make-icn 007f 4141 4142 457a