version bmup

.gitignore

@@ -1,4 +1,5 @@
 html/
+html_demo/
 build/
 firmware/
 espfs/mkespfsimage/*.o

CMakeLists.txt

@@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 3.7)
 # Do not attempt to build it with cmake, use make instead.        #
 ###################################################################
 
-project(esp_vt100_firmware)
+project(ESPTerm)
 
 set(CMAKE_CXX_STANDARD GNU99)
 
@@ -110,6 +110,8 @@ set(SOURCE_FILES
         user/serial.h
         user/routes.c
         user/routes.h
+        user/uart_asyncdrv.c-
+        user/uart_asyncdrv.h-
         user/cgi_main.c
         user/cgi_main.h
         user/cgi_sockets.c
@@ -117,14 +119,29 @@ set(SOURCE_FILES
         user/cgi_sockets.h
         user/ansi_parser_callbacks.c
         user/ansi_parser_callbacks.h
-        user/user_main.h
         user/wifimgr.c
         user/wifimgr.h
         user/persist.c
         user/persist.h
         include/helpers.h
         user/syscfg.c
-        user/syscfg.h)
+        user/syscfg.h
+        user/ascii.h
+        user/sgr.h
+        user/apars_utf8.c
+        user/apars_utf8.h
+        user/apars_logging.h
+        user/version.h
+        user/apars_csi.c
+        user/apars_csi.h
+        user/apars_short.c
+        user/apars_short.h
+        user/apars_string.c
+        user/apars_string.h
+        user/apars_osc.c
+        user/apars_osc.h
+        user/apars_dcs.c
+        user/apars_dcs.h user/uart_buffer.c user/uart_buffer.h user/jstring.c user/jstring.h user/character_sets.h)
 
 include_directories(include)
 include_directories(user)
@@ -145,6 +162,8 @@ add_definitions(
         -DFLAG_GZIP=2
         -DADMIN_PASSWORD="asdf"
         -DGIT_HASH="blabla"
+        -DDEBUG_HEAP=1
+        -DDEBUG_MALLOC=1
         -DESPFS_HEATSHRINK)
 
-add_executable(esp_vt100_firmware ${SOURCE_FILES})
+add_executable(ESPTerm ${SOURCE_FILES})

Makefile

@@ -65,8 +65,14 @@ LIBS += esphttpd
 # compiler flags using during compilation of source files
 CFLAGS		= -Os -ggdb -std=gnu99 -Werror -Wpointer-arith -Wundef -Wall -Wl,-EL -fno-inline-functions \
 		-nostdlib -mlongcalls -mtext-section-literals  -D__ets__ -DICACHE_FLASH \
-		-Wno-address -Wno-unused -DHTTPD_MAX_BACKLOG_SIZE=8192 -DADMIN_PASSWORD=$(ADMIN_PASSWORD) \
-		-DGIT_HASH='"$(shell git rev-parse --short HEAD)"'
+		-Wno-address -Wno-unused
+
+CFLAGS += -DGIT_HASH='"$(shell git rev-parse --short HEAD)"'
+CFLAGS += -DADMIN_PASSWORD=$(ADMIN_PASSWORD)
+
+ifdef GLOBAL_CFLAGS
+CFLAGS += $(GLOBAL_CFLAGS)
+endif
 
 # linker flags used to generate the main object file
 LDFLAGS		= -nostdlib -Wl,--no-check-sections -u call_user_start -Wl,-static

README.md

@@ -1,76 +1,128 @@
 # ESPTerm
 
-ESP8266 Wireless Terminal Emulator project
+**ESPTerm is a VT100-like terminal emulator running on the ESP8266 WiFi chip.**
 
-This project is based on SpriteTM's esphttpd and libesphttpd, forked by MightyPork to
-[MightyPork/esphttpd](https://github.com/MightyPork/esphttpd) and 
-[MightyPork/libesphttpd](https://github.com/MightyPork/libesphttpd) respectively.
+![Photo][photo-hw]<br>
+*Fig 1: Breadboard adapter developed for ESPTerm*
 
-Those forks include improvements not available upstream.
+Version 1.0.0 **passes most of VTTEST test cases** (from the main menu and some Xterm specific), making it 
+functionally comparable to eg. gnome-terminal, terminator, konsole, GtkTerm or PuTTY. 
+ESPTerm is **capable of running Midnight Commander** through agetty, **including full
+mouse support**, provided agetty is made to believe it's Xterm, which shows ESPTerm is sufficiently well
+implemented to work with ncurses.
 
-## Goals
+To see what escape sequences are supported, check out this [annotated Xterm manual page][xterm-compare]
+which was used for reference, or the built-in help page ([online demo][demo-help])
 
-The project aims to be a wireless terminal emulator that'll work with the likes of 
-Arduino, AVR, PIC, STM8, STM32, mbed etc, anything with UART, even your USB-serial dongle will work.
+The terminal screen can be accessed using any web browser, even on a phone or tablet. 
+It works with ESP-01, ESP-01S, ESP-12 and likely many other modules (I use an ESP-12
+on a LoLin NodeMCU board from eBay for development).
 
-Connect it to the master device via UART and use the terminal on the built-in web page for debug logging, 
-remote control etc. It works like a simple LCD screen, in a way.
+With ESPTerm, you can add remote access via WiFi to any embeded project, all you need is 
+a serial port and some imagination!
 
-It lets you make simple UI (manipulating the screen with ANSI sequences) and receive input from buttons on
-the webpage (and keyboard on PC). There is some rudimentary touch input as well.
+## Try it online
 
-The screen size is adjustable up to 25x80 (via a special control sequence) and uses 16 standard colors 
-(8 dark and 8 bright). Both default size and colors can be configured in the settings.
+You can try the web user interface here: [espterm.github.io][demo-term]
 
-## Project status
+The demo is almost identical to the real thing, except, of course, it doesn't do much without the
+emulator backend that runs on the ESP8266. The web version will be updated to match this repository
+ after each minor release.
 
-*A little buggy, but mostly okay! There are many features and fixes planned, but it should be fairly usable already.*
+## Main features
 
-- We have a working **2-way terminal** (UART->ESP->Browser and vice versa) with real-time update via websocket.
+- **Almost complete VT102 emulation** with some extras from Xterm, eg.
+  - Screen size up to 80x25
+  - All standard text styles and 16 colors supported
+  - Full UTF-8 support, alternate character sets
+  - Standard mouse tracking modes
+  - You can dynamically set screen title, button labels...
+- **Web Interface**
+  - Real-time screen update via WebSocket
+  - Button to open keyboard on Android
+  - 5 buttons under the screen for quick commands
+  - Text file upload tool with configurable delays and line endings
+  - *Built-in help page* ([demo][demo-help]) with basic troubleshooting and command reference
+- **Robust WiFi configuration interface** (Demo: [WiFi][demo-wifi], [network][demo-network] config)
+  - Static IP, DHCP, channel selection, power
+  - SSID search utility for finding your existing network
+
+## Running ESPTerm
+
+To run ESPTerm on your ESP8266, either build it yourself from source using `xtensa-lx106-elf-gcc` 
+(and the included Makefile), or download pre-built binaries from the [GitHub releases section][releases]. 
+Flash the binaries using [esptool][esptool].
+
+### Pins
+
+- Pin GPIO2 is used for debug messages at 115200 baud, 8 bit, no parity.
+- Pins Rx and Tx are used for the main communication UART, parameters of which can be set on the system config page.
+  Connect your USB-serial dongle or application microcontroller here.
+
+### Setup
+
+- When flashed for the first time, ESPTerm wipes any possible previous WiFi configuration, because it implements its own WiFi 
+  config manager with many additional features. 
+- It should start in AP mode, the default SSID being `TERM-MACADR` with `MACADR` being three unique bytes from the MAC 
+  address / Device ID as ASCII hex.
+- Connect to the AP via a smartphone or laptop and configure WiFi as desired. If a captive portal page does not open, 
+  try 192.168.4.1 in your web browser.
+
+### Rescue from messed up config
+
+It can happen that some changes to the WiFi or network config make the module inaccessible.
   
-  This means that what you type in the browser is sent to UART0 and what's received on UART0 is processed by the 
-  ANSI parser and applied to the internal screen buffer. You'll also immediately see the changes in your browser. 
-  There's a filter in the way that discards garbage characters (like unicode and most ASCII outside 32-126).
-  
-  For a quick test, try connecting the UART0 Rx and Tx with a piece of wire to make a loopback interface. 
-  *NOTE: Use the bare module, not something like LoLin or NodeMCU with a FTDI, it'll interfere*. 
-  You should then directly see what you type & can even try some ANSI sequences, right from the browser.
-  
-- All ANSI sequences that make sense, as well as control codes like Backspace and CR / LF are implemented.
-  Set colors with your usual `\e[31;1m` etc (see Wikipedia). `\e` is the ASCII code 27 (ESC).
-  
-  Arrow keys generate ANSI sequences, ESC sends literal ASCII code 27 etc. Almost everything can be input 
-  straight from the browser.
+- To re-enable the built-in AP, hold the BOOT (GPIO0 -> GND) button for about 1 s, until the blue LED starts flashing. 
+  Then quickly release the button.
+- To reset all settings to defaults, hold the button a couple seconds until the LED flashes rapidly, then release it.
+- You can cancel this wipe/reset operation (when triggered by accident) by pressing Reset or disconnecting the power supply.
 
-- Buttons pressed in the browser UI send ASCII codes 1..5. Mouse clicks are sent as `\e[<row>;<col>M`.
+### Config files
 
-- There's a built-in WiFi config page and a Help page with a list of all supported ANSI sequences and other details.
+ESPTerm has two config "files", one for defaults and one for the currently used settings. In the case of the terminal 
+config, there is also a third, temporary file for changes done via ESC commands.
+
+When you get your settings *just right*, you can store them as defaults, which can then be at any time restored 
+by holding the BOOT (GPIO0) button. You can do this on the System Settings page. This asks for an "admin password", 
+which you can define when building the firmware in the `esphttpdconfig.mk` file. 
+
+The default password is `19738426`. This password can't presently be changed without re-flashing the firmware.
+
+You can also restore everything (except the saved defaults) to "factory defaults", there is a button for this 
+on the System Settings page. Those are the initial values in the config files.
+
+## Research resources
+
+Developing ESPTerm wasn't an easy task, because the information is scattered across many places and the existing 
+terminal emulators I originally used for reference (terminator, Konsole) are not implemented correctly in some details.
+
+A great tool for checking my implementation has proven to be [VTTTEST][vttest] and Xterm as a reference
+implementation that is probably the most complete emulator available, although it's cumbersome to use and its age
+really shows in the looks.
+
+I've comnpiled a list of those I found most helpful here: [VT100 emulation resources][resources]
 
 ## Development
 
+ESPTerm's firmware is written in C and is based on SpriteTM's `libesphttpd` http server library forked to
+[MightyPork/libesphttpd][httpdlib]. This fork includes various improvements
+and changes required by the project.
+
 ### Installation for development
 
 - Clone this project with `--recursive`, or afterwards run `git submodule init` and `git submodule update`.
-
-- Install [esp-open-sdk](https://github.com/pfalcon/esp-open-sdk/) and build it with 
-  `make toolchain esptool libhal STANDALONE=n`. 
-  
+- Install [esp-open-sdk][opensdk] and build it with 
+  `make toolchain esptool libhal STANDALONE=n`.
   Make sure the `xtensa-lx106-elf/bin` folder is on $PATH.
-
-- Install [esptool](https://github.com/espressif/esptool) (it's in the Arch community repo and on AUR, too)
-
+- Install [esptool][esptool] (it's in the Arch community repo and on AUR, too)
 - Set up udev rules so you have access to ttyUSB0 without root, eg:
-
   ```
   KERNEL=="tty[A-Z]*[0-9]*", GROUP="uucp", MODE="0666"
   ```
-
 - Install Ragel if you wish to make modifications to the ANSI sequence parser. 
   If not, comment out its call in `build_parser.sh`. The `.rl` file is the actual source, the `.c` is generated.
-
 - Install Ruby and then the `sass` package with `gem install sass` (or try some other implementation, such as 
   `sassc`)
-
 - Make sure your `esphttpdconfig.mk` is set up properly - link to the SDK etc.
 
 The IoT SDK is now included in the project due to problems with obtaining the correct version and patching it.
@@ -80,7 +132,7 @@ than welcome!
 ### Web resources
 
 The web resources are in `html_orig`. To prepare for a build, run `build_web.sh`, which packs them and 
-copies over to `html`. The compression and minification is handled by scripts in libesphttpd, specifically
+copies over to `html`. The compression and minification is handled by scripts in libesphttpd, specifically,
 it runs yuicompressor on js and css and gzip or heatshrink on the other files. The `html` folder is 
 then embedded in the firmware image.
 
@@ -97,3 +149,18 @@ Sometimes it does not, particularly with `make -B`. Try just plain `make`. You c
 build scripts manually, too.
 
 To flash, just run `make flash`. 
+
+[releases]: https://github.com/MightyPork/esp-vt100-firmware/releases
+[httpdlib]: https://github.com/MightyPork/libesphttpd
+[esptool]: https://github.com/espressif/esptool
+[opensdk]: https://github.com/pfalcon/esp-open-sdk/
+
+[demo-help]: https://espterm.github.io/help.html
+[demo-wifi]: https://espterm.github.io/cfg_wifi.html
+[demo-network]: https://espterm.github.io/cfg_network.html
+[demo-term]: https://espterm.github.io/term.html
+
+[xterm-compare]: https://espterm.github.io/docs/espterm-xterm.html
+[photo-hw]: https://espterm.github.io/docs/espterm-hw-small.jpg
+[resources]: https://espterm.github.io/docs/index.html
+[vttest]: http://invisible-island.net/vttest/

build_demo.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+
+echo "-- Preparing WWW files --"
+
+[[ -e html_demo ]] && rm -r html_demo
+mkdir -p html_demo/img
+mkdir -p html_demo/js
+mkdir -p html_demo/css
+
+cd html_orig
+sh ./packjs.sh
+ESP_DEMO=1 php ./build_html.php
+cd ..
+
+cp html_orig/js/app.js html_demo/js/
+
+sass html_orig/sass/app.scss html_demo/css/app.css
+rm html_demo/css/app.css.map
+
+cp html_orig/img/* html_demo/img/
+cp html_orig/favicon.ico html_demo/favicon.ico
+
+# cleanup
+find html_demo/ -name "*.orig" -delete
+find html_demo/ -name "*.xcf" -delete
+find html_demo/ -name "*~" -delete

build_web.sh

@@ -19,3 +19,8 @@ rm html/css/app.css.map
 
 cp html_orig/img/* html/img/
 cp html_orig/favicon.ico html/favicon.ico
+
+# cleanup
+find html/ -name "*.orig" -delete
+find html/ -name "*.xcf" -delete
+find html/ -name "*~" -delete

demo_deploy.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+./build_demo.sh
+
+cp -r html_demo/* ../espterm.github.io/
+
+cd ../espterm.github.io/
+
+echo "Enter to deploy (^C to abort):"
+read
+
+git add --all
+git commit -m "Deploy updates"
+git push

esphttpdconfig.mk

@@ -40,3 +40,18 @@ ESP_SPI_FLASH_SIZE_K = 1024
 
 # Admin password, used to store settings to flash as defaults
 ADMIN_PASSWORD = "19738426"
+
+GLOBAL_CFLAGS = \
+    -DDEBUG_ROUTER=0 \
+    -DDEBUG_CAPTDNS=0 \
+    -DDEBUG_HTTP=1 \
+    -DDEBUG_ESPFS=0 \
+    -DDEBUG_WS=0 \
+    -DDEBUG_ANSI=1 \
+    -DDEBUG_ANSI_NOIMPL=1 \
+    -DHTTPD_MAX_BACKLOG_SIZE=8192 \
+    -DHTTPD_MAX_HEAD_LEN=1024 \
+    -DHTTPD_MAX_POST_LEN=512 \
+    -DDEBUG_INPUT=0 \
+    -DDEBUG_HEAP=1 \
+    -DDEBUG_MALLOC=0

html_orig/_debug_replacements.php

@@ -5,46 +5,56 @@
  * without esphttpd. This is needed mainly for places where the replacements
  * are given to JavaScript, to avoid syntax errors with
  */
+
+$vers = '???';
+$f = file_get_contents(__DIR__ . '/../user/version.h');
+preg_match_all('/#define FW_V_.*? (\d+)/', $f, $vm);
+#define FW_V_MAJOR 1
+#define FW_V_MINOR 0
+#define FW_V_PATCH 0
+
+$vers = $vm[1][0].'.'.$vm[1][1].'.'.$vm[1][2];
+
 return [
-	'term_title' => 'ESPTerm local debug',
+	'term_title' => ESP_DEMO ? 'ESPTerm Web UI Demo' : 'ESPTerm local debug',
 
-	'btn1' => '1',
-	'btn2' => '2',
-	'btn3' => '3',
+	'btn1' => 'OK',
+	'btn2' => 'Cancel',
+	'btn3' => '',
 	'btn4' => '',
-	'btn5' => '5',
-	'labels_seq' => 'TESPTerm local debug
1
2
3

5',
-
-	'screenData' => '






HELLOx

N
RE3
',//'\u000b\u0001\u001b\u0001\u0001\u0001\u0001\u0001\f\u0005\u0001\u0010\u0003HELLOx\u0002\u000b\u0001\u0001N\u0001RE\u00023\u0001', //,
-	/*'{
-		 "w": 26, "h": 10,
-		 "x": 10, "y": 5,
-		 "cv": 1, "fg": 10, "bg": 2,
-		 "screen": ""
-	}',//"70 t259"*/
+	'btn5' => 'Help',
+	'bm1' => '01,'.ord('y'),
+	'bm2' => '01,'.ord('n'),
+	'bm3' => '',
+	'bm4' => '',
+	'bm5' => '05',
+	'labels_seq' => ESP_DEMO ? 'TESPTerm Web UI Demo
OK
Cancel


Help' : 'TESPTerm local debug
OK
Cancel


Help',
 
 	'parser_tout_ms' => 10,
+	'display_tout_ms' => 15,
+	'display_cooldown_ms' => 35,
+	'fn_alt_mode' => '1',
 
 	'opmode' => '2',
-	'sta_enable' => '0',
+	'sta_enable' => '1',
 	'ap_enable' => '1',
 
 	'tpw' => '60',
 	'ap_channel' => '7',
-	'ap_ssid' => 'ESP-123456',
-	'ap_password' => 'Passw0rd!',
+	'ap_ssid' => 'TERM-027451',
+	'ap_password' => '',
 	'ap_hidden' => '0',
 
-	'sta_ssid' => 'Chlivek',
-	'sta_password' => 'windows XP is The Best',
-	'sta_active_ip' => '1.2.3.4',
-	'sta_active_ssid' => 'Chlivek',
+	'sta_ssid' => 'Cisco',
+	'sta_password' => 'Passw0rd!',
+	'sta_active_ip' => ESP_DEMO ? '192.168.82.66' : '192.168.0.19',
+	'sta_active_ssid' => 'Cisco',
 
-	'vers_fw' => '1.2.3',
+	'vers_fw' => $vers,
 	'date' => date('Y-m-d'),
 	'time' => date('G:i'),
-	'vers_httpd' => '4.5.6',
-	'vers_sdk' => '1.52',
+	'vers_httpd' => '0.4',
+	'vers_sdk' => '010502',
 	'githubrepo' => 'https://github.com/MightyPork/esp-vt100-firmware',
 
 	'ap_dhcp_time' => '120',
@@ -58,17 +68,19 @@ return [
 	'sta_addr_mask' => '255.255.255.0',
 	'sta_addr_gw' => '192.168.0.1',
 
-	'sta_mac' => 'ab:cd:ef:01:23:45',
-	'ap_mac' => '01:23:45:ab:cd:ef',
+	'sta_mac' => '5c:cf:7f:02:74:51',
+	'ap_mac' => '5e:cf:7f:02:74:51',
 
-	'term_width' => '26',
-	'term_height' => '10',
+	'term_width' => '80',
+	'term_height' => '25',
 	'default_bg' => '0',
 	'default_fg' => '7',
+	'show_buttons' => '1',
+	'show_config_links' => '1',
 
 	'uart_baud' => 115200,
 	'uart_stopbits' => 1,
 	'uart_parity' => 2,
 
-	'theme' => 5,
+	'theme' => 0,
 ];

html_orig/_pages.php

@@ -41,6 +41,10 @@ pg('help',  'cfg page-help',  'help', '/help');
 pg('about', 'cfg page-about', 'about', '/about');
 pg('term',  'term',           '', '/', 'title.term');
 
+pg('reset_screen',  'api',     '', '/system/cls', 'title.term');
+
+pg('index',  'api',           '', '/', '');
+
 // ajax API
 
 return $pages;

html_orig/base.php

@@ -23,6 +23,30 @@ define('DEBUG', !$prod);
 $root = DEBUG ? json_encode(ESP_IP) : 'location.host';
 define('JS_WEB_ROOT', $root);
 
+define('ESP_DEMO', (bool)getenv('ESP_DEMO'));
+if (ESP_DEMO) {
+	define('DEMO_SCREEN', '"S\u0019\u0001Q\u0001\u0017\u0001K\u0001\u0015\u0004\u0003\b\u0001 \u0002P\u0001┌ESPTerm─Demo─\u0002\u0002\u0001\u0003\u0002\u000131\u0003\u0003\u000132\u0003\u0004\u00013\u0002\u0002\u0001\u0003\u0005\u000134\u0003\u0006\u000135\u0003\u0007\u000136\u0003\b\u000137\u0003\t\u000190\u0003\n\u000191\u0003\u000b\u000192\u0003\f\u000193\u0003\r\u000194\u0003\u000e\u000195\u0003\u000f\u000196\u0003\u0010\u000197\u0003\b\u0001─\u0002\r\u0001┐ \u0002\u0015\u0001│ \u00029\u0001│ \u0002\u0004\u0001│\u0002\t\u0001 \u0002\b\u0001│\u0004\u0002\u0001Bold \u0004\u0003\u0001F\u0004\u0003\u0001a\u0004\u0003\u0001i\u0004\u0003\u0001n\u0004\u0003\u0001t\u0004\u0003\u0001 \u0004\u0005\u0001I\u0004\u0005\u0001t\u0004\u0005\u0001a\u0004\u0005\u0001l\u0004\u0005\u0001i\u0004\u0005\u0001c\u0004\u0005\u0001 \u0004\t\u0001U\u0004\t\u0001n\u0004\t\u0001d\u0004\t\u0001e\u0004\t\u0001r\u0004\t\u0001l\u0004\t\u0001i\u0004\t\u0001n\u0004\t\u0001e\u0004\u0001\u0001 \u0004\u0011\u0001B\u0004\u0011\u0001l\u0004\u0011\u0001i\u0004\u0011\u0001n\u0004\u0011\u0001k\u0004\u0011\u0001 \u0001q\u0001\u0001Inverse\u0003\b\u0001 \u0004A\u0001S\u0004A\u0001t\u0004A\u0001r\u0004A\u0001i\u0004A\u0001k\u0004A\u0001e\u0004\u0001\u0001 \u0004!\u0001F\u0004!\u0001r\u0004!\u0001a\u0004!\u0001k\u0004!\u0001t\u0004!\u0001u\u0004!\u0001r\u0004\u0001\u0001 │ \u0002\u0002\u0001─\u0002\u0002\u0001\u0003\n\u0002 \u0002\t\u0001\u0003\b\u0001─\u0002\u0002\u0001 \u0002\u0006\u0001│ \u00029\u0001│ \u0002\u0002\u0001─\u0002\u0002\u0001\u0003\n\u0002 \u0003\u0002\u0002ESP826\u0002\u0002\u0001\u0003\n\u0002 \u0003\b\u0001─\u0002\u0002\u0001 \u0002\u0006\u0001└─\u00029\u0001┤ \u0002\u0002\u0001─\u0002\u0002\u0001\u0003\n\u0002 \u0002\t\u0001\u0003\b\u0001─\u0002\u0002\u0001 \u0002@\u0001│ \u0002\u0002\u0001─\u0002\u0002\u0001\u0003\n\u0002 \u0003\u0002\u0002(@)#\u0002\u0004\u0001\u0003\n\u0002 \u0003\b\u0001─\u0002\u0002\u0001 \u0002\u0007\u0001\u0003O\u0001 This is a static demo of the ESPTerm Web Interface \u0002\u0004\u0001\u0003\b\u0001 \u0002\u0002\u0001│ \u0002\u0002\u0001─\u0002\u0002\u0001\u0003\n\u0002 \u0002\t\u0001\u0003\b\u0001─\u0002\u0002\u0001 \u0002\u0007\u0001\u0003O\u0001 \u00027\u0001\u0003\b\u0001 \u0002\u0002\u0001│ \u0002\u0004\u0001│\u0002\t\u0001 \u0002\t\u0001\u0003O\u0001 Try the links beneath this scre\u0002\u0002\u0001n to browse the menu. \u0003\b\u0001 \u0002\u0002\u0001♦ \u0002\u0016\u0001\u0003O\u0001 \u00027\u0001\u0003\b\u0001 \u0002\u0019\u0001\u0003O\u0001 <°)\u0002\u0003\u0001>< ESPTerm ful\u0002\u0002\u0001y sup\u0002\u0002\u0001orts UTF-8 お は よ ー \u0002\u0002\u0001><(\u0002\u0003\u0001°> \u0003\b\u0001 \u0002\u0019\u0001\u0003O\u0001 \u00027\u0001\u0003\b\u0001 \u0002i\u0001\u0003\u000b\u0001Other interesting features:\u0003\b\u0001 \u0002\u0018\u0001↓ \u0002n\u0001\u0003\u0003\u0001- Almost ful\u0002\u0002\u0001 VT10\u0002\u0002\u0001 emulation \u0003\b\u0001 \u0003\u0006\u0001()\u0003\b\u0001 \u0003\u0006\u0001()\u0003\b\u0001 \u0002\b\u0001Funguje tu čeština! \u0002\u0011\u0001\u0003\u0005\u0001- Xterm-like mouse tracking\u0003\b\u0001 \u0002\u0003\u0001=\u0002\u0002\u0001\u0003\t\u0002°.°\u0003\b\u0001=\u0002\u0002\u0001 \u0003\u0006\u0001<-\u0002\u0003\u0001, \u0003\b\u0001 \u0002$\u0001\u0003\u0004\u0001- File upload utility\u0003\b\u0001 \u0002\n\u0001\'\u0002\u0002\u0001 \'\u0002\u0002\u0001 \u0002\u0002\u0001\u0003\u0006\u0001 \u0002\u0004\u0001mouse\u0003\b\u0001 \u0002!\u0001\u0003\u0002\u0001- User-friendly config interface\u0003\b\u0001 \u00020\u0001\u0003\u000e\u0001-\u0003\u0002\u0001 \u0003\u000e\u0001Advanced WiFi & network set\u0002\u0002\u0001ings\u0003\b\u0001 \u0002\u0011\u0001\u0003\f\u0001Try ESPTerm today!\u0003\b\u0001 \u0002\u000b\u0001- Built-in help page \u0002\u001a\u0001\u0003\u0007\u0001-\u0002\u0002\u0001>\u0003\b\u0001 \u0002\u0002\u0001\u0003\f\u0001Pre-built binaries\u0003\b\u0001 \u0003\f\u0001are\u0003\b\u0001 \u0002\"\u0001\u0003\u0007\u0001link on the About page \u0002\u0002\u0001\u0003\f\u0001available on GitHub! \u0003\b\u0001 \u0002U\u0001"');
+	define('DEMO_APS', <<<APS
+{
+ "result": {
+  "inProgress": 0,
+  "APs": [
+   {"essid": "Cisco", "bssid": "88:f7:c7:52:b3:99", "rssi": 205, "rssi_perc": 100, "enc": 4, "channel": 7},
+   {"essid": "UPC Wi-Free", "bssid": "8a:f7:c7:52:b3:9b", "rssi": 203, "rssi_perc": 100, "enc": 5, "channel": 1},
+   {"essid": "UPC Wi-Free", "bssid": "0a:95:2a:0c:84:31", "rssi": 166, "rssi_perc": 32, "enc": 5, "channel": 1},
+   {"essid": "MujO2Internet_2EEB96", "bssid": "d0:60:8c:2e:eb:96", "rssi": 174, "rssi_perc": 48, "enc": 4, "channel": 4},
+   {"essid": "Internet", "bssid": "38:72:c0:32:bd:0d", "rssi": 164, "rssi_perc": 28, "enc": 2, "channel": 10},
+   {"essid": "MyO2Internet_08C850", "bssid": "78:c1:a7:08:c8:50", "rssi": 186, "rssi_perc": 72, "enc": 4, "channel": 11},
+   {"essid": "UPC Wi-Free", "bssid": "06:7c:34:9a:6f:7c", "rssi": 167, "rssi_perc": 34, "enc": 0, "channel": 11},
+   {"essid": "Internet_B0", "bssid": "5c:f4:ab:11:3b:b3", "rssi": 175, "rssi_perc": 50, "enc": 3, "channel": 13},
+   {"essid": "UPC5716805", "bssid": "08:95:2a:0c:84:3f", "rssi": 165, "rssi_perc": 30, "enc": 4, "channel": 1}
+    ]
+ }
+}
+APS
+);
+}
+
 define('LOCALE', isset($_GET['locale']) ? $_GET['locale'] : 'en');
 
 $_messages = require(__DIR__ . '/lang/' . LOCALE . '.php');
@@ -37,6 +61,7 @@ function url($name, $relative = false)
 	if ($relative) return $_pages[$name]->path;
 
 	if (DEBUG) return "/index.php?page=$name";
+	if (ESP_DEMO) return "$name.html";
 	else return $_pages[$name]->path;
 }
 
@@ -52,6 +77,12 @@ function e($s)
 	return htmlspecialchars($s, ENT_HTML5 | ENT_QUOTES);
 }
 
+function je($s)
+{
+	return htmlspecialchars(json_encode($s), ENT_HTML5);
+}
+
+
 function tr($key)
 {
 	global $_messages;
@@ -69,3 +100,78 @@ function include_str($code)
 	fclose($tmp);
 	return $ret;
 }
+
+if (!function_exists('utf8')) {
+	function utf8($num)
+	{
+		if($num<=0x7F)       return chr($num);
+		if($num<=0x7FF)      return chr(($num>>6)+192).chr(($num&63)+128);
+		if($num<=0xFFFF)     return chr(($num>>12)+224).chr((($num>>6)&63)+128).chr(($num&63)+128);
+		if($num<=0x1FFFFF)   return chr(($num>>18)+240).chr((($num>>12)&63)+128).chr((($num>>6)&63)+128).chr(($num&63)+128);
+		return '';
+	}
+}
+
+if (!function_exists('load_esp_charsets')) {
+	function load_esp_charsets() {
+		$chsf = __DIR__ . '/../user/character_sets.h';
+		$re_table = '/\/\/ %%BEGIN:(.)%%\s*(.*?)\s*\/\/ %%END:\1%%/s';
+		preg_match_all($re_table, file_get_contents($chsf), $m_tbl);
+
+		$re_bounds = '/#define CODEPAGE_(.)_BEGIN\s+(\d+)\n#define CODEPAGE_\1_END\s+(\d+)/';
+		preg_match_all($re_bounds, file_get_contents($chsf), $m_bounds);
+
+		$cps = [];
+
+		foreach ($m_tbl[2] as $i => $str) {
+			$name = $m_tbl[1][$i];
+			$start = intval($m_bounds[2][$i]);
+			$table = [];
+			$str = preg_replace('/,\s*\/\/[^\n]*/', '', $str);
+			$rows = explode("\n", $str);
+			$rows = array_map('trim', $rows);
+
+			foreach($rows as $j => $v) {
+				if (strpos($v, '0x') === 0) {
+					$v = substr($v, 2);
+					$v = hexdec($v);
+				} else {
+					$v = intval($v);
+				}
+				$ascii = $start+$j;
+				$table[] = [
+					$ascii,
+					chr($ascii),
+					utf8($v==0? $ascii :$v),
+				];
+			}
+			$cps[$name] = $table;
+		}
+		return $cps;
+	}
+}
+
+if (!function_exists('tplSubs')) {
+	function tplSubs($str, $reps)
+	{
+		return preg_replace_callback('/%(j:|js:|h:|html:)?([a-z0-9-_.]+)%/i', function ($m) use ($reps) {
+			$key = $m[2];
+			if (array_key_exists($key, $reps)) {
+				$val = $reps[$key];
+			} else {
+				$val = '';
+			}
+			switch ($m[1]) {
+				case 'j:':
+				case 'js:':
+					$v = json_encode($val);
+					return substr($v, 1, strlen($v) - 2);
+				case 'h:':
+				case 'html:':
+					return htmlspecialchars($val);
+				default:
+					return $val;
+			}
+		}, $str);
+	}
+}

html_orig/build_html.php

@@ -14,23 +14,36 @@ function process_html($s) {
 	return $s;
 }
 
+$no_tpl_files = ['help', 'cfg_wifi_conn'];
+
+$dest = ESP_DEMO ? __DIR__ . '/../html_demo/' : __DIR__ . '/../html/';
+
 ob_start();
 foreach($_pages as $_k => $p) {
-	if ($p->bodyclass == 'api') continue;
-	echo "Generating: $_k ($p->title)\n";
-	$_GET['page'] = $_k;
-	ob_flush();                                   // print the message
-	ob_clean();                                   // clean up
-	include(__DIR__ . '/index.php');
-	$s = ob_get_contents();                       // grab the output
+	if ($p->bodyclass == 'api') {
+		if (ESP_DEMO) {
+			$target = 'term.html';
+			echo "Generating: ~$_k.html -> $target\n";
+			$s = "<!DOCTYPE HTML><meta http-equiv=\"refresh\" content=\"0;url=$target\">";
+		} else {
+			continue;
+		}
+	} else {
+		echo "Generating: $_k ($p->title)\n";
 
-	// remove newlines and comments
-	// as tests have shown, it saves just a couple kilobytes,
-	// making it not a very big improvement at the expense of ugly html.
-//	$s = process_html($s);
+		$_GET['page'] = $_k;
+		ob_flush();                                   // print the message
+		ob_clean();                                   // clean up
+		include(__DIR__ . '/index.php');
+		$s = ob_get_contents();                       // grab the output
 
-	ob_clean();                                   // clean up
-	$of = __DIR__ . '/../html/' . $_k . '.tpl';
+		// remove newlines and comments
+		// as tests have shown, it saves just a couple kilobytes,
+		// making it not a very big improvement at the expense of ugly html.
+		//	$s = process_html($s);
+		ob_clean();
+	}                                 // clean up
+	$of = $dest . $_k . ((in_array($_k, $no_tpl_files)||ESP_DEMO) ? '.html' : '.tpl');
 	file_put_contents($of, $s);                   // write to a file
 }
 

html_orig/dump_js_lang.php

@@ -8,6 +8,7 @@ $selected = [
 	'wifi.connected_ip_is',
 	'wifi.not_conn',
 	'wifi.enter_passwd',
+	'wifi.passwd_saved',
 ];
 
 $out = [];

html_orig/fontello/unpack.sh

@@ -39,9 +39,12 @@ echo -e "@charset \"UTF-8\";\n\n/* Fontello data, processed by the unpack script
 #grep -Pazo "(?s)@font-face.*?normal;\n\}" "$OUTPUT_DIR/fontello.css" \
 #	| sed 's/\x0//g' >> "$SASSFILE"
 
-grep -Pazo "(?s)@font-face \{\n\s*font-family: 'fontello';\n\s*src: url\('data.*?truetype'\);\n\}" "$OUTPUT_DIR/fontello-embedded.css" \
+grep -Pazo "(?s)@font-face \{\n\s*font-family: 'fontello';\n\s*src: url\('data.*?woff'\)" "$OUTPUT_DIR/fontello-embedded.css" \
 	| sed 's/\x0//g' >> "$SASSFILE"
 
+echo -e ";\n}" >> "$SASSFILE"
+
+
 grep -Pazo "(?s)$ICON_PREFIX-\"\]:before .*?\}" "$OUTPUT_DIR/fontello.css" \
 	| sed 's/\x0//g' \
 	| sed "s/$ICON_PREFIX-\"\]:before/\n\n%fontello-icon-base \{\n\&::before /g" \

html_orig/index.php

@@ -7,47 +7,44 @@ if (!isset($_GET['page'])) $_GET['page'] = 'term';
 $_GET['PAGE_TITLE'] = $_pages[$_GET['page']]->title . ' :: ' . APP_NAME;
 $_GET['BODYCLASS'] = $_pages[$_GET['page']]->bodyclass;
 
-if (!function_exists('tplSubs')) {
-	function tplSubs($str, $reps)
-	{
-		return preg_replace_callback('/%(j:|js:|h:|html:)?([a-z0-9-_.]+)%/i', function ($m) use ($reps) {
-			$key = $m[2];
-			if (array_key_exists($key, $reps)) {
-				$val = $reps[$key];
-			} else {
-				$val = '';
-			}
-			switch ($m[1]) {
-				case 'j:':
-				case 'js:':
-					$v = json_encode($val);
-					return substr($v, 1, strlen($v) - 2);
-				case 'h:':
-				case 'html:':
-					return htmlspecialchars($val);
-				default:
-					return $val;
-			}
-		}, $str);
-	}
+$_pf = __DIR__ . '/pages/'.$_GET['page'].'.php';
+
+if (!file_exists($_pf)) {
+	header("Location: /", true, 302);
+	die();
 }
 
 require __DIR__ . '/pages/_head.php';
-$_pf = __DIR__ . '/pages/'.$_GET['page'].'.php';
+
+$include_re = '/<\?php\s*(require|include)\s*\(?\s*?(?:__DIR__\s*\.)?\s*(["\'])(.*?)\2\s*\)?;\s*\?>/';
+
 if (file_exists($_pf)) {
 	$f = file_get_contents($_pf);
 
-	if (DEBUG)
+	// Resolve requires inline - they wont work after dumping the resulting file to /tmp for eval
+	$f = preg_replace_callback($include_re, function ($m) use ($_pf) {
+		$n = dirname($_pf).'/'.$m[3];
+		if (file_exists($n)) {
+			return file_get_contents($n);
+		} else {
+			return "<p>NOT FOUND: $n</p>";
+		}
+	}, $f);
+
+	if (DEBUG || ESP_DEMO)
 		$str = tplSubs($f,  require(__DIR__ . '/_debug_replacements.php'));
 	else $str = $f;
 
 	// special symbols
 	$str = str_replace('\,', '&#8239;', $str);
-	$str = preg_replace('/(?<=\w)~(?=\w)/', '&nbsp;', $str);
+	$str = preg_replace('/(?<=[^ \\\\])~(?=[^ ])/', '&nbsp;', $str);
+	$str = str_replace('\~', '~', $str);
+	$str = preg_replace('/(?<![\w\\\\])`([^ `][^`]*?[^ `]|[^ `])`(?!\w)/', '<code>$1</code>', $str);
+	$str = preg_replace('/(?<![\w\\\\])_([^ _][^_]*?[^ _]|[^ _])_(?!\w)/', '<i>$1</i>', $str);
+	$str = preg_replace('/(?<![\w\\\\])\*([^ *][^*]*?[^ *]|[^ *])\*(?!\w)/', '<b>$1</b>', $str);
 
+	$str = preg_replace("/\s*(\\\\\\\\)[\n \t]+/", '<br>', $str);
 	include_str($str);
-} else {
-	echo "404";
 }
 
 require __DIR__ . '/pages/_tail.php';

html_orig/jssrc/appcommon.js

@@ -16,7 +16,7 @@ $.ready(function () {
 	});
 
 	// Expanding boxes on mobile
-	$('.Box.mobcol').forEach(function(x) {
+	$('.Box.mobcol,.Box.fold').forEach(function(x) {
 		var h = x.querySelector('h2');
 
 		var hdl = function() {
@@ -25,7 +25,7 @@ $.ready(function () {
 		$(h).on('click', hdl).on('keypress', cr(hdl));
 	});
 
-	qsa('form').forEach(function(x) {
+	$('form').forEach(function(x) {
 		$(x).on('keypress', function(e) {
 			if ((e.keyCode == 10 || e.keyCode == 13) && e.ctrlKey) {
 				x.submit();
@@ -96,7 +96,7 @@ $.ready(function () {
 
 	// remove tabindixes from h2 if wide
 	if (window.innerWidth > 550) {
-		qsa('.Box h2').forEach(function (x) {
+		$('.Box h2').forEach(function (x) {
 			x.removeAttribute('tabindex');
 		});
 
@@ -123,3 +123,67 @@ $.ready(function() {
 		}, 1);
 	}
 });
+
+
+/*! http://mths.be/fromcodepoint v0.1.0 by @mathias */
+if (!String.fromCodePoint) {
+	(function() {
+		var defineProperty = (function() {
+			// IE 8 only supports `Object.defineProperty` on DOM elements
+			try {
+				var object = {};
+				var $defineProperty = Object.defineProperty;
+				var result = $defineProperty(object, object, object) && $defineProperty;
+			} catch(error) {}
+			return result;
+		}());
+		var stringFromCharCode = String.fromCharCode;
+		var floor = Math.floor;
+		var fromCodePoint = function() {
+			var MAX_SIZE = 0x4000;
+			var codeUnits = [];
+			var highSurrogate;
+			var lowSurrogate;
+			var index = -1;
+			var length = arguments.length;
+			if (!length) {
+				return '';
+			}
+			var result = '';
+			while (++index < length) {
+				var codePoint = Number(arguments[index]);
+				if (
+					!isFinite(codePoint) ||       // `NaN`, `+Infinity`, or `-Infinity`
+					codePoint < 0 ||              // not a valid Unicode code point
+					codePoint > 0x10FFFF ||       // not a valid Unicode code point
+					floor(codePoint) != codePoint // not an integer
+				) {
+					throw RangeError('Invalid code point: ' + codePoint);
+				}
+				if (codePoint <= 0xFFFF) { // BMP code point
+					codeUnits.push(codePoint);
+				} else { // Astral code point; split in surrogate halves
+					// http://mathiasbynens.be/notes/javascript-encoding#surrogate-formulae
+					codePoint -= 0x10000;
+					highSurrogate = (codePoint >> 10) + 0xD800;
+					lowSurrogate = (codePoint % 0x400) + 0xDC00;
+					codeUnits.push(highSurrogate, lowSurrogate);
+				}
+				if (index + 1 == length || codeUnits.length > MAX_SIZE) {
+					result += stringFromCharCode.apply(null, codeUnits);
+					codeUnits.length = 0;
+				}
+			}
+			return result;
+		};
+		if (defineProperty) {
+			defineProperty(String, 'fromCodePoint', {
+				'value': fromCodePoint,
+				'configurable': true,
+				'writable': true
+			});
+		} else {
+			String.fromCodePoint = fromCodePoint;
+		}
+	}());
+}

html_orig/jssrc/keymaster.js

@@ -0,0 +1,310 @@
+//     keymaster.js
+//     (c) 2011-2013 Thomas Fuchs
+//     keymaster.js may be freely distributed under the MIT license.
+
+;(function(global){
+  var k,
+    _handlers = {},
+    _mods = { 16: false, 18: false, 17: false, 91: false },
+    _scope = 'all',
+    // modifier keys
+    _MODIFIERS = {
+      '⇧': 16, shift: 16,
+      '⌥': 18, alt: 18, option: 18,
+      '⌃': 17, ctrl: 17, control: 17,
+      '⌘': 91, command: 91
+    },
+    // special keys
+    _MAP = {
+      backspace: 8, tab: 9, clear: 12,
+      enter: 13, 'return': 13,
+      esc: 27, escape: 27, space: 32,
+      left: 37, up: 38,
+      right: 39, down: 40,
+      del: 46, 'delete': 46,
+      home: 36, end: 35,
+      pageup: 33, pagedown: 34,
+      ',': 188, '.': 190, '/': 191,
+      '`': 192, '-': 189, '=': 187,
+      ';': 186, '\'': 222,
+      '[': 219, ']': 221, '\\': 220,
+      // added:
+      insert: 45,
+      np_0: 96, np_1: 97, np_2: 98, np_3: 99, np_4: 100, np_5: 101,
+	  np_6: 102, np_7: 103, np_8: 104, np_9: 105, np_mul: 106,
+	  np_add: 107, np_sub: 109, np_point: 110, np_div: 111, numlock: 144,
+    },
+    code = function(x){
+      return _MAP[x] || x.toUpperCase().charCodeAt(0);
+    },
+    _downKeys = [];
+
+  for(k=1;k<20;k++) _MAP['f'+k] = 111+k;
+
+  // IE doesn't support Array#indexOf, so have a simple replacement
+  function index(array, item){
+    var i = array.length;
+    while(i--) if(array[i]===item) return i;
+    return -1;
+  }
+
+  // for comparing mods before unassignment
+  function compareArray(a1, a2) {
+    if (a1.length != a2.length) return false;
+    for (var i = 0; i < a1.length; i++) {
+        if (a1[i] !== a2[i]) return false;
+    }
+    return true;
+  }
+
+  var modifierMap = {
+      16:'shiftKey',
+      18:'altKey',
+      17:'ctrlKey',
+      91:'metaKey'
+  };
+  function updateModifierKey(event) {
+      for(k in _mods) _mods[k] = event[modifierMap[k]];
+  };
+
+  function isModifierPressed(mod) {
+    if (mod=='control'||mod=='ctrl') return _mods[17];
+	if (mod=='shift') return _mods[16];
+	if (mod=='meta') return _mods[91];
+	if (mod=='alt') return _mods[18];
+	return false;
+  }
+
+  // handle keydown event
+  function dispatch(event) {
+    var key, handler, k, i, modifiersMatch, scope;
+    key = event.keyCode;
+
+    if (index(_downKeys, key) == -1) {
+        _downKeys.push(key);
+    }
+
+    // if a modifier key, set the key.<modifierkeyname> property to true and return
+    if(key == 93 || key == 224) key = 91; // right command on webkit, command on Gecko
+    if(key in _mods) {
+      _mods[key] = true;
+      // 'assignKey' from inside this closure is exported to window.key
+      for(k in _MODIFIERS) if(_MODIFIERS[k] == key) assignKey[k] = true;
+      return;
+    }
+    updateModifierKey(event);
+
+    // see if we need to ignore the keypress (filter() can can be overridden)
+    // by default ignore key presses if a select, textarea, or input is focused
+    if(!assignKey.filter.call(this, event)) return;
+
+    // abort if no potentially matching shortcuts found
+    if (!(key in _handlers)) return;
+
+    scope = getScope();
+
+    // for each potential shortcut
+    for (i = 0; i < _handlers[key].length; i++) {
+      handler = _handlers[key][i];
+
+      // see if it's in the current scope
+      if(handler.scope == scope || handler.scope == 'all'){
+        // check if modifiers match if any
+        modifiersMatch = handler.mods.length > 0;
+        for(k in _mods)
+          if((!_mods[k] && index(handler.mods, +k) > -1) ||
+            (_mods[k] && index(handler.mods, +k) == -1)) modifiersMatch = false;
+        // call the handler and stop the event if neccessary
+        if((handler.mods.length == 0 && !_mods[16] && !_mods[18] && !_mods[17] && !_mods[91]) || modifiersMatch){
+          if(handler.method(event, handler)===false){
+            if(event.preventDefault) event.preventDefault();
+              else event.returnValue = false;
+            if(event.stopPropagation) event.stopPropagation();
+            if(event.cancelBubble) event.cancelBubble = true;
+          }
+        }
+      }
+    }
+  };
+
+  // unset modifier keys on keyup
+  function clearModifier(event){
+    var key = event.keyCode, k,
+        i = index(_downKeys, key);
+
+    // remove key from _downKeys
+    if (i >= 0) {
+        _downKeys.splice(i, 1);
+    }
+
+    if(key == 93 || key == 224) key = 91;
+    if(key in _mods) {
+      _mods[key] = false;
+      for(k in _MODIFIERS) if(_MODIFIERS[k] == key) assignKey[k] = false;
+    }
+  };
+
+  function resetModifiers() {
+    for(k in _mods) _mods[k] = false;
+    for(k in _MODIFIERS) assignKey[k] = false;
+  };
+
+  // parse and assign shortcut
+  function assignKey(key, scope, method){
+    var keys, mods;
+    keys = getKeys(key);
+    if (method === undefined) {
+      method = scope;
+      scope = 'all';
+    }
+
+    // for each shortcut
+    for (var i = 0; i < keys.length; i++) {
+      // set modifier keys if any
+      mods = [];
+      key = keys[i].split('+');
+      if (key.length > 1){
+        mods = getMods(key);
+        key = [key[key.length-1]];
+      }
+      // convert to keycode and...
+      key = key[0]
+      key = code(key);
+      // ...store handler
+      if (!(key in _handlers)) _handlers[key] = [];
+      _handlers[key].push({ shortcut: keys[i], scope: scope, method: method, key: keys[i], mods: mods });
+    }
+  };
+
+  // unbind all handlers for given key in current scope
+  function unbindKey(key, scope) {
+    var multipleKeys, keys,
+      mods = [],
+      i, j, obj;
+
+    multipleKeys = getKeys(key);
+
+    for (j = 0; j < multipleKeys.length; j++) {
+      keys = multipleKeys[j].split('+');
+
+      if (keys.length > 1) {
+        mods = getMods(keys);
+      }
+
+      key = keys[keys.length - 1];
+      key = code(key);
+
+      if (scope === undefined) {
+        scope = getScope();
+      }
+      if (!_handlers[key]) {
+        return;
+      }
+      for (i = 0; i < _handlers[key].length; i++) {
+        obj = _handlers[key][i];
+        // only clear handlers if correct scope and mods match
+        if (obj.scope === scope && compareArray(obj.mods, mods)) {
+          _handlers[key][i] = {};
+        }
+      }
+    }
+  };
+
+  // Returns true if the key with code 'keyCode' is currently down
+  // Converts strings into key codes.
+  function isPressed(keyCode) {
+      if (typeof(keyCode)=='string') {
+        keyCode = code(keyCode);
+      }
+      return index(_downKeys, keyCode) != -1;
+  }
+
+  function getPressedKeyCodes() {
+      return _downKeys.slice(0);
+  }
+
+  function filter(event){
+    var tagName = (event.target || event.srcElement).tagName;
+    // ignore keypressed in any elements that support keyboard data input
+    return !(tagName == 'INPUT' || tagName == 'SELECT' || tagName == 'TEXTAREA');
+  }
+
+  // initialize key.<modifier> to false
+  for(k in _MODIFIERS) assignKey[k] = false;
+
+  // set current scope (default 'all')
+  function setScope(scope){ _scope = scope || 'all' };
+  function getScope(){ return _scope || 'all' };
+
+  // delete all handlers for a given scope
+  function deleteScope(scope){
+    var key, handlers, i;
+
+    for (key in _handlers) {
+      handlers = _handlers[key];
+      for (i = 0; i < handlers.length; ) {
+        if (handlers[i].scope === scope) handlers.splice(i, 1);
+        else i++;
+      }
+    }
+  };
+
+  // abstract key logic for assign and unassign
+  function getKeys(key) {
+    var keys;
+    key = key.replace(/\s/g, '');
+    keys = key.split(',');
+    if ((keys[keys.length - 1]) == '') {
+      keys[keys.length - 2] += ',';
+    }
+    return keys;
+  }
+
+  // abstract mods logic for assign and unassign
+  function getMods(key) {
+    var mods = key.slice(0, key.length - 1);
+    for (var mi = 0; mi < mods.length; mi++)
+    mods[mi] = _MODIFIERS[mods[mi]];
+    return mods;
+  }
+
+  // cross-browser events
+  function addEvent(object, event, method) {
+    if (object.addEventListener)
+      object.addEventListener(event, method, false);
+    else if(object.attachEvent)
+      object.attachEvent('on'+event, function(){ method(window.event) });
+  };
+
+  // set the handlers globally on document
+  addEvent(document, 'keydown', function(event) { dispatch(event) }); // Passing _scope to a callback to ensure it remains the same by execution. Fixes #48
+  addEvent(document, 'keyup', clearModifier);
+
+  // reset modifiers to false whenever the window is (re)focused.
+  addEvent(window, 'focus', resetModifiers);
+
+  // store previously defined key
+  var previousKey = global.key;
+
+  // restore previously defined key and return reference to our key object
+  function noConflict() {
+    var k = global.key;
+    global.key = previousKey;
+    return k;
+  }
+
+  // set window.key and window.key.set/get/deleteScope, and the default filter
+  global.key = assignKey;
+  global.key.setScope = setScope;
+  global.key.getScope = getScope;
+  global.key.deleteScope = deleteScope;
+  global.key.filter = filter;
+  global.key.isPressed = isPressed;
+  global.key.isModifier = isModifierPressed;
+  global.key.getPressedKeyCodes = getPressedKeyCodes;
+  global.key.noConflict = noConflict;
+  global.key.unbind = unbindKey;
+
+  if(typeof module !== 'undefined') module.exports = assignKey;
+
+})(this);

html_orig/jssrc/modal.js

@@ -1,13 +1,15 @@
 /** Module for toggling a modal overlay */
 (function () {
 	var modal = {};
+	var curCloseCb = null;
 
-	modal.show = function (sel) {
+	modal.show = function (sel, closeCb) {
 		var $m = $(sel);
 		$m.removeClass('hidden visible');
 		setTimeout(function () {
 			$m.addClass('visible');
 		}, 1);
+		curCloseCb = closeCb;
 	};
 
 	modal.hide = function (sel) {
@@ -15,6 +17,7 @@
 		$m.removeClass('visible');
 		setTimeout(function () {
 			$m.addClass('hidden');
+			if (curCloseCb) curCloseCb();
 		}, 500); // transition time
 	};
 

html_orig/jssrc/term.js

@@ -1,368 +1,6 @@
-var Screen = (function () {
-	var W = 0, H = 0; // dimensions
-	var inited = false;
-
-	var cursor = {
-		a: false,        // active (blink state)
-		x: 0,            // 0-based coordinates
-		y: 0,
-		fg: 7,           // colors 0-15
-		bg: 0,
-		bold: false,
-		suppress: false, // do not turn on in blink interval (for safe moving)
-		hidden: false    // do not show
-	};
-
-	var screen = [];
-	var blinkIval;
-
-	/** Clear screen */
-	function _clear() {
-		for (var i = W*H-1; i>=0; i--) {
-			var cell = screen[i];
-			cell.t = ' ';
-			cell.bg = cursor.bg;
-			cell.fg = cursor.fg;
-			cell.bold = false;
-			_draw(cell);
-		}
-	}
-
-	/** Set text and color at XY */
-	function _cellAt(y, x) {
-		return screen[y*W+x];
-	}
-
-	/** Get cell under cursor */
-	function _curCell() {
-		return screen[cursor.y*W + cursor.x];
-	}
-
-	/** Enable or disable cursor visibility */
-	function _cursorEnable(enable) {
-		cursor.hidden = !enable;
-		cursor.a &= enable;
-		_draw(_curCell());
-	}
-
-	/** Safely move cursor */
-	function cursorSet(y, x) {
-		// Hide and prevent from showing up during the move
-		cursor.suppress = true;
-		_draw(_curCell(), false);
-		cursor.x = x;
-		cursor.y = y;
-		// Show again
-		cursor.suppress = false;
-		_draw(_curCell());
-	}
-
-	/** Update cell on display. inv = invert (for cursor) */
-	function _draw(cell, inv) {
-		if (typeof inv == 'undefined') {
-			inv = cursor.a && cursor.x == cell.x && cursor.y == cell.y;
-		}
-
-		var e = cell.e, fg, bg;
-		// Colors
-		fg = inv ? cell.bg : cell.fg;
-		bg = inv ? cell.fg : cell.bg;
-		// Update
-		e.innerText = (cell.t + ' ')[0];
-		e.className = 'fg' + fg + ' bg' + bg + (cell.bold ? ' bold' : '');
-	}
-
-	/** Show entire screen */
-	function _drawAll() {
-		for (var i = W*H-1; i>=0; i--) {
-			_draw(screen[i]);
-		}
-	}
-
-	function _rebuild(rows, cols) {
-		W = cols;
-		H = rows;
-
-		/* Build screen & show */
-		var e, cell, scr = qs('#screen');
-
-		// Empty the screen node
-		while (scr.firstChild) scr.removeChild(scr.firstChild);
-
-		screen = [];
-
-		for(var i = 0; i < W*H; i++) {
-			e = mk('span');
-
-			(function() {
-				var x = i % W;
-				var y = Math.floor(i / W);
-				e.addEventListener('click', function () {
-					Input.onTap(y, x);
-				});
-			})();
-
-			/* End of line */
-			if ((i > 0) && (i % W == 0)) {
-				scr.appendChild(mk('br'));
-			}
-			/* The cell */
-			scr.appendChild(e);
-
-			cell = {
-				t: ' ',
-				fg: cursor.fg,
-				bg: cursor.bg,
-				e: e,
-				x: i % W,
-				y: Math.floor(i / W),
-			};
-			screen.push(cell);
-			_draw(cell);
-		}
-	}
-
-	/** Init the terminal */
-	function _init() {
-		/* Cursor blinking */
-		clearInterval(blinkIval);
-		blinkIval = setInterval(function () {
-			cursor.a = !cursor.a;
-			if (cursor.hidden) {
-				cursor.a = false;
-			}
-
-			if (!cursor.suppress) {
-				_draw(_curCell(), cursor.a);
-			}
-		}, 500);
-		inited = true;
-	}
-
-	/** Decode two-byte number */
-	function parse2B(s, i) {
-		return (s.charCodeAt(i++) - 1) + (s.charCodeAt(i) - 1) * 127;
-	}
-
-	var SEQ_SET_COLOR = 1;
-	var SEQ_REPEAT = 2;
-
-	function _load_content(str) {
-		var i = 0, ci = 0, j, jc, num, num2, t = ' ', fg, bg, bold, cell;
-
-		if (!inited) _init();
-
-		// Set size
-		num = parse2B(str, i); i += 2;  // height
-		num2 = parse2B(str, i); i += 2; // width
-		if (num != H || num2 != W) {
-			_rebuild(num, num2);
-		}
-		// console.log("Size ",num, num2);
-
-		// Cursor position
-		num = parse2B(str, i); i += 2; // row
-		num2 = parse2B(str, i); i += 2; // col
-		cursorSet(num, num2);
-		// console.log("Cursor at ",num, num2);
-
-		// Attributes
-		num = parse2B(str, i); i += 2; // fg bg bold hidden
-		cursor.fg = num & 0x0F;
-		cursor.bg = (num & 0xF0) >> 4;
-		cursor.bold = !!(num & 0x100);
-		cursor.hidden = !(num & 0x200);
-		// console.log("FG ",cursor.fg, ", BG ", cursor.bg,", BOLD ", cursor.bold, ", HIDE ", cursor.hidden);
-
-		fg = cursor.fg;
-		bg = cursor.bg;
-		bold = cursor.bold;
-
-		// Here come the content
-		while(i < str.length && ci<W*H) {
-
-			j = str[i++];
-			jc = j.charCodeAt(0);
-			if (jc == SEQ_SET_COLOR) {
-				num = parse2B(str, i); i += 2;
-				fg = num & 0x0F;
-				bg = (num & 0xF0) >> 4;
-				bold = !!(num & 0x100);
-				// console.log("Switch to ",fg,bg,bold);
-			}
-			else if (jc == SEQ_REPEAT) {
-				num = parse2B(str, i); i += 2;
-				// console.log("Repeat x ",num);
-				for (; num>0 && ci<W*H; num--) {
-					cell = screen[ci++];
-					cell.fg = fg;
-					cell.bg = bg;
-					cell.t = t;
-					cell.bold = bold;
-				}
-			}
-			else {
-				cell = screen[ci++];
-				// Unique cell character
-				t = cell.t = j;
-				cell.fg = fg;
-				cell.bg = bg;
-				cell.bold = bold;
-				// console.log("Symbol ", j);
-			}
-		}
-
-		_drawAll();
-	}
-
-	function _load_labels(str) {
-		var pieces = str.split('\x01');
-		qs('h1').textContent = pieces[0];
-		qsa('#buttons button').forEach(function(x, i) {
-			var s = pieces[i+1].trim();
-			// if empty string, use the "dim" effect and put nbsp instead to stretch the btn vertically
-			x.innerHTML = s.length >0 ? e(s) : "&nbsp;";
-			x.style.opacity = s.length > 0 ? 1 : 0.2;
-		});
-	}
-
-	/** Load screen content from a binary sequence (new) */
-	function load(str) {
-		var content = str.substr(1);
-		switch(str.charAt(0)) {
-			case 'S':
-				_load_content(content);
-				break;
-			case 'T':
-				_load_labels(content);
-				break;
-			default:
-				console.warn("Bad data message type, ignoring.");
-		}
-	}
-
-	return  {
-		load: load, // full load (string)
-	};
-})();
-
-/** Handle connections */
-var Conn = (function() {
-	var ws;
-
-	function onOpen(evt) {
-		console.log("CONNECTED");
-	}
-
-	function onClose(evt) {
-		console.warn("SOCKET CLOSED, code "+evt.code+". Reconnecting...");
-		setTimeout(function() {
-			init();
-		}, 1000);
-	}
-
-	function onMessage(evt) {
-		try {
-			console.log("RX: ", evt.data);
-			// Assume all our messages are screen updates
-			Screen.load(evt.data);
-		} catch(e) {
-			console.error(e);
-		}
-	}
-
-	function doSend(message) {
-		console.log("TX: ", message);
-		if (!ws) return; // for dry testing
-		if (ws.readyState != 1) {
-			console.error("Socket not ready");
-			return;
-		}
-		if (typeof message != "string") {
-			message = JSON.stringify(message);
-		}
-		ws.send(message);
-	}
-
-	function init() {
-		ws = new WebSocket("ws://"+_root+"/term/update.ws");
-		ws.onopen = onOpen;
-		ws.onclose = onClose;
-		ws.onmessage = onMessage;
-
-		console.log("Opening socket.");
-
-		// Ask for initial data
-		$.get('http://'+_root+'/term/init', function(resp, status) {
-			if (status !== 200) location.reload(true);
-			console.log("Data received!");
-			Screen.load(resp);
-
-			showPage();
-		});
-	}
-
-	return {
-		ws: null,
-		init: init,
-		send: doSend
-	};
-})();
-
-/** User input */
-var Input = (function() {
-	function sendStrMsg(str) {
-		Conn.send("STR:"+str);
-	}
-
-	function sendPosMsg(y, x) {
-		Conn.send("TAP:"+y+','+x);
-	}
-
-	function sendBtnMsg(n) {
-		Conn.send("BTN:"+n);
-	}
-
-	function init() {
-		window.addEventListener('keypress', function(e) {
-			var code = +e.which;
-			if (code >= 32 && code < 127) {
-				var ch = String.fromCharCode(code);
-				//console.log("Typed ", ch, "code", code, e);
-				sendStrMsg(ch);
-			}
-		});
-
-		window.addEventListener('keydown', function(e) {
-			var code = e.keyCode;
-			//console.log("Down ", code, e);
-			switch(code) {
-				case 8: sendStrMsg('\x08'); break;
-				case 10:
-				case 13: sendStrMsg('\x0d\x0a'); break;
-				case 27: sendStrMsg('\x1b'); break; // this allows to directly enter control sequences
-				case 37: sendStrMsg('\x1b[D'); break;
-				case 38: sendStrMsg('\x1b[A'); break;
-				case 39: sendStrMsg('\x1b[C'); break;
-				case 40: sendStrMsg('\x1b[B'); break;
-			}
-		});
-
-		qsa('#buttons button').forEach(function(s) {
-			s.addEventListener('click', function() {
-				sendBtnMsg(+this.dataset['n']);
-			});
-		});
-	}
-
-	return {
-		init: init,
-		onTap: sendPosMsg,
-		sendString: sendStrMsg,
-	};
-})();
-
+/** Init the terminal sub-module - called from HTML */
 window.termInit = function () {
 	Conn.init();
 	Input.init();
+	TermUpl.init();
 };

html_orig/jssrc/term_conn.js

@@ -0,0 +1,131 @@
+/** Handle connections */
+var Conn = (function() {
+	var ws;
+	var heartbeatTout;
+	var pingIv;
+	var xoff = false;
+	var autoXoffTout;
+
+	function onOpen(evt) {
+		console.log("CONNECTED");
+	}
+
+	function onClose(evt) {
+		console.warn("SOCKET CLOSED, code "+evt.code+". Reconnecting...");
+		setTimeout(function() {
+			init();
+		}, 200);
+		// this happens when the buffer gets fucked up via invalid unicode.
+		// we basically use polling instead of socket then
+	}
+
+	function onMessage(evt) {
+		try {
+			// . = heartbeat
+			switch (evt.data.charAt(0)) {
+				case 'B':
+				case 'T':
+				case 'S':
+					Screen.load(evt.data);
+					break;
+
+				case '-':
+					//console.log('xoff');
+					xoff = true;
+					autoXoffTout = setTimeout(function(){xoff=false;}, 250);
+					break;
+
+				case '+':
+					//console.log('xon');
+					xoff = false;
+					clearTimeout(autoXoffTout);
+					break;
+			}
+			heartbeat();
+		} catch(e) {
+			console.error(e);
+		}
+	}
+
+	function canSend() {
+		return !xoff;
+	}
+
+	function doSend(message) {
+		if (_demo) {
+			console.log("TX: ", message);
+			return true; // Simulate success
+		}
+		if (xoff) {
+			// TODO queue
+			console.log("Can't send, flood control.");
+			return false;
+		}
+
+		if (!ws) return false; // for dry testing
+		if (ws.readyState != 1) {
+			console.error("Socket not ready");
+			return false;
+		}
+		if (typeof message != "string") {
+			message = JSON.stringify(message);
+		}
+		ws.send(message);
+		return true;
+	}
+
+	function init() {
+		if (_demo) {
+			console.log("Demo mode!");
+			Screen.load(_demo_screen);
+			showPage();
+			return;
+		}
+		heartbeat();
+
+		ws = new WebSocket("ws://"+_root+"/term/update.ws");
+		ws.onopen = onOpen;
+		ws.onclose = onClose;
+		ws.onmessage = onMessage;
+
+		console.log("Opening socket.");
+
+		// Ask for initial data
+		$.get('http://'+_root+'/term/init', function(resp, status) {
+			if (status !== 200) location.reload(true);
+			console.log("Data received!");
+			Screen.load(resp);
+			heartbeat();
+
+			showPage();
+		});
+	}
+
+	function heartbeat() {
+		clearTimeout(heartbeatTout);
+		heartbeatTout = setTimeout(heartbeatFail, 2000);
+	}
+
+	function heartbeatFail() {
+		console.error("Heartbeat lost, probing server...");
+		pingIv = setInterval(function() {
+			console.log("> ping");
+			$.get('http://'+_root+'/system/ping', function(resp, status) {
+				if (status == 200) {
+					clearInterval(pingIv);
+					console.info("Server ready, reloading page...");
+					location.reload();
+				}
+			}, {
+				timeout: 100,
+			});
+		}, 500);
+	}
+
+	return {
+		ws: null,
+		init: init,
+		send: doSend,
+		canSend: canSend, // check flood control
+	};
+})();

html_orig/jssrc/term_input.js

@@ -0,0 +1,262 @@
+/**
+ * User input
+ *
+ * --- Rx messages: ---
+ * S - screen content (binary encoding of the entire screen with simple compression)
+ * T - text labels - Title and buttons, \0x01-separated
+ * B - beep
+ * . - heartbeat
+ *
+ * --- Tx messages ---
+ * s - string
+ * b - action button
+ * p - mb press
+ * r - mb release
+ * m - mouse move
+ */
+var Input = (function() {
+	var opts = {
+		np_alt: false,
+		cu_alt: false,
+		fn_alt: false,
+		mt_click: false,
+		mt_move: false,
+		no_keys: false,
+	};
+
+	/** Send a literal message */
+	function sendStrMsg(str) {
+		return Conn.send("s"+str);
+	}
+
+	/** Send a button event */
+	function sendBtnMsg(n) {
+		Conn.send("b"+Chr(n));
+	}
+
+	/** Fn alt choice for key message */
+	function fa(alt, normal) {
+		return opts.fn_alt ? alt : normal;
+	}
+
+	/** Cursor alt choice for key message */
+	function ca(alt, normal) {
+		return opts.cu_alt ? alt : normal;
+	}
+
+	/** Numpad alt choice for key message */
+	function na(alt, normal) {
+		return opts.np_alt ? alt : normal;
+	}
+
+	function _bindFnKeys() {
+		var keymap = {
+			'tab': '\x09',
+			'backspace': '\x08',
+			'enter': '\x0d',
+			'ctrl+enter': '\x0a',
+			'esc': '\x1b',
+			'up': ca('\x1bOA', '\x1b[A'),
+			'down': ca('\x1bOB', '\x1b[B'),
+			'right': ca('\x1bOC', '\x1b[C'),
+			'left': ca('\x1bOD', '\x1b[D'),
+			'home': ca('\x1bOH', fa('\x1b[H', '\x1b[1~')),
+			'insert': '\x1b[2~',
+			'delete': '\x1b[3~',
+			'end': ca('\x1bOF', fa('\x1b[F', '\x1b[4~')),
+			'pageup': '\x1b[5~',
+			'pagedown': '\x1b[6~',
+			'f1': fa('\x1bOP', '\x1b[11~'),
+			'f2': fa('\x1bOQ', '\x1b[12~'),
+			'f3': fa('\x1bOR', '\x1b[13~'),
+			'f4': fa('\x1bOS', '\x1b[14~'),
+			'f5': '\x1b[15~', // note the disconnect
+			'f6': '\x1b[17~',
+			'f7': '\x1b[18~',
+			'f8': '\x1b[19~',
+			'f9': '\x1b[20~',
+			'f10': '\x1b[21~', // note the disconnect
+			'f11': '\x1b[23~',
+			'f12': '\x1b[24~',
+			'shift+f1': fa('\x1bO1;2P', '\x1b[25~'),
+			'shift+f2': fa('\x1bO1;2Q', '\x1b[26~'), // note the disconnect
+			'shift+f3': fa('\x1bO1;2R', '\x1b[28~'),
+			'shift+f4': fa('\x1bO1;2S', '\x1b[29~'), // note the disconnect
+			'shift+f5': fa('\x1b[15;2~', '\x1b[31~'),
+			'shift+f6': fa('\x1b[17;2~', '\x1b[32~'),
+			'shift+f7': fa('\x1b[18;2~', '\x1b[33~'),
+			'shift+f8': fa('\x1b[19;2~', '\x1b[34~'),
+			'shift+f9': fa('\x1b[20;2~', '\x1b[35~'), // 35-38 are not standard - but what is?
+			'shift+f10': fa('\x1b[21;2~', '\x1b[36~'),
+			'shift+f11': fa('\x1b[22;2~', '\x1b[37~'),
+			'shift+f12': fa('\x1b[23;2~', '\x1b[38~'),
+			'np_0': na('\x1bOp', '0'),
+			'np_1': na('\x1bOq', '1'),
+			'np_2': na('\x1bOr', '2'),
+			'np_3': na('\x1bOs', '3'),
+			'np_4': na('\x1bOt', '4'),
+			'np_5': na('\x1bOu', '5'),
+			'np_6': na('\x1bOv', '6'),
+			'np_7': na('\x1bOw', '7'),
+			'np_8': na('\x1bOx', '8'),
+			'np_9': na('\x1bOy', '9'),
+			'np_mul': na('\x1bOR', '*'),
+			'np_add': na('\x1bOl', '+'),
+			'np_sub': na('\x1bOS', '-'),
+			'np_point': na('\x1bOn', '.'),
+			'np_div': na('\x1bOQ', '/'),
+			// we don't implement numlock key (should change in numpad_alt mode, but it's even more useless than the rest)
+		};
+
+		for (var k in keymap) {
+			if (keymap.hasOwnProperty(k)) {
+				bind(k, keymap[k]);
+			}
+		}
+	}
+
+	/** Bind a keystroke to message */
+	function bind(combo, str) {
+		// mac fix - allow also cmd
+		if (combo.indexOf('ctrl+') !== -1) {
+			combo += ',' + combo.replace('ctrl', 'command');
+		}
+
+		// unbind possible old binding
+		key.unbind(combo);
+
+		key(combo, function (e) {
+			if (opts.no_keys) return;
+			e.preventDefault();
+			sendStrMsg(str)
+		});
+	}
+
+	/** Bind/rebind key messages */
+	function _initKeys() {
+		// This takes care of text characters typed
+		window.addEventListener('keypress', function(evt) {
+			if (opts.no_keys) return;
+			var str = '';
+			if (evt.key) str = evt.key;
+			else if (evt.which) str = String.fromCodePoint(evt.which);
+			if (str.length>0 && str.charCodeAt(0) >= 32) {
+//				console.log("Typed ", str);
+				sendStrMsg(str);
+			}
+		});
+
+		// ctrl-letter codes are sent as simple low ASCII codes
+		for (var i = 1; i<=26;i++) {
+			bind('ctrl+' + String.fromCharCode(96+i), String.fromCharCode(i));
+		}
+		bind('ctrl+]', '\x1b'); // alternate way to enter ESC
+		bind('ctrl+\\', '\x1c');
+		bind('ctrl+[', '\x1d');
+		bind('ctrl+^', '\x1e');
+		bind('ctrl+_', '\x1f');
+
+		_bindFnKeys();
+	}
+
+	// mouse button states
+	var mb1 = 0;
+	var mb2 = 0;
+	var mb3 = 0;
+
+	/** Init the Input module */
+	function init() {
+		_initKeys();
+
+		// Button presses
+		$('#action-buttons button').forEach(function(s) {
+			s.addEventListener('click', function() {
+				sendBtnMsg(+this.dataset['n']);
+			});
+		});
+
+		// global mouse state tracking - for motion reporting
+		window.addEventListener('mousedown', function(evt) {
+			if (evt.button == 0) mb1 = 1;
+			if (evt.button == 1) mb2 = 1;
+			if (evt.button == 2) mb3 = 1;
+		});
+
+		window.addEventListener('mouseup', function(evt) {
+			if (evt.button == 0) mb1 = 0;
+			if (evt.button == 1) mb2 = 0;
+			if (evt.button == 2) mb3 = 0;
+		});
+	}
+
+	/** Prepare modifiers byte for mouse message */
+	function packModifiersForMouse() {
+		return (key.isModifier('ctrl')?1:0) |
+			(key.isModifier('shift')?2:0) |
+			(key.isModifier('alt')?4:0) |
+			(key.isModifier('meta')?8:0);
+	}
+
+	return {
+		/** Init the Input module */
+		init: init,
+
+		/** Send a literal string message */
+		sendString: sendStrMsg,
+
+		/** Enable alternate key modes (cursors, numpad, fn) */
+		setAlts: function(cu, np, fn) {
+			if (opts.cu_alt != cu || opts.np_alt != np || opts.fn_alt != fn) {
+				opts.cu_alt = cu;
+				opts.np_alt = np;
+				opts.fn_alt = fn;
+
+				// rebind keys - codes have changed
+				_bindFnKeys();
+			}
+		},
+
+		setMouseMode: function(click, move) {
+			opts.mt_click = click;
+			opts.mt_move = move;
+		},
+
+		// Mouse events
+		onMouseMove: function (x, y) {
+			if (!opts.mt_move) return;
+			var b = mb1 ? 1 : mb2 ? 2 : mb3 ? 3 : 0;
+			var m = packModifiersForMouse();
+			Conn.send("m" + encode2B(y) + encode2B(x) + encode2B(b) + encode2B(m));
+		},
+		onMouseDown: function (x, y, b) {
+			if (!opts.mt_click) return;
+			if (b > 3 || b < 1) return;
+			var m = packModifiersForMouse();
+			Conn.send("p" + encode2B(y) + encode2B(x) + encode2B(b) + encode2B(m));
+			// console.log("B ",b," M ",m);
+		},
+		onMouseUp: function (x, y, b) {
+			if (!opts.mt_click) return;
+			if (b > 3 || b < 1) return;
+			var m = packModifiersForMouse();
+			Conn.send("r" + encode2B(y) + encode2B(x) + encode2B(b) + encode2B(m));
+			// console.log("B ",b," M ",m);
+		},
+		onMouseWheel: function (x, y, dir) {
+			if (!opts.mt_click) return;
+			// -1 ... btn 4 (away from user)
+			// +1 ... btn 5 (towards user)
+			var m = packModifiersForMouse();
+			var b = (dir < 0 ? 4 : 5);
+			Conn.send("p" + encode2B(y) + encode2B(x) + encode2B(b) + encode2B(m));
+			// console.log("B ",b," M ",m);
+		},
+		mouseTracksClicks: function() {
+			return opts.mt_click;
+		},
+		blockKeys: function(yes) {
+			opts.no_keys = yes;
+		}
+	};
+})();
+

html_orig/jssrc/term_screen.js

@@ -0,0 +1,378 @@
+var Screen = (function () {
+	var W = 0, H = 0; // dimensions
+	var inited = false;
+
+	var cursor = {
+		a: false,        // active (blink state)
+		x: 0,            // 0-based coordinates
+		y: 0,
+		fg: 7,           // colors 0-15
+		bg: 0,
+		attrs: 0,
+		suppress: false, // do not turn on in blink interval (for safe moving)
+		forceOn: false,  // force on unless hanging: used to keep cursor visible during move
+		hidden: false,    // do not show (DEC opt)
+		hanging: false,   // cursor at column "W+1" - not visible
+	};
+
+	var screen = [];
+	var blinkIval;
+	var cursorFlashStartIval;
+
+	// Some non-bold Fraktur symbols are outside the contiguous block
+	var frakturExceptions = {
+		'C': '\u212d',
+		'H': '\u210c',
+		'I': '\u2111',
+		'R': '\u211c',
+		'Z': '\u2128',
+	};
+
+	// for BEL
+	var audioCtx = null;
+	try {
+		audioCtx = new (window.AudioContext || window.audioContext || window.webkitAudioContext)();
+	} catch (er) {
+		console.error("No AudioContext!", er);
+	}
+
+	/** Get cell under cursor */
+	function _curCell() {
+		return screen[cursor.y*W + cursor.x];
+	}
+
+	/** Safely move cursor */
+	function cursorSet(y, x) {
+		// Hide and prevent from showing up during the move
+		cursor.suppress = true;
+		_draw(_curCell(), false);
+		cursor.x = x;
+		cursor.y = y;
+		// Show again
+		cursor.suppress = false;
+		_draw(_curCell());
+	}
+
+	function alpha2fraktur(t) {
+		// perform substitution
+		if (t >= 'a' && t <= 'z') {
+			t = String.fromCodePoint(0x1d51e - 97 + t.charCodeAt(0));
+		}
+		else if (t >= 'A' && t <= 'Z') {
+			// this set is incomplete, some exceptions are needed
+			if (frakturExceptions.hasOwnProperty(t)) {
+				t = frakturExceptions[t];
+			} else {
+				t = String.fromCodePoint(0x1d504 - 65 + t.charCodeAt(0));
+			}
+		}
+		return t;
+	}
+
+	/** Update cell on display. inv = invert (for cursor) */
+	function _draw(cell, inv) {
+		if (!cell) return;
+		if (typeof inv == 'undefined') {
+			inv = cursor.a && cursor.x == cell.x && cursor.y == cell.y;
+		}
+
+		var fg, bg, cn, t;
+
+		fg = inv ? cell.bg : cell.fg;
+		bg = inv ? cell.fg : cell.bg;
+
+		t = cell.t;
+		if (!t.length) t = ' ';
+
+		cn = 'fg' + fg + ' bg' + bg;
+		if (cell.attrs & (1<<0)) cn += ' bold';
+		if (cell.attrs & (1<<1)) cn += ' faint';
+		if (cell.attrs & (1<<2)) cn += ' italic';
+		if (cell.attrs & (1<<3)) cn += ' under';
+		if (cell.attrs & (1<<4)) cn += ' blink';
+		if (cell.attrs & (1<<5)) {
+			cn += ' fraktur';
+			t = alpha2fraktur(t);
+		}
+		if (cell.attrs & (1<<6)) cn += ' strike';
+
+		cell.slot.textContent = t;
+		cell.elem.className = cn;
+	}
+
+	/** Show entire screen */
+	function _drawAll() {
+		for (var i = W*H-1; i>=0; i--) {
+			_draw(screen[i]);
+		}
+	}
+
+	function _rebuild(rows, cols) {
+		W = cols;
+		H = rows;
+
+		/* Build screen & show */
+		var cOuter, cInner, cell, screenDiv = qs('#screen');
+
+		// Empty the screen node
+		while (screenDiv.firstChild) screenDiv.removeChild(screenDiv.firstChild);
+
+		screen = [];
+
+		for(var i = 0; i < W*H; i++) {
+			cOuter = mk('span');
+			cInner = mk('span');
+
+			/* Mouse tracking */
+			(function() {
+				var x = i % W;
+				var y = Math.floor(i / W);
+				cOuter.addEventListener('mouseenter', function (evt) {
+					Input.onMouseMove(x, y);
+				});
+				cOuter.addEventListener('mousedown', function (evt) {
+					Input.onMouseDown(x, y, evt.button+1);
+				});
+				cOuter.addEventListener('mouseup', function (evt) {
+					Input.onMouseUp(x, y, evt.button+1);
+				});
+				cOuter.addEventListener('contextmenu', function (evt) {
+					if (Input.mouseTracksClicks()) {
+						evt.preventDefault();
+					}
+				});
+				cOuter.addEventListener('mousewheel', function (evt) {
+					Input.onMouseWheel(x, y, evt.deltaY>0?1:-1);
+					return false;
+				});
+			})();
+
+			/* End of line */
+			if ((i > 0) && (i % W == 0)) {
+				screenDiv.appendChild(mk('br'));
+			}
+			/* The cell */
+			cOuter.appendChild(cInner);
+			screenDiv.appendChild(cOuter);
+
+			cell = {
+				t: ' ',
+				fg: 7,
+				bg: 0, // the colors will be replaced immediately as we receive data (user won't see this)
+				attrs: 0,
+				elem: cOuter,
+				slot: cInner,
+				x: i % W,
+				y: Math.floor(i / W),
+			};
+			screen.push(cell);
+			_draw(cell);
+		}
+	}
+
+	/** Init the terminal */
+	function _init() {
+		/* Cursor blinking */
+		clearInterval(blinkIval);
+		blinkIval = setInterval(function () {
+			cursor.a = !cursor.a;
+			if (cursor.hidden || cursor.hanging) {
+				cursor.a = false;
+			}
+
+			if (!cursor.suppress) {
+				_draw(_curCell(), cursor.forceOn || cursor.a);
+			}
+		}, 500);
+
+		/* blink attribute animation */
+		setInterval(function () {
+			$('#screen').removeClass('blink-hide');
+			setTimeout(function () {
+				$('#screen').addClass('blink-hide');
+			}, 800); // 200 ms ON
+		}, 1000);
+
+		inited = true;
+	}
+
+	// constants for decoding the update blob
+	var SEQ_SET_COLOR_ATTR = 1;
+	var SEQ_REPEAT = 2;
+	var SEQ_SET_COLOR = 3;
+	var SEQ_SET_ATTR = 4;
+
+	/** Parse received screen update object (leading S removed already) */
+	function _load_content(str) {
+		var i = 0, ci = 0, j, jc, num, num2, t = ' ', fg, bg, attrs, cell;
+
+		if (!inited) _init();
+
+		var cursorMoved;
+
+		// Set size
+		num = parse2B(str, i); i += 2;  // height
+		num2 = parse2B(str, i); i += 2; // width
+		if (num != H || num2 != W) {
+			_rebuild(num, num2);
+		}
+		// console.log("Size ",num, num2);
+
+		// Cursor position
+		num = parse2B(str, i); i += 2; // row
+		num2 = parse2B(str, i); i += 2; // col
+		cursorMoved = (cursor.x != num2 || cursor.y != num);
+		cursorSet(num, num2);
+		// console.log("Cursor at ",num, num2);
+
+		// Attributes
+		num = parse2B(str, i); i += 2; // fg bg attribs
+		cursor.hidden = !(num & (1<<0)); // DEC opt "visible"
+		cursor.hanging = !!(num & (1<<1));
+		// console.log("Attributes word ",num.toString(16)+'h');
+
+		Input.setAlts(
+			!!(num & (1<<2)), // cursors alt
+			!!(num & (1<<3)), // numpad alt
+			!!(num & (1<<4)) // fn keys alt
+		);
+
+		var mt_click = !!(num & (1<<5));
+		var mt_move = !!(num & (1<<6));
+		Input.setMouseMode(
+			mt_click,
+			mt_move
+		);
+		$('#screen').toggleClass('noselect', mt_move);
+
+		var show_buttons = !!(num & (1<<7));
+		var show_config_links = !!(num & (1<<8));
+		$('.x-term-conf-btn').toggleClass('hidden', !show_config_links);
+		$('#action-buttons').toggleClass('hidden', !show_buttons);
+
+		fg = 7;
+		bg = 0;
+		attrs = 0;
+
+		// Here come the content
+		while(i < str.length && ci<W*H) {
+
+			j = str[i++];
+			jc = j.charCodeAt(0);
+			if (jc == SEQ_SET_COLOR_ATTR) {
+				num = parse3B(str, i); i += 3;
+				fg = num & 0x0F;
+				bg = (num & 0xF0) >> 4;
+				attrs = (num & 0xFF00)>>8;
+			}
+			else if (jc == SEQ_SET_COLOR) {
+				num = parse2B(str, i); i += 2;
+				fg = num & 0x0F;
+				bg = (num & 0xF0) >> 4;
+			}
+			else if (jc == SEQ_SET_ATTR) {
+				num = parse2B(str, i); i += 2;
+				attrs = num & 0xFF;
+			}
+			else if (jc == SEQ_REPEAT) {
+				num = parse2B(str, i); i += 2;
+				// console.log("Repeat x ",num);
+				for (; num>0 && ci<W*H; num--) {
+					cell = screen[ci++];
+					cell.fg = fg;
+					cell.bg = bg;
+					cell.t = t;
+					cell.attrs = attrs;
+				}
+			}
+			else {
+				cell = screen[ci++];
+				// Unique cell character
+				t = cell.t = j;
+				cell.fg = fg;
+				cell.bg = bg;
+				cell.attrs = attrs;
+				// console.log("Symbol ", j);
+			}
+		}
+
+		_drawAll();
+
+		// if (!cursor.hidden || cursor.hanging || !cursor.suppress) {
+		// 	// hide cursor asap
+		// 	_draw(_curCell(), false);
+		// }
+
+		if (cursorMoved) {
+			cursor.forceOn = true;
+			cursorFlashStartIval = setTimeout(function() {
+				cursor.forceOn = false;
+			}, 1200);
+			_draw(_curCell(), true);
+		}
+	}
+
+	/** Apply labels to buttons and screen title (leading T removed already) */
+	function _load_labels(str) {
+		var pieces = str.split('\x01');
+		qs('h1').textContent = pieces[0];
+		$('#action-buttons button').forEach(function(x, i) {
+			var s = pieces[i+1].trim();
+			// if empty string, use the "dim" effect and put nbsp instead to stretch the btn vertically
+			x.innerHTML = s.length > 0 ? e(s) : "&nbsp;";
+			x.style.opacity = s.length > 0 ? 1 : 0.2;
+		})
+	}
+
+	/** Audible beep for ASCII 7 */
+	function _beep() {
+		var osc, gain;
+		if (!audioCtx) return;
+
+		// Main beep
+		osc = audioCtx.createOscillator();
+		gain = audioCtx.createGain();
+		osc.connect(gain);
+		gain.connect(audioCtx.destination);
+		gain.gain.value = 0.5;
+		osc.frequency.value = 750;
+		osc.type = 'sine';
+		osc.start();
+		osc.stop(audioCtx.currentTime+0.05);
+
+		// Surrogate beep (making it sound like 'oops')
+		osc = audioCtx.createOscillator();
+		gain = audioCtx.createGain();
+		osc.connect(gain);
+		gain.connect(audioCtx.destination);
+		gain.gain.value = 0.2;
+		osc.frequency.value = 400;
+		osc.type = 'sine';
+		osc.start(audioCtx.currentTime+0.05);
+		osc.stop(audioCtx.currentTime+0.08);
+	}
+
+	/** Load screen content from a binary sequence (new) */
+	function load(str) {
+		//console.log(JSON.stringify(str));
+		var content = str.substr(1);
+		switch(str.charAt(0)) {
+			case 'S':
+				_load_content(content);
+				break;
+			case 'T':
+				_load_labels(content);
+				break;
+			case 'B':
+				_beep();
+				break;
+			default:
+				console.warn("Bad data message type, ignoring.");
+				console.log(str);
+		}
+	}
+
+	return  {
+		load: load, // full load (string)
+	};
+})();

html_orig/jssrc/term_upload.js

@@ -0,0 +1,146 @@
+/** File upload utility */
+var TermUpl = (function() {
+	var lines, // array of lines without newlines
+		line_i, // current line index
+		fuTout, // timeout handle for line sending
+		send_delay_ms, // delay between lines (ms)
+		nl_str, // newline string to use
+		curLine, // current line (when using fuOil)
+		inline_pos; // Offset in line (for long lines)
+
+	// lines longer than this are split to chunks
+	// sending a super-ling string through the socket is not a good idea
+	var MAX_LINE_LEN = 128;
+
+	function fuOpen() {
+		fuStatus("Ready...");
+		Modal.show('#fu_modal', onClose);
+		$('#fu_form').toggleClass('busy', false);
+		Input.blockKeys(true);
+	}
+
+	function onClose() {
+		console.log("Upload modal closed.");
+		clearTimeout(fuTout);
+		line_i = 0;
+		Input.blockKeys(false);
+	}
+
+	function fuStatus(msg) {
+		qs('#fu_prog').textContent = msg;
+	}
+
+	function fuSend() {
+		var v = qs('#fu_text').value;
+		if (!v.length) {
+			fuClose();
+			return;
+		}
+
+		lines = v.split('\n');
+		line_i = 0;
+		inline_pos = 0; // offset in line
+		send_delay_ms = qs('#fu_delay').value;
+
+		// sanitize - 0 causes overflows
+		if (send_delay_ms < 0) {
+			send_delay_ms = 0;
+			qs('#fu_delay').value = send_delay_ms;
+		}
+
+		nl_str = {
+			'CR': '\r',
+			'LF': '\n',
+			'CRLF': '\r\n',
+		}[qs('#fu_crlf').value];
+
+		$('#fu_form').toggleClass('busy', true);
+		fuStatus("Starting...");
+		fuSendLine();
+	}
+
+	function fuSendLine() {
+		if (!$('#fu_modal').hasClass('visible')) {
+			// Modal is closed, cancel
+			return;
+		}
+
+		if (!Conn.canSend()) {
+			// postpone
+			fuTout = setTimeout(fuSendLine, 1);
+			return;
+		}
+
+		if (inline_pos == 0) {
+			curLine = lines[line_i++] + nl_str;
+		}
+
+		var chunk;
+		if ((curLine.length - inline_pos) <= MAX_LINE_LEN) {
+			chunk = curLine.substr(inline_pos, MAX_LINE_LEN);
+			inline_pos = 0;
+		} else {
+			chunk = curLine.substr(inline_pos, MAX_LINE_LEN);
+			inline_pos += MAX_LINE_LEN;
+		}
+
+		if (!Input.sendString(chunk)) {
+			fuStatus("FAILED!");
+			return;
+		}
+
+		var all = lines.length;
+
+		fuStatus(line_i+" / "+all+ " ("+(Math.round((line_i/all)*1000)/10)+"%)");
+
+		if (lines.length > line_i || inline_pos > 0) {
+			fuTout = setTimeout(fuSendLine, send_delay_ms);
+		} else {
+			closeWhenReady();
+		}
+	}
+
+	function closeWhenReady() {
+		if (!Conn.canSend()) {
+			// stuck in XOFF still, wait to process...
+			fuStatus("Waiting for Tx buffer...");
+			setTimeout(closeWhenReady, 100);
+		} else {
+			fuStatus("Done.");
+			// delay to show it
+			setTimeout(function() {
+				fuClose();
+			}, 100);
+		}
+	}
+
+	function fuClose() {
+		Modal.hide('#fu_modal');
+	}
+
+	return {
+		init: function() {
+			qs('#fu_file').addEventListener('change', function (evt) {
+				var reader = new FileReader();
+				var file = evt.target.files[0];
+				console.log("Selected file type: "+file.type);
+				if (!file.type.match(/text\/.*|application\/(json|csv|.*xml.*|.*script.*)/)) {
+					// Deny load of blobs like img - can crash browser and will get corrupted anyway
+					if (!confirm("This does not look like a text file: "+file.type+"\nReally load?")) {
+						qs('#fu_file').value = '';
+						return;
+					}
+				}
+				reader.onload = function(e) {
+					var txt = e.target.result.replace(/[\r\n]+/,'\n');
+					qs('#fu_text').value = txt;
+				};
+				console.log("Loading file...");
+				reader.readAsText(file);
+			}, false);
+		},
+		close: fuClose,
+		start: fuSend,
+		open: fuOpen,
+	}
+})();

html_orig/jssrc/utils.js

@@ -113,11 +113,49 @@ function undef(x) {
 }
 
 /** Safe json parse */
-function jsp() {
+function jsp(str) {
 	try {
-		return JSON.parse(e);
+		return JSON.parse(str);
 	} catch(e) {
 		console.error(e);
 		return null;
 	}
 }
+
+/** Create a character from ASCII code */
+function Chr(n) {
+	return String.fromCharCode(n);
+}
+
+/** Decode number from 2B encoding */
+function parse2B(s, i) {
+	return (s.charCodeAt(i++) - 1) + (s.charCodeAt(i) - 1) * 127;
+}
+
+/** Decode number from 3B encoding */
+function parse3B(s, i) {
+	return (s.charCodeAt(i) - 1) + (s.charCodeAt(i+1) - 1) * 127 + (s.charCodeAt(i+2) - 1) * 127 * 127;
+}
+
+/** Encode using 2B encoding, returns string. */
+function encode2B(n) {
+	var lsb, msb;
+	lsb = (n % 127);
+	n = ((n - lsb) / 127);
+	lsb += 1;
+	msb = (n + 1);
+	return Chr(lsb) + Chr(msb);
+}
+
+/** Encode using 3B encoding, returns string. */
+function encode3B(n) {
+	var lsb, msb, xsb;
+	lsb = (n % 127);
+	n = (n - lsb) / 127;
+	lsb += 1;
+	msb = (n % 127);
+	n = (n - msb) / 127;
+	msb += 1;
+	xsb = (n + 1);
+	return Chr(lsb) + Chr(msb) + Chr(xsb);
+}

html_orig/jssrc/wifi.js

@@ -17,7 +17,6 @@
 
 		$('#sta-nw .essid').html(e(name));
 		var nopw = undef(password) || password.length == 0;
-		$('#sta-nw .x-passwd').html(e(password));
 		$('#sta-nw .passwd').toggleClass('hidden', nopw);
 		$('#sta-nw .nopasswd').toggleClass('hidden', !nopw);
 		$('#sta-nw .ip').html(ip.length>0 ? tr('wifi.connected_ip_is')+ip : tr('wifi.not_conn'));
@@ -121,7 +120,11 @@
 
 	/** Ask the CGI what APs are visible (async) */
 	function scanAPs() {
-		$.get('http://'+_root+'/cfg/wifi/scan', onScan);
+		if (_demo) {
+			onScan(_demo_aps, 200);
+		} else {
+			$.get('http://' + _root + '/cfg/wifi/scan', onScan);
+		}
 	}
 
 	function rescan(time) {

html_orig/lang/en.php

@@ -2,6 +2,7 @@
 
 return [
 	'appname' => 'ESPTerm',
+	'appname_demo' => 'ESPTerm<sup> DEMO</sup>',
 
 	'menu.cfg_wifi' => 'WiFi Settings',
 	'menu.cfg_network' => 'Network Settings',
@@ -20,6 +21,10 @@ return [
 	'term_nav.wifi' => 'WiFi',
 	'term_nav.help' => 'Help',
 	'term_nav.about' => 'About',
+	'term_nav.paste' => 'Paste',
+	'term_nav.upload' => 'Upload',
+	'term_nav.keybd' => 'Keyboard',
+	'term_nav.paste_prompt' => 'Paste text to send:',
 
 	'net.ap' => 'DHCP Server (AP)',
 	'net.sta' => 'DHCP Client (Station)',
@@ -28,20 +33,32 @@ return [
 	'net.details' => 'MAC addresses',
 
 	'term.defaults' => 'Initial Settings',
+	'term.expert' => 'Expert Options',
 	'term.explain_initials' => '
-		Those are the initial settings used after ESPTerm powers on. 
-		The selected colors will also be used after receiving a 
-		screen- or attributes-reset command. Those settings will be 
-		applied immediately after saving to preview the changes live.',
+		Those are the initial settings used after ESPTerm powers on or when the screen
+		reset command is received. Some options can be changed by the application via escape sequences, 
+		those changes won\'t be saved in Flash.
+		',
+	'term.explain_expert' => '
+		Those are advanced config options that usually don\'t need to be changed.
+		Edit them only if you know what you\'re doing.',
 
 	'term.example' => 'Default colors preview',
 
+	'term.reset_screen' => 'Reset screen & parser',
 	'term.term_title' => 'Header text',
 	'term.term_width' => 'Width / height',
 	'term.default_fg_bg' => 'Text / background',
 	'term.buttons' => 'Button labels',
 	'term.theme' => 'Color scheme',
 	'term.parser_tout_ms' => 'Parser timeout',
+	'term.display_tout_ms' => 'Redraw delay',
+	'term.display_cooldown_ms' => 'Redraw cooldown',
+	'term.fn_alt_mode' => 'SS3 Fn keys',
+	'term.show_config_links' => 'Show nav links',
+	'term.show_buttons' => 'Show buttons',
+	'term.loopback' => 'Local Echo',
+	'term.button_msgs' => 'Button codes<br>(ASCII, dec, CSV)',
 
 	// terminal color labels
 	'color.0' => 'Black',
@@ -91,7 +108,7 @@ return [
 
 	'wifi.not_conn' => 'Not connected.',
 	'wifi.sta_none' => 'None',
-	'wifi.sta_active_pw' => '🔒',
+	'wifi.sta_active_pw' => '🔒 Password saved',
 	'wifi.sta_active_nopw' => '🔓 Open access',
 	'wifi.connected_ip_is' => 'Connected, IP is ',
 	'wifi.sta_password' => 'Password:',

html_orig/packjs.sh

@@ -3,10 +3,12 @@
 echo "Packing js..."
 
 cat jssrc/chibi.js \
+	jssrc/keymaster.js \
 	jssrc/utils.js \
 	jssrc/modal.js \
 	jssrc/notif.js \
 	jssrc/appcommon.js \
 	jssrc/lang.js \
 	jssrc/wifi.js \
+	jssrc/term_* \
 	jssrc/term.js > js/app.js

html_orig/pages/_cfg_menu.php

@@ -1,5 +1,5 @@
 <nav id="menu">
-	<div id="brand" tabindex=0><?= tr('appname') ?></div>
+	<div id="brand" tabindex=0><?= tr('appname'.(ESP_DEMO?'_demo':'')) ?></div>
 	<a href="<?= e(url('term')) ?>" class="icn-back"><?= tr('menu.term') ?></a>
 	<?php
 	// generate the menu

html_orig/pages/_head.php

@@ -7,7 +7,12 @@
 	<title><?= $_GET['PAGE_TITLE'] ?></title>
 	<link href="/css/app.css" rel="stylesheet">
 	<script src="/js/app.js"></script>
-	<script>var _root = <?= JS_WEB_ROOT ?>;</script>
+	<script>
+		var _root = <?= JS_WEB_ROOT ?>;
+		var _demo = <?= (int)ESP_DEMO ?>;
+		<?php if($_GET['page']=='term'): ?>var _demo_screen = <?= ESP_DEMO ? DEMO_SCREEN : 0 ?>;<?php endif; ?>
+		<?php if($_GET['page']=='cfg_wifi'): ?>var _demo_aps = <?= ESP_DEMO ? json_encode(DEMO_APS) : '' ?>;<?php endif; ?>
+	</script>
 </head>
 <body class="<?= $_GET['BODYCLASS'] ?>">
 <div id="outer">

html_orig/pages/_tail.php

@@ -1,4 +1,8 @@
 
+<?php if ($_GET['BODYCLASS'] !== 'page-term'): ?>
+<div class="botpad"></div>
+<?php endif; ?>
+
 <div class="NotifyMsg hidden" id="notif"></div>
 
 </div>

html_orig/pages/cfg_term.php

@@ -1,3 +1,7 @@
+<div class="Box">
+	<a href="<?= e(url('reset_screen')) ?>"><?= tr('term.reset_screen') ?></a>
+</div>
+
 <form class="Box mobopen str" action="<?= e(url('term_set')) ?>" method="GET" id='form-1'>
 	<h2><?= tr('term.defaults') ?></h2>
 
@@ -104,14 +108,71 @@
 		<input class="short" type="text" name="btn5" id="btn5" value="%h:btn5%">
 	</div>
 
+	<div class="Row buttons">
+		<a class="button icn-ok" href="#" onclick="qs('#form-1').submit()"><?= tr('apply') ?></a>
+	</div>
+</form>
+
+<form class="Box fold str" action="<?= e(url('term_set')) ?>" method="GET" id='form-2'>
+	<h2><?= tr('term.expert') ?></h2>
+
+	<div class="Row explain">
+		<?= tr('term.explain_expert') ?>
+	</div>
+
 	<div class="Row">
 		<label for="parser_tout_ms"><?= tr('term.parser_tout_ms') ?><span class="mq-phone">&nbsp;(ms)</span></label>
 		<input type="number" step=1 min=0 name="parser_tout_ms" id="parser_tout_ms" value="%parser_tout_ms%" required>
 		<span class="mq-no-phone">&nbsp;ms</span>
 	</div>
 
+	<div class="Row">
+		<label for="display_tout_ms"><?= tr('term.display_tout_ms') ?><span class="mq-phone">&nbsp;(ms)</span></label>
+		<input type="number" step=1 min=0 name="display_tout_ms" id="display_tout_ms" value="%display_tout_ms%" required>
+		<span class="mq-no-phone">&nbsp;ms</span>
+	</div>
+
+	<div class="Row">
+		<label for="display_cooldown_ms"><?= tr('term.display_cooldown_ms') ?><span class="mq-phone">&nbsp;(ms)</span></label>
+		<input type="number" step=1 min=0 name="display_cooldown_ms" id="display_cooldown_ms" value="%display_cooldown_ms%" required>
+		<span class="mq-no-phone">&nbsp;ms</span>
+	</div>
+
+	<div class="Row">
+		<label><?= tr("term.button_msgs") ?></label>
+		<input class="short" type="text" name="bm1" id="bm1" value="%h:bm1%">&nbsp;
+		<input class="short" type="text" name="bm2" id="bm2" value="%h:bm2%">&nbsp;
+		<input class="short" type="text" name="bm3" id="bm3" value="%h:bm3%">&nbsp;
+		<input class="short" type="text" name="bm4" id="bm4" value="%h:bm4%">&nbsp;
+		<input class="short" type="text" name="bm5" id="bm5" value="%h:bm5%">
+	</div>
+
+	<div class="Row checkbox" >
+		<label><?= tr('term.fn_alt_mode') ?></label><!--
+		--><span class="box" tabindex=0 role=checkbox></span>
+		<input type="hidden" id="fn_alt_mode" name="fn_alt_mode" value="%fn_alt_mode%">
+	</div>
+
+	<div class="Row checkbox" >
+		<label><?= tr('term.show_buttons') ?></label><!--
+		--><span class="box" tabindex=0 role=checkbox></span>
+		<input type="hidden" id="show_buttons" name="show_buttons" value="%show_buttons%">
+	</div>
+
+	<div class="Row checkbox" >
+		<label><?= tr('term.show_config_links') ?></label><!--
+		--><span class="box" tabindex=0 role=checkbox></span>
+		<input type="hidden" id="show_config_links" name="show_config_links" value="%show_config_links%">
+	</div>
+
+	<div class="Row checkbox" >
+		<label><?= tr('term.loopback') ?></label><!--
+		--><span class="box" tabindex=0 role=checkbox></span>
+		<input type="hidden" id="loopback" name="loopback" value="%loopback%">
+	</div>
+
 	<div class="Row buttons">
-		<a class="button icn-ok" href="#" onclick="qs('#form-1').submit()"><?= tr('apply') ?></a>
+		<a class="button icn-ok" href="#" onclick="qs('#form-2').submit()"><?= tr('apply') ?></a>
 	</div>
 </form>
 

html_orig/pages/cfg_wifi.php

@@ -65,7 +65,7 @@
 			<div class="wrap">
 				<div class="inner">
 					<div class="essid"></div>
-					<div class="passwd"><?= tr('wifi.sta_active_pw') ?>&nbsp;<span class="x-passwd"></span></div>
+					<div class="passwd"><?= tr('wifi.sta_active_pw') ?></div>
 					<div class="nopasswd"><?= tr('wifi.sta_active_nopw') ?></div>
 					<div class="ip"></div>
 				</div>

html_orig/pages/help.php

@@ -1,361 +1,20 @@
 <div class="Box">
-	<h2>Troubleshooting</h2>
-
-	<ul>
-		<li>ESPTerm communicates with external µC via UART on pins <b>Rx</b> and <b>Tx</b>.
-			It can be configured in <a href="<?= url('cfg_system') ?>">System Settings</a>.
-			Make sure you're using the correct baud rate and other settings on the other side.
-
-		<li>Boot log and debug messages are available on pin <b>GPIO2</b> (P2) at 115200\,bps, 1 stop bit, no parity.
-
-		<li>ESPTerm uses 3.3\,V logic. For communication with 5\,V logic (eg. Aurdino), 470\,R
-			protection resistors are recommended. The ESPTerm breakout board already includes those resistors.
-
-		<li>If the Low Voltage Detector ("LVD") LED on the ESPTerm breakout lights up, your power connections have too high
-			resistance or the power supply is insufficient. ESP8266 can consume in short spikes up to 500\,A and
-			the supply voltage on the module must not drop below about 2.7\,V. Avoid needless breadboard jumpers and too thin wires.
-
-		<li>Connect Rx and Tx with a piece of wire to verify that the terminal works correctly; you should then immediately
-			see what you type in the browser. <i>This won't work if your ESP8266 board has a built-in USB-serial
-			converter connected to those pins.</i>
-
-		<li>For best performance, use the module in Client mode (connected to external network). Enabling AP mode consumes
-			extra RAM and cycles, since the captive portal DNS server and DHCP server are be loaded.
-
-		<li>In AP mode, check that the channel used by ESPTerm is clear; interference may cause flaky connection. A good mobile app to use for this is <a href="https://play.google.com/store/apps/details?id=com.farproc.wifi.analyzer">WiFi Analyzer (Google Play)</a>
-
-		<li>The terminal browser display needs WebSockets for the real-time updating to work.
-			It will not work with some old browsers (Android < 4.4, IE < 10, Opera Mini)
-			- see the <a href="https://caniuse.com/websockets/embed/">compatibility chart</a>.
-
-		<li>At most 4 clients can be connected to the AP at the same time. This is a limitation of the ESP8266 SDK.
-	</ul>
+	<a href="#" onclick="hpfold(1);return false">Expand all</a>&nbsp;|&nbsp;<a href="#" onclick="hpfold(0);return false">Collapse all</a>
 </div>
 
-<div class="Box">
-	<h2>Screen</h2>
+<?php require __DIR__ . "/help/troubleshooting.php"; ?>
+<?php require __DIR__ . "/help/nomenclature.php"; ?>
+<?php require __DIR__ . "/help/screen_behavior.php"; ?>
+<?php require __DIR__ . "/help/input.php"; ?>
+<?php require __DIR__ . "/help/charsets.php"; ?>
+<?php require __DIR__ . "/help/sgr_styles.php"; ?>
+<?php require __DIR__ . "/help/sgr_colors.php"; ?>
+<?php require __DIR__ . "/help/cmd_cursor.php"; ?>
+<?php require __DIR__ . "/help/cmd_screen.php"; ?>
+<?php require __DIR__ . "/help/cmd_system.php"; ?>
 
-	<ul>
-		<li>Most ANSI escape sequences are supported.
-
-		<li>The initial screen size and other terminal options can be configured in
-			<a href="<?= url('cfg_term') ?>">Terminal Settings</a>
-
-		<li>Display updates are sent to the browser after 20 ms of inactivity on the communication UART.
-			This is to avoid hogging the server with tiny updates during large screen repaints.
-	</ul>
-</div>
-
-<div class="Box theme-0">
-	<h2>Color Reference</h2>
-
-	<p>Color is set using <code>\e[&lt;c&gt;m</code> where <code>&lt;c&gt;</code> are numbers separated by semicolons
-		(and <code>\e</code> is ESC, code 27). The actual color representation depends on a color theme which
-		can be selected in <a href="<?= url('cfg_term') ?>">Terminal Settings</a>.</p>
-
-	<b>Foreground</b>
-
-	<div class="colorprev">
-		<span class="bg7 fg0">30</span>
-		<span class="bg0 fg1">31</span>
-		<span class="bg0 fg2">32</span>
-		<span class="bg0 fg3">33</span>
-		<span class="bg0 fg4">34</span>
-		<span class="bg0 fg5">35</span>
-		<span class="bg0 fg6">36</span>
-		<span class="bg0 fg7">37</span>
-	</div>
-
-	<div class="colorprev">
-		<span class="bg0 fg8">90</span>
-		<span class="bg0 fg9">91</span>
-		<span class="bg0 fg10">92</span>
-		<span class="bg0 fg11">93</span>
-		<span class="bg0 fg12">94</span>
-		<span class="bg0 fg13">95</span>
-		<span class="bg0 fg14">96</span>
-		<span class="bg0 fg15">97</span>
-	</div>
-
-	<b>Background</b>
-
-	<div class="colorprev">
-		<span class="bg0 fg15">40</span>
-		<span class="bg1 fg15">41</span>
-		<span class="bg2 fg15">42</span>
-		<span class="bg3 fg0">43</span>
-		<span class="bg4 fg15">44</span>
-		<span class="bg5 fg15">45</span>
-		<span class="bg6 fg15">46</span>
-		<span class="bg7 fg0">47</span>
-	</div>
-
-	<div class="colorprev">
-		<span class="bg8 fg15">100</span>
-		<span class="bg9 fg0">101</span>
-		<span class="bg10 fg0">102</span>
-		<span class="bg11 fg0">103</span>
-		<span class="bg12 fg0">104</span>
-		<span class="bg13 fg0">105</span>
-		<span class="bg14 fg0">106</span>
-		<span class="bg15 fg0">107</span>
-	</div>
-
-	<p>To make the text bold, use the "bold" attribute (eg. <code>\e[31;40;1m</code> for
-		<span style="padding: 2px;" class="bg0 fg1 bold">bold red on black</span>).</p>
-
-	<p>The colors are reset to default using <code>\e[0m</code>. For more info, see the tables below.</p>
-</div>
-
-<div class="Box">
-	<h2>User Input</h2>
-
-	<p>
-		All the user types on their keyboard is sent as-is to the UART, including ESC, ANSI sequences for arrow keys and CR-LF for Enter.
-	</p>
-
-	<p>The buttons under the screen send ASCII codes 1, 2, 3, 4, 5. This choice was made to make their parsing as simple as possible.</p>
-
-	<p>
-		Mouse input (click/tap) is sent as <code>\e[&lt;y&gt;;&lt;x&gt;M</code>. You can use this for virtual on-screen buttons.
-	</p>
-</div>
-
-<div class="Box">
-	<h2>Supported ANSI Escape Sequences</h2>
-
-	<p>Sequences are started by ASCII code 27 (ESC, <code>\e</code>, <code>\x1b</code>, <code>\033</code>)</p>
-
-	<p>Instead of <code>\a</code> (BELL, ASCII 7) in the commands, you can use `\e\` (ESC + backslash). It's the Text Separator code.</p>
-
-	<h3>Text Attributes</h3>
-
-	<p>
-		All text attributes are set using <code>\e[...m</code> where the dots are numbers separated by semicolons.
-		You can combine up to 3 attributes in a single command.
-	</p>
-
-	<table class="ansiref">
-		<thead>
-		<tr>
-			<th>Attribute</th>
-			<th>Meaning</th>
-		</tr>
-		</thead>
-		<tbody>
-		<tr>
-			<td>0</td>
-			<td>Reset text attributes to default</td>
-		</tr>
-		<tr>
-			<td>1</td>
-			<td>Bold</td>
-		</tr>
-		<tr>
-			<td>21 or 22</td>
-			<td>Bold off</td>
-		</tr>
-		<tr>
-			<td>7</td>
-			<td>Inverse (fg/bg swap when printing)</td>
-		</tr>
-		<tr>
-			<td>27</td>
-			<td>Inverse OFF</td>
-		</tr>
-		<tr>
-			<td>30-37, 90-97</td>
-			<td>Foreground color, normal and bright</td>
-		</tr>
-		<tr>
-			<td>40-47, 100-107</td>
-			<td>Background color, normal and bright</td>
-		</tr>
-		</tbody>
-	</table>
-
-	<h3>Cursor</h3>
-
-	<p>Movement commands scroll the screen if needed. The coordinates are 1-based, origin top left.</p>
-
-	<table class="ansiref w100">
-		<thead>
-		<tr>
-			<th>Code</th>
-			<th>Params</th>
-			<th>Meaning</th>
-		</tr>
-		</thead>
-		<tbody>
-		<tr>
-			<td>\e[&lt;n&gt;A</td>
-			<td>[count]</td>
-			<td>Move cursor up</td>
-		</tr>
-		<tr>
-			<td>\e[&lt;n&gt;B</td>
-			<td>[count]</td>
-			<td>Move cursor down</td>
-		</tr>
-		<tr>
-			<td>\e[&lt;n&gt;C</td>
-			<td>[count]</td>
-			<td>Move cursor forward (right)</td>
-		</tr>
-		<tr>
-			<td>\e[&lt;n&gt;D</td>
-			<td>[count]</td>
-			<td>Move cursor backward (left)</td>
-		</tr>
-		<tr>
-			<td>\e[&lt;n&gt;E</td>
-			<td>[count]</td>
-			<td>Go N lines down, start of line</td>
-		</tr>
-		<tr>
-			<td>\e[&lt;n&gt;F</td>
-			<td>[count]</td>
-			<td>Go N lines up, start of line</td>
-		</tr>
-		<tr>
-			<td>\e[&lt;n&gt;G</td>
-			<td>column</td>
-			<td>Go to column</td>
-		</tr>
-		<tr>
-			<td>\e[&lt;y&gt;;&lt;x&gt;G</td>
-			<td>[row=1];[col=1]</td>
-			<td>Go to row and column</td>
-		</tr>
-		<tr>
-			<td>\e[6n</td>
-			<td>--</td>
-			<td>Query cursor position. Position is sent back as <code>\e[?;?R</code> with row;column.</td>
-		</tr>
-		<tr>
-			<td>\e[s</td>
-			<td>--</td>
-			<td>Store position</td>
-		</tr>
-		<tr>
-			<td>\e[u</td>
-			<td>--</td>
-			<td>Restore position</td>
-		</tr>
-		<tr>
-			<td>\e7</td>
-			<td>--</td>
-			<td>Store position & attributes</td>
-		</tr>
-		<tr>
-			<td>\e8</td>
-			<td>--</td>
-			<td>Restore position & attributes</td>
-		</tr>
-		<tr>
-			<td>\e[?25l</td>
-			<td>--</td>
-			<td>Hide cursor</td>
-		</tr>
-		<tr>
-			<td>\e[?25h</td>
-			<td>--</td>
-			<td>Show cursor</td>
-		</tr>
-		<tr>
-			<td>\e[?7l</td>
-			<td>--</td>
-			<td>Disable cursor auto-wrap & auto-scroll at end of screen</td>
-		</tr>
-		<tr>
-			<td>\e[?7h</td>
-			<td>--</td>
-			<td>Enable cursor auto-wrap & auto-scroll at end of screen</td>
-		</tr>
-		</tbody>
-	</table>
-
-	<h3>Screen</h3>
-
-	<table class="ansiref w100">
-		<thead>
-		<tr>
-			<th>Code</th>
-			<th>Params</th>
-			<th>Meaning</th>
-		</tr>
-		</thead>
-		<tbody>
-		<tr>
-			<td>\e[&lt;m&gt;J</td>
-			<td>[mode=0]</td>
-			<td>Clear screen. Mode: 0 - from cursor, 1 - to cursor, 2 - all</td>
-		</tr>
-		<tr>
-			<td>\e[&lt;m&gt;K</td>
-			<td>[mode=0]</td>
-			<td>Erase line. Mode: 0 - from cursor, 1 - to cursor, 2 - all</td>
-		</tr>
-		<tr>
-			<td>\e[&lt;n&gt;S</td>
-			<td>[lines]</td>
-			<td>Scroll screen content up, add empty line at the bottom</td>
-		</tr>
-		<tr>
-			<td>\e[&lt;n&gt;T</td>
-			<td>[lines]</td>
-			<td>Scroll screen content down, add empty line at the top</td>
-		</tr>
-		<tr>
-			<td>\e]W&lt;r&gt;;&lt;c&gt;\a</td>
-			<td>rows;cols</td>
-			<td>Set screen size (max ~ 80x30). This also clears the screen. This is a custom ESPTerm OSC command.</td>
-		</tr>
-		</tbody>
-	</table>
-
-	<h3>System Commands</h3>
-
-	<table class="ansiref w100">
-		<thead>
-		<tr>
-			<th>Code</th>
-			<th>Params</th>
-			<th>Meaning</th>
-		</tr>
-		</thead>
-		<tbody>
-		<tr>
-			<td>\ec</td>
-			<td>--</td>
-			<td>
-				"Device Reset" - clear screen, reset attributes, show cursor & move it to 1,1.
-				The screen size and WiFi settings stay unchanged.
-			</td>
-		</tr>
-		<tr>
-			<td>\e[5n</td>
-			<td>--</td>
-			<td>Query device status, replies with <code>\e[0n</code> "device is OK". Can be used to check if the UART works.</td>
-		</tr>
-		<tr>
-			<td>\e]TITLE=…\a</td>
-			<td>Title text</td>
-			<td>Set terminal title. This is a custom ESPTerm OSC command.</td>
-		</tr>
-		<tr>
-			<td>\e]BTNn=…\a</td>
-			<td>1-5, label</td>
-			<td>Set button label. This is a custom ESPTerm OSC command.</td>
-		</tr>
-		<tr>
-			<td>ASCII 24 (18h)</td>
-			<td></td>
-			<td>This symbol is sent by ESPTerm when it becomes ready to receive commands. It can be used to wait before it becomes
-				ready on power-up, or to detect a spontaneous ESPTerm restart - that could happen due to RAM exhaustion due
-				to a memory leak, or perhaps a power outage.
-			</td>
-		</tr>
-		</tbody>
-	</table>
-</div>
+<script>
+	function hpfold(yes) {
+		$('.fold').toggleClass('expanded', !!yes);
+	}
+</script>

html_orig/pages/help/charsets.php

@@ -0,0 +1,80 @@
+<div class="Box fold">
+	<h2>Alternate Character Sets</h2>
+
+	<div class="Row v">
+		<p>
+			ESPTerm implements Alternate Character Sets as a way to print box drawing characters
+			and special symbols. A character set can change what each received ASCII character
+			is printed as on the screen (eg. "{" is "π" in codepage `0`). The implementation is based
+			on the original VT devices.
+		</p>
+
+		<p>
+			Since ESPTerm also supports UTF-8, this feature is the most useful for applications
+			which can't print UTF-8 or already use alternate character sets for historical reasons.
+		</p>
+
+		<h3>Supported codepages</h3>
+
+		<ul>
+			<li>`B` - US ASCII (default)</li>
+			<li>`A` - UK ASCII: # replaced with £</li>
+			<li>`0` - Symbols and basic line drawing (standard DEC alternate character set)</li>
+			<li>`1` - Symbols and advanced line drawing (based on DOS codepage 437, ESPTerm specific)</li>
+		</ul>
+
+		<p>
+			All codepages use codes 32-127, 32 being space. A character with no entry in the active codepage
+			stays unchanged.
+		</p>
+
+		<?php
+			$codepages = load_esp_charsets();
+			foreach($codepages as $name => $cp) {
+				echo "<h4>Codepage `$name`</h4>\n";
+				echo '<div class="charset">';
+				foreach($cp as $point) {
+					$dis = $point[1]==$point[2]?' class="none"' : '';
+					echo "<div$dis><span>$point[0]</span><span>$point[1]</span><span>$point[2]</span></div>";
+				}
+				echo '</div>';
+			}
+		?>
+
+		<h3>Switching commands</h3>
+
+		<p>
+			There are two character set slots, G0 and G1.
+			Those slots are selected as active using ASCII codes Shift In and Shift Out (those originally served for shifting
+			a red-black typewriter tape). Often only G0 is used for simplicity.
+		</p>
+
+		<p>
+			Each slot (G0 and G1) can have a different codepage assigned. G0 and G1 and the active slot number are
+			saved and restored with the cursor and cleared with a screen reset (<code>\ec</code>).
+		</p>
+
+		<p>The following commands are used:</p>
+
+		<table class="ansiref w100">
+			<thead><tr><th>Code</th><th>Meaning</th></tr></thead>
+			<tbody>
+			<tr>
+				<td>`\e(<i>x</i>`</td>
+				<td>Set G0 = codepage <i>x</i></td>
+			</tr>
+			<tr>
+				<td>`\e)<i>x</i>`</td>
+				<td>Set G1 = codepage <i>x</i></td>
+			</tr>
+			<tr>
+				<td>_SO_ (14)</td>
+				<td>Activate G0</td>
+			</tr>
+			<tr>
+				<td>_SI_ (15)</td>
+				<td>Activate G1</td>
+			</tr>
+		</table>
+	</div>
+</div>

html_orig/pages/help/cmd_cursor.php

@@ -0,0 +1,199 @@
+<div class="Box fold">
+	<h2>Commands: Cursor Functions</h2>
+
+	<div class="Row v">
+		<p>
+			The coordinates are 1-based, origin is top left. The cursor can move within the entire screen,
+			or in the active Scrolling Region if Origin Mode is enabled.
+		</p>
+
+		<p>After writing a character, the cursor advances to the right. If it has reached the end of the row,
+			it stays on the same line, but writing the next character makes it jump to the start of the next
+			line first, scrolling up if needed. If Auto-wrap mode is disabled, the cursor never wraps or scrolls
+			the screen.
+		</p>
+
+		<p>
+			*Legend:*
+			Italic letters such as _n_ are ASCII numbers that serve as arguments, separated with a semicolon.
+			If an argument is left out, it's treated as 0 or 1, depending on what makes sense for the command.
+		</p>
+
+		<h3>Movement</h3>
+
+		<table class="ansiref w100">
+			<thead><tr><th>Code</th><th>Meaning</th></tr></thead>
+			<tbody>
+			<tr>
+				<td>
+					<code>
+						\e[<i>n</i>A \\
+						\e[<i>n</i>B \\
+						\e[<i>n</i>C \\
+						\e[<i>n</i>D
+					</code>
+				</td>
+				<td>Move cursor up (`A`), down (`B`), right (`C`), left (`D`)</td>
+			</tr>
+			<tr>
+				<td>
+					<code>
+						\e[<i>n</i>F \\
+						\e[<i>n</i>E
+					</code>
+				</td>
+				<td>Go _n_ lines up (`F`) or down (`E`), start of line</td>
+			</tr>
+			<tr>
+				<td>
+					<code>
+						\e[<i>r</i>d \\
+						\e[<i>c</i>G \\
+						\e[<i>r</i>;<i>c</i>H
+					</code>
+				</td>
+				<td>
+					Go to absolute position - row (`d`), column (`G`), or both (`H`). Use `\e[H` to go to 1,1.
+				</td>
+			</tr>
+			<tr>
+				<td>
+					`\e[6n`
+				</td>
+				<td>
+					Query cursor position. Sent back as `\e[<i>r</i>;<i>c</i>R`.
+				</td>
+			</tr>
+			</tbody>
+		</table>
+
+		<h3>Save / restore</h3>
+
+		<table class="ansiref w100">
+			<thead><tr><th>Code</th><th>Meaning</th></tr></thead>
+			<tbody>
+			<tr>
+				<td>
+					<code>
+						\e[s \\
+						\e[u
+					</code>
+				</td>
+				<td>Save (`s`) or restore (`u`) cursor position</td>
+			</tr>
+			<tr>
+				<td>
+					<code>
+						\e7 \\
+						\e8
+					</code>
+				</td>
+				<td>Save (`7`) or restore (`8`) cursor position and attributes</td>
+			</tr>
+			</tbody>
+		</table>
+
+		<h3>Scrolling Region</h3>
+
+		<table class="ansiref w100">
+			<thead><tr><th>Code</th><th>Meaning</th></tr></thead>
+			<tbody>
+			<tr>
+				<td>
+					`\e[<i>a</i>;<i>b</i>r`
+				</td>
+				<td>
+					Set scrolling region to rows _a_ through _b_ and go to 1,1. By default, the
+					scrolling region spans the entire screen height. The cursor can leave the region using
+					absolute position commands, unless Origin Mode (see below) is active.
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<code>
+						\e[?6h \\
+						\e[?6l
+					</code>
+				</td>
+				<td>
+					Enable (`h`) or disable (`l`) Origin Mode and go to 1,1. In Origin Mode, all coordinates
+					are relative to the Scrolling Region and the cursor can't leave the region.
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<code>
+						\e[<i>n</i>S \\
+						\e[<i>n</i>T
+					</code>
+				</td>
+				<td>
+					Move contents of the Scrolling Region up (`S`) or down (`T`), pad with empty
+					lines of the current background color. This is similar to what happens when AutoWrap
+					is enabled and some text is printed at the very end of the screen.
+				</td>
+			</tr>
+			</tbody>
+		</table>
+
+		<h3>Tab stops</h3>
+
+		<table class="ansiref w100">
+			<thead><tr><th>Code</th><th>Meaning</th></tr></thead>
+			<tbody>
+			<tr>
+				<td>
+					`\eH`
+				</td>
+				<td>
+					Set tab stop at the current column. There are, by default, tabs every 8 columns.
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<code>
+						\e[<i>n</i>I \\
+						\e[<i>n</i>Z
+					</code>
+				</td>
+				<td>Advance (`I`) or go back (`Z`) _n_ tab stops or end/start of line. ASCII _TAB_ (9) is equivalent to <code>\e[1I</code></td>
+			</tr>
+			<tr>
+				<td>
+					<code>
+						\e[0g \\
+						\e[3g \\
+					</code>
+				</td>
+				<td>Clear tab stop at the current column (`0`), or all columns (`3`).</td>
+			</tr>
+			</tbody>
+		</table>
+
+		<h3>Other options</h3>
+
+		<table class="ansiref w100">
+			<thead><tr><th>Code</th><th>Meaning</th></tr></thead>
+			<tbody>
+			<tr>
+				<td>
+					<code>
+						\e[?7h \\
+						\e[?7l
+					</code>
+				</td>
+				<td>Enable (`h`) or disable (`l`) cursor auto-wrap and screen auto-scroll</td>
+			</tr>
+			<tr>
+				<td>
+					<code>
+						\e[?25h \\
+						\e[?25l
+					</code>
+				</td>
+				<td>Show (`h`) or hide (`l`) the cursor</td>
+			</tr>
+			</tbody>
+		</table>
+	</div>
+</div>

html_orig/pages/help/cmd_screen.php

@@ -0,0 +1,63 @@
+<div class="Box fold">
+	<h2>Commands: Screen Functions</h2>
+
+	<div class="Row v">
+		<p>
+			<b>Legend:</b>
+			Italic letters such as _n_ are ASCII numbers that serve as arguments, separated with a semicolon.
+			If an argument is left out, it's treated as 0 or 1, depending on what makes sense for the command.
+		</p>
+
+		<table class="ansiref w100">
+			<thead><tr><th>Code</th><th>Meaning</th></tr></thead>
+			<tbody>
+			<tr>
+				<td>
+					`\e[<i>m</i>J`
+				</td>
+				<td>
+					Clear part of screen. _m_: 0 - from cursor, 1 - to cursor, 2 - all
+				</td>
+			</tr>
+			<tr>
+				<td>
+					`\e[<i>m</i>K`
+				</td>
+				<td>
+					Erase part of line. _m_: 0 - from cursor, 1 - to cursor, 2 - all
+				</td>
+			</tr>
+			<tr>
+				<td>
+					`\e[<i>n</i>X`</td>
+				<td>
+					Erase _n_ characters in line.
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<code>
+						\e[<i>n</i>L \\
+						\e[<i>n</i>M
+					</code>
+				</td>
+				<td>
+					Insert (`L`) or delete (`M`) _n_ lines. Following lines are pulled up or pushed down.
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<code>
+						\e[<i>n</i>@ \\
+						\e[<i>n</i>P
+					</code>
+				</td>
+				<td>
+					Insert (`@`) or delete (`P`) _n_ characters. The rest of the line is pulled left or pushed right.
+					Characters going past the end of line are lost.
+				</td>
+			</tr>
+			</tbody>
+		</table>
+	</div>
+</div>

html_orig/pages/help/cmd_system.php

@@ -0,0 +1,103 @@
+<div class="Box fold">
+	<h2>Commands: System Functions</h2>
+
+	<div class="Row v">
+		<p>
+			It's possible to dynamically change the screen title text and action button labels.
+			Setting an empty label to a button makes it look disabled. The buttons send ASCII 1-5 when clicked.
+			Those changes are not retained after restart.
+		</p>
+
+		<table class="ansiref w100">
+			<thead><tr><th>Code</th><th>Meaning</th></tr></thead>
+			<tbody>
+			<tr>
+				<td>`\ec`</td>
+				<td>
+					Clear screen, reset attributes and cursor.
+					The screen size, title and button labels remain unchanged.
+				</td>
+			</tr>
+			<tr>
+				<td>`\e[5n`</td>
+				<td>
+					Query device status, ESPTerm replies with `\e[0n` "device is OK".
+					Can be used to check if the terminal has booted up and is ready to receive commands.
+				</td>
+			</tr>
+			<tr>
+				<td>_CAN_ (24)</td>
+				<td>
+					This ASCII code is not a command, but is sent by ESPTerm when it becomes ready to receive commands.
+					When this code is received on the UART, it means ESPTerm has restarted and is ready. Use this to detect
+					spontaneous restarts which require a full screen repaint.
+				</td>
+			</tr>
+			<tr>
+				<td>`\e]0;<i>t</i>\a`</td>
+				<td>Set screen title to _t_ (this is a standard OSC command)</td>
+			</tr>
+			<tr>
+				<td>
+					<code>
+						\e]<i>80+n</i>;<i>t</i>\a
+					</code>
+				</td>
+				<td>
+					Set label for button _n_ = 1-5 (code 81-85) to _t_ - e.g.`\e]81;Yes\a`
+					sets the first button text to "Yes".
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<code>
+						\e]<i>90+n</i>;<i>m</i>\a
+					</code>
+				</td>
+				<td>
+					Set message for button _n_ = 1-5 (code 81-85) to _m_ - e.g.`\e]94;iv\a`
+					sets the 3rd button to send string "iv" when pressed.
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<code>
+						\e[?800h \\
+						\e[?800l
+					</code>
+				</td>
+				<td>
+					Show (`h`) or hide (`l`) action buttons (the blue buttons under the screen).
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<code>
+						\e[?801h \\
+						\e[?801l
+					</code>
+				</td>
+				<td>
+					Show (`h`) or hide (`l`) menu/help links under the screen.
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<code>
+						\e[12h \\
+						\e[12l
+					</code>
+				</td>
+				<td>
+					Enable (`h`) or disable (`l`) Send-Receive Mode (SRM).
+					SRM is the opposite of Local Echo, meaning `\e[12h` disables and `\e[12l` enables Local Echo.
+				</td>
+			</tr>
+			<tr>
+				<td>`\e[8;<i>r</i>;<i>c</i>t`</td>
+				<td>Set screen size to _r_ rows and _c_ columns (this is a command borrowed from Xterm)</td>
+			</tr>
+			</tbody>
+		</table>
+	</div>
+</div>

html_orig/pages/help/input.php

@@ -0,0 +1,254 @@
+
+<div class="Box fold">
+	<h2>User Input: Keyboard, Mouse</h2>
+
+	<div class="Row v">
+		<h3>Keyboard</h3>
+
+		<p>
+			The user can input text using their keyboard, or on Android, using the on-screen keyboard which is open using
+			a button beneath the screen. Supported are all printable characters, as well as many control keys, such as arrows, _Ctrl+letters_
+			and function keys. Sequences sent by function keys are based on VT102 and Xterm.
+		</p>
+
+		<p>
+			The codes sent by _Home_, _End_, _F1-F4_ and cursor keys are affected by various keyboard modes (_Application Cursor Keys_,
+			_Application Numpad Mode_, _SS3 Fn Keys Mode_). Some can be set in the <a href="<?= url('cfg_term') ?>">Terminal Settings</a>,
+			others via commands.
+		</p>
+
+		<p>
+			Here are some examples of control key codes:
+		</p>
+
+		<table>
+			<thead><tr><th>Key</th><th>Code</th><th>Key</th><th>Code</th></tr></thead>
+			<tr>
+				<td>Up</td>
+				<td>`\e[A`,~`\eOA`</td>
+				<td>F1</td>
+				<td>`\eOP`,~`\e[11\~`</td>
+			</tr>
+			<tr>
+				<td>Down</td>
+				<td>`\e[B`,~`\eOB`</td>
+				<td>F2</td>
+				<td>`\eOQ`,~`\e[12\~`</td>
+			</tr>
+			<tr>
+				<td>Right</td>
+				<td>`\e[C`,~`\eOC`</td>
+				<td>F3</td>
+				<td>`\eOR`,~`\e[13\~`</td>
+			</tr>
+			<tr>
+				<td>Left</td>
+				<td>`\e[D`,~`\eOD`</td>
+				<td>F4</td>
+				<td>`\eOS`,~`\e[14\~`</td>
+			</tr>
+			<tr>
+				<td>Home</td>
+				<td>`\eOH`,~`\e[H`,~`\e[1\~`</td>
+				<td>F5</td>
+				<td>`\e[15~`</td>
+			</tr>
+			<tr>
+				<td>End</td>
+				<td>`\eOF`,~`\e[F`,~`\e[4\~`</td>
+				<td>F6</td>
+				<td>`\e[17\~`</td>
+			</tr>
+			<tr>
+				<td>Insert</td>
+				<td>`\e[2\~`</td>
+				<td>F7</td>
+				<td>`\e[18\~`</td>
+			</tr>
+			<tr>
+				<td>Delete</td>
+				<td>`\e[3\~`</td>
+				<td>F8</td>
+				<td>`\e[19\~`</td>
+			</tr>
+			<tr>
+				<td>Page Up</td>
+				<td>`\e[5\~`</td>
+				<td>F9</td>
+				<td>`\e[20\~`</td>
+			</tr>
+			<tr>
+				<td>Page Down</td>
+				<td>`\e[6\~`</td>
+				<td>F10</td>
+				<td>`\e[21\~`</td>
+			</tr>
+			<tr>
+				<td>Enter</td>
+				<td>`\r` (13)</td>
+				<td>F11</td>
+				<td>`\e[23\~`</td>
+			</tr>
+			<tr>
+				<td>Ctrl+Enter</td>
+				<td>`\n` (10)</td>
+				<td>F12</td>
+				<td>`\e[24\~`</td>
+			</tr>
+			<tr>
+				<td>Tab</td>
+				<td>`\t` (9)</td>
+				<td>ESC</td>
+				<td>`\e` (27)</td>
+			</tr>
+			<tr>
+				<td>Backspace</td>
+				<td>`\b` (8)</td>
+				<td>Ctrl+A..Z</td>
+				<td>ASCII 1-26</td>
+			</tr>
+		</table>
+
+		<h3>Action buttons</h3>
+
+		<p>
+			The blue buttons under the screen send ASCII codes 1, 2, 3, 4, 5, which incidentally
+			correspond to _Ctrl+A,B,C,D,E_. This choice was made to make button press parsing as simple as possible.
+		</p>
+
+		<h3>Mouse</h3>
+
+		<p>
+			ESPTerm implements standard mouse tracking modes based on Xterm. Mouse tracking can be used to implement
+			powerful user interactions such as on-screen buttons, draggable sliders or dials, menus etc. ESPTerm's
+			mouse tracking was tested using VTTest and should be compatible with all terminal applications
+			that request mouse tracking.
+		</p>
+
+		<p>
+			Mouse can be tracked in different ways; some are easier to parse, others more powerful. The coordinates
+			can also be encoded in different ways. All mouse tracking options are set using option commands:
+			`CSI ? _n_ h` to enable, `CSI ? _n_ l` to disable option _n_.
+		</p>
+
+		<h4>Mouse Tracking Modes</h4>
+
+		<p>
+			All tracking modes produce three numbers which are then encoded and send to the application.
+			First is the _event number_ N, then the _X and Y coordinates_, 1-based.
+		</p>
+
+		<p>
+			Mouse buttons are numbered: 1=left, 2=middle, 3=right.
+			Wheel works as two buttons (4 and 5) which generate only press events (no release).
+		</p>
+
+		<div class="tscroll">
+			<table class="nomen">
+				<thead><tr><th>Option</th><th>Name</th><th>Description</th></tr></thead>
+				<tr>
+					<td>`9`</td>
+					<td>*X10~mode*</td>
+					<td>
+						This is the most basic tracking mode, in which <b>only button presses</b> are reported.
+						N = button - 1: (0 left, 1 middle, 2 right, 3, 4 wheel).
+					</td>
+				</tr>
+				<tr>
+					<td>`1000`</td>
+					<td>*Normal~mode*</td>
+					<td>
+						In Normal mode, both button presses and releases are reported.
+						The lower two bits of N indicate the button pressed:
+						`00b` (0) left, `01b` (1) middle, `10b` (2) right, `11b` (3) button release.
+						Wheel buttons are reported as 0 and 1 with added 64 (e.g. 64 and 65).
+						Normal mode also supports tracking of modifier keys, which are added to N as bit masks:
+						4=_Shift_, 8=_Meta/Alt_, 16=_Control/Cmd_. Example: middle button with _Shift_ = 1 + 4 = `101b` (5).
+					</td>
+				</tr>
+				<tr>
+					<td>`1002`</td>
+					<td>*Button-Event tracking*</td>
+					<td>
+						This is similar to Normal mode (`1000`), but mouse motion with a button held is also reported.
+						A motion event is generated when the mouse cursor moves between screen character cells.
+						A motion event has the same N as a press event, but 32 is added.
+						For example, drag-drop event with the middle button will produce N = 1 (press), 33 (dragging) and 3 (release).
+					</td>
+				</tr>
+				<tr>
+					<td>`1003`</td>
+					<td>*Any-Event tracking*</td>
+					<td>
+						This mode is almost identical to Button Event tracking (1002), but motion events
+						are sent even when no mouse buttons are held. This could be used to draw on-screen mouse cursor, for example.
+						Motion events with no buttons will use N = 32 + _11b_ (35).
+					</td>
+				</tr>
+				<tr>
+					<td>`1004`</td>
+					<td>*Focus~tracking*</td>
+					<td>
+						Focus tracking is a separate function from the other mouse tracking modes, therefore they can be enabled together.
+						Focus tracking reports when the terminal window (in Xterm) gets or loses focus, or in ESPTerm's case, when any
+						user is connected. This can be used to pause/resume a game or on-screen animations.
+						Focus tracking mode sends `CSI I` when the terminal receives, and `CSI O` when it loses focus.
+					</td>
+				</tr>
+			</table>
+		</div>
+
+		<h4>Mouse Report Encoding</h4>
+
+		<p>
+			The following encoding schemes can be used with any of the tracking modes (except Focus tracking, which is not affected).
+		</p>
+
+		<div class="tscroll">
+			<table class="nomen">
+				<thead><tr><th>Option</th><th>Name</th><th>Description</th></tr></thead>
+				<tr>
+					<td>--</td>
+					<td>*Normal~encoding*</td>
+					<td>
+						This is the default encoding scheme used when no other option is selected.
+						In this mode, a mouse report has the format `CSI M _n_ _x_ _y_`,
+						where _n_, _x_ and _y_ are characters with ASCII value = 32 (space) + the respective number, e.g.
+						0 becomes 32 (space), 1 becomes 33 (!). The reason for adding 32 is to avoid producing control characters.
+						Example: `\e[M !!` - left button press at coordinates 1,1 when using X10 mode.
+					</td>
+				</tr>
+				<tr>
+					<td>`1005`</td>
+					<td>*UTF-8~encoding*</td>
+					<td>
+						This scheme should encode each of the numbers as a UTF-8 code point, expanding the maximum possible value.
+						Since ESPTerm's screen size is limited and this has no practical benefit, this serves simply as an alias
+						to the normal scheme.
+					</td>
+				</tr>
+				<tr>
+					<td>`1006`</td>
+					<td>*SGR~encoding*</td>
+					<td>
+						In SGR encoding, the response looks like a SGR sequence with the three numbers as semicolon-separated
+						ASCII values. In this case 32 is not added like in the Normal and UTF-8 schemes, because
+						it would serve nor purpose here. Also, button release is not reported as 11b,
+						but using the normal button code while changing the final SGR character: `M` for button press
+						and `m` for button release. Example: `\e[2;80;24m` - the right button was released
+						at row 80, column 24.
+					</td>
+				</tr>
+				<tr>
+					<td>`1015`</td>
+					<td>*URXVT~encoding*</td>
+					<td>
+						This is similar to SGR encoding, but the final character is always `M` and the numbers are
+						like in the Normal scheme, with 32 added. This scheme has no real advantage over the previous schemes and
+						was added solely for completeness.
+					</td>
+				</tr>
+			</table>
+		</div>
+	</div>
+</div>

html_orig/pages/help/nomenclature.php

@@ -0,0 +1,84 @@
+<div class="Box fold">
+	<h2>Basic Intro & Nomenclature</h2>
+
+	<div class="Row v">
+		<img src="/img/vt100.jpg" class="aside" alt="VT102">
+
+		<p>
+			ESPTerm emulates VT102 (pictured) with some additions from later VT models and Xterm.
+			All commonly used attributes and commands are supported.
+			ESPTerm is capable of displaying ncurses applications such as _Midnight Commander_ using _agetty_.
+		</p>
+
+		<p>
+			ESPTerm accepts UTF-8 characters received on the communication UART and displays them on the screen,
+			interpreting some codes as Control Characters. Those are e.g. _Carriage Return_ (13), _Line Feed_ (10),
+			_Tab_ (9), _Backspace_ (8) and _Bell_ (7).
+		</p>
+
+		<p>
+			Escape sequences start with the control character _ESC_ (27),
+			followed by any number of ASCII characters forming the body of the command.
+		</p>
+
+		<h3>Nomenclature & Command Types</h3>
+
+		<p>
+			Examples on this help page use the following symbols for special characters and command types:\\
+			(spaces are for clarity only, _DO NOT_ include them in the commands!)
+		</p>
+
+		<div class="tscroll">
+			<table class="nomen">
+				<thead><tr><th>Name</th><th>Symbol</th><th>ASCII</th><th>C string</th><th>Function</th></tr></thead>
+				<tbody>
+				<tr>
+					<td>*ESC*</td>
+					<td>`\e`</td>
+					<td>`ESC` (27)</td>
+					<td>`"\e"`, `"\x1b"`, `"\033"`</td>
+					<td>Introduces an escape sequence. _(Note: `\e` is a GCC extension)_</td>
+				</tr>
+				<tr>
+					<td>*Bell*</td>
+					<td>`\a`</td>
+					<td>`BEL`~(7)</td>
+					<td>`"\a"`, `"\x7"`, `"\07"`</td>
+					<td>Audible beep</td>
+				</tr>
+				<tr>
+					<td>*String Terminator*</td>
+					<td>`ST`</td>
+					<td>`ESC \`~(27~92)<br>_or_~`\a`~(7)</td>
+					<td>`"\x1b\\"`, `"\a"`</td>
+					<td>Terminates a string command (`\a` can be used as an alternative)</td>
+				</tr>
+				<tr>
+					<td>*Control Sequence Introducer*</td>
+					<td>`CSI`</td>
+					<td>`ESC [`</td>
+					<td>`"\x1b["`</td>
+					<td>Starts a CSI command. Examples: `\e[?7;10h`, `\e[2J`</td>
+				</tr>
+				<tr>
+					<td>*Operating System Command*</td>
+					<td>`OSC`</td>
+					<td>`ESC ]`</td>
+					<td>`"\x1b]"`</td>
+					<td>Starts an OSC command. Is followed by a command string terminated by `ST`. Example: `\e]0;My Screen Title\a`</td>
+				</tr>
+				<tr>
+					<td>*Select Graphic Rendition*</td>
+					<td>`SGR`</td>
+					<td>`CSI <i>n</i>;<i>n</i>;<i>n</i>m`</td>
+					<td>`"\x1b[1;2;3m"`</td>
+					<td>Set text attributes, like color or style. 0 to 10 numbers can be used, `\e[m` is treated as `\e[0m`</td>
+				</tr>
+				</tbody>
+			</table>
+		</div>
+
+		<p>There are also some other commands that don't follow the CSI, SGR or OSC pattern, such as `\e7` or
+			`\e#8`. A list of the most important escape sequences is presented in the following sections.</p>
+	</div>
+</div>

html_orig/pages/help/screen_behavior.php

@@ -0,0 +1,17 @@
+<div class="Box fold">
+	<h2>Screen Behavior & Refreshing</h2>
+
+	<div class="Row v">
+		<p>
+			The initial screen size, title text and button labels can be configured in <a href="<?= url('cfg_term') ?>">Terminal Settings</a>.
+		</p>
+
+		<p>
+			Screen updates are sent to the browser through a WebSocket after some time of inactivity on the communication UART
+			(called "Redraw Delay"). After an update is sent, at least a time of "Redraw Cooldown" must elapse before the next
+			update can be sent. Those delays are used is to avoid burdening the server with tiny updates during a large screen
+			repaint. If you experience issues (broken image due to dropped bytes), try adjusting those config options. It may also
+			be useful to try different baud rates.
+		</p>
+	</div>
+</div>

html_orig/pages/help/sgr_colors.php

@@ -0,0 +1,65 @@
+
+<div class="Box fold theme-0">
+	<h2>Commands: Color SGR</h2>
+
+	<div class="Row v">
+		<p>
+			Colors are set using SGR commands (like `\e[10;20;30m`). The following tables list the SGR codes to use.
+			Selected colors are used for any new text entered, as well as for empty space when using line and screen clearing commands.
+			The configured default colors can be restored using SGR 39 for foreground and SGR 49 for background.
+		</p>
+
+		<p>
+			The actual color representation depends on a color theme which
+			can be selected in <a href="<?= url('cfg_term') ?>">Terminal Settings</a>.
+		</p>
+
+		<h3>Foreground colors</h3>
+
+		<div class="colorprev">
+			<span class="bg7 fg0">30</span>
+			<span class="bg0 fg1">31</span>
+			<span class="bg0 fg2">32</span>
+			<span class="bg0 fg3">33</span>
+			<span class="bg0 fg4">34</span>
+			<span class="bg0 fg5">35</span>
+			<span class="bg0 fg6">36</span>
+			<span class="bg0 fg7">37</span>
+		</div>
+
+		<div class="colorprev">
+			<span class="bg0 fg8">90</span>
+			<span class="bg0 fg9">91</span>
+			<span class="bg0 fg10">92</span>
+			<span class="bg0 fg11">93</span>
+			<span class="bg0 fg12">94</span>
+			<span class="bg0 fg13">95</span>
+			<span class="bg0 fg14">96</span>
+			<span class="bg0 fg15">97</span>
+		</div>
+
+		<h3>Background colors</h3>
+
+		<div class="colorprev">
+			<span class="bg0 fg15">40</span>
+			<span class="bg1 fg15">41</span>
+			<span class="bg2 fg15">42</span>
+			<span class="bg3 fg0">43</span>
+			<span class="bg4 fg15">44</span>
+			<span class="bg5 fg15">45</span>
+			<span class="bg6 fg15">46</span>
+			<span class="bg7 fg0">47</span>
+		</div>
+
+		<div class="colorprev">
+			<span class="bg8 fg15">100</span>
+			<span class="bg9 fg0">101</span>
+			<span class="bg10 fg0">102</span>
+			<span class="bg11 fg0">103</span>
+			<span class="bg12 fg0">104</span>
+			<span class="bg13 fg0">105</span>
+			<span class="bg14 fg0">106</span>
+			<span class="bg15 fg0">107</span>
+		</div>
+	</div>
+</div>

html_orig/pages/help/sgr_styles.php

@@ -0,0 +1,26 @@
+<div class="Box fold">
+	<h2>Commands: Style SGR</h2>
+
+	<div class="Row v">
+		<p>
+			All text attributes are set using SGR commands like `\e[10;20;30m`, with up to 10 numbers separated by semicolons.
+			To restore all attributes to their default states, use SGR 0: `\e[0m` or `\e[m`.
+		</p>
+
+		<p>Those are the supported text attributes SGR codes:</p>
+
+		<table>
+			<thead><tr><th>Style</th><th>Enable</th><th>Disable</th></tr></thead>
+			<tbody>
+			<tr><td><b>Bold</b></td><td>1</td><td>21, 22</td></tr>
+			<tr><td style="opacity:.6">Faint</td><td>2</td><td>22</td></tr>
+			<tr><td><i>Italic</i></td><td>3</td><td>23</td></tr>
+			<tr><td><u>Underlined</u></td><td>4</td><td>24</td></tr>
+			<tr><td>Blink</td><td>5</td><td>25</td></tr>
+			<tr><td><span style="color:black;background:#ccc;">Inverse</span></td><td>7</td><td>27</td></tr>
+			<tr><td><s>Striked</s></td><td>9</td><td>29</td></tr>
+			<tr><td>𝔉𝔯𝔞𝔨𝔱𝔲𝔯</td><td>20</td><td>23</td></tr>
+			</tbody>
+		</table>
+	</div>
+</div>

html_orig/pages/help/troubleshooting.php

@@ -0,0 +1,33 @@
+<div class="Box fold">
+	<h2>Tips & Troubleshooting</h2>
+
+	<div class="Row v">
+		<ul>
+			<li>*Communication UART (Rx, Tx)* can be configured in the <a href="<?= url('cfg_system') ?>">System Settings</a>.
+
+			<li>*Boot log and debug messages* are available on pin *GPIO2* (P2) at 115200\,baud, 1 stop bit, no parity.
+				Those messages may be disabled through compile flags.
+
+			<li>*Loopback test*: Connect the Rx and Tx pins with a piece of wire. Anything you type in the browser should
+				appear on the screen. Set _Parser Timeout = 0_ in <a href="<?= url('cfg_term') ?>">Terminal Settings</a>
+				to be able to manually enter escape sequences.
+
+			<li>There is very little RAM available to the webserver, and it can support at most 4 connections at the same time.
+				Each terminal session (open window with the terminal screen) uses one persistent connection for screen updates.
+				*Avoid leaving unused windows open*, or either the RAM or connections may be exhausted.
+
+			<li>*For best performance*, use the module in Client mode (connected to external network) and minimize the number
+				of simultaneous connections. Enabling AP consumes extra RAM because the DHCP server and Captive Portal
+				DNS server are started.
+
+			<li>In AP mode, *check that the WiFi channel used is clear*; interference may cause flaky connection.
+				A good mobile app to use for this is
+				<a href="https://play.google.com/store/apps/details?id=com.farproc.wifi.analyzer">WiFi Analyzer (Google Play)</a>.
+				Adjust the hotspot strength and range using the _Tx Power setting_.
+
+			<li>Hold the BOOT button (GPIO0 to GND) for ~1 second to force enable AP. Hold it for ~6 seconds to restore default settings.
+				(This is indicated by the blue LED rapidly flashing). Default settings can be overwritten in the
+				<a href="<?= url('cfg_system') ?>">System Settings</a>.
+		</ul>
+	</div>
+</div>

html_orig/pages/term.php

@@ -5,31 +5,62 @@
 			console.error("Page load failed, refreshing…");
 			location.reload(true);
 		}
-	}, 2000);
+	}, 3000);
 </script>
 
-<h1></h1>
+<div class="Modal light hidden" id="fu_modal">
+	<div id="fu_form" class="Dialog">
+		<div class="fu-content">
+			<h2>Text Upload</h2>
+			<p>
+				<label for="fu_file">Load a text file:</label>
+				<input type="file" id="fu_file" accept="text/*" /><br>
+				<textarea id="fu_text"></textarea>
+			</p>
+			<p>
+				<label for="fu_crlf">Line Endings:</label>
+				<select id="fu_crlf">
+					<option value="CR">CR (Enter key)</option>
+					<option value="CRLF">CR LF (Windows)</option>
+					<option value="LF">LF (Linux)</option>
+				</select>
+			</p>
+			<p>
+				<label for="fu_delay">Line Delay (ms):</label>
+				<input id="fu_delay" type="number" value=1 min=0>
+			</p>
+		</div>
+		<div class="fu-buttons">
+			<button onclick="TermUpl.start()" class="icn-ok x-fu-go">Start</button>&nbsp;
+			<button onclick="TermUpl.close()" class="icn-cancel x-fu-cancel">Cancel</button>&nbsp;
+			<i class="fu-prog-box">Upload: <span id="fu_prog"></span></i>
+		</div>
+	</div>
+</div>
 
-<div id="termwrap">
+<h1><!-- Screen title gets loaded here by JS --></h1>
+
+<div id="term-wrap">
 	<div id="screen" class="theme-%theme%"></div>
 
-	<div id="buttons">
-		<button data-n="1" class="btn-blue"></button><!--
-		--><button data-n="2" class="btn-blue"></button><!--
-		--><button data-n="3" class="btn-blue"></button><!--
-		--><button data-n="4" class="btn-blue"></button><!--
-		--><button data-n="5" class="btn-blue"></button>
+	<div id="action-buttons">
+		<button data-n="1"></button><!--
+		--><button data-n="2"></button><!--
+		--><button data-n="3"></button><!--
+		--><button data-n="4"></button><!--
+		--><button data-n="5"></button>
 	</div>
 </div>
 
 <textarea id="softkb-input" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"></textarea>
 
-<nav id="botnav">
-	<a href="#" onclick="toggleSoftKb(true); return false" class="icn-keyboard mq-tablet-max"></a><!--
-	--><a href="<?= url('cfg_term') ?>"><?= tr('term_nav.config') ?></a><!--
-	--><a href="<?= url('cfg_wifi') ?>"><?= tr('term_nav.wifi') ?></a><!--
-	--><a href="<?= url('help') ?>"><?= tr('term_nav.help') ?></a><!--
-	--><a href="<?= url('about') ?>"><?= tr('term_nav.about') ?></a>
+<nav id="term-nav">
+	<a href="#" onclick="kbOpen(true);return false" class="mq-tablet-max"><i class="icn-keyboard"></i><span><?= tr('term_nav.keybd') ?></span></a><!--
+	--><a href="#" onclick="TermUpl.open();return false"><i class="icn-download"></i><span><?= tr('term_nav.upload') ?></a><!--
+	--><a href="<?= url('cfg_term') ?>" class="x-term-conf-btn"><i class="icn-configure"></i><span><?= tr('term_nav.config') ?></span></a><!--
+	--><a href="<?= url('cfg_wifi') ?>" class="x-term-conf-btn"><i class="icn-wifi"></i><span><?= tr('term_nav.wifi') ?></span></a><!--
+	--><a href="<?= url('help') ?>" class="x-term-conf-btn"><i class="icn-help"></i><span><?= tr('term_nav.help') ?></span></a><!--
+	--><a href="<?= url('about') ?>" class="x-term-conf-btn"><i class="icn-about"></i><span><?= tr('term_nav.about') ?></span></a>
 </nav>
 
 <script>
@@ -48,13 +79,13 @@
 		});
 	} catch(e) {
 		console.error(e);
-		console.error("Fail, reloading in 1s…");
+		console.error("Fail, reloading in 3s…");
 		setTimeout(function() {
 			location.reload(true);
-		}, 1000);
+		}, 3000);
 	}
 
-	function toggleSoftKb(yes) {
+	function kbOpen(yes) {
 		var i = qs('#softkb-input');
 		if (yes) i.focus();
 		else i.blur();

html_orig/sass/_normalize.scss

@@ -245,7 +245,7 @@ code,
 pre
 //samp
 {
-  font-family: monospace;
+  font-family: "DejaVu Sans Mono", "Inconsolata", monospace;
   font-size: 1em;
 }
 

html_orig/sass/app.scss

@@ -18,6 +18,10 @@ $c-form-field-fg: white;
 $c-form-highlight: #2972ba;
 $c-form-highlight-a: #2ea1f9;
 
+$c-modal-bg: #242426;
+
+$screen-stack: "DejaVu Sans Mono", "Liberation Mono", "Inconsolata", monospace;
+
 @function dist($x) {
 	@return modular-scale($x, 1rem, $golden);
 }

html_orig/sass/form/_form_layout.scss

@@ -16,6 +16,7 @@ form { @include naked(); }
 	vertical-align: middle;
 	margin: 12px auto;
 	text-align: left;
+	line-height: 1.35em;
 
 	display: flex;
 	flex-direction: row;
@@ -29,6 +30,20 @@ form { @include naked(); }
 		margin-bottom: 0;
 	}
 
+	&.v {
+		display: block;
+	}
+
+	.aside {
+		float: right;
+		margin-left: 5px;
+		margin-bottom: 5px;
+
+		@include media($phone) {
+			margin: 0; float: none;
+		}
+	}
+
 	.spacer {
 		width: $form-label-w;
 

html_orig/sass/layout/_base.scss

@@ -31,6 +31,11 @@ a:hover {
 }
 
 ul > * {
-	padding-top: .2em;
-	padding-bottom: .2em;
+	padding-top: .3em;
+	padding-bottom: .3em;
+}
+
+ul {
+	margin-top: 0;
+	margin-bottom: 0;
 }

html_orig/sass/layout/_box.scss

@@ -1,3 +1,8 @@
+.botpad {
+	display:block;
+	height: 5em;
+}
+
 .Box {
 	display: block;
 	max-width: 900px;
@@ -103,44 +108,69 @@
 	}
 }
 
+@mixin mobcol-base {
+	h2 {
+		position: relative;
+		cursor: pointer;
+		padding: 2px 1.3rem 2px 5px;
+		margin: 0 -5px 0 -5px;
+
+		&::after {
+			position: absolute;
+			right: 4px;
+			content: '▸';
+
+			top:50%;
+			font-size: 120%;
+			font-weight: bold;
+			transform: translate(0,-50%) rotate(90deg);
+		}
+	}
+
+	&.expanded h2::after {
+		transform: translate(-25%,-50%) rotate(-90deg);
+		margin-bottom: dist(0);
+	}
+
+	.Row {
+		display: none;
+	}
+
+	&.expanded {
+		.Row {
+			display: flex;
+
+			&.v {
+				display: block;
+			}
+		}
+	}
+}
+
+.Box.fold {
+	@include mobcol-base;
+}
+
 @include media($phone) {
-	.Box.mobcol {
+	.Box.fold, .Box.mobcol {
 		h2 {
-			position: relative;
-			cursor: pointer;
 			padding: 2px 1.3rem 2px 5px;
 			margin: 0 -5px 0 -5px;
-
-			&::after {
-				position: absolute;
-				right: 4px;
-				content: '▸';
-
-				top:50%;
-				font-size: 120%;
-				font-weight: bold;
-				transform: translate(0,-50%) rotate(90deg);
-			}
 		}
 
 		&.expanded h2::after {
-			transform: translate(-25%,-50%) rotate(-90deg);
 			margin-bottom: dist(0);
 		}
+	}
 
-		.Row {
-			display: none;
-		}
+	.Box.mobcol {
+		@include mobcol-base;
 
 		#ap-box {
 			display: none;
 		}
 
 		&.expanded {
-			.Row {
-				display: flex;
-			}
-
 			#ap-box {
 				display: block;
 			}

html_orig/sass/layout/_modal.scss

@@ -1,4 +1,5 @@
 .Modal {
+	z-index: 100;
 	position: fixed;
 	width: 100%; height: 100%;
 	left: 0; top: 0; right: 0; bottom: 0;
@@ -12,6 +13,21 @@
 	opacity: 0;
 	&.visible { opacity: 1 }
 	&.hidden { display: none }
+
+	&.light {
+		background: rgba(black, .25);
+	}
+
+	@include media($phone) {
+		flex-direction: column;
+		justify-content: flex-start;
+		overflow-y: auto;
+		.Dialog {
+			margin-top: dist(-1) !important;
+			flex-basis: unset;
+			flex-shrink: 0;
+		}
+	}
 }
 
 .Dialog {
@@ -19,16 +35,16 @@
 	padding: dist(0);
 	overflow: hidden;
 
-	max-width: 100%;
-	max-height: 100%;
-	flex: 0 1 30rem;
+	//max-width: 100%;
+	//max-height: 100%;
+	flex-basis: 35rem;
 	//min-height: 15rem;
 
-	background: #1c1c1e;
+	background: $c-modal-bg;//#1c1c1e;
 	border-left: 6px solid $c-form-highlight;
 	border-right: 6px solid $c-form-highlight;
-	border-top: 1px solid $c-form-highlight;
-	border-bottom: 1px solid $c-form-highlight;
+	//border-top: 1px solid $c-form-highlight;
+	//border-bottom: 1px solid $c-form-highlight;
 	box-shadow: 0 0 6px 0 black;
 
 	border-radius: 6px;

html_orig/sass/pages/_about.scss

@@ -22,6 +22,14 @@
 	}
 }
 
+.page-help {
+	code {
+		background: rgba(33, 97, 109, 0.31);
+		border-radius: 1px;
+		padding: 0 2px;
+	}
+}
+
 .colorprev {
 	margin-top: dist(-2);
 	margin-bottom: dist(-2);
@@ -33,7 +41,7 @@
 	}
 }
 
-.ansiref {
+.Row table {
 	&,td,th{
 		border: 1px solid #666;
 	}
@@ -45,20 +53,76 @@
 	th {
 		background-color: rgba(255,255,255,.1);
 	}
+}
 
-	td:nth-child(1) {
-		font-family: monospace;
-	}
-
+.ansiref {
 	&.w100 {
 		width: 100%;
 
 		td:nth-child(1) {
-			width: 9em;
-		}
-
-		td:nth-child(2) {
 			width: 8em;
 		}
 	}
 }
+
+.nomen {
+	width: 100%;
+
+	code {
+		white-space: nowrap;
+	}
+
+	td:last-child {
+		min-width: 15em;
+	}
+}
+
+.tscroll {
+	overflow-x: auto;
+}
+
+.charset {
+	line-height: 1;
+
+	div {
+		display: inline-block;
+		width: 2.7em;
+		border: 1px solid #666;
+		height: 3em;
+		margin: 1px;
+		position: relative;
+
+		span {
+			display: block;
+			position: absolute;
+		}
+
+		span:nth-child(1) {
+			left: .2em;
+			top: .2em;
+			height: 1em;
+			font-size: 85%;
+			color: #999;
+		}
+
+		span:nth-child(2) {
+			right: .2em;
+			top: .2em;
+			height: 1em;
+			font-size: 85%;
+			color: #999;
+		}
+
+		span:nth-child(3) {
+			width: 100%;
+			font-size: 105%;
+			text-align: center;
+			bottom: .4em;
+			font-family: $screen-stack;
+		}
+
+		&.none {
+			opacity: .4;
+		}
+	}
+}

html_orig/sass/pages/_term.scss

@@ -13,82 +13,178 @@ body.term {
 		// longer duration to load everything in background nicely
 		transition: opacity 0.25s ease-in;
 	}
+}
 
-	#screen {
+#screen {
+	white-space: nowrap;
+	background: #111213;
+	padding: 6px;
+	display: inline-block;
+	border: 2px solid #3983CD;
+
+	font-size: 20px; // some font heights cause visual glitches with some font renderers. This should be configurable.
+	font-family: $screen-stack;
+
+	span {
+		white-space: pre;
+	}
+
+	> span {
+		position: relative;
+		cursor: pointer;
+
+		&::before {
+			content: " ";
+		}
+
+		> span {
+			position:absolute;
+			left: 0;
+			z-index: 1;
+		}
+	}
+
+	&.noselect {
 		@include noselect();
-		font-family: monospace;
-		font-size: 16pt;
-		white-space: nowrap;
-		background: #111213;
-		padding: 6px;
-		display: inline-block;
-		border: 2px solid #3983CD; //#1bc249;
-
-		span {
-			white-space: pre;
-			cursor: pointer;
-			&:hover {
-				outline: 1px solid rgba(#ffffff, 0.4);
-				@include media($phone) {
-					outline: 0 none;
-				}
-			}
-		}
 	}
+}
 
-	#buttons {
-		margin-top: 10px;
-		white-space: nowrap;
+#action-buttons {
+	margin-top: 10px;
+	white-space: nowrap;
 
-		button {
-			margin: 0 3px;
-			padding: 8px 5px;
-			//width: 18%;
-			min-width: 62px;
-			//max-width: 65px;
-			//min-width: initial;
-			cursor: pointer;
-			font-weight: bold;
-		}
-	}
+	button {
+		margin: 0 3px;
+		padding: 8px 5px;
+		min-width: 62px;
+		cursor: pointer;
+		font-weight: bold;
 
-	#botnav {
-		padding-top: 1.5em;
-		text-align: center;
-
-		a {
-			padding: 0 dist(-2);
-			text-decoration: underline;
-
-			&, &:visited, &:link {
-				color: #336085;
-			}
-
-			&:hover {
-				color: #5abfff;
-			}
-		}
-
-		.icn-keyboard {
-			text-decoration: none;
-			font-size: 150%;
-			vertical-align: middle;
+		&:focus {
+			outline: 0 none !important;
 		}
 	}
 }
 
-#termwrap {
+#term-nav {
+	padding-top: 1.5em;
+	text-align: center;
+
+	a {
+		text-decoration: none;
+		padding: 5px 5px;
+		border-radius: 2px;
+		position: relative;
+
+		&, &:visited, &:link {
+			color: #336085;
+		}
+
+		&:hover {
+			color: #5abfff;
+			background: #1b273c;
+		}
+
+		&:active {
+			top: 1px;
+		}
+
+		i::before {
+			display: inline;
+		}
+
+		span {
+			margin-left: .2em;
+		}
+
+		@include media($phone) {
+			span {
+				display: none;
+			}
+
+			font-size: 130%;
+			padding: 6px;
+		}
+	}
+
+	.icn-keyboard {
+		text-decoration: none;
+		font-size: 130%; // make it bigger - icon is too small to be recognizable
+		vertical-align: middle;
+	}
+}
+
+#term-wrap {
 	text-align: center;
 }
 
+// Dummy input field used to open android keyboard
 #softkb-input {
 	position: absolute;
 	top: -9999px;
 }
 
-// "non-bold"
-.nb {
-	font-weight: normal !important;
+#fu_modal {
+	align-items: flex-start;
+}
+
+#fu_form {
+	//border: 1px solid #3983CD;
+	//border-radius: 2px;
+	//padding: 0 dist(0);
+	//background: #333e58;
+	padding: dist(0);
+	margin-top: 100px; // offset
+
+	z-index: 1000;
+
+	label {
+		width: 8em;
+		display: inline-block;
+	}
+
+	input[type="number"], select {
+		width: 10em;
+	}
+
+	textarea {
+		width: 100%;
+		min-height: 8em;
+		margin-top: dist(-1);
+		resize: vertical;
+	}
+
+	.fu-buttons {
+		text-align: center;
+		padding: dist(-2);
+		margin-top: dist(-2);
+		border-radius: 3px;
+	}
+
+	.fu-prog-box {
+		display: none;
+	}
+
+	&.busy {
+		background: rgba($c-modal-bg, .3);
+		border-left-color: rgba($c-form-highlight, .3);
+		border-right-color: rgba($c-form-highlight, .3);
+
+		.fu-content {
+			@include click-through;
+			opacity: .3;
+		}
+
+		.fu-buttons {
+			text-align: left;
+			background: $c-modal-bg;
+			border: 1px solid $c-form-highlight;
+		}
+
+		.fu-prog-box {
+			display: inline-block;
+		}
+	}
 }
 
 // Tango
@@ -163,10 +259,36 @@ body.term {
 	}
 }
 
+// Attributes
 .bold {
 	font-weight: bold !important;
 }
 
+.faint span { // content of faint is wrapped in span
+	opacity: 0.6;
+}
+
+.italic {
+	font-style: italic;
+}
+
+.under {
+	text-decoration: underline;
+}
+
+.strike {
+	text-decoration: line-through;
+}
+
+.underline.strike {
+	text-decoration: underline line-through;
+}
+
+.blink-hide .blink {
+	color: transparent;
+}
+//
+
 .Row.color-preview {
 	font-family: monospace;
 	font-size: 16pt;

user/ansi_parser.c

@@ -2,50 +2,87 @@
 /* #line 1 "user/ansi_parser.rl" */
 #include <esp8266.h>
 #include "ansi_parser.h"
-#include "screen.h"
+#include "ansi_parser_callbacks.h"
+#include "ascii.h"
+#include "apars_logging.h"
 
 /* Ragel constants block */
 
-/* #line 10 "user/ansi_parser.c" */
+/* #line 12 "user/ansi_parser.c" */
 static const char _ansi_actions[] = {
 	0, 1, 0, 1, 1, 1, 2, 1, 
 	3, 1, 4, 1, 5, 1, 6, 1, 
 	7, 1, 8, 1, 9, 1, 10, 1, 
-	11, 1, 12, 1, 13, 1, 14, 2, 
-	9, 10, 2, 9, 11
+	11, 1, 12, 1, 13, 1, 14, 1, 
+	15
 };
 
 static const char _ansi_eof_actions[] = {
-	0, 13, 13, 13, 13, 13, 13, 13, 
-	13, 13, 13, 13, 13, 13, 13, 13, 
-	13, 13, 13, 13, 13, 13, 13, 13, 
-	13, 13, 0, 0, 0, 0, 0
+	0, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 0, 0, 0, 0
 };
 
 static const int ansi_start = 1;
-static const int ansi_first_final = 26;
+static const int ansi_first_final = 11;
 static const int ansi_error = 0;
 
-static const int ansi_en_CSI_body = 3;
-static const int ansi_en_OSC_body = 5;
+static const int ansi_en_CSI_body = 5;
+static const int ansi_en_STRCMD_body = 8;
+static const int ansi_en_charsetcmd_body = 10;
 static const int ansi_en_main = 1;
 
 
-/* #line 9 "user/ansi_parser.rl" */
+/* #line 11 "user/ansi_parser.rl" */
 
 
+// Max nr of CSI parameters
+#define CSI_N_MAX 10
+#define STR_CHAR_MAX 64
+
 static volatile int cs = -1;
+static volatile bool inside_string = false;
 
-static ETSTimer resetTim;
+// public
+volatile u32 ansi_parser_char_cnt = 0;
 
-static void ICACHE_FLASH_ATTR
-resetParserCb(void *arg) {
+void ICACHE_FLASH_ATTR
+ansi_parser_reset(void) {
 	if (cs != ansi_start) {
 		cs = ansi_start;
-		warn("Parser timeout, state reset");
+		inside_string = false;
+		apars_reset_utf8buffer();
+		ansi_warn("Parser state reset (timeout?)");
 	}
 }
 
+#define HISTORY_LEN 10
+
+#if DEBUG_ANSI
+static char history[HISTORY_LEN + 1];
+#endif
+
+void ICACHE_FLASH_ATTR
+apars_show_context(void)
+{
+#if DEBUG_ANSI
+	char buf1[HISTORY_LEN*3+2];
+	char buf2[HISTORY_LEN*3+2];
+	char *b1 = buf1;
+	char *b2 = buf2;
+	char c;
+
+	for(int i=0;i<HISTORY_LEN;i++) {
+		c = history[i];
+		b1 += sprintf(b1, "%2X ", c);
+		if (c < 32 || c > 127) c = '.';
+		b2 += sprintf(b2, "%c  ", c);
+	}
+
+	ansi_dbg("Context: %s", buf2);
+	ansi_dbg("         %s", buf1);
+#endif
+}
+
 /**
  * \brief Linear ANSI chars stream parser
  *
@@ -60,44 +97,109 @@ resetParserCb(void *arg) {
  * \param len - length of the newdata buffer
  */
 void ICACHE_FLASH_ATTR
-ansi_parser(const char *newdata, size_t len)
+ansi_parser(char newchar)
 {
 	// The CSI code is built here
-	static char csi_leading;      //!< Leading char, 0 if none
-	static int  csi_ni;           //!< Number of the active digit
-	static int  csi_n[CSI_N_MAX]; //!< Param digits
-	static char csi_char;         //!< CSI action char (end)
-	static char osc_buffer[OSC_CHAR_MAX];
-	static int  osc_bi;
+	static char leadchar;
+	static char interchar; // intermediate CSI char
+	static int  arg_ni;
+	static int  arg_cnt;
+	static int  arg[CSI_N_MAX];
+	static char string_buffer[STR_CHAR_MAX];
+	static int  str_ni;
 
-	if (len == 0) len = strlen(newdata);
-	
-	// Load new data to Ragel vars
-	const char *p = newdata;
-	const char *eof = NULL;
-	const char *pe = newdata + len;
+	// This is used to detect timeout delay (time since last rx char)
+	ansi_parser_char_cnt++;
 
 	// Init Ragel on the first run
 	if (cs == -1) {
 		
-/* #line 84 "user/ansi_parser.c" */
+/* #line 118 "user/ansi_parser.c" */
 	{
 	cs = ansi_start;
 	}
 
-/* #line 57 "user/ansi_parser.rl" */
+/* #line 92 "user/ansi_parser.rl" */
+
+		#if DEBUG_ANSI
+			memset(history, 0, sizeof(history));
+		#endif
 	}
 
-	// schedule state reset
-	if (termconf->parser_tout_ms > 0) {
-		os_timer_disarm(&resetTim);
-		os_timer_setfn(&resetTim, resetParserCb, NULL);
-		os_timer_arm(&resetTim, termconf->parser_tout_ms, 0);
+	#if DEBUG_ANSI
+		for(int i=1; i<HISTORY_LEN; i++) {
+			history[i-1] = history[i];
+		}
+		history[HISTORY_LEN-1] = newchar;
+	#endif
+
+	// Handle simple characters immediately (bypass parser)
+	if (newchar < ' ' && !inside_string) {
+		switch (newchar) {
+			case ESC:
+				// Reset state
+				cs = ansi_start;
+				// now the ESC will be processed by the parser
+				break; // proceed to parser
+
+				// Literally passed
+			case FF:
+			case VT:
+				newchar = LF; // translate to LF, like VT100 / xterm do
+			case CR:
+			case LF:
+			case BS:
+				apars_handle_plainchar(newchar);
+				return;
+
+			case TAB:
+				apars_handle_tab();
+				return;
+
+				// Select G0 or G1
+			case SI:
+				apars_handle_chs_switch(0);
+				return;
+
+			case SO:
+				apars_handle_chs_switch(1);
+				return;
+
+			case BEL:
+				// bel is also used to terminate OSC
+				apars_handle_bel();
+				return;
+
+			case ENQ:
+				apars_handle_enq();
+				return;
+
+				// Cancel the active sequence
+			case CAN:
+			case SUB:
+				cs = ansi_start;
+				return;
+
+			default:
+				// Discard all other control codes
+				return;
+		}
+	} else {
+		// bypass the parser for simple characters (speed-up)
+		if (cs == ansi_start && newchar >= ' ') {
+			apars_handle_plainchar(newchar);
+			return;
+		}
 	}
+	
+	// Load new data to Ragel vars
+	const char *p = &newchar;
+	const char *eof = NULL;
+	const char *pe = &newchar + 1;
 
 	// The parser
 	
-/* #line 101 "user/ansi_parser.c" */
+/* #line 203 "user/ansi_parser.c" */
 	{
 	const char *_acts;
 	unsigned int _nacts;
@@ -109,356 +211,315 @@ ansi_parser(const char *newdata, size_t len)
 _resume:
 	switch ( cs ) {
 case 1:
-	if ( (*p) == 27 )
-		goto tr1;
-	goto tr0;
-case 2:
 	switch( (*p) ) {
-		case 55: goto tr3;
-		case 56: goto tr4;
-		case 91: goto tr5;
-		case 93: goto tr6;
-		case 99: goto tr7;
+		case 7: goto tr1;
+		case 27: goto tr2;
 	}
-	goto tr2;
+	goto tr0;
 case 0:
 	goto _out;
-case 26:
-	if ( (*p) == 27 )
-		goto tr1;
-	goto tr0;
-case 3:
-	if ( (*p) == 59 )
-		goto tr10;
-	if ( (*p) < 60 ) {
-		if ( (*p) > 47 ) {
-			if ( 48 <= (*p) && (*p) <= 57 )
-				goto tr9;
-		} else if ( (*p) >= 32 )
-			goto tr8;
-	} else if ( (*p) > 64 ) {
-		if ( (*p) > 90 ) {
-			if ( 97 <= (*p) && (*p) <= 122 )
-				goto tr11;
-		} else if ( (*p) >= 65 )
-			goto tr11;
-	} else
-		goto tr8;
-	goto tr2;
-case 4:
-	if ( (*p) == 59 )
-		goto tr10;
-	if ( (*p) < 65 ) {
-		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr9;
-	} else if ( (*p) > 90 ) {
-		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr11;
-	} else
-		goto tr11;
-	goto tr2;
-case 27:
-	goto tr2;
-case 5:
+case 2:
 	switch( (*p) ) {
-		case 66: goto tr12;
-		case 84: goto tr13;
-		case 87: goto tr14;
+		case 32: goto tr3;
+		case 35: goto tr4;
+		case 37: goto tr5;
+		case 80: goto tr7;
+		case 88: goto tr7;
+		case 91: goto tr8;
+		case 107: goto tr7;
 	}
-	goto tr2;
-case 6:
-	if ( (*p) == 84 )
-		goto tr15;
-	goto tr2;
-case 7:
-	if ( (*p) == 78 )
-		goto tr16;
-	goto tr2;
-case 8:
-	if ( 48 <= (*p) && (*p) <= 57 )
-		goto tr17;
-	goto tr2;
-case 9:
-	if ( (*p) == 61 )
-		goto tr18;
-	goto tr2;
-case 10:
-	if ( (*p) == 27 )
-		goto tr2;
-	goto tr19;
+	if ( (*p) < 64 ) {
+		if ( (*p) < 48 ) {
+			if ( 40 <= (*p) && (*p) <= 47 )
+				goto tr5;
+		} else if ( (*p) > 57 ) {
+			if ( 60 <= (*p) && (*p) <= 62 )
+				goto tr6;
+		} else
+			goto tr6;
+	} else if ( (*p) > 92 ) {
+		if ( (*p) < 97 ) {
+			if ( 93 <= (*p) && (*p) <= 95 )
+				goto tr7;
+		} else if ( (*p) > 122 ) {
+			if ( 124 <= (*p) && (*p) <= 126 )
+				goto tr6;
+		} else
+			goto tr6;
+	} else
+		goto tr6;
+	goto tr1;
+case 3:
+	if ( (*p) > 71 ) {
+		if ( 76 <= (*p) && (*p) <= 78 )
+			goto tr9;
+	} else if ( (*p) >= 70 )
+		goto tr9;
+	goto tr1;
 case 11:
 	switch( (*p) ) {
-		case 7: goto tr20;
-		case 27: goto tr21;
+		case 7: goto tr1;
+		case 27: goto tr2;
 	}
-	goto tr19;
-case 28:
+	goto tr0;
+case 4:
+	if ( 48 <= (*p) && (*p) <= 57 )
+		goto tr10;
+	goto tr1;
+case 5:
 	switch( (*p) ) {
-		case 7: goto tr20;
-		case 27: goto tr21;
+		case 36: goto tr11;
+		case 59: goto tr13;
 	}
-	goto tr19;
+	if ( (*p) < 48 ) {
+		if ( (*p) < 38 ) {
+			if ( 32 <= (*p) && (*p) <= 34 )
+				goto tr11;
+		} else if ( (*p) > 39 ) {
+			if ( 41 <= (*p) && (*p) <= 45 )
+				goto tr11;
+		} else
+			goto tr11;
+	} else if ( (*p) > 57 ) {
+		if ( (*p) < 64 ) {
+			if ( 61 <= (*p) && (*p) <= 63 )
+				goto tr14;
+		} else if ( (*p) > 90 ) {
+			if ( 96 <= (*p) && (*p) <= 126 )
+				goto tr15;
+		} else
+			goto tr15;
+	} else
+		goto tr12;
+	goto tr1;
+case 6:
+	if ( (*p) > 90 ) {
+		if ( 96 <= (*p) && (*p) <= 126 )
+			goto tr15;
+	} else if ( (*p) >= 64 )
+		goto tr15;
+	goto tr1;
 case 12:
-	if ( (*p) == 92 )
-		goto tr22;
-	goto tr2;
-case 29:
-	goto tr2;
+	goto tr1;
+case 7:
+	switch( (*p) ) {
+		case 36: goto tr11;
+		case 59: goto tr13;
+	}
+	if ( (*p) < 41 ) {
+		if ( (*p) > 34 ) {
+			if ( 38 <= (*p) && (*p) <= 39 )
+				goto tr11;
+		} else if ( (*p) >= 32 )
+			goto tr11;
+	} else if ( (*p) > 45 ) {
+		if ( (*p) < 64 ) {
+			if ( 48 <= (*p) && (*p) <= 57 )
+				goto tr12;
+		} else if ( (*p) > 90 ) {
+			if ( 96 <= (*p) && (*p) <= 126 )
+				goto tr15;
+		} else
+			goto tr15;
+	} else
+		goto tr11;
+	goto tr1;
+case 8:
+	switch( (*p) ) {
+		case 7: goto tr17;
+		case 27: goto tr18;
+	}
+	goto tr16;
 case 13:
-	if ( (*p) == 73 )
-		goto tr23;
-	goto tr2;
+	goto tr1;
+case 9:
+	if ( (*p) == 92 )
+		goto tr17;
+	goto tr1;
+case 10:
+	switch( (*p) ) {
+		case 7: goto tr1;
+		case 27: goto tr1;
+	}
+	goto tr19;
 case 14:
-	if ( (*p) == 84 )
-		goto tr24;
-	goto tr2;
-case 15:
-	if ( (*p) == 76 )
-		goto tr25;
-	goto tr2;
-case 16:
-	if ( (*p) == 69 )
-		goto tr26;
-	goto tr2;
-case 17:
-	if ( (*p) == 61 )
-		goto tr27;
-	goto tr2;
-case 18:
-	if ( (*p) == 27 )
-		goto tr2;
-	goto tr28;
-case 19:
-	switch( (*p) ) {
-		case 7: goto tr29;
-		case 27: goto tr30;
-	}
-	goto tr28;
-case 30:
-	switch( (*p) ) {
-		case 7: goto tr29;
-		case 27: goto tr30;
-	}
-	goto tr28;
-case 20:
-	if ( (*p) == 92 )
-		goto tr31;
-	goto tr2;
-case 21:
-	if ( 48 <= (*p) && (*p) <= 57 )
-		goto tr32;
-	goto tr2;
-case 22:
-	if ( (*p) == 59 )
-		goto tr33;
-	if ( 48 <= (*p) && (*p) <= 57 )
-		goto tr32;
-	goto tr2;
-case 23:
-	if ( 48 <= (*p) && (*p) <= 57 )
-		goto tr34;
-	goto tr2;
-case 24:
-	switch( (*p) ) {
-		case 7: goto tr35;
-		case 27: goto tr36;
-	}
-	if ( 48 <= (*p) && (*p) <= 57 )
-		goto tr34;
-	goto tr2;
-case 25:
-	if ( (*p) == 92 )
-		goto tr35;
-	goto tr2;
+	goto tr1;
 	}
 
-	tr2: cs = 0; goto f0;
+	tr1: cs = 0; goto f0;
 	tr0: cs = 1; goto f1;
-	tr1: cs = 2; goto _again;
-	tr8: cs = 4; goto f7;
-	tr9: cs = 4; goto f8;
-	tr10: cs = 4; goto f9;
-	tr12: cs = 6; goto _again;
-	tr15: cs = 7; goto _again;
-	tr16: cs = 8; goto _again;
-	tr17: cs = 9; goto f8;
-	tr18: cs = 10; goto _again;
-	tr19: cs = 11; goto f11;
-	tr21: cs = 12; goto _again;
-	tr13: cs = 13; goto _again;
-	tr23: cs = 14; goto _again;
-	tr24: cs = 15; goto _again;
-	tr25: cs = 16; goto _again;
-	tr26: cs = 17; goto _again;
-	tr27: cs = 18; goto _again;
-	tr28: cs = 19; goto f11;
-	tr30: cs = 20; goto _again;
-	tr14: cs = 21; goto _again;
-	tr32: cs = 22; goto f8;
-	tr33: cs = 23; goto f9;
-	tr34: cs = 24; goto f8;
-	tr36: cs = 25; goto _again;
-	tr3: cs = 26; goto f2;
-	tr4: cs = 26; goto f3;
-	tr5: cs = 26; goto f4;
-	tr6: cs = 26; goto f5;
-	tr7: cs = 26; goto f6;
-	tr11: cs = 27; goto f10;
-	tr20: cs = 28; goto f12;
-	tr22: cs = 29; goto f13;
-	tr31: cs = 29; goto f15;
-	tr35: cs = 29; goto f16;
-	tr29: cs = 30; goto f14;
+	tr2: cs = 2; goto _again;
+	tr3: cs = 3; goto _again;
+	tr4: cs = 4; goto _again;
+	tr11: cs = 6; goto f8;
+	tr12: cs = 7; goto f9;
+	tr13: cs = 7; goto f10;
+	tr14: cs = 7; goto f11;
+	tr16: cs = 8; goto f13;
+	tr18: cs = 9; goto _again;
+	tr5: cs = 11; goto f2;
+	tr6: cs = 11; goto f3;
+	tr7: cs = 11; goto f4;
+	tr8: cs = 11; goto f5;
+	tr9: cs = 11; goto f6;
+	tr10: cs = 11; goto f7;
+	tr15: cs = 12; goto f12;
+	tr17: cs = 13; goto f14;
+	tr19: cs = 14; goto f15;
 
-	f1: _acts = _ansi_actions + 1; goto execFuncs;
-	f4: _acts = _ansi_actions + 3; goto execFuncs;
-	f7: _acts = _ansi_actions + 5; goto execFuncs;
-	f8: _acts = _ansi_actions + 7; goto execFuncs;
+	f0: _acts = _ansi_actions + 1; goto execFuncs;
+	f1: _acts = _ansi_actions + 3; goto execFuncs;
+	f5: _acts = _ansi_actions + 5; goto execFuncs;
+	f11: _acts = _ansi_actions + 7; goto execFuncs;
 	f9: _acts = _ansi_actions + 9; goto execFuncs;
 	f10: _acts = _ansi_actions + 11; goto execFuncs;
-	f0: _acts = _ansi_actions + 13; goto execFuncs;
-	f5: _acts = _ansi_actions + 15; goto execFuncs;
-	f16: _acts = _ansi_actions + 17; goto execFuncs;
-	f11: _acts = _ansi_actions + 19; goto execFuncs;
-	f15: _acts = _ansi_actions + 21; goto execFuncs;
-	f13: _acts = _ansi_actions + 23; goto execFuncs;
-	f6: _acts = _ansi_actions + 25; goto execFuncs;
-	f2: _acts = _ansi_actions + 27; goto execFuncs;
-	f3: _acts = _ansi_actions + 29; goto execFuncs;
-	f14: _acts = _ansi_actions + 31; goto execFuncs;
-	f12: _acts = _ansi_actions + 34; goto execFuncs;
+	f8: _acts = _ansi_actions + 13; goto execFuncs;
+	f12: _acts = _ansi_actions + 15; goto execFuncs;
+	f4: _acts = _ansi_actions + 17; goto execFuncs;
+	f13: _acts = _ansi_actions + 19; goto execFuncs;
+	f14: _acts = _ansi_actions + 21; goto execFuncs;
+	f7: _acts = _ansi_actions + 23; goto execFuncs;
+	f3: _acts = _ansi_actions + 25; goto execFuncs;
+	f6: _acts = _ansi_actions + 27; goto execFuncs;
+	f2: _acts = _ansi_actions + 29; goto execFuncs;
+	f15: _acts = _ansi_actions + 31; goto execFuncs;
 
 execFuncs:
 	_nacts = *_acts++;
 	while ( _nacts-- > 0 ) {
 		switch ( *_acts++ ) {
 	case 0:
-/* #line 76 "user/ansi_parser.rl" */
+/* #line 179 "user/ansi_parser.rl" */
 	{
-			apars_handle_plainchar((*p));
+			ansi_warn("Parser error.");
+			apars_show_context();
+			inside_string = false; // no longer in string, for sure
+			{cs = 1;goto _again;}
 		}
 	break;
 	case 1:
-/* #line 83 "user/ansi_parser.rl" */
+/* #line 188 "user/ansi_parser.rl" */
 	{
-			// Reset the CSI builder
-			csi_leading = csi_char = 0;
-			csi_ni = 0;
-
-			// Zero out digits
-			for(int i = 0; i < CSI_N_MAX; i++) {
-				csi_n[i] = 0;
+			if ((*p) != 0) {
+				apars_handle_plainchar((*p));
 			}
-
-			{cs = 3;goto _again;}
 		}
 	break;
 	case 2:
-/* #line 96 "user/ansi_parser.rl" */
+/* #line 196 "user/ansi_parser.rl" */
 	{
-			csi_leading = (*p);
-		}
-	break;
-	case 3:
-/* #line 100 "user/ansi_parser.rl" */
-	{
-			// x10 + digit
-			if (csi_ni < CSI_N_MAX) {
-				csi_n[csi_ni] = csi_n[csi_ni]*10 + ((*p) - '0');
-			}
-		}
-	break;
-	case 4:
-/* #line 107 "user/ansi_parser.rl" */
-	{
-			csi_ni++;
-		}
-	break;
-	case 5:
-/* #line 111 "user/ansi_parser.rl" */
-	{
-			csi_char = (*p);
+			// Reset the CSI builder
+			leadchar = NUL;
+			interchar = NUL;
+			arg_ni = 0;
+			arg_cnt = 0;
 
-			apars_handle_CSI(csi_leading, csi_n, csi_char);
-
-			{cs = 1;goto _again;}
-		}
-	break;
-	case 6:
-/* #line 119 "user/ansi_parser.rl" */
-	{
-			apars_handle_badseq();
-			{cs = 1;goto _again;}
-		}
-	break;
-	case 7:
-/* #line 136 "user/ansi_parser.rl" */
-	{
-			csi_ni = 0;
-
-			// we reuse the CSI numeric buffer
+			// Zero out digits
 			for(int i = 0; i < CSI_N_MAX; i++) {
-				csi_n[i] = 0;
+				arg[i] = 0;
 			}
 
-			osc_bi = 0;
-			osc_buffer[0] = '\0';
-
 			{cs = 5;goto _again;}
 		}
 	break;
-	case 8:
-/* #line 150 "user/ansi_parser.rl" */
+	case 3:
+/* #line 211 "user/ansi_parser.rl" */
 	{
-			apars_handle_OSC_SetScreenSize(csi_n[0], csi_n[1]);
+			leadchar = (*p);
+		}
+	break;
+	case 4:
+/* #line 215 "user/ansi_parser.rl" */
+	{
+			if (arg_cnt == 0) arg_cnt = 1;
+			// x10 + digit
+			if (arg_ni < CSI_N_MAX) {
+				arg[arg_ni] = arg[arg_ni]*10 + ((*p) - '0');
+			}
+		}
+	break;
+	case 5:
+/* #line 223 "user/ansi_parser.rl" */
+	{
+			if (arg_cnt == 0) arg_cnt = 1; // handle case when first arg is empty
+			arg_cnt++;
+			arg_ni++;
+		}
+	break;
+	case 6:
+/* #line 229 "user/ansi_parser.rl" */
+	{
+			interchar = (*p);
+		}
+	break;
+	case 7:
+/* #line 233 "user/ansi_parser.rl" */
+	{
+			apars_handle_csi(leadchar, arg, arg_cnt, interchar, (*p));
 			{cs = 1;goto _again;}
 		}
 	break;
-	case 9:
-/* #line 155 "user/ansi_parser.rl" */
+	case 8:
+/* #line 245 "user/ansi_parser.rl" */
 	{
-			osc_buffer[osc_bi++] = (*p);
+			leadchar = (*p);
+			str_ni = 0;
+			string_buffer[0] = '\0';
+			inside_string = true;
+			{cs = 8;goto _again;}
+		}
+	break;
+	case 9:
+/* #line 253 "user/ansi_parser.rl" */
+	{
+			string_buffer[str_ni++] = (*p);
 		}
 	break;
 	case 10:
-/* #line 159 "user/ansi_parser.rl" */
+/* #line 257 "user/ansi_parser.rl" */
 	{
-			osc_buffer[osc_bi++] = '\0';
-			apars_handle_OSC_SetTitle(osc_buffer);
+			inside_string = false;
+			string_buffer[str_ni++] = '\0';
+			apars_handle_string_cmd(leadchar, string_buffer);
 			{cs = 1;goto _again;}
 		}
 	break;
 	case 11:
-/* #line 165 "user/ansi_parser.rl" */
+/* #line 270 "user/ansi_parser.rl" */
 	{
-			osc_buffer[osc_bi++] = '\0';
-			apars_handle_OSC_SetButton(csi_n[0], osc_buffer);
+			apars_handle_hash_cmd((*p));
 			{cs = 1;goto _again;}
 		}
 	break;
 	case 12:
-/* #line 177 "user/ansi_parser.rl" */
+/* #line 275 "user/ansi_parser.rl" */
 	{
-			// Reset screen
-			apars_handle_RESET_cmd();
+			apars_handle_short_cmd((*p));
 			{cs = 1;goto _again;}
 		}
 	break;
 	case 13:
-/* #line 183 "user/ansi_parser.rl" */
+/* #line 280 "user/ansi_parser.rl" */
 	{
-			apars_handle_saveCursorAttrs();
+			apars_handle_space_cmd((*p));
 			{cs = 1;goto _again;}
 		}
 	break;
 	case 14:
-/* #line 188 "user/ansi_parser.rl" */
+/* #line 287 "user/ansi_parser.rl" */
 	{
-			apars_handle_restoreCursorAttrs();
+			leadchar = (*p);
+			{cs = 10;goto _again;}
+		}
+	break;
+	case 15:
+/* #line 292 "user/ansi_parser.rl" */
+	{
+			apars_handle_chs_designate(leadchar, (*p));
 			{cs = 1;goto _again;}
 		}
 	break;
-/* #line 462 "user/ansi_parser.c" */
+/* #line 523 "user/ansi_parser.c" */
 		}
 	}
 	goto _again;
@@ -475,16 +536,18 @@ _again:
 	unsigned int __nacts = (unsigned int) *__acts++;
 	while ( __nacts-- > 0 ) {
 		switch ( *__acts++ ) {
-	case 6:
-/* #line 119 "user/ansi_parser.rl" */
+	case 0:
+/* #line 179 "user/ansi_parser.rl" */
 	{
-			apars_handle_badseq();
+			ansi_warn("Parser error.");
+			apars_show_context();
+			inside_string = false; // no longer in string, for sure
 			{cs = 1;	if ( p == pe )
 		goto _test_eof;
 goto _again;}
 		}
 	break;
-/* #line 488 "user/ansi_parser.c" */
+/* #line 551 "user/ansi_parser.c" */
 		}
 	}
 	}
@@ -492,6 +555,6 @@ goto _again;}
 	_out: {}
 	}
 
-/* #line 208 "user/ansi_parser.rl" */
+/* #line 315 "user/ansi_parser.rl" */
 
 }

user/ansi_parser.h

@@ -2,21 +2,10 @@
 #define ANSI_PARSER_H
 
 #include <stdlib.h>
-#include <screen.h>
 
-// Max nr of CSI parameters
-#define CSI_N_MAX 3
-#define OSC_CHAR_MAX TERM_TITLE_LEN
+void ansi_parser_reset(void);
 
-extern void apars_handle_badseq(void);
-extern void apars_handle_CSI(char leadchar, int *params, char keychar);
-extern void apars_handle_RESET_cmd(void);
-extern void apars_handle_plainchar(char c);
-extern void apars_handle_OSC_SetScreenSize(int rows, int cols);
-extern void apars_handle_saveCursorAttrs(void);
-extern void apars_handle_restoreCursorAttrs(void);
-extern void apars_handle_OSC_SetButton(int num, const char *buffer);
-extern void apars_handle_OSC_SetTitle(const char *buffer);
+extern volatile u32 ansi_parser_char_cnt;
 
 /**
  * \brief Linear ANSI chars stream parser
@@ -28,9 +17,11 @@ extern void apars_handle_OSC_SetTitle(const char *buffer);
  * \attention -> but always check the Ragel output for 'p--' 
  *            or 'p -=', that means trouble.
  * 
- * \param newdata - array of new chars to process
- * \param len - length of the newdata buffer
+ * \param newchar - received char
  */
-void ansi_parser(const char *newdata, size_t len);
+void ansi_parser(char newchar);
+
+/** This shows a short error message and prints the history (if any) */
+void apars_show_context(void);
 
 #endif // ANSI_PARSER_H

user/ansi_parser.rl

@@ -1,6 +1,8 @@
 #include <esp8266.h>
 #include "ansi_parser.h"
-#include "screen.h"
+#include "ansi_parser_callbacks.h"
+#include "ascii.h"
+#include "apars_logging.h"
 
 /* Ragel constants block */
 %%{
@@ -8,18 +10,54 @@
 	write data;
 }%%
 
+// Max nr of CSI parameters
+#define CSI_N_MAX 10
+#define STR_CHAR_MAX 64
+
 static volatile int cs = -1;
+static volatile bool inside_string = false;
 
-static ETSTimer resetTim;
+// public
+volatile u32 ansi_parser_char_cnt = 0;
 
-static void ICACHE_FLASH_ATTR
-resetParserCb(void *arg) {
+void ICACHE_FLASH_ATTR
+ansi_parser_reset(void) {
 	if (cs != ansi_start) {
 		cs = ansi_start;
-		warn("Parser timeout, state reset");
+		inside_string = false;
+		apars_reset_utf8buffer();
+		ansi_warn("Parser state reset (timeout?)");
 	}
 }
 
+#define HISTORY_LEN 10
+
+#if DEBUG_ANSI
+static char history[HISTORY_LEN + 1];
+#endif
+
+void ICACHE_FLASH_ATTR
+apars_show_context(void)
+{
+#if DEBUG_ANSI
+	char buf1[HISTORY_LEN*3+2];
+	char buf2[HISTORY_LEN*3+2];
+	char *b1 = buf1;
+	char *b2 = buf2;
+	char c;
+
+	for(int i=0;i<HISTORY_LEN;i++) {
+		c = history[i];
+		b1 += sprintf(b1, "%2X ", c);
+		if (c < 32 || c > 127) c = '.';
+		b2 += sprintf(b2, "%c  ", c);
+	}
+
+	ansi_dbg("Context: %s", buf2);
+	ansi_dbg("         %s", buf1);
+#endif
+}
+
 /**
  * \brief Linear ANSI chars stream parser
  *
@@ -34,172 +72,241 @@ resetParserCb(void *arg) {
  * \param len - length of the newdata buffer
  */
 void ICACHE_FLASH_ATTR
-ansi_parser(const char *newdata, size_t len)
+ansi_parser(char newchar)
 {
 	// The CSI code is built here
-	static char csi_leading;      //!< Leading char, 0 if none
-	static int  csi_ni;           //!< Number of the active digit
-	static int  csi_n[CSI_N_MAX]; //!< Param digits
-	static char csi_char;         //!< CSI action char (end)
-	static char osc_buffer[OSC_CHAR_MAX];
-	static int  osc_bi;
+	static char leadchar;
+	static char interchar; // intermediate CSI char
+	static int  arg_ni;
+	static int  arg_cnt;
+	static int  arg[CSI_N_MAX];
+	static char string_buffer[STR_CHAR_MAX];
+	static int  str_ni;
 
-	if (len == 0) len = strlen(newdata);
-	
-	// Load new data to Ragel vars
-	const char *p = newdata;
-	const char *eof = NULL;
-	const char *pe = newdata + len;
+	// This is used to detect timeout delay (time since last rx char)
+	ansi_parser_char_cnt++;
 
 	// Init Ragel on the first run
 	if (cs == -1) {
 		%% write init;
+
+		#if DEBUG_ANSI
+			memset(history, 0, sizeof(history));
+		#endif
 	}
 
-	// schedule state reset
-	if (termconf->parser_tout_ms > 0) {
-		os_timer_disarm(&resetTim);
-		os_timer_setfn(&resetTim, resetParserCb, NULL);
-		os_timer_arm(&resetTim, termconf->parser_tout_ms, 0);
+	#if DEBUG_ANSI
+		for(int i=1; i<HISTORY_LEN; i++) {
+			history[i-1] = history[i];
+		}
+		history[HISTORY_LEN-1] = newchar;
+	#endif
+
+	// Handle simple characters immediately (bypass parser)
+	if (newchar < ' ' && !inside_string) {
+		switch (newchar) {
+			case ESC:
+				// Reset state
+				cs = ansi_start;
+				// now the ESC will be processed by the parser
+				break; // proceed to parser
+
+				// Literally passed
+			case FF:
+			case VT:
+				newchar = LF; // translate to LF, like VT100 / xterm do
+			case CR:
+			case LF:
+			case BS:
+				apars_handle_plainchar(newchar);
+				return;
+
+			case TAB:
+				apars_handle_tab();
+				return;
+
+				// Select G0 or G1
+			case SI:
+				apars_handle_chs_switch(0);
+				return;
+
+			case SO:
+				apars_handle_chs_switch(1);
+				return;
+
+			case BEL:
+				// bel is also used to terminate OSC
+				apars_handle_bel();
+				return;
+
+			case ENQ:
+				apars_handle_enq();
+				return;
+
+				// Cancel the active sequence
+			case CAN:
+			case SUB:
+				cs = ansi_start;
+				return;
+
+			default:
+				// Discard all other control codes
+				return;
+		}
+	} else {
+		// bypass the parser for simple characters (speed-up)
+		if (cs == ansi_start && newchar >= ' ') {
+			apars_handle_plainchar(newchar);
+			return;
+		}
 	}
+	
+	// Load new data to Ragel vars
+	const char *p = &newchar;
+	const char *eof = NULL;
+	const char *pe = &newchar + 1;
 
 	// The parser
 	%%{
 #/*
 		ESC = 27;
-		NOESC = (any - ESC);
+		NOESC = (any - ESC - 7);
 		TOK_ST = ESC '\\'; # String terminator - used for OSC commands
-		OSC_END = ('\a' | ESC '\\');
+		STR_END = (7 | TOK_ST);
+
+		# --- Error handler ---
+
+		action errBadSeq {
+			ansi_warn("Parser error.");
+			apars_show_context();
+			inside_string = false; // no longer in string, for sure
+			fgoto main;
+		}
 
 		# --- Regular characters to be printed ---
 
 		action plain_char {
-			apars_handle_plainchar(fc);
+			if (fc != 0) {
+				apars_handle_plainchar(fc);
+			}
 		}
 
-		# --- CSI CSI commands (Select Graphic Rendition) ---
-		# Text color & style
+		# --- CSI commands ---
 
 		action CSI_start {
 			// Reset the CSI builder
-			csi_leading = csi_char = 0;
-			csi_ni = 0;
+			leadchar = NUL;
+			interchar = NUL;
+			arg_ni = 0;
+			arg_cnt = 0;
 
 			// Zero out digits
 			for(int i = 0; i < CSI_N_MAX; i++) {
-				csi_n[i] = 0;
+				arg[i] = 0;
 			}
 
 			fgoto CSI_body;
 		}
 
 		action CSI_leading {
-			csi_leading = fc;
+			leadchar = fc;
 		}
 
 		action CSI_digit {
+			if (arg_cnt == 0) arg_cnt = 1;
 			// x10 + digit
-			if (csi_ni < CSI_N_MAX) {
-				csi_n[csi_ni] = csi_n[csi_ni]*10 + (fc - '0');
+			if (arg_ni < CSI_N_MAX) {
+				arg[arg_ni] = arg[arg_ni]*10 + (fc - '0');
 			}
 		}
 
 		action CSI_semi {
-			csi_ni++;
+			if (arg_cnt == 0) arg_cnt = 1; // handle case when first arg is empty
+			arg_cnt++;
+			arg_ni++;
+		}
+
+		action CSI_intermed {
+			interchar = fc;
 		}
 
 		action CSI_end {
-			csi_char = fc;
-
-			apars_handle_CSI(csi_leading, csi_n, csi_char);
-
+			apars_handle_csi(leadchar, arg, arg_cnt, interchar, fc);
 			fgoto main;
 		}
 
-		action errBadSeq {
-			apars_handle_badseq();
-			fgoto main;
-		}
-
-		action back2main {
-			fgoto main;
-		}
-
-		CSI_body := ((32..47|60..64) @CSI_leading)?
+		#(32..47|60..64)
+		CSI_body := ([?>=] @CSI_leading)?
 			((digit @CSI_digit)* ';' @CSI_semi)*
-			(digit @CSI_digit)* alpha @CSI_end $!errBadSeq;
+			(digit @CSI_digit)* ([ $*"+,)'&!\-] @CSI_intermed)? (alpha|[`@{}~|]) @CSI_end $!errBadSeq;
 
+		# --- String commands ---
 
-		# --- OSC commands (Operating System Commands) ---
-		# Module parametrisation
-
-		action OSC_start {
-			csi_ni = 0;
-
-			// we reuse the CSI numeric buffer
-			for(int i = 0; i < CSI_N_MAX; i++) {
-				csi_n[i] = 0;
-			}
-
-			osc_bi = 0;
-			osc_buffer[0] = '\0';
-
-			fgoto OSC_body;
+		action StrCmd_start {
+			leadchar = fc;
+			str_ni = 0;
+			string_buffer[0] = '\0';
+			inside_string = true;
+			fgoto STRCMD_body;
 		}
 
-		action OSC_resize {
-			apars_handle_OSC_SetScreenSize(csi_n[0], csi_n[1]);
+		action StrCmd_char {
+			string_buffer[str_ni++] = fc;
+		}
+
+		action StrCmd_end {
+			inside_string = false;
+			string_buffer[str_ni++] = '\0';
+			apars_handle_string_cmd(leadchar, string_buffer);
 			fgoto main;
 		}
 
-		action OSC_text_char {
-			osc_buffer[osc_bi++] = fc;
-		}
+		# According to the spec, ESC should be allowed inside the string sequence.
+		# We disallow ESC for simplicity, as it's hardly ever used.
+		STRCMD_body := ((NOESC @StrCmd_char)* STR_END @StrCmd_end) $!errBadSeq;
 
-		action OSC_title {
-			osc_buffer[osc_bi++] = '\0';
-			apars_handle_OSC_SetTitle(osc_buffer);
+		# --- Single character ESC ---
+
+		action HASH_code {
+			apars_handle_hash_cmd(fc);
 			fgoto main;
 		}
 
-		action OSC_button {
-			osc_buffer[osc_bi++] = '\0';
-			apars_handle_OSC_SetButton(csi_n[0], osc_buffer);
-			fgoto main;
-		}
-		
-		OSC_body := (
-			("BTN" digit @CSI_digit '=' (NOESC @OSC_text_char)+ OSC_END @OSC_button) |
-			("TITLE=" (NOESC @OSC_text_char)+ OSC_END @OSC_title) |
-			('W' (digit @CSI_digit)+ ';' @CSI_semi (digit @CSI_digit)+ OSC_END @OSC_resize)
-		) $!errBadSeq;
-
-		action RESET_cmd {
-			// Reset screen
-			apars_handle_RESET_cmd();
+		action SHORT_code {
+			apars_handle_short_cmd(fc);
 			fgoto main;
 		}
 
-		action CSI_SaveCursorAttrs {
-			apars_handle_saveCursorAttrs();
+		action SPACE_cmd {
+			apars_handle_space_cmd(fc);
 			fgoto main;
 		}
 
-		action CSI_RestoreCursorAttrs {
-			apars_handle_restoreCursorAttrs();
+		# --- Charset selection ---
+
+		action CharsetCmd_start {
+			leadchar = fc;
+			fgoto charsetcmd_body;
+		}
+
+		action CharsetCmd_end {
+			apars_handle_chs_designate(leadchar, fc);
 			fgoto main;
 		}
 
+		charsetcmd_body := (NOESC @CharsetCmd_end) $!errBadSeq;
+
 		# --- Main parser loop ---
 
 		main :=
 			(
 				(NOESC @plain_char)* ESC (
-					'[' @CSI_start |
-					']' @OSC_start |
-					'c' @RESET_cmd |
-			        '7' @CSI_SaveCursorAttrs |
-					'8' @CSI_RestoreCursorAttrs
+					('[' @CSI_start) |
+					([_\]Pk\^X] @StrCmd_start) |
+					('#' digit @HASH_code) |
+					(([a-zA-Z0-9=<>~}|@\\] - [PXk]) @SHORT_code) |
+					([()*+-./%] @CharsetCmd_start) |
+					(' ' [FGLMN] @SPACE_cmd)
 				)
 			)+ $!errBadSeq;
 

user/ansi_parser_callbacks.c

@@ -5,285 +5,44 @@
  */
 
 #include <esp8266.h>
+#include <helpers.h>
 #include "ansi_parser_callbacks.h"
+#include "cgi_sockets.h"
+#include "version.h"
+#include "uart_buffer.h"
 #include "screen.h"
-#include "ansi_parser.h"
-#include "uart_driver.h"
-#include "persist.h"
-
-static char utf_collect[4];
-static int utf_i = 0;
-static int utf_j = 0;
 
 /**
- * Handle a received plain character
+ * Send a response to UART0
+ * @param str
  */
 void ICACHE_FLASH_ATTR
-apars_handle_plainchar(char c)
+apars_respond(const char *str)
 {
-	// collecting unicode glyphs...
-	if (c & 0x80) {
-		if (utf_i == 0) {
-			if ((c & 0xE0) == 0xC0) {
-				utf_i = 2;
-			}
-			else if ((c & 0xF0) == 0xE0) {
-				utf_i = 3;
-			}
-			else if ((c & 0xF8) == 0xF0) {
-				utf_i = 4;
-			}
-
-			utf_collect[0] = c;
-			utf_j = 1;
-		}
-		else {
-			utf_collect[utf_j++] = c;
-			if (utf_j >= utf_i) {
-				screen_putchar(utf_collect);
-				utf_i = 0;
-				utf_j = 0;
-				memset(utf_collect, 0, 4);
-			}
-		}
-	}
-	else {
-		utf_collect[0] = c;
-		utf_collect[1] = 0; // just to make sure it's closed...
-		screen_putchar(utf_collect);
-	}
+	UART_SendAsync(str, -1);
 }
 
 /**
- * Bad sequence received, show warning
+ * Beep at the user.
  */
-void apars_handle_badseq(void)
+void ICACHE_FLASH_ATTR
+apars_handle_bel(void)
 {
-	warn("Invalid escape sequence discarded.");
+	send_beep();
 }
 
 /**
- * \brief Handle fully received CSI ANSI sequence
- * \param leadchar - private range leading character, 0 if none
- * \param params - array of CSI_N_MAX ints holding the numeric arguments
- * \param keychar - the char terminating the sequence
+ * Send to uart the answerback message
  */
 void ICACHE_FLASH_ATTR
-apars_handle_CSI(char leadchar, int *params, char keychar)
+apars_handle_enq(void)
 {
-	/*
-		Implemented codes (from Wikipedia)
-
-		CSI n A	CUU – Cursor Up
-		CSI n B	CUD – Cursor Down
-		CSI n C	CUF – Cursor Forward
-		CSI n D	CUB – Cursor Back
-		CSI n E	CNL – Cursor Next Line
-		CSI n F	CPL – Cursor Previous Line
-		CSI n G	CHA – Cursor Horizontal Absolute
-		CSI n ; m H	CUP – Cursor Position
-		CSI n J	ED – Erase Display
-		CSI n K	EL – Erase in Line
-		CSI n S	SU – Scroll Up
-		CSI n T	SD – Scroll Down
-		CSI n ; m f	HVP – Horizontal and Vertical Position
-		CSI n m	SGR – Select Graphic Rendition  (Implemented only some)
-		CSI 6n	DSR – Device Status Report
-		CSI s	SCP – Save Cursor Position
-		CSI u	RCP – Restore Cursor Position
-		CSI ?25l	DECTCEM	Hides the cursor
-		CSI ?25h	DECTCEM	Shows the cursor
-	*/
-
-	int n1 = params[0];
-	int n2 = params[1];
-//	int n3 = params[2];
-
-	// defaults
-	switch (keychar) {
-		case 'A':
-		case 'B':
-		case 'C':
-		case 'D':
-		case 'E':
-		case 'F':
-		case 'G':
-		case 'S':
-		case 'T':
-			if (n1 == 0) n1 = 1;
-			break;
-
-		case 'H':
-		case 'f':
-			if (n1 == 0) n1 = 1;
-			if (n2 == 0) n2 = 1;
-			break;
-
-		case 'J':
-		case 'K':
-			if (n1 > 2) n1 = 0;
-			break;
-	}
-
-	switch (keychar) {
-		// CUU CUD CUF CUB
-		case 'A': screen_cursor_move(-n1, 0); break;
-		case 'B': screen_cursor_move(n1, 0);  break;
-		case 'C': screen_cursor_move(0, n1);  break;
-		case 'D': screen_cursor_move(0, -n1); break;
-
-		case 'E': // CNL
-			screen_cursor_move(n1, 0);
-			screen_cursor_set_x(0);
-			break;
-
-		case 'F': // CPL
-			screen_cursor_move(-n1, 0);
-			screen_cursor_set_x(0);
-			break;
-
-			// CHA
-		case 'G':
-			screen_cursor_set_x(n1 - 1); break; // 1-based
-
-			// SU, SD
-		case 'S': screen_scroll_up(n1);	  break;
-		case 'T': screen_scroll_down(n1); break;
-
-			// CUP,HVP
-		case 'H':
-		case 'f':
-			screen_cursor_set(n1-1, n2-1); break; // 1-based
-
-		case 'J': // ED
-			if (n1 == 0) {
-				screen_clear(CLEAR_TO_CURSOR);
-			} else if (n1 == 1) {
-				screen_clear(CLEAR_FROM_CURSOR);
-			} else {
-				screen_clear(CLEAR_ALL);
-				screen_cursor_set(0, 0);
-			}
-			break;
-
-		case 'K': // EL
-			if (n1 == 0) {
-				screen_clear_line(CLEAR_TO_CURSOR);
-			} else if (n1 == 1) {
-				screen_clear_line(CLEAR_FROM_CURSOR);
-			} else {
-				screen_clear_line(CLEAR_ALL);
-			}
-			break;
-
-			// SCP, RCP
-		case 's': screen_cursor_save(0); break;
-		case 'u': screen_cursor_restore(0); break;
-
-		case 'n':
-			if (n1 == 6) {
-				// Query cursor position
-				char buf[20];
-				int x, y;
-				screen_cursor_get(&y, &x);
-				sprintf(buf, "\033[%d;%dR", y+1, x+1);
-				UART_WriteString(UART0, buf, UART_TIMEOUT_US);
-			}
-			else if (n1 == 5) {
-				// Query device status - reply "Device is OK"
-				UART_WriteString(UART0, "\033[0n", UART_TIMEOUT_US);
-			}
-			break;
-
-			// DECTCEM feature enable / disable
-
-		case 'h':
-			if (leadchar == '?') {
-				if (n1 == 25) {
-					screen_cursor_enable(1);
-				} else if (n1 == 7) {
-					screen_wrap_enable(1);
-				}
-			}
-			break;
-
-		case 'l':
-			if (leadchar == '?') {
-				if (n1 == 25) {
-					screen_cursor_enable(0);
-				} else if (n1 == 7) {
-					screen_wrap_enable(0);
-				}
-			}
-			break;
-
-		case 'm': // SGR
-			// iterate arguments
-			for (int i = 0; i < CSI_N_MAX; i++) {
-				int n = params[i];
-
-				if (i == 0 && n == 0) { // reset SGR
-					screen_reset_cursor(); // resets colors, inverse and bold.
-					break; // cannot combine reset with others
-				}
-				else if (n >= 30 && n <= 37) screen_set_fg(n-30); // ANSI normal fg
-				else if (n >= 40 && n <= 47) screen_set_bg(n-40); // ANSI normal bg
-				else if (n == 39) screen_set_fg(7); // default fg
-				else if (n == 49) screen_set_bg(false); // default bg
-				else if (n == 7) screen_inverse(true); // inverse
-				else if (n == 27) screen_inverse(false); // positive
-				else if (n == 1) screen_set_bold(true); // bold
-				else if (n == 21 || n == 22) screen_set_bold(false); // bold off
-				else if (n >= 90 && n <= 97) screen_set_fg(n-90+8); // AIX bright fg
-				else if (n >= 100 && n <= 107) screen_set_bg(n-100+8); // AIX bright bg
-			}
-			break;
-	}
-}
-
-void ICACHE_FLASH_ATTR apars_handle_saveCursorAttrs(void)
-{
-	screen_cursor_save(1);
-}
-
-void ICACHE_FLASH_ATTR apars_handle_restoreCursorAttrs(void)
-{
-	screen_cursor_restore(1);
-}
-
-/**
- * \brief Handle a request to reset the display device
- */
-void ICACHE_FLASH_ATTR
-apars_handle_RESET_cmd(void)
-{
-	screen_reset();
-}
-
-/**
- * Handle a screen resize request
- */
-void ICACHE_FLASH_ATTR
-apars_handle_OSC_SetScreenSize(int rows, int cols)
-{
-	info("OSC: Set screen size to %d x %d", rows, cols);
-
-	screen_resize(rows, cols);
-}
-
-
-void ICACHE_FLASH_ATTR
-apars_handle_OSC_SetButton(int num, const char *buffer)
-{
-	strncpy(termconf_scratch.btn[num-1], buffer, TERM_BTN_LEN);
-	info("OSC: Set BTN%d = %s", num, buffer);
-	screen_notifyChange(CHANGE_LABELS);
+	// version encased in SOS and ST
+	apars_respond("\x1bXESPTerm " FIRMWARE_VERSION "\x1b\\");
 }
 
 void ICACHE_FLASH_ATTR
-apars_handle_OSC_SetTitle(const char *buffer)
+apars_handle_tab(void)
 {
-	strncpy(termconf_scratch.title, buffer, TERM_TITLE_LEN);
-	info("OSC: Set TITLE = %s", buffer);
-	screen_notifyChange(CHANGE_LABELS);
+	screen_tab_forward(1);
 }

user/ansi_parser_callbacks.h

@@ -1,14 +1,19 @@
 #ifndef ANSI_PARSER_CALLBACKS_H
 #define ANSI_PARSER_CALLBACKS_H
 
-void apars_handle_badseq(void);
-void apars_handle_CSI(char leadchar, int *params, char keychar);
-void apars_handle_RESET_cmd(void);
-void apars_handle_plainchar(char c);
-void apars_handle_OSC_SetScreenSize(int rows, int cols);
-void apars_handle_saveCursorAttrs(void);
-void apars_handle_restoreCursorAttrs(void);
-void apars_handle_OSC_SetButton(int num, const char *buffer);
-void apars_handle_OSC_SetTitle(const char *buffer);
+#include "apars_csi.h"
+#include "apars_dcs.h"
+#include "apars_osc.h"
+#include "apars_string.h"
+#include "apars_short.h"
+#include "apars_utf8.h"
+
+void apars_respond(const char *str);
+
+void apars_handle_bel(void);
+void apars_handle_enq(void);
+void apars_handle_tab(void);
+
+extern void apars_show_context(void);
 
 #endif //ESP_VT100_FIRMWARE_ANSI_PARSER_CALLBACKS_H

user/apars_csi.c

@@ -0,0 +1,830 @@
+//
+// Created by MightyPork on 2017/08/20.
+//
+// Handle CSI sequences
+// CSI <symbol?> Pm <symbol?> <char>
+//
+// Example of those are cursor manipulation sequences and SGR.
+//
+// For details, see:
+// http://invisible-island.net/xterm/ctlseqs/ctlseqs.html#h2-Functions-using-CSI-_-ordered-by-the-final-character_s_
+//
+
+#include <esp8266.h>
+#include "apars_csi.h"
+#include "screen.h"
+#include "apars_logging.h"
+#include "ansi_parser.h"
+#include "ascii.h"
+#include "ansi_parser_callbacks.h"
+#include "uart_driver.h"
+#include "sgr.h"
+#include "version.h"
+#include "syscfg.h"
+
+/** Struct passed to subroutines */
+typedef struct {
+	char lead;
+	const int *n;
+	int count;
+	char inter;
+	char key;
+} CSI_Data;
+
+// Disambiguations
+static inline void switch_csi_Plain(CSI_Data *opts);
+static inline void switch_csi_NoLeadInterBang(CSI_Data *opts);
+static inline void switch_csi_LeadGreater(CSI_Data *opts);
+static inline void switch_csi_LeadQuest(CSI_Data *opts);
+static inline void switch_csi_LeadEquals(CSI_Data *opts);
+
+// Subroutines
+static inline void do_csi_sgr(CSI_Data *opts);
+static inline void do_csi_decreqtparm(CSI_Data *opts);
+static inline void do_csi_set_option(CSI_Data *opts);
+static inline void do_csi_xterm_screen_cmd(CSI_Data *opts);
+static inline void do_csi_set_private_option(CSI_Data *opts);
+
+/**
+ * Show warning and dump context for invalid CSI
+ */
+static void warn_bad_csi(void)
+{
+	ansi_noimpl_r("Unknown CSI");
+	apars_show_context();
+}
+
+/**
+ * Handle fully received CSI ANSI sequence
+ *
+ * @param leadchar - leading character
+ * @param params - array of CSI_N_MAX ints holding the numeric arguments
+ * @param count - actual amount of received numeric arguments
+ * @param keychar - intermediate character
+ * @param keychar - final character
+ */
+void ICACHE_FLASH_ATTR
+apars_handle_csi(char leadchar, const int *params, int count, char interchar, char keychar)
+{
+	CSI_Data opts = {leadchar, params, count, interchar, keychar};
+
+	switch(leadchar) {
+		case '?':
+			switch_csi_LeadQuest(&opts);
+			break;
+
+		case '>':
+			switch_csi_LeadGreater(&opts);
+			break;
+
+		case '=':
+			switch_csi_LeadEquals(&opts);
+			break;
+
+		case NUL:
+			// No leading character, switch by intermediate character
+			switch(interchar) {
+				case NUL:
+					switch_csi_Plain(&opts);
+					break;
+
+				case '!':
+					switch_csi_NoLeadInterBang(&opts);
+					break;
+
+//				case '\'':
+//					switch_csi_NoLeadInterApos(opts);
+//					break;
+
+//				case '*':
+//					switch_csi_NoLeadInterStar(opts);
+//					break;
+
+//				case '+':
+//					switch_csi_NoLeadInterPlus(opts);
+//					break;
+
+//				case '"':
+//					switch_csi_NoLeadInterQuote(opts);
+//					break;
+
+//				case '|':
+//					switch_csi_NoLeadInterDollar(opts);
+//					break;
+
+//				case ' ':
+//					switch_csi_NoLeadInterSpace(opts);
+//					break;
+
+//				case ',':
+//					switch_csi_NoLeadInterComma(opts);
+//					break;
+
+//				case ')':
+//					switch_csi_NoLeadInterRparen(opts);
+//					break;
+
+//				case '&':
+//					switch_csi_NoLeadInterAmpers(opts);
+//					break;
+
+//				case '-':
+//					switch_csi_NoLeadInterDash(opts);
+//					break;
+
+				default:
+					warn_bad_csi();
+			}
+			break;
+
+		default:
+			warn_bad_csi();
+	}
+}
+
+
+/**
+ * CSI none Pm none key
+ * @param opts
+ */
+static inline void ICACHE_FLASH_ATTR
+switch_csi_Plain(CSI_Data *opts)
+{
+	char resp_buf[20];
+	int n1 = opts->n[0];
+	int n2 = opts->n[1];
+
+	// fix arguments (default values etc)
+	switch (opts->key) {
+		// Single argument, 1-based
+		case 'A': // up
+		case 'e': // down (old)
+		case 'B': // down
+		case 'a': // right (old)
+		case 'C': // right
+		case 'D': // left
+		case 'E': // cursor next line
+		case 'F': // cursor prev line
+		case 'b': // repeat last char
+		case 'G': // set X
+		case '`': // set X (alias)
+		case 'd': // set Y
+		case 'X': // clear in line
+		case 'S': // scroll up
+		case 'T': // scroll down
+		case 'L': // Insert lines
+		case 'M': // Delete lines
+		case '@': // Insert in line
+		case 'P': // Delete in line
+		case 'I': // Tab forward
+		case 'Z': // Tab backward
+			if (n1 == 0) n1 = 1;
+			break;
+
+			// Two arguments, 1-based
+		case 'H': // Absolute positioning
+		case 'f':
+			if (n1 == 0) n1 = 1;
+			if (n2 == 0) n2 = 1;
+			break;
+
+			// Erase modes 0,1,2
+		case 'J': // Erase in screen
+		case 'K': // Erase in line
+			if (n1 > 2) n1 = 0;
+			break;
+
+			// No defaults
+		case 't': // Xterm window commands & reports
+		case 's': // Cursor save no attr
+		case 'r': // Set scrolling region
+		case 'u': // Cursor restore no attr
+		case 'h': // Option ON
+		case 'l': // Option OFF
+		case 'm': // SGR
+		case 'g': // Clear tabs
+		case 'n': // Queries 1 - device status
+		case 'c': // Queries 2 - primary DA
+		case 'x': // Queries 3 - DECREQTPARM
+		default:
+			// leave as is
+			break;
+	}
+
+	switch (opts->key) {
+		// CUU CUD CUF CUB
+		case 'A': // Up
+			screen_cursor_move(-n1, 0, false);
+			break;
+
+		case 'e':
+		case 'B': // Down
+			screen_cursor_move(n1, 0, false);
+			break;
+
+		case 'a': // some archaic form of "Go Right"
+		case 'C': // Right (forward)
+			screen_cursor_move(0, n1, false);
+			break;
+
+		case 'D': // Left (backward)
+			screen_cursor_move(0, -n1, false);
+			break;
+
+		case 'E': // CNL - Cursor Next Line
+			screen_cursor_move(n1, 0, false);
+			screen_cursor_set_x(0);
+			break;
+
+		case 'F': // CPL - Cursor Prev Line
+			screen_cursor_move(-n1, 0, false);
+			screen_cursor_set_x(0);
+			break;
+
+		case 'b':
+			// TODO repeat preceding graphic character n1 times
+			ansi_noimpl("Repeat char");
+			return;
+
+			// Set X
+		case 'G':
+		case '`': // alternate code
+			screen_cursor_set_x(n1 - 1);
+			break; // 1-based
+
+			// Set Y
+		case 'd':
+			screen_cursor_set_y(n1 - 1);
+			break; // 1-based
+
+			// Clear in line
+		case 'X':
+			screen_clear_in_line(n1);
+			break; // 1-based
+
+			// SU, SD - scroll up/down
+		case 'S':
+			screen_scroll_up(n1);
+			break;
+
+		case 'T':
+			screen_scroll_down(n1);
+			break;
+
+		case 't': // xterm window commands
+			do_csi_xterm_screen_cmd(opts);
+			break;
+
+			// CUP,HVP - set position
+		case 'H':
+		case 'f':
+			screen_cursor_set(n1-1, n2-1);
+			break; // 1-based
+
+		case 'J': // Erase screen
+			if (n1 == 0) {
+				screen_clear(CLEAR_FROM_CURSOR);
+			} else if (n1 == 1) {
+				screen_clear(CLEAR_TO_CURSOR);
+			} else {
+				screen_clear(CLEAR_ALL);
+				screen_cursor_set(0, 0);
+			}
+			break;
+
+		case 'K': // Erase lines
+			if (n1 == 0) {
+				screen_clear_line(CLEAR_FROM_CURSOR);
+			} else if (n1 == 1) {
+				screen_clear_line(CLEAR_TO_CURSOR);
+			} else {
+				screen_clear_line(CLEAR_ALL);
+			}
+			break;
+
+			// SCP, RCP - save/restore position
+		case 's':
+			screen_cursor_save(0);
+			break;
+
+		case 'r':
+			screen_set_scrolling_region(n1-1, n2-1);
+			break;
+
+		case 'u':
+			screen_cursor_restore(0);
+			break;
+
+		case 'h': // DEC feature enable
+		case 'l': // DEC feature disable
+			// --- DEC standard attributes ---
+			do_csi_set_option(opts);
+			break;
+
+		case 'm': // SGR - set graphics rendition
+			do_csi_sgr(opts);
+			break;
+
+		case 'L': // Insert lines (shove down)
+			screen_insert_lines(n1);
+			break;
+
+		case 'M': // Delete lines (pull up)
+			screen_delete_lines(n1);
+			break;
+
+		case '@': // Insert in line (shove right)
+			screen_insert_characters(n1);
+			break;
+
+		case 'P': // Delete in line (pull left)
+			screen_delete_characters(n1);
+			break;
+
+		case 'g': // Clear tabs
+			if (n1 == 3) {
+				screen_clear_all_tabs();
+			}
+			else if (n1 == 0) {
+				screen_clear_tab();
+			}
+			break;
+
+		case 'Z': // Tab backward
+			screen_tab_reverse(n1);
+			break;
+
+		case 'I': // Tab forward
+			screen_tab_forward(n1);
+			break;
+
+		case 'n': // Queries
+			if (n1 == 6) {
+				// Query cursor position
+				int x, y;
+				screen_cursor_get(&y, &x);
+				sprintf(resp_buf, "\033[%d;%dR", y + 1, x + 1);
+				apars_respond(resp_buf);
+			}
+			else if (n1 == 5) {
+				// Query device status - reply "Device is OK"
+				apars_respond("\033[0n");
+			}
+			else {
+				warn_bad_csi();
+			}
+			break;
+
+		case 'c': // CSI-c - report capabilities
+			// Primary device attributes
+			apars_respond("\033[?64;22;9c"); // pretend we're vt420 with national character sets and colors.
+			break;
+
+		case 'x': // DECREQTPARM -> DECREPTPARM
+			do_csi_decreqtparm(opts);
+			break;
+
+		default:
+			warn_bad_csi();
+	}
+}
+
+
+/**
+ * CSI none Pm ! key
+ */
+static inline void  ICACHE_FLASH_ATTR
+switch_csi_NoLeadInterBang(CSI_Data *opts)
+{
+	switch(opts->key) {
+		case 'p':
+			// RIS - CSI ! p
+			// On real VT there are differences between soft and hard reset, we treat both equally
+			screen_reset();
+			break;
+
+		default:
+			warn_bad_csi();
+	}
+}
+
+
+/**
+ * CSI > Pm inter key
+ */
+static inline void ICACHE_FLASH_ATTR
+switch_csi_LeadGreater(CSI_Data *opts)
+{
+	char resp_buf[20];
+	switch(opts->key) {
+		case 'c': // CSI > c - secondary device attributes query
+			// 41 - we're "VT400", FV wers, 0 - ROM cartridge number
+			sprintf(resp_buf, "\033[>41;%d;0c", FIRMWARE_VERSION_NUM);
+			apars_respond(resp_buf);
+			break;
+
+		default:
+			warn_bad_csi();
+	}
+}
+
+
+/**
+ * CSI = Pm inter key
+ */
+static inline void ICACHE_FLASH_ATTR
+switch_csi_LeadEquals(CSI_Data *opts)
+{
+	char resp_buf[20];
+	u8 mac[6];
+	switch(opts->key) {
+		case 'c': // CSI = c - tertiary device attributes query
+			// report our unique ID number
+			wifi_get_macaddr(SOFTAP_IF, mac);
+			sprintf(resp_buf, "\033P!|%02X%02X%02X\033\\", mac[3], mac[4], mac[5]);
+			apars_respond(resp_buf);
+			break;
+
+		default:
+			warn_bad_csi();
+	}
+}
+
+/**
+ * CSI ? Pm inter key
+ */
+static inline void  ICACHE_FLASH_ATTR
+switch_csi_LeadQuest(CSI_Data *opts)
+{
+	switch(opts->key) {
+		case 's':
+			// Save private attributes
+			ansi_noimpl("Save private attrs");
+			apars_show_context(); // TODO priv attr s/r
+			break;
+
+		case 'r':
+			// Restore private attributes
+			ansi_noimpl("Restore private attrs");
+			apars_show_context(); // TODO priv attr s/r
+			break;
+
+		case 'J': // Erase screen selectively
+			// TODO selective erase
+			ansi_noimpl("Selective screen erase");
+			break;
+
+		case 'K': // Erase line selectively
+			// TODO selective erase
+			ansi_noimpl("Selective line erase");
+			break;
+
+		case 'l':
+		case 'h':
+			do_csi_set_private_option(opts);
+			break;
+
+		default:
+			warn_bad_csi();
+	}
+}
+
+
+/**
+ * CSI Pm m
+ * @param opts
+ */
+static inline void ICACHE_FLASH_ATTR
+do_csi_sgr(CSI_Data *opts)
+{
+	int count = opts->count;
+
+	if (count == 0) {
+		count = 1; // this makes it work as 0 (reset)
+	}
+
+	// iterate arguments
+	for (int i = 0; i < count; i++) {
+		int n = opts->n[i];
+
+		if (n == SGR_RESET) screen_reset_sgr();
+			// -- set color --
+		else if (n >= SGR_FG_START && n <= SGR_FG_END) screen_set_fg((Color) (n - SGR_FG_START)); // ANSI normal fg
+		else if (n >= SGR_BG_START && n <= SGR_BG_END) screen_set_bg((Color) (n - SGR_BG_START)); // ANSI normal bg
+		else if (n == SGR_FG_DEFAULT) screen_set_fg(termconf_scratch.default_fg); // default fg
+		else if (n == SGR_BG_DEFAULT) screen_set_bg(termconf_scratch.default_bg); // default bg
+			// -- set attr --
+		else if (n == SGR_BOLD) screen_set_sgr(ATTR_BOLD, 1);
+		else if (n == SGR_FAINT) screen_set_sgr(ATTR_FAINT, 1);
+		else if (n == SGR_ITALIC) screen_set_sgr(ATTR_ITALIC, 1);
+		else if (n == SGR_UNDERLINE) screen_set_sgr(ATTR_UNDERLINE, 1);
+		else if (n == SGR_BLINK || n == SGR_BLINK_FAST) screen_set_sgr(ATTR_BLINK, 1); // 6 - rapid blink, not supported
+		else if (n == SGR_STRIKE) screen_set_sgr(ATTR_STRIKE, 1);
+		else if (n == SGR_FRAKTUR) screen_set_sgr(ATTR_FRAKTUR, 1);
+		else if (n == SGR_INVERSE) screen_set_sgr_inverse(1);
+			// -- clear attr --
+		else if (n == SGR_OFF(SGR_BOLD)) screen_set_sgr(ATTR_BOLD, 0); // can also mean "Double Underline"
+		else if (n == SGR_OFF(SGR_FAINT)) screen_set_sgr(ATTR_FAINT | ATTR_BOLD, 0); // "normal"
+		else if (n == SGR_OFF(SGR_ITALIC)) screen_set_sgr(ATTR_ITALIC | ATTR_FRAKTUR, 0); // there is no dedicated OFF code for Fraktur
+		else if (n == SGR_OFF(SGR_UNDERLINE)) screen_set_sgr(ATTR_UNDERLINE, 0);
+		else if (n == SGR_OFF(SGR_BLINK)) screen_set_sgr(ATTR_BLINK, 0);
+		else if (n == SGR_OFF(SGR_STRIKE)) screen_set_sgr(ATTR_STRIKE, 0);
+		else if (n == SGR_OFF(SGR_INVERSE)) screen_set_sgr_inverse(0);
+			// -- AIX bright colors --
+		else if (n >= SGR_FG_BRT_START && n <= SGR_FG_BRT_END) screen_set_fg((Color) ((n - SGR_FG_BRT_START) + 8)); // AIX bright fg
+		else if (n >= SGR_BG_BRT_START && n <= SGR_BG_BRT_END) screen_set_bg((Color) ((n - SGR_BG_BRT_START) + 8)); // AIX bright bg
+		else {
+			ansi_noimpl("SGR %d", n);
+		}
+	}
+}
+
+
+/**
+ * CSI Pm h or l
+ * @param opts
+ */
+static inline void ICACHE_FLASH_ATTR
+do_csi_set_option(CSI_Data *opts)
+{
+	bool yn = (opts->key == 'h');
+
+	for (int i = 0; i < opts->count; i++) {
+		int n = opts->n[i];
+
+		if (n == 4) {
+			screen_set_insert_mode(yn);
+		}
+		else if (n == 12) {
+			// SRM is inverted, according to vt510 manual
+			termconf_scratch.loopback = !yn;
+		}
+		else if (n == 20) {
+			screen_set_newline_mode(yn);
+		}
+		else if (n == 33) {
+			ansi_noimpl("Steady cursor");
+			// reference https://ttssh2.osdn.jp/manual/en/about/ctrlseq.html
+		}
+		else if (n == 34) {
+			ansi_noimpl("Underline cursor");
+			// reference https://ttssh2.osdn.jp/manual/en/about/ctrlseq.html
+		}
+		else {
+			ansi_noimpl("OPTION %d", n);
+		}
+	}
+}
+
+
+/**
+ * CSI ? Pm h or l
+ * @param opts
+ */
+static inline void ICACHE_FLASH_ATTR
+do_csi_set_private_option(CSI_Data *opts)
+{
+	bool yn = (opts->key == 'h');
+
+	// --- DEC private attributes ---
+	for (int i = 0; i < opts->count; i++) {
+		int n = opts->n[i];
+		if (n == 1) {
+			screen_set_cursors_alt_mode(yn);
+		}
+		else if (n == 2) {
+			// should reset all Gx to USASCII and reset to VT100 (which we use always)
+			screen_set_charset(0, 'B');
+			screen_set_charset(1, 'B');
+		}
+		else if (n == 3) {
+			// DECCOLM 132 column mode - not implemented due to RAM demands
+			ansi_noimpl("132col");
+
+			// DECCOLM side effects as per
+			// https://www.chiark.greenend.org.uk/~sgtatham/putty/wishlist/deccolm-cls.html
+			screen_clear(CLEAR_ALL);
+			screen_set_scrolling_region(0, 0);
+			screen_cursor_set(0, 0);
+		}
+		else if (n == 4) {
+			// Smooth scroll - not implemented
+		}
+		else if (n == 5) {
+			screen_set_reverse_video(yn);
+		}
+		else if (n == 6) {
+			screen_set_origin_mode(yn);
+		}
+		else if (n == 7) {
+			screen_wrap_enable(yn);
+		}
+		else if (n == 8) {
+			// Key auto-repeat
+			// We don't implement this currently, but it could be added
+			// - discard repeated keypress events between keydown and keyup.
+			ansi_noimpl("Auto-repeat toggle");
+		}
+		else if (n == 9 || (n >= 1000 && n <= 1006) || n == 1015) {
+			// 9 - X10 tracking
+			// 1000 - X11 mouse - Send Mouse X & Y on button press and release.
+			// 1001 - Hilite mouse tracking - not impl
+			// 1002 - Cell Motion Mouse Tracking
+			// 1003 - All Motion Mouse Tracking
+			// 1004 - Send FocusIn/FocusOut events
+			// 1005 - Enable UTF-8 Mouse Mode - we implement this as an alias to X10 mode
+			// 1006 - SGR mouse mode
+			if (n == 9) mouse_tracking.mode = yn ? MTM_X10 : MTM_NONE;
+			else if (n == 1000) mouse_tracking.mode = yn ? MTM_NORMAL : MTM_NONE;
+			else if (n == 1002) mouse_tracking.mode = yn ? MTM_BUTTON_MOTION : MTM_NONE;
+			else if (n == 1003) mouse_tracking.mode = yn ? MTM_ANY_MOTION : MTM_NONE;
+			else if (n == 1004) mouse_tracking.focus_tracking = yn;
+			else if (n == 1005) mouse_tracking.encoding = yn ? MTE_UTF8 : MTE_SIMPLE;
+			else if (n == 1006) mouse_tracking.encoding = yn ? MTE_SGR : MTE_SIMPLE;
+			else if (n == 1015) mouse_tracking.encoding = yn ? MTE_URXVT : MTE_SIMPLE;
+
+			dbg("Mouse mode=%d, enc=%d, foctr=%d",
+				mouse_tracking.mode,
+				mouse_tracking.encoding,
+				mouse_tracking.focus_tracking);
+		}
+		else if (n == 12) {
+			// TODO Cursor blink on/off
+			ansi_noimpl("Cursor blink toggle");
+		}
+		else if (n == 40) {
+			// allow/disallow 80->132 mode
+			// not implemented because of RAM demands
+			ansi_noimpl("132col enable");
+		}
+		else if (n == 45) {
+			// reverse wrap-around
+			ansi_noimpl("Reverse Wraparound");
+		}
+		else if (n == 69) {
+			// horizontal margins
+			ansi_noimpl("Left/right margin");
+		}
+		else if (n == 47 || n == 1047) {
+			// Switch to/from alternate screen
+			//  - not implemented fully due to RAM demands
+			screen_swap_state(yn);
+		}
+		else if (n == 1048) {
+			// same as DECSC - save/restore cursor with attributes
+			if (yn) {
+				screen_cursor_save(true);
+			}
+			else {
+				screen_cursor_restore(true);
+			}
+		}
+		else if (n == 1049) {
+			// save/restore cursor and screen and clear it
+			if (yn) {
+				screen_cursor_save(true);
+				screen_swap_state(true); // this should save the screen - can't because of RAM size
+				screen_clear(CLEAR_ALL);
+			}
+			else {
+				screen_clear(CLEAR_ALL);
+				screen_swap_state(false); // this should restore the screen - can't because of RAM size
+				screen_cursor_restore(true);
+			}
+		}
+		else if (n == 2004) {
+			// Bracketed paste mode
+			ansi_noimpl("Bracketed paste");
+		}
+		else if (n == 25) {
+			screen_set_cursor_visible(yn);
+		}
+		else if (n == 800) { // ESPTerm: Toggle display of buttons
+			termconf_scratch.show_buttons = yn;
+			screen_notifyChange(CHANGE_CONTENT); // this info is included in the screen preamble
+		}
+		else if (n == 801) { // ESPTerm: Toggle display of config links
+			termconf_scratch.show_config_links = yn;
+			screen_notifyChange(CHANGE_CONTENT); // this info is included in the screen preamble
+		}
+		else {
+			ansi_noimpl("?OPTION %d", n);
+		}
+	}
+}
+
+
+/**
+ * CSI Ps ; Ps ; Ps t
+ * @param opts
+ */
+static inline void ICACHE_FLASH_ATTR
+do_csi_xterm_screen_cmd(CSI_Data *opts)
+{
+	char resp_buf[20];
+	switch (opts->n[0]) {
+		case 8: // set size
+			screen_resize(opts->n[1], opts->n[2]);
+			break;
+
+		case 18: // Report the size of the text area in characters.
+		case 19: // Report the size of the screen in characters.
+			sprintf(resp_buf, "\033[8;%d;%dt", termconf_scratch.height, termconf_scratch.width);
+			apars_respond(resp_buf);
+			break;
+
+		case 20: // Report icon
+		case 21: // Report title
+			apars_respond("\033]l");
+			apars_respond(termconf_scratch.title);
+			apars_respond("\033\\");
+			break;
+
+		case 22:
+			ansi_noimpl("Push title");
+			break;
+		case 23:
+			ansi_noimpl("Pop title");
+			break;
+
+		case 24: // Set Height only
+			screen_resize(opts->n[1], termconf_scratch.width);
+			break;
+
+		default:
+			ansi_noimpl("Xterm win report %d", opts->n[0]);
+			break;
+	}
+}
+
+
+// data tables for the DECREPTPARM command response
+struct DECREPTPARM_parity { int parity; const char * msg; };
+static const struct DECREPTPARM_parity DECREPTPARM_parity_arr[] = {
+	{PARITY_NONE, "1"},
+	{PARITY_ODD, "4"},
+	{PARITY_EVEN, "5"},
+	{-1, 0}
+};
+
+struct DECREPTPARM_baud { int baud; const char * msg; };
+static const struct DECREPTPARM_baud DECREPTPARM_baud_arr[] = {
+	{BIT_RATE_300, "48"},
+	{BIT_RATE_600, "56"},
+	{BIT_RATE_1200, "64"},
+	{BIT_RATE_2400, "88"},
+	{BIT_RATE_4800, "96"},
+	{BIT_RATE_9600  , "104"},
+	{BIT_RATE_19200 , "112"},
+	{BIT_RATE_38400 , "120"},
+	{BIT_RATE_57600 , "128"}, // this is the last in the spec, follow +8
+	{BIT_RATE_74880 , "136"},
+	{BIT_RATE_115200, "144"},
+	{BIT_RATE_230400, "152"},
+	{BIT_RATE_460800, "160"},
+	{BIT_RATE_921600, "168"},
+	{BIT_RATE_1843200, "176"},
+	{BIT_RATE_3686400, "184"},
+	{-1, 0}
+};
+
+/**
+ * CSI Ps x
+ * @param opts
+ */
+static inline void ICACHE_FLASH_ATTR
+do_csi_decreqtparm(CSI_Data *opts)
+{
+	const int n1 = opts->n[0];
+
+	// reference http://vt100.net/docs/vt100-ug/chapter3.html - search DECREPTPARM
+	if (n1 <= 1) {
+		apars_respond("\033["); // this is a response on request (2 would be gratuitous)
+
+		apars_respond(n1 == 0 ? "2;" : "3;");
+
+		// Parity
+		for(const struct DECREPTPARM_parity *p = DECREPTPARM_parity_arr; p->parity != -1; p++) {
+			if (p->parity == sysconf->uart_parity) {
+				apars_respond(p->msg);
+				break;
+			}
+		}
+
+		// bits per character (uart byte) - 1 = 8, 2 = 7
+		apars_respond(";1;");
+
+		// Baud rate
+		for(const struct DECREPTPARM_baud *p = DECREPTPARM_baud_arr; p->baud != -1; p++) {
+			if (p->baud == sysconf->uart_baudrate) {
+				apars_respond(p->msg);
+				apars_respond(";");
+				apars_respond(p->msg);
+				break;
+			}
+		}
+
+		// multiplier 1, flags 0
+		apars_respond(";1;0x"); // ROM cartridge number ??
+	}
+}

user/apars_csi.h

@@ -0,0 +1,10 @@
+//
+// Created by MightyPork on 2017/08/20.
+//
+
+#ifndef ESP_VT100_FIRMWARE_APARS_CSI_H
+#define ESP_VT100_FIRMWARE_APARS_CSI_H
+
+void apars_handle_csi(char leadchar, const int *params, int count, char interchar, char keychar);
+
+#endif //ESP_VT100_FIRMWARE_APARS_CSI_H

user/apars_dcs.c

@@ -0,0 +1,89 @@
+//
+// Created by MightyPork on 2017/08/20.
+//
+// Handle DCS sequences (Device Control String)
+// DCS Pt ST
+// (DCS = ESC P)
+//
+// Those are used for terminal status queries.
+//
+// Pt =
+// $ q " p .... read conformance level
+// $ q " q .... read character protection attribute
+// $ q r ...... read scrolling region extents
+// $ q s ...... read horizontal margins extents
+// $ q m ...... read SGR in a format that would restore them exactly when run as a CSI Pm m
+// $ q SP q ... read cursor style
+//
+// For details, see
+// http://invisible-island.net/xterm/ctlseqs/ctlseqs.html#h2-Device-Control-functions
+//
+
+#include <esp8266.h>
+#include "apars_dcs.h"
+#include "ansi_parser_callbacks.h"
+#include "screen.h"
+#include "apars_logging.h"
+
+/**
+ * Helper function to parse incoming DCS (Device Control String)
+ * @param buffer - the DCS body (after DCS and before ST)
+ */
+void ICACHE_FLASH_ATTR
+apars_handle_dcs(const char *buffer)
+{
+	char buf[64]; // just about big enough for full-house SGR
+	size_t len = strlen(buffer);
+	if ((len == 3 || len == 4) && strneq(buffer, "$q", 2)) {
+		// DECRQSS - Request Status String
+		if (strneq(buffer+2, "\"p", 2)) {
+			// DECSCL - Select Conformance Level
+			apars_respond("\033P1$r64;1\"p\033\\"); // 64;1 - Pretend we are VT400 with 7-bit characters
+		}
+		else if (strneq(buffer+2, "\"q", 2)) {
+			// DECSCA - Select character protection attribute
+			sprintf(buf, "\033P1$r%d\"q\033\\", 0); // 0 - Can erase - TODO real protection status if implemented
+			apars_respond(buf);
+		}
+		else if (buffer[2] == 'r') {
+			// DECSTBM - Query scrolling region
+			sprintf(buf, "\033P1$r%d;%dr\033\\", 1, termconf_scratch.height); // 1-80 TODO real extent of scrolling region
+			apars_respond(buf);
+		}
+		else if (buffer[2] == 's') {
+			// DECSLRM - Query horizontal margins
+			sprintf(buf, "\033P1$r%d;%ds\033\\", 1, termconf_scratch.width); // Can erase - TODO real extent of horiz margins if implemented
+			apars_respond(buf);
+		}
+		else if (buffer[2] == 'm') {
+			// SGR - query SGR
+			apars_respond("\033P1$r");
+			screen_report_sgr(buf);
+			apars_respond(buf);
+			apars_respond("m\033\\");
+		}
+		else if (strneq(buffer+2, " q", 2)) {
+			// DECSCUSR - Query cursor style
+			sprintf(buf, "\033P1$r%d q\033\\", 1);
+			/*
+				Ps = 0  -> blinking block.
+				Ps = 1  -> blinking block (default).
+				Ps = 2  -> steady block.
+				Ps = 3  -> blinking underline.
+				Ps = 4  -> steady underline.
+				Ps = 5  -> blinking bar (xterm).
+				Ps = 6  -> steady bar (xterm).
+			 */
+			apars_respond(buf);
+		}
+		else {
+			// invalid query
+			ansi_noimpl("DCS %s ST", buffer);
+			sprintf(buf, "\033P0$r%s\033\\", buffer+2);
+		}
+	}
+	else {
+		ansi_warn("Bad DCS: %s", buffer);
+		apars_show_context();
+	}
+}

user/apars_dcs.h

@@ -0,0 +1,10 @@
+//
+// Created by MightyPork on 2017/08/20.
+//
+
+#ifndef ESP_VT100_FIRMWARE_APARS_DCS_H
+#define ESP_VT100_FIRMWARE_APARS_DCS_H
+
+void apars_handle_dcs(const char *buffer);
+
+#endif //ESP_VT100_FIRMWARE_APARS_DCS_H

user/apars_logging.h

@@ -0,0 +1,37 @@
+//
+// Created by MightyPork on 2017/08/20.
+//
+// Logging functions for the parser, can be switched off with a compile flag
+//
+
+#ifndef ESP_VT100_FIRMWARE_APARS_LOGGING_H
+#define ESP_VT100_FIRMWARE_APARS_LOGGING_H
+
+#include <esp8266.h>
+
+#ifndef DEBUG_ANSI
+#define DEBUG_ANSI 0
+#endif
+
+#ifndef DEBUG_ANSI_NOIMPL
+#define DEBUG_ANSI_NOIMPL 0
+#endif
+
+// defined in the makefile
+#if DEBUG_ANSI
+#define ansi_warn warn
+#define ansi_dbg dbg
+#else
+#define ansi_warn(fmt, ...)
+#define ansi_dbg(fmt, ...)
+#endif
+
+#if DEBUG_ANSI_NOIMPL
+#define ansi_noimpl(fmt, ...) warn("NOIMPL: " fmt, ##__VA_ARGS__)
+#define ansi_noimpl_r(fmt, ...) warn(fmt, ##__VA_ARGS__)
+#else
+#define ansi_noimpl(fmt, ...)
+#define ansi_noimpl_r(fmt, ...)
+#endif
+
+#endif //ESP_VT100_FIRMWARE_APARS_LOGGING_H

user/apars_osc.c

@@ -0,0 +1,55 @@
+//
+// Created by MightyPork on 2017/08/20.
+//
+// Handle OSC commands (Operating System Command)
+// ESC ] Ps ; Pt ST
+//
+// Those are used to pass various text variables to the terminal:
+//
+// Ps = 0 or 2 ... set screen title to Pt
+// Ps = 81-85  ... set button label to Pt
+//
+
+#include "apars_osc.h"
+#include "apars_logging.h"
+#include "screen.h"
+#include "ansi_parser.h"
+
+/**
+ * Helper function to parse incoming OSC (Operating System Control)
+ * @param buffer - the OSC body (after OSC and before ST)
+ */
+void ICACHE_FLASH_ATTR
+apars_handle_osc(const char *buffer)
+{
+	int n = 0;
+	char c = 0;
+	while ((c = *buffer++) != 0) {
+		if (c >= '0' && c <= '9') {
+			n = (n * 10 + (c - '0'));
+		} else {
+			break;
+		}
+	}
+
+	if (c == ';') {
+		// Do something with the data string and number
+		// (based on xterm manpage)
+		if (n == 0 || n == 2) {
+			screen_set_title(buffer);
+		}
+		else if (n >= 81 && n <= 85) { // ESPTerm: action button label
+			screen_set_button_text(n - 80, buffer);
+		}
+		else if (n >= 91 && n <= 95) { // ESPTerm: action button text
+			strncpy(termconf_scratch.btn_msg[n - 91], buffer, TERM_BTN_MSG_LEN);
+		}
+		else {
+			ansi_noimpl("OSC %d ; %s ST", n, buffer);
+		}
+	}
+	else {
+		ansi_warn("BAD OSC: %s", buffer);
+		apars_show_context();
+	}
+}

user/apars_osc.h

@@ -0,0 +1,10 @@
+//
+// Created by MightyPork on 2017/08/20.
+//
+
+#ifndef ESP_VT100_FIRMWARE_APARS_OSC_H
+#define ESP_VT100_FIRMWARE_APARS_OSC_H
+
+void apars_handle_osc(const char *buffer);
+
+#endif //ESP_VT100_FIRMWARE_APARS_OSC_H

user/apars_short.c

@@ -0,0 +1,183 @@
+//
+// Created by MightyPork on 2017/08/20.
+//
+// Short sequences: (* = not implemented)
+//
+// ESC char
+//   ESC 6     Back Index (DECBI), VT420 and up.
+//   ESC 7     Save Cursor (DECSC).
+//   ESC 8     Restore Cursor (DECRC).
+//   ESC 9     Forward Index (DECFI), VT420 and up.
+//   ESC =     Application Keypad (DECKPAM).
+//   ESC >     Normal Keypad (DECKPNM).
+//   ESC F     Cursor to lower left corner of screen.
+//   ESC c     Full Reset (RIS).
+//  *ESC l     Memory Lock (per HP terminals). Locks memory above the cursor.
+//  *ESC m     Memory Unlock (per HP terminals).
+//   ESC n     Invoke the G2 Character Set as GL (LS2).
+//   ESC o     Invoke the G3 Character Set as GL (LS3).
+//  *ESC |     Invoke the G3 Character Set as GR (LS3R).
+//  *ESC }     Invoke the G2 Character Set as GR (LS2R).
+//  *ESC ~     Invoke the G1 Character Set as GR (LS1R).
+//
+// ESC # Ps
+//  *ESC # 3   DEC double-height line, top half (DECDHL).
+//  *ESC # 4   DEC double-height line, bottom half (DECDHL).
+//  *ESC # 5   DEC single-width line (DECSWL).
+//  *ESC # 6   DEC double-width line (DECDWL).
+//   ESC # 8   DEC Screen Alignment Test (DECALN).
+//
+// ESC SP char
+//  *ESC SP F  7-bit controls (S7C1T).
+//  *ESC SP G  8-bit controls (S8C1T).
+//  *ESC SP L  Set ANSI conformance level 1 (dpANS X3.134.1).
+//  *ESC SP M  Set ANSI conformance level 2 (dpANS X3.134.1).
+//  *ESC SP N  Set ANSI conformance level 3 (dpANS X3.134.1).
+//
+// Charset commands
+//   ESC ( char  Designate G0 character set ('0' = symbols, 'B' = ASCII-US, 'A' = ASCII-UK)
+//   ESC ) char  Designate G1 character set
+//   SO          Switch to G0 character set
+//   SI          Switch to G1 character set
+//
+
+#include <esp8266.h>
+#include "apars_short.h"
+#include "apars_logging.h"
+#include "screen.h"
+
+// ----- Character Set ---
+
+/**
+ * Command to assign G0 or G1
+ * @param slot - ( or ) for G0 or G1
+ * @param c - character table ID (0, B etc)
+ */
+void ICACHE_FLASH_ATTR
+apars_handle_chs_designate(char slot, char c)
+{
+	if (slot == '(') screen_set_charset(0, c); // G0
+	else if (slot == ')') screen_set_charset(1, c); // G1
+	else {
+		ansi_noimpl("ESC %c %c", slot, c);
+	}
+	// other alternatives * + . - / not implemented
+}
+
+/** Select charset slot */
+void ICACHE_FLASH_ATTR
+apars_handle_chs_switch(int Gx)
+{
+	screen_set_charset_n(Gx);
+}
+
+// ----- ESC SP char -----
+
+/**
+ * ESC SP <c> (this sets 8/7-bit mode and some other archaic options)
+ * @param c - key character
+ */
+void ICACHE_FLASH_ATTR
+apars_handle_space_cmd(char c)
+{
+	ansi_noimpl("ESC SP %c", c);
+}
+
+// ----- ESC # num -----
+
+/**
+ * Codes in the format ESC # n
+ * @param c - the trailing symbol (numeric ASCII)
+ */
+void ICACHE_FLASH_ATTR apars_handle_hash_cmd(char c)
+{
+	switch(c) {
+		case '3': // Double size, top half
+		case '4': // Single size, bottom half
+		case '5': // Single width, single height
+		case '6': // Double width
+			ansi_noimpl("Double Size Line");
+			break;
+
+		case '8':
+			screen_fill_with_E();
+			break;
+
+		default:
+			ansi_noimpl("ESC # %c", c);
+	}
+}
+
+// ----- ESC char -----
+
+/**
+ * Single-character escape codes (ESC x)
+ * @param c - the trailing symbol (ASCII)
+ */
+void ICACHE_FLASH_ATTR apars_handle_short_cmd(char c)
+{
+	switch(c) {
+		case 'c': // screen reset
+			screen_reset();
+			break;
+
+		case '6': // back index
+			screen_back_index(1);
+			break;
+
+		case '7': // save cursor + attributes
+			screen_cursor_save(true);
+			break;
+
+		case '8': // restore cursor + attributes
+			screen_cursor_restore(true);
+			break;
+
+		case 'E': // same as CR LF
+			screen_cursor_move(1, 0, false);
+			screen_cursor_set_x(0);
+			break;
+
+		case 'F': // bottom left
+			screen_cursor_set(termconf_scratch.height-1, 0);
+			break;
+
+		case 'D': // move cursor down, scroll screen up if needed
+			screen_cursor_move(1, 0, true);
+			break;
+
+		case 'M': // move cursor up, scroll screen down if needed
+			screen_cursor_move(-1, 0, true);
+			break;
+
+		case 'H':
+			screen_set_tab();
+			break;
+
+		case '>':
+			screen_set_numpad_alt_mode(false);
+			break;
+
+		case '<': // "Enter ANSI / VT100 mode" - no-op (we don't support VT52 mode)
+			break;
+
+		case '=':
+			screen_set_numpad_alt_mode(true);
+			break;
+
+		case '|': // Invoke the G3 Character Set as GR (LS3R).
+		case '}': // Invoke the G2 Character Set as GR (LS2R).
+		case '~': // Invoke the G1 Character Set as GR (LS1R).
+			// Those do not seem to do anything TODO investigate
+			break;
+
+		case '@': // no-op padding char (?)
+			break;
+
+		case '\\': // spurious string terminator
+			break;
+
+		default:
+			ansi_noimpl("ESC %c", c);
+	}
+}

user/apars_short.h

@@ -0,0 +1,14 @@
+//
+// Created by MightyPork on 2017/08/20.
+//
+
+#ifndef ESP_VT100_FIRMWARE_APARS_SIMPLE_H
+#define ESP_VT100_FIRMWARE_APARS_SIMPLE_H
+
+void apars_handle_short_cmd(char c);
+void apars_handle_hash_cmd(char c);
+void apars_handle_space_cmd(char c);
+void apars_handle_chs_designate(char slot, char c);
+void apars_handle_chs_switch(int Gx);
+
+#endif //ESP_VT100_FIRMWARE_APARS_SIMPLE_H

user/apars_string.c

@@ -0,0 +1,52 @@
+//
+// Created by MightyPork on 2017/08/20.
+//
+// String based commands.
+// Those command start with a introducer sequence, followed by arbitrary string,
+// and end with a String Terminator (`ESC \`, or `BEL`)
+//
+// ESC k Pt ST ... set screen title (same as `OSC 0 ; Pt ST`, is shorter)
+// ESC ] Pt ST ... OSC - Operating System Command (split to its own file)
+// ESC P Pt ST ... DCS - Device Control String (split to its own file)
+// ESC ^ Pt ST ... PM - Privacy message (unused)
+// ESC _ Pt ST ... APC - Application Program Command (unused)
+// ESC X Pt ST ... SOS - Start Of String (unused; sent back in response to ENQ)
+
+#include <esp8266.h>
+#include "apars_string.h"
+#include "apars_logging.h"
+#include "ansi_parser_callbacks.h"
+#include "screen.h"
+
+// ----- Generic String cmd - disambiguation -----
+
+void ICACHE_FLASH_ATTR
+apars_handle_string_cmd(char leadchar, const char *buffer)
+{
+	switch (leadchar) {
+		case 'k': // ESC k TITLE ST (defined in GNU screen manpage)
+			screen_set_title(buffer);
+			break;
+
+		case ']': // OSC - Operating System Command
+			apars_handle_osc(buffer);
+			break;
+
+		case 'P': // DCS - Device Control String
+			apars_handle_dcs(buffer);
+			break;
+
+		case '^': // PM - Privacy Message
+			break;
+
+		case '_': // APC - Application Program Command
+			break;
+
+		case 'X': // SOS - Start of String (purpose unclear)
+			break;
+
+		default:
+			ansi_warn("Bad str cmd");
+			apars_show_context();
+	}
+}

user/apars_string.h

@@ -0,0 +1,10 @@
+//
+// Created by MightyPork on 2017/08/20.
+//
+
+#ifndef ESP_VT100_FIRMWARE_APARS_STRING_H
+#define ESP_VT100_FIRMWARE_APARS_STRING_H
+
+void apars_handle_string_cmd(char leadchar, const char *buffer);
+
+#endif //ESP_VT100_FIRMWARE_APARS_STRING_H

user/apars_utf8.c

@@ -0,0 +1,84 @@
+//
+// Created by MightyPork on 2017/08/20.
+//
+// UTF-8 parser - collects bytes of a code point before writing them
+// into a screen cell.
+//
+
+#include "apars_utf8.h"
+#include "apars_logging.h"
+#include "screen.h"
+
+static char utf_collect[4];
+static int utf_i = 0;
+static int utf_j = 0;
+
+/**
+ * Clear the buffer where we collect pieces of a code point.
+ * This is used for parser reset.
+ */
+void ICACHE_FLASH_ATTR
+apars_reset_utf8buffer(void)
+{
+	utf_i = 0;
+	utf_j = 0;
+	memset(utf_collect, 0, 4);
+}
+
+/**
+ * Handle a received plain character
+ * @param c - received character
+ */
+void ICACHE_FLASH_ATTR
+apars_handle_plainchar(char c)
+{
+	// collecting unicode glyphs...
+	if (c & 0x80) {
+		if (utf_i == 0) {
+			// start
+			if (c == 192 || c == 193 || c >= 245) {
+				// forbidden codes
+				goto fail;
+			}
+
+			if ((c & 0xE0) == 0xC0) {
+				utf_i = 2;
+			}
+			else if ((c & 0xF0) == 0xE0) {
+				utf_i = 3;
+			}
+			else if ((c & 0xF8) == 0xF0) {
+				utf_i = 4;
+			}
+			else {
+				// chars over 127 that don't start unicode sequences
+				goto fail;
+			}
+
+			utf_collect[0] = c;
+			utf_j = 1;
+		}
+		else {
+			if ((c & 0xC0) != 0x80) {
+				goto fail;
+			}
+			else {
+				utf_collect[utf_j++] = c;
+				if (utf_j >= utf_i) {
+					screen_putchar(utf_collect);
+					apars_reset_utf8buffer();
+				}
+			}
+		}
+	}
+	else {
+		utf_collect[0] = c;
+		utf_collect[1] = 0; // just to make sure it's closed...
+		screen_putchar(utf_collect);
+	}
+
+	return;
+	fail:
+	ansi_warn("Bad UTF-8: %0Xh", c);
+	apars_reset_utf8buffer();
+}

user/apars_utf8.h

@@ -0,0 +1,11 @@
+//
+// Created by MightyPork on 2017/08/20.
+//
+
+#ifndef ESP_VT100_FIRMWARE_APARS_UTF8_H
+#define ESP_VT100_FIRMWARE_APARS_UTF8_H
+
+void apars_handle_plainchar(char c);
+void apars_reset_utf8buffer(void);
+
+#endif //ESP_VT100_FIRMWARE_APARS_UTF8_H

user/ascii.h

@@ -0,0 +1,49 @@
+//
+// Created by MightyPork on 2017/08/19.
+//
+
+#ifndef ESP_VT100_FIRMWARE_ASCII_H
+#define ESP_VT100_FIRMWARE_ASCII_H
+
+enum ASCII_CODES {
+	NUL = 0,
+	SOH = 1,
+	STX = 2,
+	ETX = 3,
+	EOT = 4,
+	ENQ = 5,
+	ACK = 6,
+	BEL = 7, /* \a */
+	BS = 8,  /* \b */
+	TAB = 9, /* \t */
+	LF = 10, /* \n */
+	VT = 11, /* \v */
+	FF = 12, /* \f */
+	CR = 13, /* \r */
+	SO = 14,
+	SI = 15,
+	DLE = 16,
+	DC1 = 17,
+	DC2 = 18,
+	DC3 = 19,
+	DC4 = 20,
+	NAK = 21,
+	SYN = 22,
+	ETB = 23,
+	CAN = 24,
+	EM = 25,
+	SUB = 26,
+	ESC = 27, /* \033, \x1b, \e */
+	FS = 28,
+	GS = 29,
+	RS = 30,
+	US = 31,
+	SP = 32,
+	DEL = 127,
+
+	// aliases
+	XON = DC1,
+	XOFF = DC3,
+};
+
+#endif //ESP_VT100_FIRMWARE_ASCII_H

user/cgi_main.c

@@ -5,7 +5,7 @@
 
 #include "cgi_main.h"
 #include "screen.h"
-#include "user_main.h"
+#include "version.h"
 #include "helpers.h"
 
 /**

user/cgi_sockets.c

@@ -3,30 +3,59 @@
 #include <cgiwebsocket.h>
 
 #include "cgi_sockets.h"
-#include "uart_driver.h"
 #include "screen.h"
+#include "uart_buffer.h"
+#include "ansi_parser.h"
+#include "jstring.h"
+#include "uart_driver.h"
 
-#define SOCK_BUF_LEN 1024
-static char sock_buff[SOCK_BUF_LEN];
+// Heartbeat interval in ms
+#define HB_TIME 1000
+
+// Buffer size (sent in one go)
+// Must be less than httpd sendbuf
+#define SOCK_BUF_LEN 2000
 
 volatile bool notify_available = true;
+volatile bool notify_cooldown = false;
 
-static ETSTimer notifyTim;
-static ETSTimer notifyTim2;
+volatile bool browser_wants_xon = false;
+
+static ETSTimer notifyContentTim;
+static ETSTimer notifyLabelsTim;
+static ETSTimer notifyCooldownTim;
+static ETSTimer heartbeatTim;
 
 // we're trying to do a kind of mutex here, without the actual primitives
 // this might glitch, very rarely.
 // it's recommended to put some delay between setting labels and updating the screen.
 
+/**
+ * Cooldown delay is over
+ * @param arg
+ */
 static void ICACHE_FLASH_ATTR
-notifyTimCb(void *arg) {
-	void *data = NULL;
+notifyCooldownTimCb(void *arg)
+{
+	notify_cooldown = false;
+}
 
-	if (!notify_available) {
+/**
+ * Tell browser we have new content
+ * @param arg
+ */
+static void ICACHE_FLASH_ATTR
+notifyContentTimCb(void *arg)
+{
+	void *data = NULL;
+	int max_bl, total_bl;
+	char sock_buff[SOCK_BUF_LEN];
+
+	cgiWebsockMeasureBacklog(URL_WS_UPDATE, &max_bl, &total_bl);
+
+	if (!notify_available || notify_cooldown || (max_bl > 2048)) { // do not send if we have anything significant backlogged
 		// postpone a little
-		os_timer_disarm(&notifyTim);
-		os_timer_setfn(&notifyTim, notifyTimCb, NULL);
-		os_timer_arm(&notifyTim, 1, 0);
+		TIMER_START(&notifyContentTim, notifyContentTimCb, 5, 0);
 		return;
 	}
 	notify_available = false;
@@ -43,17 +72,24 @@ notifyTimCb(void *arg) {
 	// cleanup
 	screenSerializeToBuffer(NULL, SOCK_BUF_LEN, &data);
 
+	notify_cooldown = true;
 	notify_available = true;
+
+	TIMER_START(&notifyCooldownTim, notifyCooldownTimCb, termconf->display_cooldown_ms, 0);
 }
 
+/**
+ * Tell browsers about the new text labels
+ * @param arg
+ */
 static void ICACHE_FLASH_ATTR
 notifyLabelsTimCb(void *arg)
 {
-	if (!notify_available) {
+	char sock_buff[SOCK_BUF_LEN];
+
+	if (!notify_available || notify_cooldown) {
 		// postpone a little
-		os_timer_disarm(&notifyTim2);
-		os_timer_setfn(&notifyTim2, notifyLabelsTimCb, NULL);
-		os_timer_arm(&notifyTim2, 1, 0);
+		TIMER_START(&notifyLabelsTim, notifyLabelsTimCb, 1, 0);
 		return;
 	}
 	notify_available = false;
@@ -61,7 +97,18 @@ notifyLabelsTimCb(void *arg)
 	screenSerializeLabelsToBuffer(sock_buff, SOCK_BUF_LEN);
 	cgiWebsockBroadcast(URL_WS_UPDATE, sock_buff, (int) strlen(sock_buff), 0);
 
+	notify_cooldown = true;
 	notify_available = true;
+
+	TIMER_START(&notifyCooldownTim, notifyCooldownTimCb, termconf->display_cooldown_ms, 0);
+}
+
+/** Beep */
+void ICACHE_FLASH_ATTR
+send_beep(void)
+{
+	// here's some potential for a race error with the other broadcast functions :C
+	cgiWebsockBroadcast(URL_WS_UPDATE, "B", 1, 0);
 }
 
 
@@ -74,84 +121,187 @@ void ICACHE_FLASH_ATTR screen_notifyChange(ScreenNotifyChangeTopic topic)
 {
 	// this is not the most ideal/cleanest implementation
 	// PRs are welcome for a nicer update "queue" solution
+	if (termconf->display_tout_ms == 0) termconf->display_tout_ms = SCR_DEF_DISPLAY_TOUT_MS;
+
+	// NOTE: the timers are restarted if already running
 
 	if (topic == CHANGE_LABELS) {
 		// separate timer from content change timer, to avoid losing that update
-		os_timer_disarm(&notifyTim2);
-		os_timer_setfn(&notifyTim2, notifyLabelsTimCb, NULL);
-		os_timer_arm(&notifyTim2, SCREEN_NOTIFY_DELAY_MS, 0);
+		TIMER_START(&notifyLabelsTim, notifyLabelsTimCb, termconf->display_tout_ms, 0);
 	}
 	else if (topic == CHANGE_CONTENT) {
 		// throttle delay
-		os_timer_disarm(&notifyTim);
-		os_timer_setfn(&notifyTim, notifyTimCb, NULL);
-		os_timer_arm(&notifyTim, SCREEN_NOTIFY_DELAY_MS, 0);
+		TIMER_START(&notifyContentTim, notifyContentTimCb, termconf->display_tout_ms, 0);
 	}
 }
 
+/**
+ * mouse event rx
+ * @param evt - event type: p, r, m
+ * @param y - coord 0-based
+ * @param x - coord 0-based
+ * @param button - which button, 1-based. 0=none
+ * @param mods - modifier keys bitmap: meta|alt|shift|ctrl
+ */
+void ICACHE_FLASH_ATTR sendMouseAction(char evt, int y, int x, int button, u8 mods)
+{
+	// one-based
+	x++;
+	y++;
+
+	bool ctrl = (mods & 1) > 0;
+	bool shift = (mods & 2) > 0;
+	bool alt = (mods & 4) > 0;
+	bool meta = (mods & 8) > 0;
+	enum MTM mtm = mouse_tracking.mode;
+	enum MTE mte = mouse_tracking.encoding;
+
+	// No message on release in X10 mode
+	if (mtm == MTM_X10 && (button == 0 || evt == 'r')) {
+		return;
+	}
+
+	if (evt == 'm' && mtm != MTM_BUTTON_MOTION && mtm != MTM_ANY_MOTION) {
+		return;
+	}
+
+	if (evt == 'm' && mtm == MTM_BUTTON_MOTION && button == 0) {
+		return;
+	}
+
+	int eventcode = 0;
+
+	if (mtm == MTM_X10) {
+		eventcode = button-1;
+	}
+	else {
+		if (button == 0 || (evt == 'r' && mte != MTE_SGR)) eventcode = 3; // release
+		else if (button == 1) eventcode = 0;
+		else if (button == 2) eventcode = 1;
+		else if (button == 3) eventcode = 2;
+		else if (button == 4) eventcode = 64;
+		else if (button == 5) eventcode = 65;
+
+		if (shift) eventcode |= 4;
+		if (alt || meta) eventcode |= 8;
+		if (ctrl) eventcode |= 16;
+
+		if (mtm == MTM_BUTTON_MOTION || mtm == MTM_ANY_MOTION) {
+			if (evt == 'm') {
+				eventcode |= 32;
+			}
+		}
+	}
+
+	// Encode
+	char buf[20];
+	buf[0] = 0;
+	if (mte == MTE_SIMPLE || mte == MTE_UTF8) {
+		// strictly, for UTF8 this will break if any coord is over 127,
+		// but that is unlikely due to screen size limitations in ESPTerm
+		sprintf(buf, "\x1b[M%c%c%c", (u8)(32+eventcode), (u8)(32+x), (u8)(32+y));
+	}
+	else if (mte == MTE_SGR) {
+		sprintf(buf, "\x1b[<%d;%d;%d%c", eventcode, x, y, (evt == 'p'||(evt=='m'&&button>0)) ? 'M' : 'm');
+	}
+	else if (mte == MTE_URXVT) {
+		sprintf(buf, "\x1b[%d;%d;%dM", (u8)(32+eventcode), (u8)(32+x), (u8)(32+y));
+	}
+
+	UART_SendAsync(buf, -1);
+}
+
 /** Socket received a message */
 void ICACHE_FLASH_ATTR updateSockRx(Websock *ws, char *data, int len, int flags)
 {
-	char buf[20];
 	// Add terminator if missing (seems to randomly happen)
 	data[len] = 0;
 
-	// TODO re-implement those, use single byte markers and B2 encoding
+	ws_dbg("Sock RX str: %s, len %d", data, len);
 
-	dbg("Sock RX str: %s, len %d", data, len);
+	int y, x, m, b;
+	u8 btnNum;
 
-	if (strstarts(data, "STR:")) {
-		// pass string verbatim
-		UART_WriteString(UART0, data+4, UART_TIMEOUT_US);
-	}
-	else if (strstarts(data, "BTN:")) {
-		// send button as low ASCII value 1-9
-		int btnNum = data[4] - '0';
-		if (btnNum > 0 && btnNum < 10) {
-			UART_WriteChar(UART0, (unsigned char)btnNum, UART_TIMEOUT_US);
-		}
-	}
-	else if (strstarts(data, "TAP:")) {
-		// this comes in as 0-based
-
-		int y=0, x=0;
-
-		char *pc=data+4;
-		char c;
-		int phase=0;
-
-		while((c=*pc++) != '\0') {
-			if (c==','||c==';') {
-				phase++;
-			}
-			else if (c>='0' && c<='9') {
-				if (phase==0) {
-					y=y*10+(c-'0');
-				} else {
-					x=x*10+(c-'0');
+	char c = data[0];
+	switch (c) {
+		case 's':
+			// pass string verbatim
+			if (termconf_scratch.loopback) {
+				for (int i = 1; i < len; i++) {
+					ansi_parser(data[i]);
 				}
 			}
-		}
+			UART_SendAsync(data+1, -1);
 
-		if (!screen_isCoordValid(y, x)) {
-			warn("Mouse input at invalid coordinates");
-			return;
-		}
+			// TODO base this on the actual buffer empty space, not rx chunk size
+			if ((UART_AsyncTxGetEmptySpace() < 256) && !browser_wants_xon) {
+				UART_WriteChar(UART1, '-', 100);
+				cgiWebsockBroadcast(URL_WS_UPDATE, "-", 1, 0);
+				browser_wants_xon = true;
 
-		dbg("Screen clicked at row %d, col %d", y+1, x+1);
+				system_soft_wdt_feed();
+			}
+			break;
 
-		// Send as 1-based to user
-		sprintf(buf, "\033[%d;%dM", y+1, x+1);
-		UART_WriteString(UART0, buf, UART_TIMEOUT_US);
+		case 'b':
+			// action button press
+			btnNum = (u8) (data[1]);
+			if (btnNum > 0 && btnNum < 10) {
+				UART_SendAsync(termconf_scratch.btn_msg[btnNum-1], -1);
+			}
+			break;
+
+		case 'm':
+		case 'p':
+		case 'r':
+			if (mouse_tracking.mode == MTM_NONE) break; // no need to parse, not enabled
+
+			// mouse move
+			y = parse2B(data+1); // row, 0-based
+			x = parse2B(data+3); // column, 0-based
+			b = parse2B(data+5); // mouse button, 0 = none, 1-5 = button number
+			m = parse2B(data+7); // modifier keys held
+
+			sendMouseAction(c,y,x,b,m);
+			break;
+
+		default:
+			ws_warn("Bad command.");
 	}
-	else {
-		warn("Bad command.");
+}
+
+/** Send a heartbeat msg */
+void ICACHE_FLASH_ATTR heartbeatTimCb(void *unused)
+{
+	if (notify_available) {
+		// Heartbeat packet - indicate we're still connected
+		// JS reloads the page if heartbeat is lost for a couple seconds
+		cgiWebsockBroadcast(URL_WS_UPDATE, ".", 1, 0);
 	}
 }
 
 /** Socket connected for updates */
 void ICACHE_FLASH_ATTR updateSockConnect(Websock *ws)
 {
-	info("Socket connected to "URL_WS_UPDATE);
+	ws_info("Socket connected to "URL_WS_UPDATE);
 	ws->recvCb = updateSockRx;
+
+	TIMER_START(&heartbeatTim, heartbeatTimCb, HB_TIME, 1);
+}
+
+ETSTimer xonTim;
+
+void ICACHE_FLASH_ATTR notify_empty_txbuf_cb(void *unused)
+{
+	UART_WriteChar(UART1, '+', 100);
+	cgiWebsockBroadcast(URL_WS_UPDATE, "+", 1, 0);
+	browser_wants_xon = false;
+}
+
+
+void notify_empty_txbuf(void)
+{
+	if (browser_wants_xon) {
+		TIMER_START(&xonTim, notify_empty_txbuf_cb, 1, 0);
+	}
 }

user/cgi_sockets.h

@@ -3,10 +3,24 @@
 
 #define URL_WS_UPDATE "/term/update.ws"
 
-#include "screen.h"
+#include <cgiwebsocket.h>
 
 /** Update websocket connect callback */
 void updateSockConnect(Websock *ws);
-void screen_notifyChange(ScreenNotifyChangeTopic topic);
+
+void notify_empty_txbuf(void);
+
+void send_beep(void);
+
+// defined in the makefile
+#if DEBUG_INPUT
+#define ws_warn warn
+#define ws_dbg dbg
+#define ws_info info
+#else
+#define ws_warn(...)
+#define ws_dbg(...)
+#define ws_info(...)
+#endif
 
 #endif //CGI_SOCKETS_H

user/cgi_system.c

@@ -7,6 +7,7 @@
 #include "persist.h"
 #include "syscfg.h"
 #include "uart_driver.h"
+#include "ansi_parser.h"
 
 #define SET_REDIR_SUC "/cfg/system"
 #define SET_REDIR_ERR SET_REDIR_SUC"?err="
@@ -18,6 +19,22 @@ static void ICACHE_FLASH_ATTR tmrCb(void *arg)
 	system_restart();
 }
 
+httpd_cgi_state ICACHE_FLASH_ATTR cgiResetScreen(HttpdConnData *connData)
+{
+	if (connData->conn==NULL) {
+		//Connection aborted. Clean up.
+		return HTTPD_CGI_DONE;
+	}
+
+	info("--- User request to reset screen! ---");
+	// this copies termconf to scratch and also resets the screen
+	terminal_apply_settings();
+	ansi_parser_reset();
+
+	httpdRedirect(connData, "/");
+	return HTTPD_CGI_DONE;
+}
+
 httpd_cgi_state ICACHE_FLASH_ATTR cgiResetDevice(HttpdConnData *connData)
 {
 	if (connData->conn==NULL) {

user/cgi_system.h

@@ -8,5 +8,6 @@ httpd_cgi_state cgiPing(HttpdConnData *connData);
 httpd_cgi_state cgiResetDevice(HttpdConnData *connData);
 httpd_cgi_state cgiSystemCfgSetParams(HttpdConnData *connData);
 httpd_cgi_state tplSystemCfg(HttpdConnData *connData, char *token, void **arg);
+httpd_cgi_state cgiResetScreen(HttpdConnData *connData);
 
 #endif // CGI_PING_H

user/cgi_term_cfg.c

@@ -20,7 +20,9 @@ cgiTermCfgSetParams(HttpdConnData *connData)
 {
 	char buff[50];
 	char redir_url_buf[100];
-	int n, w, h;
+	int32 n, w, h;
+
+	bool shall_clear_screen = false;
 
 	char *redir_url = redir_url_buf;
 	redir_url += sprintf(redir_url, SET_REDIR_ERR);
@@ -41,8 +43,11 @@ cgiTermCfgSetParams(HttpdConnData *connData)
 				h = atoi(buff);
 				if (h > 1) {
 					if (w * h <= MAX_SCREEN_SIZE) {
-						termconf->width = w;
-						termconf->height = h;
+						if (termconf->width != w || termconf->height != h) {
+							termconf->width = w;
+							termconf->height = h;
+							shall_clear_screen = true;
+						}
 					} else {
 						warn("Bad dimensions: %d x %d (total %d)", w, h, w*h);
 						redir_url += sprintf(redir_url, "term_width,term_height,");
@@ -66,7 +71,10 @@ cgiTermCfgSetParams(HttpdConnData *connData)
 		dbg("Screen default BG: %s", buff);
 		n = atoi(buff);
 		if (n >= 0 && n < 16) {
-			termconf->default_bg = (u8) n;
+			if (termconf->default_bg != n) {
+				termconf->default_bg = (u8) n;
+				shall_clear_screen = true;
+			}
 		} else {
 			warn("Bad color %s", buff);
 			redir_url += sprintf(redir_url, "default_bg,");
@@ -77,18 +85,67 @@ cgiTermCfgSetParams(HttpdConnData *connData)
 		dbg("Parser timeout: %s ms", buff);
 		n = atoi(buff);
 		if (n >= 0) {
-			termconf->parser_tout_ms = (u8) n;
+			termconf->parser_tout_ms = n;
 		} else {
-			warn("Bad timeout %s", buff);
+			warn("Bad parser timeout %s", buff);
 			redir_url += sprintf(redir_url, "parser_tout_ms,");
 		}
 	}
 
+	if (GET_ARG("display_tout_ms")) {
+		dbg("Display update idle timeout: %s ms", buff);
+		n = atoi(buff);
+		if (n > 0) {
+			termconf->display_tout_ms = n;
+		} else {
+			warn("Bad update timeout %s", buff);
+			redir_url += sprintf(redir_url, "display_tout_ms,");
+		}
+	}
+
+	if (GET_ARG("display_cooldown_ms")) {
+		dbg("Display update cooldown: %s ms", buff);
+		n = atoi(buff);
+		if (n > 0) {
+			termconf->display_cooldown_ms = n;
+		} else {
+			warn("Bad cooldown %s", buff);
+			redir_url += sprintf(redir_url, "display_cooldown_ms,");
+		}
+	}
+
+	if (GET_ARG("fn_alt_mode")) {
+		dbg("FN alt mode: %s", buff);
+		n = atoi(buff);
+		termconf->fn_alt_mode = (bool)n;
+	}
+
+	if (GET_ARG("show_buttons")) {
+		dbg("Show buttons: %s", buff);
+		n = atoi(buff);
+		termconf->show_buttons = (bool)n;
+	}
+
+	if (GET_ARG("show_config_links")) {
+		dbg("Show config links: %s", buff);
+		n = atoi(buff);
+		termconf->show_config_links = (bool)n;
+	}
+
+	if (GET_ARG("loopback")) {
+		dbg("Loopback: %s", buff);
+		n = atoi(buff);
+		termconf->loopback = (bool)n;
+	}
+
 	if (GET_ARG("default_fg")) {
 		dbg("Screen default FG: %s", buff);
 		n = atoi(buff);
 		if (n >= 0 && n < 16) {
-			termconf->default_fg = (u8) n;
+			if (termconf->default_fg != n) {
+				termconf->default_fg = (u8) n;
+				shall_clear_screen = true;
+			}
 		} else {
 			warn("Bad color %s", buff);
 			redir_url += sprintf(redir_url, "default_fg,");
@@ -111,11 +168,67 @@ cgiTermCfgSetParams(HttpdConnData *connData)
 		strncpy_safe(termconf->title, buff, 64); // ATTN those must match the values in
 	}
 
-	for (int i = 1; i <= 5; i++) {
-		sprintf(buff, "btn%d", i);
+	for (int btn_i = 1; btn_i <= TERM_BTN_COUNT; btn_i++) {
+		sprintf(buff, "btn%d", btn_i);
 		if (GET_ARG(buff)) {
-			dbg("Button%d default text: \"%s\"", i, buff);
-			strncpy_safe(termconf->btn[i-1], buff, TERM_BTN_LEN);
+			dbg("Button%d default text: \"%s\"", btn_i, buff);
+			strncpy_safe(termconf->btn[btn_i-1], buff, TERM_BTN_LEN);
+		}
+
+		sprintf(buff, "bm%d", btn_i);
+		if (GET_ARG(buff)) {
+			dbg("Button%d message (ASCII): \"%s\"", btn_i, buff);
+
+			// parse: comma,space or semicolon separated decimal values of ASCII codes
+			char c;
+			char *cp = buff;
+			int char_i = 0;
+			int acu = 0;
+			bool lastsp = 1;
+			char buff_bm[TERM_BTN_MSG_LEN];
+			while ((c = *cp++) != 0) {
+				if (c == ' ' || c == ',' || c == ';') {
+					if(lastsp) continue;
+
+					if (acu==0 || acu>255) {
+						warn("Bad value! %d", acu);
+						redir_url += sprintf(redir_url, "bm%d,", btn_i);
+						break;
+					}
+
+					if (char_i >= TERM_BTN_MSG_LEN-1) {
+						warn("Too long! %d", acu);
+						redir_url += sprintf(redir_url, "bm%d,", btn_i);
+						break;
+					}
+
+					dbg("acu %d", acu);
+					buff_bm[char_i++] = (char)acu;
+
+					// prepare for next char
+					acu = 0;
+					lastsp = 1;
+				} else if (c>='0'&&c<='9') {
+					lastsp = 0;
+					acu *= 10;
+					acu += c - '0';
+				} else {
+					warn("Bad syntax!");
+					redir_url += sprintf(redir_url, "bm%d,", btn_i);
+					break;
+				}
+			}
+			if (lastsp && char_i == 0) {
+				warn("Required!");
+				redir_url += sprintf(redir_url, "bm%d,", btn_i);
+			}
+			if (!lastsp) {
+				buff_bm[char_i++] = (char)acu;
+			}
+			buff_bm[char_i] = 0;
+			dbg("%s, chari = %d", buff_bm, char_i);
+
+			strncpy(termconf->btn_msg[btn_i-1], buff_bm, TERM_BTN_MSG_LEN);
 		}
 	}
 
@@ -123,9 +236,14 @@ cgiTermCfgSetParams(HttpdConnData *connData)
 		// All was OK
 		info("Set term params - success, saving...");
 
-		terminal_apply_settings();
 		persist_store();
 
+		if (shall_clear_screen) {
+			terminal_apply_settings();
+		} else {
+			terminal_apply_settings_noclear();
+		}
+
 		httpdRedirect(connData, SET_REDIR_SUC);
 	} else {
 		warn("Some settings did not validate, asking for correction");
@@ -159,6 +277,24 @@ tplTermCfg(HttpdConnData *connData, char *token, void **arg)
 	else if (streq(token, "parser_tout_ms")) {
 		sprintf(buff, "%d", termconf->parser_tout_ms);
 	}
+	else if (streq(token, "display_tout_ms")) {
+		sprintf(buff, "%d", termconf->display_tout_ms);
+	}
+	else if (streq(token, "display_cooldown_ms")) {
+		sprintf(buff, "%d", termconf->display_cooldown_ms);
+	}
+	else if (streq(token, "fn_alt_mode")) {
+		sprintf(buff, "%d", (int)termconf->fn_alt_mode);
+	}
+	else if (streq(token, "show_buttons")) {
+		sprintf(buff, "%d", (int)termconf->show_buttons);
+	}
+	else if (streq(token, "show_config_links")) {
+		sprintf(buff, "%d", (int)termconf->show_config_links);
+	}
+	else if (streq(token, "loopback")) {
+		sprintf(buff, "%d", (int)termconf->loopback);
+	}
 	else if (streq(token, "theme")) {
 		sprintf(buff, "%d", termconf->theme);
 	}
@@ -172,10 +308,27 @@ tplTermCfg(HttpdConnData *connData, char *token, void **arg)
 		strncpy_safe(buff, termconf->title, BUFLEN);
 	}
 	else {
-		for (int i = 1; i <= 5; i++) {
-			sprintf(buff2, "btn%d", i);
+		for (int btn_i = 1; btn_i <= TERM_BTN_COUNT; btn_i++) {
+			sprintf(buff2, "btn%d", btn_i);
 			if (streq(token, buff2)) {
-				strncpy_safe(buff, termconf->btn[i-1], BUFLEN);
+				strncpy_safe(buff, termconf->btn[btn_i-1], BUFLEN);
+				break;
+			}
+
+			sprintf(buff2, "bm%d", btn_i);
+			if (streq(token, buff2)) {
+				char c;
+				char *bp = buff;
+				char *cp = termconf->btn_msg[btn_i-1];
+				int n = 0;
+				while((c = *cp++) != 0) {
+					if(n>0) {
+						*bp = ',';
+						bp++;
+					}
+					bp += sprintf(bp, "%d", (int)c);
+					n++;
+				}
 				break;
 			}
 		}

user/character_sets.h

@@ -0,0 +1,169 @@
+//
+// Created by MightyPork on 2017/09/06.
+//
+
+#ifndef ESPTERM_CHARACTER_SETS_H_H
+#define ESPTERM_CHARACTER_SETS_H_H
+
+#include <c_types.h>
+
+// Tables must be contiguous!
+
+#define CODEPAGE_A_BEGIN 35
+#define CODEPAGE_A_END 35
+
+static const u16 codepage_A[] =
+	{//	Unicode    ASCII   SYM
+		// %%BEGIN:A%%
+		0x20a4, // 35   #   £
+		// %%END:A%%
+	};
+
+#define CODEPAGE_0_BEGIN 96
+#define CODEPAGE_0_END 126
+
+/**
+ * translates VT100 ACS escape codes to Unicode values.
+ * Based on rxvt-unicode screen.C table.
+ */
+static const u16 codepage_0[] =
+	{//	Unicode    ASCII   SYM
+		// %%BEGIN:0%%
+		0x2666, // 96	`	♦
+		0x2592, // 97	a	▒
+		0x2409, // 98	b	HT
+		0x240c, // 99	c	FF
+		0x240d, // 100	d	CR
+		0x240a, // 101	e	LF
+		0x00b0, // 102	f	°
+		0x00b1, // 103	g	±
+		0x2424, // 104	h	NL
+		0x240b, // 105	i	VT
+		0x2518, // 106	j	┘
+		0x2510, // 107	k	┐
+		0x250c, // 108	l	┌
+		0x2514, // 109	m	└
+		0x253c, // 110	n	┼
+		0x23ba, // 111	o	⎺
+		0x23bb, // 112	p	⎻
+		0x2500, // 113	q	─
+		0x23bc, // 114	r	⎼
+		0x23bd, // 115	s	⎽
+		0x251c, // 116	t	├
+		0x2524, // 117	u	┤
+		0x2534, // 118	v	┴
+		0x252c, // 119	w	┬
+		0x2502, // 120	x	│
+		0x2264, // 121	y	≤
+		0x2265, // 122	z	≥
+		0x03c0, // 123	{	π
+		0x2260, // 124	|	≠
+		0x20a4, // 125	}	£
+		0x00b7, // 126	~	·
+		// %%END:0%%
+	};
+
+#define CODEPAGE_1_BEGIN 33
+#define CODEPAGE_1_END 126
+
+static const u16 codepage_1[] =
+	{//	Unicode    ASCII   SYM  DOS
+		// %%BEGIN:1%%
+		0x263A,	// 33	!	☺	(1)  - low ASCII symbols from DOS, moved to +32
+		0x263B,	// 34	"	☻	(2)
+		0x2665,	// 35	#	♥	(3)
+		0x2666,	// 36	$	♦	(4)
+		0x2663,	// 37	%	♣	(5)
+		0x2660,	// 38	&	♠	(6)
+		0x2022,	// 39	'	•	(7)  - inverse dot and circle left out, can be done with SGR
+		0x231B,	// 40	(	⌛        - hourglass (timer icon)
+		0x25CB,	// 41	)	○	(9)
+		0x21AF,	// 42	*	↯        - electricity (lightning monitor...)
+		0x266A,	// 43	+	♪	(13)
+		0x266B,	// 44	,	♫	(14)
+		0x263C,	// 45	-	☼	(15)
+		0x2302,	// 46	.	⌂	(127)
+		0x2622,	// 47	/	☢         - radioactivity (geiger counter...)
+		0x2591,	// 48	0	░	(176) - this block is kept aligned and ordered from DOS, moved -128
+		0x2592,	// 49	1	▒	(177)
+		0x2593,	// 50	2	▓	(178)
+		0x2502,	// 51	3	│	(179)
+		0x2524,	// 52	4	┤	(180)
+		0x2561,	// 53	5	╡	(181)
+		0x2562,	// 54	6	╢	(182)
+		0x2556,	// 55	7	╖	(183)
+		0x2555,	// 56	8	╕	(184)
+		0x2563,	// 57	9	╣	(185)
+		0x2551,	// 58	:	║	(186)
+		0x2557,	// 59	;	╗	(187)
+		0x255D,	// 60	<	╝	(188)
+		0x255C,	// 61	=	╜	(189)
+		0x255B,	// 62	>	╛	(190)
+		0x2510,	// 63	?	┐	(191)
+		0x2514,	// 64	@	└	(192)
+		0x2534,	// 65	A	┴	(193)
+		0x252C,	// 66	B	┬	(194)
+		0x251C,	// 67	C	├	(195)
+		0x2500,	// 68	D	─	(196)
+		0x253C,	// 69	E	┼	(197)
+		0x255E,	// 70	F	╞	(198)
+		0x255F,	// 71	G	╟	(199)
+		0x255A,	// 72	H	╚	(200)
+		0x2554,	// 73	I	╔	(201)
+		0x2569,	// 74	J	╩	(202)
+		0x2566,	// 75	K	╦	(203)
+		0x2560,	// 76	L	╠	(204)
+		0x2550,	// 77	M	═	(205)
+		0x256C,	// 78	N	╬	(206)
+		0x2567,	// 79	O	╧	(207)
+		0x2568,	// 80	P	╨	(208)
+		0x2564,	// 81	Q	╤	(209)
+		0x2565,	// 82	R	╥	(210)
+		0x2559,	// 83	S	╙	(211)
+		0x2558,	// 84	T	╘	(212)
+		0x2552,	// 85	U	╒	(213)
+		0x2553,	// 86	V	╓	(214)
+		0x256B,	// 87	W	╫	(215)
+		0x256A,	// 88	X	╪	(216)
+		0x2518,	// 89	Y	┘	(217)
+		0x250C,	// 90	Z	┌	(218)
+		0x2588,	// 91	[	█	(219)
+		0x2584,	// 92	\	▄	(220)
+		0x258C,	// 93	]	▌	(221)
+		0x2590,	// 94	^	▐	(222)
+		0x2580,	// 95	_	▀	(223)
+		0x2195,	// 96	`	↕	(18)  - moved from low DOS ASCII
+		0x2191,	// 97	a	↑	(24)
+		0x2193,	// 98	b	↓	(25)
+		0x2192,	// 99	c	→	(26)
+		0x2190,	// 100	d	←	(27)
+		0x2194,	// 101	e	↔	(29)
+		0x25B2,	// 102	f	▲	(30)
+		0x25BC,	// 103	g	▼	(31)
+		0x25BA,	// 104	h	►	(16)
+		0x25C4,	// 105	i	◄	(17)
+		0x25E2,	// 106	j	◢         - added for slanted corners
+		0x25E3,	// 107	k	◣
+		0x25E4,	// 108	l	◤
+		0x25E5,	// 109	m	◥
+		0x256D,	// 110	n	╭         - rounded corners
+		0x256E,	// 111	o	╮
+		0x256F,	// 112	p	╯
+		0x2570,	// 113	q	╰
+		0x0,	// 114	r             - free positions for future expansion
+		0x0,	// 115	s
+		0x0,	// 116	t
+		0x0,	// 117	u
+		0x0,	// 118	v
+		0x0,	// 119	w
+		0x0,	// 120	x
+		0x0,	// 121	y
+		0x0,	// 122	z
+		0x0,	// 123	{
+		0x0,	// 124	|
+		0x2714,	// 125	}	✔         - checkboxes or checklist items
+		0x2718,	// 126	~	✘
+		// %%END:1%%
+	};
+
+#endif //ESPTERM_CHARACTER_SETS_H_H

user/io.c

@@ -13,6 +13,8 @@
 #include "ansi_parser_callbacks.h"
 #include "wifimgr.h"
 #include "persist.h"
+#include "screen.h"
+#include "ansi_parser.h"
 
 #define BTNGPIO 0
 
@@ -21,6 +23,28 @@ static bool enable_ap_button = false;
 
 static ETSTimer resetBtntimer;
 static ETSTimer blinkyTimer;
+static ETSTimer ansiParserResetTimer;
+
+static void ICACHE_FLASH_ATTR ansiParserResetTimerCb(void *arg) {
+	static u32 last_charcnt = 0;
+	static int same_charcnt = -1;
+	if (termconf->parser_tout_ms == 0) return;
+
+	if (last_charcnt != ansi_parser_char_cnt) {
+		last_charcnt = ansi_parser_char_cnt;
+		same_charcnt = 0;
+	}
+	else {
+		if (same_charcnt != -1) {
+			same_charcnt++;
+			if (same_charcnt > termconf->parser_tout_ms) {
+				ansi_parser_reset();
+				same_charcnt = -1;
+			}
+		}
+	}
+}
+
 
 // Holding BOOT pin triggers AP reset, then Factory Reset.
 // Indicate that by blinking the on-board LED.
@@ -102,6 +126,10 @@ void ICACHE_FLASH_ATTR ioInit() {
 	os_timer_setfn(&resetBtntimer, resetBtnTimerCb, NULL);
 	os_timer_arm(&resetBtntimer, 500, 1);
 
+	os_timer_disarm(&ansiParserResetTimer);
+	os_timer_setfn(&ansiParserResetTimer, ansiParserResetTimerCb, NULL);
+	os_timer_arm(&ansiParserResetTimer, 1, 1);
+
 	// One way to enter AP mode - hold GPIO0 low.
 	if (GPIO_INPUT_GET(BTNGPIO) == 0) {
 		// starting "in BOOT mode" - do not install the AP reset timer

user/jstring.c

@@ -0,0 +1,41 @@
+//
+// Created by MightyPork on 2017/09/04.
+//
+
+#include "jstring.h"
+
+void ICACHE_FLASH_ATTR
+encode2B(u16 number, WordB2 *stru)
+{
+	stru->lsb = (u8) (number % 127);
+	number = (u16) ((number - stru->lsb) / 127);
+	stru->lsb += 1;
+
+	stru->msb = (u8) (number + 1);
+}
+
+void ICACHE_FLASH_ATTR
+encode3B(u32 number, WordB3 *stru)
+{
+	stru->lsb = (u8) (number % 127);
+	number = (number - stru->lsb) / 127;
+	stru->lsb += 1;
+
+	stru->msb = (u8) (number % 127);
+	number = (number - stru->msb) / 127;
+	stru->msb += 1;
+
+	stru->xsb = (u8) (number + 1);
+}
+
+u16 ICACHE_FLASH_ATTR
+parse2B(const char *str)
+{
+	return (u16) ((str[0] - 1) + (str[1] - 1) * 127);
+}
+
+u32 ICACHE_FLASH_ATTR
+parse3B(const char *str)
+{
+	return (u32) ((str[0] - 1) + (str[1] - 1) * 127 + (str[2] - 1) * 127 * 127);
+}

user/jstring.h

@@ -0,0 +1,29 @@
+//
+// Created by MightyPork on 2017/09/04.
+//
+
+#ifndef ESPTERM_JSTRING_H
+#define ESPTERM_JSTRING_H
+
+#include <esp8266.h>
+
+typedef struct {
+	u8 lsb;
+	u8 msb;
+} WordB2;
+
+typedef struct {
+	u8 lsb;
+	u8 msb;
+	u8 xsb;
+} WordB3;
+
+void encode2B(u16 number, WordB2 *stru);
+
+void encode3B(u32 number, WordB3 *stru);
+
+u16 parse2B(const char *str);
+
+u32 parse3B(const char *str);
+
+#endif //ESPTERM_JSTRING_H

user/routes.c

@@ -29,7 +29,7 @@ HttpdBuiltInUrl routes[] = {
 	// --- Web pages ---
 	ROUTE_TPL_FILE("/", tplScreen, "/term.tpl"),
 	ROUTE_TPL_FILE("/about/?", tplAbout, "/about.tpl"),
-	ROUTE_FILE("/help/?", "/help.tpl"),
+	ROUTE_FILE("/help/?", "/help.html"),
 
 	// --- Sockets ---
 	ROUTE_CGI("/term/init", cgiTermInitialImage),
@@ -38,6 +38,7 @@ HttpdBuiltInUrl routes[] = {
 	// --- System control ---
 	ROUTE_CGI("/system/reset/?", cgiResetDevice),
 	ROUTE_CGI("/system/ping/?", cgiPing),
+	ROUTE_CGI("/system/cls/?", cgiResetScreen),
 
 	// --- WiFi config --- (TODO make this conditional and configurable)
 #if WIFI_PROTECT
@@ -46,7 +47,7 @@ HttpdBuiltInUrl routes[] = {
 	ROUTE_REDIRECT("/cfg/?", "/cfg/wifi"),
 
 	ROUTE_TPL_FILE("/cfg/wifi/?", tplWlan, "/cfg_wifi.tpl"),
-	ROUTE_FILE("/cfg/wifi/connecting/?", "/cfg_wifi_conn.tpl"),
+	ROUTE_FILE("/cfg/wifi/connecting/?", "/cfg_wifi_conn.html"),
 	ROUTE_CGI("/cfg/wifi/scan", cgiWiFiScan),
 	ROUTE_CGI("/cfg/wifi/connstatus", cgiWiFiConnStatus),
 	ROUTE_CGI("/cfg/wifi/set", cgiWiFiSetParams),

user/screen.h

@@ -34,29 +34,47 @@
  *
  */
 
-// Size designed for the wifi config structure
+// Size designed for the terminal config structure
 // Must be constant to avoid corrupting user config after upgrade
-#define TERMCONF_SIZE 200
+#define TERMCONF_SIZE 300
 
 #define TERM_BTN_LEN 10
+#define TERM_BTN_MSG_LEN 10
 #define TERM_TITLE_LEN 64
+#define TERM_BTN_COUNT 5
 
-typedef enum {
-	CHANGE_CONTENT,
-	CHANGE_LABELS,
-} ScreenNotifyChangeTopic;
+#define SCR_DEF_DISPLAY_TOUT_MS 10
+#define SCR_DEF_DISPLAY_COOLDOWN_MS 30
+#define SCR_DEF_PARSER_TOUT_MS 10
+#define SCR_DEF_FN_ALT_MODE true // true - SS3 codes, easier to parse & for xterm compatibility
+#define SCR_DEF_WIDTH 26
+#define SCR_DEF_HEIGHT 10
+#define SCR_DEF_TITLE "ESPTerm"
 
-#define SCREEN_NOTIFY_DELAY_MS 20
+/** Maximum screen size (determines size of the static data array) */
+#define MAX_SCREEN_SIZE (80*25)
+
+#define TERMCONF_VERSION 3
+
+// --- Persistent Settings ---
 
 typedef struct {
 	u32 width;
 	u32 height;
-	u8 default_bg;
+	u8 default_bg; // should be the Color typedef, but this way the size is more explicit
 	u8 default_fg;
 	char title[TERM_TITLE_LEN];
-	char btn[5][TERM_BTN_LEN];
+	char btn[TERM_BTN_COUNT][TERM_BTN_LEN];
 	u8 theme;
 	u32 parser_tout_ms;
+	u32 display_tout_ms;
+	bool fn_alt_mode; // xterm compatibility mode (alternate codes for some FN keys)
+	u8 config_version;
+	u32 display_cooldown_ms;
+	bool loopback;
+	bool show_buttons;
+	bool show_config_links;
+	char btn_msg[TERM_BTN_COUNT][TERM_BTN_MSG_LEN];
 } TerminalConfigBundle;
 
 // Live config
@@ -68,59 +86,88 @@ extern TerminalConfigBundle * const termconf;
  */
 extern TerminalConfigBundle termconf_scratch;
 
-void terminal_restore_defaults(void);
-void terminal_apply_settings(void);
+enum MTM {
+	MTM_NONE = 0,
+	MTM_X10 = 1,
+	MTM_NORMAL = 2,
+	MTM_BUTTON_MOTION = 3, // any higher mode tracks motion
+	MTM_ANY_MOTION = 4,
+};
 
-/**
- * Maximum screen size (determines size of the static data array)
- *
- * TODO May need adjusting if there are size problems when flashing the ESP.
- * We could also try to pack the Cell struct to a single 32bit word.
- */
-#define MAX_SCREEN_SIZE (80*30)
+enum MTE {
+	MTE_SIMPLE = 0,
+	MTE_UTF8 = 1,
+	MTE_SGR = 2,
+	MTE_URXVT = 3,
+};
+
+typedef struct {
+	enum MTM mode;
+	bool focus_tracking;
+	enum MTE encoding;
+} MouseTrackingConfig;
+
+extern MouseTrackingConfig mouse_tracking;
+
+/** Restore default settings to termconf. Does not apply or copy to scratch. */
+void terminal_restore_defaults(void);
+/** Apply settings, redraw (clears the screen) */
+void terminal_apply_settings(void);
+/** Apply settings, redraw (no clear - not resized) */
+void terminal_apply_settings_noclear(void);
+/** Init the screen */
+void screen_init(void);
+/** Change the screen size */
+void screen_resize(int rows, int cols);
+/** Set screen title */
+void screen_set_title(const char *title);
+/** Set a button text */
+void screen_set_button_text(int num, const char *text);
+
+// --- Encoding ---
 
 typedef enum {
-	CLEAR_TO_CURSOR=0, CLEAR_FROM_CURSOR=1, CLEAR_ALL=2
-} ClearMode;
-
-typedef uint8_t Color;
+	CS_B_USASCII = 'B',
+	CS_A_UKASCII = 'A',
+	CS_0_DEC_SUPPLEMENTAL = '0',
+	CS_1_DOS_437 = '1',
+} CHARSET;
 
 httpd_cgi_state screenSerializeToBuffer(char *buffer, size_t buf_len, void **data);
 
 void screenSerializeLabelsToBuffer(char *buffer, size_t buf_len);
 
-
-typedef struct {
-	u8 lsb;
-	u8 msb;
-} WordB2;
-
-/** Encode number to two nice ASCII bytes */
-void encode2B(u16 number, WordB2 *stru);
-
-/** Init the screen */
-void screen_init(void);
-
-/** Change the screen size */
-void screen_resize(int rows, int cols);
-
-/** Check if coord is valid */
-bool screen_isCoordValid(int y, int x);
-
 // --- Clearing ---
 
+typedef enum {
+	CLEAR_TO_CURSOR = 0,
+	CLEAR_FROM_CURSOR = 1,
+	CLEAR_ALL = 2
+} ClearMode;
+
 /** Screen reset to default state */
 void screen_reset(void);
-
-/** Clear entire screen, set all to 7 on 0 */
+/** Clear entire screen */
 void screen_clear(ClearMode mode);
-
-/** Line reset to gray-on-white, empty */
+/** Clear line */
 void screen_clear_line(ClearMode mode);
+/** Clear part of line */
+void screen_clear_in_line(unsigned int count);
+/** Swap to alternate buffer (really what this does is backup terminal title, size and other global attributes) */
+void screen_swap_state(bool alternate);
 
+// --- insert / delete ---
+
+/** Insert lines at cursor, shove down */
+void screen_insert_lines(unsigned int lines);
+/** Delete lines at cursor, pull up */
+void screen_delete_lines(unsigned int lines);
+/** Insert characters at cursor, shove right */
+void screen_insert_characters(unsigned int count);
+/** Delete characters at cursor, pull left */
+void screen_delete_characters(unsigned int count);
 /** Shift screen upwards */
 void screen_scroll_up(unsigned int lines);
-
 /** Shift screen downwards */
 void screen_scroll_down(unsigned int lines);
 
@@ -128,51 +175,89 @@ void screen_scroll_down(unsigned int lines);
 
 /** Set cursor position */
 void screen_cursor_set(int y, int x);
-
 /** Read cursor pos to given vars */
 void screen_cursor_get(int *y, int *x);
-
 /** Set cursor X position */
 void screen_cursor_set_x(int x);
-
 /** Set cursor Y position */
 void screen_cursor_set_y(int y);
-
-/** Reset cursor attribs */
-void screen_reset_cursor(void);
-
 /** Relative cursor move */
-void screen_cursor_move(int dy, int dx);
-
+void screen_cursor_move(int dy, int dx, bool scroll);
 /** Save the cursor pos */
 void screen_cursor_save(bool withAttrs);
-
 /** Restore the cursor pos */
 void screen_cursor_restore(bool withAttrs);
 
-/** Enable cursor display */
-void screen_cursor_enable(bool enable);
+// --- Cursor behavior setting ---
 
+/** Toggle INSERT / REPLACE */
+void screen_set_insert_mode(bool insert);
+/** Enable CR auto */
+void screen_set_newline_mode(bool nlm);
 /** Enable auto wrap */
 void screen_wrap_enable(bool enable);
+/** Set scrolling region */
+void screen_set_scrolling_region(int from, int to);
+/** Enable or disable origin remap to top left of scrolling region */
+void screen_set_origin_mode(bool region_origin);
 
-// --- Colors ---
+// --- Graphic rendition setting ---
+
+typedef uint8_t Color; // 0-16
+
+#define ATTR_BOLD (1<<0)
+#define ATTR_FAINT (1<<1)
+#define ATTR_ITALIC (1<<2)
+#define ATTR_UNDERLINE (1<<3)
+#define ATTR_BLINK (1<<4)
+#define ATTR_FRAKTUR (1<<5)
+#define ATTR_STRIKE (1<<6)
 
 /** Set cursor foreground color */
 void screen_set_fg(Color color);
-
 /** Set cursor background coloor */
 void screen_set_bg(Color color);
+/** Enable/disable attrs by bitmask */
+void screen_set_sgr(u8 attrs, bool ena);
+/** Set the inverse attribute */
+void screen_set_sgr_inverse(bool ena);
+/** Reset cursor attribs */
+void screen_reset_sgr(void);
 
-/** make foreground bright */
-void screen_set_bold(bool bold);
+// --- Global modes and attributes ---
 
-/** Set cursor foreground and background color */
-void screen_set_colors(Color fg, Color bg);
+/** Enable cursor display */
+void screen_set_cursor_visible(bool visible);
+/** Toggle application keypad mode */
+void screen_set_numpad_alt_mode(bool app_mode);
+/** Toggle application cursor mode */
+void screen_set_cursors_alt_mode(bool app_mode);
+/** Set reverse video mode */
+void screen_set_reverse_video(bool reverse);
 
-/** Invert colors */
-void screen_inverse(bool inverse);
+// --- Charset ---
 
+/** Switch G0 <-> G1 */
+void screen_set_charset_n(int Gx);
+/** Assign G0 or G1 */
+void screen_set_charset(int Gx, char charset);
+
+// --- Tab stops ---
+
+/** Remove all tabs on the screen */
+void screen_clear_all_tabs(void);
+/** Set tab at the current column */
+void screen_set_tab(void);
+/** Remove tab at the current column (if any) */
+void screen_clear_tab(void);
+/** Move forward one tab */
+void screen_tab_forward(int count);
+/** Move backward one tab */
+void screen_tab_reverse(int count);
+/** Move left, shift right if at the boundary */
+void screen_back_index(int count);
+
+// --- Printing characters ---
 
 /**
  * Set a character in the cursor color, move to right with wrap.
@@ -180,12 +265,29 @@ void screen_inverse(bool inverse);
  * unicode (then it can be 4 chars, or terminated by a zero)
  */
 void screen_putchar(const char *ch);
+/**
+ * esc # 8 - fill entire screen with E of default colors
+ * (DEC alignment test mode)
+ */
+void screen_fill_with_E(void);
 
-#if 0
-/** Debug dump */
-void screen_dd(void);
-#endif
+// --- Queries ---
 
+/** Report current SGR as num;num;... for DAC query */
+void screen_report_sgr(char *buffer);
+
+// --- Notify ---
+
+typedef enum {
+	CHANGE_CONTENT = 0,
+	CHANGE_LABELS = 1,
+} ScreenNotifyChangeTopic;
+
+/**
+ * Called when the screen content or settings change
+ * and the front-end should redraw / update.
+ * @param topic - what kind of change this is (chooses what message to send)
+ */
 extern void screen_notifyChange(ScreenNotifyChangeTopic topic);
 
 #endif // SCREEN_H

user/serial.c

@@ -4,6 +4,47 @@
 #include "ansi_parser.h"
 #include "syscfg.h"
 
+#define LOGBUF_SIZE 2048
+static char logbuf[LOGBUF_SIZE];
+static u32 lb_nw = 1;
+static u32 lb_ls = 0;
+static ETSTimer flushLogTimer;
+
+static void buf_putc(char c)
+{
+	if (lb_ls != lb_nw) {
+		logbuf[lb_nw++] = c;
+		if (lb_nw >= LOGBUF_SIZE) lb_nw = 0;
+	}
+}
+
+static void buf_pop(void *unused)
+{
+	u32 quantity = 32;
+	u32 old_ls;
+	while (quantity > 0) {
+		// stop when done
+		if ((lb_ls == lb_nw-1) || (lb_ls == LOGBUF_SIZE-1 && lb_nw == 0)) break;
+
+		old_ls = lb_ls;
+		lb_ls++;
+		if (lb_ls >= LOGBUF_SIZE) lb_ls = 0;
+
+		if (OK == UART_WriteCharCRLF(UART1, logbuf[lb_ls], 1000)) {
+			quantity--;
+		} else {
+			// try another time
+			lb_ls = old_ls;
+			break;
+		}
+	}
+}
+
+//LOCAL void my_putc(char c)
+//{
+//	UART_WriteCharCRLF(UART1, (u8) c, 10);
+//}
+
 /**
  * Init the serial ports
  */
@@ -15,7 +56,15 @@ void ICACHE_FLASH_ATTR serialInitBase(void)
 	UART_SetStopBits(UART1, ONE_STOP_BIT);
 	UART_SetBaudrate(UART1, BIT_RATE_115200);
 	UART_SetPrintPort(UART1);
+	os_install_putc1(buf_putc);
+	//os_install_putc1(my_putc);
 	UART_SetupAsyncReceiver();
+
+	// 1 ms timer
+	os_timer_disarm(&flushLogTimer);
+	os_timer_setfn(&flushLogTimer, buf_pop, NULL);
+	//os_timer_arm(&flushLogTimer, 1, 1);
+	ets_timer_arm_new(&flushLogTimer, 1, 500, 0); // us timer
 }
 
 /**
@@ -42,5 +91,5 @@ void ICACHE_FLASH_ATTR serialInit(void)
  */
 void ICACHE_FLASH_ATTR UART_HandleRxByte(char c)
 {
-	ansi_parser(&c, 1);
+	ansi_parser(c);
 }

user/sgr.h

@@ -0,0 +1,37 @@
+//
+// Created by MightyPork on 2017/08/19.
+//
+
+#ifndef ESP_VT100_FIRMWARE_SGR_H
+#define ESP_VT100_FIRMWARE_SGR_H
+
+enum SGR_CODES {
+	SGR_RESET = 0,
+	SGR_BOLD = 1,
+	SGR_FAINT = 2,
+	SGR_ITALIC = 3,
+	SGR_UNDERLINE = 4,
+	SGR_BLINK = 5,
+	SGR_BLINK_FAST = 6,
+	SGR_INVERSE = 7,
+	SGR_STRIKE = 9,
+	SGR_FRAKTUR = 20,
+
+	SGR_FG_START = 30,
+	SGR_FG_END = 37,
+	SGR_FG_DEFAULT = 39,
+
+	SGR_BG_START = 40,
+	SGR_BG_END = 47,
+	SGR_BG_DEFAULT = 49,
+
+	SGR_FG_BRT_START = 90,
+	SGR_FG_BRT_END = 97,
+
+	SGR_BG_BRT_START = 100,
+	SGR_BG_BRT_END = 107,
+};
+
+#define SGR_OFF(n) (20+(n))
+
+#endif //ESP_VT100_FIRMWARE_SGR_H

user/syscfg.c

@@ -12,6 +12,8 @@ SystemConfigBundle * const sysconf = &persist.current.sysconf;
 void ICACHE_FLASH_ATTR
 sysconf_apply_settings(void)
 {
+	// !!! Update to current version !!!
+
 	serialInit();
 }
 

user/syscfg.h

@@ -10,11 +10,13 @@
 // Size designed for the wifi config structure
 // Must be constant to avoid corrupting user config after upgrade
 #define SYSCONF_SIZE 200
+#define SYSCONF_VERSION 0
 
 typedef struct {
 	u32 uart_baudrate;
 	u8 uart_parity;
 	u8 uart_stopbits;
+	u8 config_version;
 } SystemConfigBundle;
 
 extern SystemConfigBundle * const sysconf;

user/uart_buffer.c

@@ -0,0 +1,276 @@
+//
+// Created by MightyPork on 2017/08/24.
+//
+
+#include "uart_buffer.h"
+#include "uart_driver.h"
+#include "uart_handler.h"
+#include <esp8266.h>
+#include <uart_register.h>
+
+#define UART_TX_BUFFER_SIZE 512  //Ring buffer length of tx buffer
+#define UART_RX_BUFFER_SIZE 512 //Ring buffer length of rx buffer
+
+struct UartBuffer {
+	uint32 UartBuffSize;
+	uint8 *pUartBuff;
+	uint8 *pInPos;
+	uint8 *pOutPos;
+	uint16 Space;
+};
+
+static struct UartBuffer *pTxBuffer = NULL;
+static struct UartBuffer *pRxBuffer = NULL;
+
+static struct UartBuffer *UART_AsyncBufferInit(uint32 buf_size);
+
+void ICACHE_FLASH_ATTR UART_AllocBuffers(void)
+{
+	pTxBuffer = UART_AsyncBufferInit(UART_TX_BUFFER_SIZE);
+	pRxBuffer = UART_AsyncBufferInit(UART_RX_BUFFER_SIZE);
+}
+
+/******************************************************************************
+ * FunctionName : Uart_Buf_Init
+ * Description  : tx buffer enqueue: fill a first linked buffer
+ * Parameters   : char *pdata - data point  to be enqueue
+ * Returns      : NONE
+*******************************************************************************/
+static struct UartBuffer *ICACHE_FLASH_ATTR
+UART_AsyncBufferInit(uint32 buf_size)
+{
+	uint32 heap_size = system_get_free_heap_size();
+	if (heap_size <= buf_size) {
+		error("uart buf malloc fail, out of memory");
+		return NULL;
+	}
+	else {
+		struct UartBuffer *pBuff = (struct UartBuffer *) malloc(sizeof(struct UartBuffer));
+		pBuff->UartBuffSize = buf_size;
+		pBuff->pUartBuff = (uint8 *) malloc(pBuff->UartBuffSize);
+		pBuff->pInPos = pBuff->pUartBuff;
+		pBuff->pOutPos = pBuff->pUartBuff;
+		pBuff->Space = (uint16) pBuff->UartBuffSize;
+		return pBuff;
+	}
+}
+
+
+/**
+ * Copy data onto Buffer
+ * @param pCur - buffer
+ * @param pdata - data src
+ * @param data_len - data len
+ */
+static void UART_WriteToAsyncBuffer(struct UartBuffer *pCur, const char *pdata, uint16 data_len)
+{
+	if (data_len == 0) return;
+
+	uint16 tail_len = (uint16) (pCur->pUartBuff + pCur->UartBuffSize - pCur->pInPos);
+	if (tail_len >= data_len) {  //do not need to loop back  the queue
+		memcpy(pCur->pInPos, pdata, data_len);
+		pCur->pInPos += (data_len);
+		pCur->pInPos = (pCur->pUartBuff + (pCur->pInPos - pCur->pUartBuff) % pCur->UartBuffSize);
+		pCur->Space -= data_len;
+	}
+	else {
+		memcpy(pCur->pInPos, pdata, tail_len);
+		pCur->pInPos += (tail_len);
+		pCur->pInPos = (pCur->pUartBuff + (pCur->pInPos - pCur->pUartBuff) % pCur->UartBuffSize);
+		pCur->Space -= tail_len;
+		memcpy(pCur->pInPos, pdata + tail_len, data_len - tail_len);
+		pCur->pInPos += (data_len - tail_len);
+		pCur->pInPos = (pCur->pUartBuff + (pCur->pInPos - pCur->pUartBuff) % pCur->UartBuffSize);
+		pCur->Space -= (data_len - tail_len);
+	}
+}
+
+/******************************************************************************
+ * FunctionName : uart_buf_free
+ * Description  : deinit of the tx buffer
+ * Parameters   : struct UartBuffer* pTxBuff - tx buffer struct pointer
+ * Returns      : NONE
+*******************************************************************************/
+void ICACHE_FLASH_ATTR UART_FreeAsyncBuffer(struct UartBuffer *pBuff)
+{
+	free(pBuff->pUartBuff);
+	free(pBuff);
+}
+
+u16 ICACHE_FLASH_ATTR UART_AsyncRxCount(void)
+{
+	return (u16) (pRxBuffer->UartBuffSize - pRxBuffer->Space);
+}
+
+/**
+ * Retrieve some data from the RX buffer
+ * @param pdata - target
+ * @param data_len - max data to retrieve
+ * @return real nr of bytes retrieved
+ */
+uint16 ICACHE_FLASH_ATTR
+UART_ReadAsync(char *pdata, uint16 data_len)
+{
+	uint16 buf_len = (uint16) (pRxBuffer->UartBuffSize - pRxBuffer->Space);
+	uint16 tail_len = (uint16) (pRxBuffer->pUartBuff + pRxBuffer->UartBuffSize - pRxBuffer->pOutPos);
+	uint16 len_tmp = 0;
+	len_tmp = ((data_len > buf_len) ? buf_len : data_len);
+	if (pRxBuffer->pOutPos <= pRxBuffer->pInPos) {
+		memcpy(pdata, pRxBuffer->pOutPos, len_tmp);
+		pRxBuffer->pOutPos += len_tmp;
+		pRxBuffer->Space += len_tmp;
+	}
+	else {
+		if (len_tmp > tail_len) {
+			memcpy(pdata, pRxBuffer->pOutPos, tail_len);
+			pRxBuffer->pOutPos += tail_len;
+			pRxBuffer->pOutPos = (pRxBuffer->pUartBuff +
+								  (pRxBuffer->pOutPos - pRxBuffer->pUartBuff) % pRxBuffer->UartBuffSize);
+			pRxBuffer->Space += tail_len;
+
+			memcpy(pdata + tail_len, pRxBuffer->pOutPos, len_tmp - tail_len);
+			pRxBuffer->pOutPos += (len_tmp - tail_len);
+			pRxBuffer->pOutPos = (pRxBuffer->pUartBuff +
+								  (pRxBuffer->pOutPos - pRxBuffer->pUartBuff) % pRxBuffer->UartBuffSize);
+			pRxBuffer->Space += (len_tmp - tail_len);
+		}
+		else {
+			//os_printf("case 3 in rx deq\n\r");
+			memcpy(pdata, pRxBuffer->pOutPos, len_tmp);
+			pRxBuffer->pOutPos += len_tmp;
+			pRxBuffer->pOutPos = (pRxBuffer->pUartBuff +
+								  (pRxBuffer->pOutPos - pRxBuffer->pUartBuff) % pRxBuffer->UartBuffSize);
+			pRxBuffer->Space += len_tmp;
+		}
+	}
+	// this maybe shouldnt be here??
+	if (pRxBuffer->Space >= UART_FIFO_LEN) {
+		uart_rx_intr_enable(UART0);
+	}
+	return len_tmp;
+}
+
+//move data from uart fifo to rx buffer
+void UART_RxFifoCollect(void)
+{
+	uint8 fifo_len, buf_idx;
+	uint8 fifo_data;
+	fifo_len = (uint8) ((READ_PERI_REG(UART_STATUS(UART0)) >> UART_RXFIFO_CNT_S) & UART_RXFIFO_CNT);
+	if (fifo_len >= pRxBuffer->Space) {
+		UART_WriteChar(UART1, '%', 100);
+	}
+	else {
+		buf_idx = 0;
+		while (buf_idx < fifo_len) {
+			buf_idx++;
+			fifo_data = (uint8) (READ_PERI_REG(UART_FIFO(UART0)) & 0xFF);
+			*(pRxBuffer->pInPos++) = fifo_data;
+			if (pRxBuffer->pInPos == (pRxBuffer->pUartBuff + pRxBuffer->UartBuffSize)) {
+				pRxBuffer->pInPos = pRxBuffer->pUartBuff;
+			}
+		}
+		pRxBuffer->Space -= fifo_len;
+
+		if (pRxBuffer->Space >= UART_FIFO_LEN) {
+			uart_rx_intr_enable(UART0);
+		}
+	}
+}
+
+u16 ICACHE_FLASH_ATTR UART_AsyncTxGetEmptySpace(void)
+{
+	return pTxBuffer->Space;
+}
+
+/**
+ * Schedule data to be sent
+ * @param pdata
+ * @param data_len - can be -1 for strlen
+ */
+void ICACHE_FLASH_ATTR
+UART_SendAsync(const char *pdata, int16_t data_len)
+{
+	u16 real_len = (u16) data_len;
+	if (data_len <= 0) real_len = (u16) strlen(pdata);
+
+//	if (pTxBuffer == NULL) {
+//		printf("init tx buf\n\r");
+//		pTxBuffer = UART_AsyncBufferInit(UART_TX_BUFFER_SIZE);
+//		if (pTxBuffer != NULL) {
+//			UART_WriteToAsyncBuffer(pTxBuffer, pdata, real_len);
+//		}
+//		else {
+//			printf("tx alloc fail\r\n");
+//		}
+//	}
+//	else {
+		if (real_len <= pTxBuffer->Space) {
+			UART_WriteToAsyncBuffer(pTxBuffer, pdata, real_len);
+		}
+		else {
+			UART_WriteChar(UART1, '^', 100);
+		}
+//	}
+
+	// Here we enable TX empty interrupt that will take care of sending the content
+	SET_PERI_REG_MASK(UART_CONF1(UART0), (UART_TX_EMPTY_THRESH_VAL & UART_TXFIFO_EMPTY_THRHD) << UART_TXFIFO_EMPTY_THRHD_S);
+	SET_PERI_REG_MASK(UART_INT_ENA(UART0), UART_TXFIFO_EMPTY_INT_ENA);
+}
+
+
+//--------------------------------
+static void UART_TxFifoEnq(struct UartBuffer *pTxBuff, uint8 data_len, uint8 uart_no)
+{
+	uint8 i;
+	for (i = 0; i < data_len; i++) {
+		WRITE_PERI_REG(UART_FIFO(uart_no), *(pTxBuff->pOutPos++));
+		if (pTxBuff->pOutPos == (pTxBuff->pUartBuff + pTxBuff->UartBuffSize)) {
+			pTxBuff->pOutPos = pTxBuff->pUartBuff;
+		}
+	}
+	pTxBuff->pOutPos = (pTxBuff->pUartBuff + (pTxBuff->pOutPos - pTxBuff->pUartBuff) % pTxBuff->UartBuffSize);
+	pTxBuff->Space += data_len;
+}
+
+volatile bool next_empty_it_only_for_notify = false;
+/******************************************************************************
+ * FunctionName : TxFromBuffer
+ * Description  : get data from the tx buffer and fill the uart tx fifo, co-work with the uart fifo empty interrupt
+ * Parameters   : uint8 uart_no - uart port num
+ * Returns      : NONE
+*******************************************************************************/
+void UART_DispatchFromTxBuffer(uint8 uart_no)
+{
+	const uint8 tx_fifo_len = (uint8) ((READ_PERI_REG(UART_STATUS(uart_no)) >> UART_TXFIFO_CNT_S) & UART_TXFIFO_CNT);
+	const uint8 fifo_remain = (uint8) (UART_FIFO_LEN - tx_fifo_len);
+	uint8 len_tmp;
+	uint16 data_len;
+
+//	if (pTxBuffer) {
+	data_len = (uint8) (pTxBuffer->UartBuffSize - pTxBuffer->Space);
+	if (data_len > fifo_remain) {
+		len_tmp = fifo_remain;
+		UART_TxFifoEnq(pTxBuffer, len_tmp, uart_no);
+		SET_PERI_REG_MASK(UART_INT_ENA(UART0), UART_TXFIFO_EMPTY_INT_ENA);
+	}
+	else {
+		len_tmp = (uint8) data_len;
+		UART_TxFifoEnq(pTxBuffer, len_tmp, uart_no);
+
+		// we get one more IT after fifo ends even if we have 0 more bytes
+		// for notify
+		if (next_empty_it_only_for_notify) {
+			notify_empty_txbuf();
+			next_empty_it_only_for_notify = 0;
+		} else {
+			// Done sending
+			next_empty_it_only_for_notify = 1;
+			SET_PERI_REG_MASK(UART_INT_ENA(UART0), UART_TXFIFO_EMPTY_INT_ENA);
+		}
+	}
+
+//	}
+//	else {
+//		error("pTxBuff null \n\r");
+//	}
+}

user/uart_buffer.h

@@ -0,0 +1,30 @@
+//
+// Created by MightyPork on 2017/08/24.
+//
+
+#ifndef ESP_VT100_FIRMWARE_UART_BUFFER_H
+#define ESP_VT100_FIRMWARE_UART_BUFFER_H
+
+#include <esp8266.h>
+
+// the init func
+void UART_AllocBuffers(void);
+
+// read from rx buffer
+uint16 UART_ReadAsync(char *pdata, uint16 data_len);
+
+// write to tx buffer
+void UART_SendAsync(const char *pdata, int16_t data_len);
+
+//move data from uart fifo to rx buffer
+void UART_RxFifoCollect(void);
+//move data from uart tx buffer to fifo
+void UART_DispatchFromTxBuffer(uint8 uart_no);
+
+u16 UART_AsyncRxCount(void);
+
+u16 UART_AsyncTxGetEmptySpace(void);
+
+extern void __attribute__((weak)) notify_empty_txbuf(void);
+
+#endif //ESP_VT100_FIRMWARE_UART_BUFFER_H

user/uart_driver.c

@@ -84,7 +84,7 @@ bool ICACHE_FLASH_ATTR UART_CheckOutputFinished(UARTn uart_no, uint32 time_out_u
 	uint8 tx_fifo_len;
 
 	while (1) {
-		tx_fifo_len = UART_TxQueLen(uart_no);
+		tx_fifo_len = UART_TxFifoCount(uart_no);
 
 		// TODO If using output circbuf, check if empty
 
@@ -162,7 +162,7 @@ STATUS UART_WriteChar(UARTn uart_no, uint8 c, uint32 timeout_us)
 	uint32 t_s = system_get_time();
 
 	while ((system_get_time() - t_s) < timeout_us) {
-		uint8 fifo_cnt = UART_TxQueLen(uart_no);
+		uint8 fifo_cnt = UART_TxFifoCount(uart_no);
 
 		if (fifo_cnt < UART_TX_FULL_THRESH_VAL) {
 			WRITE_PERI_REG(UART_FIFO(uart_no), c);

user/uart_driver.h

@@ -172,8 +172,8 @@ extern UartDevice UartDev;
 //==============================================
 
 // FIFO used count
-#define UART_TxQueLen(uart_no) ((READ_PERI_REG(UART_STATUS((uart_no))) >> UART_TXFIFO_CNT_S) & UART_TXFIFO_CNT)
-#define UART_RxQueLen(uart_no) ((READ_PERI_REG(UART_STATUS((uart_no))) >> UART_RXFIFO_CNT_S) & UART_RXFIFO_CNT)
+#define UART_TxFifoCount(uart_no) ((READ_PERI_REG(UART_STATUS((uart_no))) >> UART_TXFIFO_CNT_S) & UART_TXFIFO_CNT)
+#define UART_RxFifoCount(uart_no) ((READ_PERI_REG(UART_STATUS((uart_no))) >> UART_RXFIFO_CNT_S) & UART_RXFIFO_CNT)
 
 STATUS UART_WriteCharCRLF(UARTn uart_no, uint8 c, uint32 timeout_us);
 STATUS UART_WriteChar(UARTn uart_no, uint8 c, uint32 timeout_us);