Major revamp of the codebase

4 years ago · 3b1e10f511
4 changed files with 389 additions and 464 deletions
--- a/README.md
+++ b/README.md
@ -14,14 +14,31 @@ If do not wish to assemble it yourself, you can download [nasu.rom](https://rabb

 ## Controls

- `arrows`, move selection
- `enter`    , insert tile
- `backspace`, delete tile
- `left-click` , add pixel
- `right-click`, remove pixel
+### Mouse
+
+- `mouse1` select/brush
+
+### Ctrl
+- `ctrl+n` new
+- `ctrl+s` save
+- `ctrl+o` open
+- `ctrl+g` open selection
+- `ctrl+r` rename
+- `ctrl+c` copy
+- `ctrl+v` paste
+- `ctrl+x` cut
+- `ctrl+h` toggle syntax
+- `ctrl+f` toggle font
+
+### Arrows
+- `ctrl+up` next label
+- `ctrl+down` prev label
+- `ctrl+left` end of line
+- `ctrl+right` start of line
+- `alt+left` next word
+- `alt+right` prev word
+
+### Keys
+
 - `1 2 3`, select color
 - `q w e`, select tool
- `ctrl+n`, clear
- `ctrl+r`, rename
- `ctrl+o`, load
- `ctrl+s`, save
--- a/src/assets.tal
+++ b/src/assets.tal
@ -0,0 +1,74 @@
+@tool-brush    e0d0 8844 2212 0c00
+@tool-selector 80c0 e0f0 f8e0 1000
+@pixel-icn     7cfe fefe fefe 7c00
+@bigpixel-icn  f0f0 f0f0 0000 0000
+@halftone-icn  aa55 aa55 aa55 aa55
+@save-icn      1054 28c6 2854 1000
+@make-icn      fe82 8282 848a f400
+@load-icn      feaa d6aa d4aa f400
+
+@slider-icns
+	f0f0 f0f0 f0f0 f000 ( full )
+	50a0 50a0 50a0 5000 ( empty )
+@circle-icns
+	3844 8282 8244 3800 ( full )
+	387c fefe fe7c 3800 ( line )
+@zoom-icns
+	3048 8484 4834 0200 ( in )
+	3245 8284 4834 0200 ( out )
+@arrow-hor-icns
+	0010 181c fe1c 1810
+	0010 3070 fe70 3010
+@arrow-ver-icns
+	0010 387c fe10 1010
+	0010 1010 fe7c 3810
+
+@font ( specter8-frag font )
+	0000 0000 0000 0000 0008 0808 0800 0800
+	0014 1400 0000 0000 0024 7e24 247e 2400
+	0008 1e28 1c0a 3c08 0000 2204 0810 2200
+	0030 4832 4c44 3a00 0008 1000 0000 0000
+	0004 0808 0808 0400 0020 1010 1010 2000
+	0000 2214 0814 2200 0000 0808 3e08 0800
+	0000 0000 0000 0810 0000 0000 3e00 0000
+	0000 0000 0000 0800 0000 0204 0810 2000
+	003c 464a 5262 3c00 0018 0808 0808 1c00
+	003c 4202 3c40 7e00 003c 421c 0242 3c00
+	000c 1424 447e 0400 007e 407c 0242 3c00
+	003c 407c 4242 3c00 007e 0204 0810 1000
+	003c 423c 4242 3c00 003c 4242 3e02 3c00
+	0000 0010 0000 1000 0000 1000 0010 1020
+	0000 0810 2010 0800 0000 003e 003e 0000
+	0000 1008 0408 1000 003c 420c 1000 1000
+	003c 4232 4a42 3c00 003c 4242 7e42 4200
+	007c 427c 4242 7c00 003c 4240 4042 3c00
+	007c 4242 4242 7c00 007e 4078 4040 7e00
+	007e 4078 4040 4000 003c 4240 4642 3c00
+	0042 427e 4242 4200 001c 0808 0808 1c00
+	007e 0202 0242 3c00 0042 4478 4442 4200
+	0040 4040 4040 7e00 0042 665a 4242 4200
+	0042 6252 4a46 4200 003c 4242 4242 3c00
+	007c 4242 7c40 4000 003c 4242 4244 3a00
+	007c 4242 7c44 4200 003e 403c 0242 3c00
+	007e 0808 0808 1000 0042 4242 4244 3a00
+	0042 4242 4224 1800 0042 4242 5a66 4200
+	0042 423c 4242 4200 0042 423e 0242 3c00
+	007e 020c 3040 7e00 000c 0808 0808 0c00
+	0040 2010 0804 0200 0030 1010 1010 3000
+	0008 1400 0000 0000 0000 0000 0000 7e00
+	0008 0400 0000 0000 0000 3c02 3e42 3a00
+	0040 407c 4242 7c00 0000 3c42 4042 3c00
+	0002 023e 4242 3e00 0000 3c42 7e40 3e00
+	0000 3e40 7840 4000 0000 3c42 3e02 3c00
+	0040 405c 6242 4200 0008 0018 0808 0400
+	0008 0018 0808 4830 0040 4244 7844 4200
+	0010 1010 1010 0c00 0000 6c52 5252 5200
+	0000 5c62 4242 4200 0000 3c42 4242 3c00
+	0000 7c42 427c 4040 0000 3e42 423e 0202
+	0000 5c62 4040 4000 0000 3e40 3c02 7c00
+	0008 7e08 0808 1000 0000 4242 4244 3a00
+	0000 4242 4224 1800 0000 5252 5252 2e00
+	0000 4224 1824 4200 0000 4242 3e02 7c00
+	0000 7e02 3c40 7e00 000c 0810 1008 0c00
+	0008 0808 0808 0800 0030 1008 0810 3000
+	0000 0032 4c00 0000 3c42 99a1 a199 423c
--- a/src/main.tal
+++ b/src/main.tal
--- a/src/utils.tal
+++ b/src/utils.tal
@ -33,6 +33,7 @@
 %IS-SPACER   { #21 < } ( char -- flag )
 %IS-LABEL    { STHk #40 = STHr #26 = ORA } ( char -- flag )
 %NOT-LINEBREAK { STHk #0d ! STHr #0a ! AND } ( char -- flag )
+%STANDARD-LB { DUP #0d = #03 * - }

 %TOGGLE { LDZk #00 = SWP STZ }
 %TOS { #00 SWP }