Moved to src

.gitignore

@@ -4,4 +4,5 @@
 *bmp
 /bin
 untitled.chr
-nasu
+nasu
+*.chr

build.sh

@@ -5,7 +5,7 @@ rm -rf bin
 mkdir bin
 
 echo "Assembling.."
-uxnasm nasu.tal bin/nasu.rom 
+uxnasm src/nasu.tal bin/nasu.rom 
 
 echo "Installing.."
 if [ -d "$HOME/roms" ] && [ -e ./bin/nasu.rom ]

src/nasu.tal

@@ -1,4 +1,4 @@
-(
+( 
 	app/nasu : spritesheet editor
 
 	arrows - move selection
@@ -12,7 +12,7 @@
 	ctrl+r - rename
 	ctrl+o - load
 	ctrl+s - save
-)
+ )
 
 %+  { ADD } %-   { SUB }  %*  { MUL } %/   { DIV }
 %<  { LTH } %>   { GTH }  %=  { EQU } %!   { NEQ }
@@ -79,7 +79,6 @@
 	&trap $1
 	&blink $1
 	&changed $1
-
 @settings
 	&depth $1
 	&color $1
@@ -88,11 +87,18 @@
 	&tool $1
 	&focus $2
 	&zoom $1
-	
-@frame [ &x1 $2 &y1 $2 &x2 $2 &y2 $2 &width $2 &height $2 ]
-@rect  [ &x1 $2 &y1 $2 &x2 $2 &y2 $2 ]
-@color $1
+@path 
+	&length $1
+	&name $20
+@frame 
+	&x1 $2 &y1 $2 
+	&x2 $2 &y2 $2 
+	&width $2 &height $2
+@pointer 
+	&x $2 &y $2
+	@color $1
 
+@rect  [ &x1 $2 &y1 $2 &x2 $2 &y2 $2 ]
 ( interface )
 @toolview  [ &x1 $2 &y1 $2 &x2 $2 &y2 $2 ]
 @colorview [ &x1 $2 &y1 $2 &x2 $2 &y2 $2 ]
@@ -101,11 +107,6 @@
 @preview   [ &x1 $2 &y1 $2 &x2 $2 &y2 $2 ]
 @tileview  [ &x1 $2 &y1 $2 &x2 $2 &y2 $2 ]
 @zoomview  [ &x1 $2 &y1 $2 &x2 $2 &y2 $2 ]
-@pointer   [ &x $2 &y $2 ]
-
-@path 
-	&length $1
-	&name $20
 
 ( program )
 
@@ -245,12 +246,6 @@ BRK
 
 @on-button-trap ( -> )
 
-	( enter )
-	.Controller/key DEI #0d ! ,&no-edit-enter JCN
-		#00 .state/trap STZ
-		#23 ;draw-filepath JSR2
-		BRK
-		&no-edit-enter
 	( backspace )
 	.Controller/key DEI #08 ! ,&no-edit-backspace JCN
 		.path/length LDZ #00 = ,&edit-end JCN
@@ -259,6 +254,12 @@ BRK
 		#23 ;draw-filepath JSR2
 		BRK
 		&no-edit-backspace
+	( enter/escape )
+	.Controller/key DEI DUP #0d = SWP #2d < #0000 == ,&no-edit-enter JCN
+		#00 .state/trap STZ
+		#23 ;draw-filepath JSR2
+		BRK
+		&no-edit-enter
 	( default )
 	.path/length LDZ #1f = ,&edit-end JCN
 		.Controller/key DEI .path/name .path/length LDZ + STZ