From 0b3cfe0e74553beea2a73718c46946ab650fd980 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Hru=C5=A1ka?= <ondra@ondrovo.com>
Date: Sat, 5 Aug 2017 23:56:35 +0200
Subject: [PATCH] use 0x01 for seps in labels string so users can use pipe if
 they want to

---
 html_orig/_debug_replacements.php |  3 ++-
 html_orig/js/app.js               |  2 +-
 html_orig/jssrc/term.js           |  2 +-
 html_orig/pages/term.php          |  2 +-
 user/cgi_main.c                   | 16 ++++------------
 user/screen.c                     |  2 +-
 6 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/html_orig/_debug_replacements.php b/html_orig/_debug_replacements.php
index 93fdf77..3ae5e3e 100644
--- a/html_orig/_debug_replacements.php
+++ b/html_orig/_debug_replacements.php
@@ -6,13 +6,14 @@
  * are given to JavaScript, to avoid syntax errors with %%
  */
 return [
-	'%term_title%' => 'ESP8266 Wireless Terminal',
+	'%term_title%' => 'ESPTerm local debug',
 
 	'%btn1%' => '1',
 	'%btn2%' => '2',
 	'%btn3%' => '3',
 	'%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', //,
 	/*'{
diff --git a/html_orig/js/app.js b/html_orig/js/app.js
index 3417498..838421a 100644
--- a/html_orig/js/app.js
+++ b/html_orig/js/app.js
@@ -1408,7 +1408,7 @@ var Screen = (function () {
 	}
 
 	function _load_labels(str) {
-		var pieces = str.split('|');
+		var pieces = str.split('\x01');
 		qs('h1').textContent = pieces[0];
 		qsa('#buttons button').forEach(function(x, i) {
 			var s = pieces[i+1].trim();
diff --git a/html_orig/jssrc/term.js b/html_orig/jssrc/term.js
index 3155c57..217e8ba 100644
--- a/html_orig/jssrc/term.js
+++ b/html_orig/jssrc/term.js
@@ -216,7 +216,7 @@ var Screen = (function () {
 	}
 
 	function _load_labels(str) {
-		var pieces = str.split('|');
+		var pieces = str.split('\x01');
 		qs('h1').textContent = pieces[0];
 		qsa('#buttons button').forEach(function(x, i) {
 			var s = pieces[i+1].trim();
diff --git a/html_orig/pages/term.php b/html_orig/pages/term.php
index f7507d1..9ba70c7 100644
--- a/html_orig/pages/term.php
+++ b/html_orig/pages/term.php
@@ -32,7 +32,7 @@
 </nav>
 
 <!-- this avoids having to escape quotes for JSON -->
-<span class="hidden" id="initial_data">T%term_title%|%btn1%|%btn2%|%btn3%|%btn4%|%btn5%</span>
+<span class="hidden" id="initial_data">%labels_seq%</span>
 
 <script>
 	try {
diff --git a/user/cgi_main.c b/user/cgi_main.c
index 7d70932..07b0024 100644
--- a/user/cgi_main.c
+++ b/user/cgi_main.c
@@ -22,24 +22,16 @@ httpd_cgi_state ICACHE_FLASH_ATTR tplScreen(HttpdConnData *connData, char *token
 		return HTTPD_CGI_DONE;
 	}
 
-	char buff[100];
-	char buff2[10];
+	char buff[150];
 
-	if (streq(token, "term_title")) {
-		httpdSend(connData, termconf_scratch.title, -1);
+	if (streq(token, "labels_seq")) {
+		screenSerializeLabelsToBuffer(buff, 150);
+		httpdSend(connData, buff, -1);
 	}
 	else if (streq(token, "theme")) {
 		sprintf(buff, "%d", termconf->theme);
 		httpdSend(connData, buff, -1);
 	}
-	else {
-		for (int i = 1; i <= 5; i++) {
-			sprintf(buff2, "btn%d", i);
-			if (streq(token, buff2)) {
-				httpdSend(connData, termconf_scratch.btn[i-1], -1);
-			}
-		}
-	}
 
 	return HTTPD_CGI_DONE;
 }
diff --git a/user/screen.c b/user/screen.c
index dfb5af5..88e023e 100644
--- a/user/screen.c
+++ b/user/screen.c
@@ -683,7 +683,7 @@ void ICACHE_FLASH_ATTR
 screenSerializeLabelsToBuffer(char *buffer, size_t buf_len)
 {
 	// let's just assume it's long enough - called with the huge websocket buffer
-	sprintf(buffer, "T%s|%s|%s|%s|%s|%s",
+	sprintf(buffer, "T%s\x01%s\x01%s\x01%s\x01%s\x01%s", // use 0x01 as separator
 			termconf_scratch.title,
 			termconf_scratch.btn[0],
 			termconf_scratch.btn[1],