From ccace2ce81e729a31c0450f455d89f6990ae8e18 Mon Sep 17 00:00:00 2001
From: iliajie <gpg@ilia.engineer>
Date: Mon, 31 Oct 2022 16:25:50 +0200
Subject: [PATCH 01/12] Add config option to make bash prompt look nice (user
 dependent)

---
 xterm/index.cgi | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/xterm/index.cgi b/xterm/index.cgi
index a738977c8..df9693a64 100644
--- a/xterm/index.cgi
+++ b/xterm/index.cgi
@@ -186,6 +186,26 @@ if ($user eq "root" && $in{'user'}) {
 	$user = $in{'user'};
 	}
 
+# Terminal flavors
+my ($ps1, $term_flavors);
+if ($config{'flavors'}) {
+	# Optionally add colors to the prompt depending on the user type
+	if ($user eq "root") {
+		# magenta@blue ~# (for root)
+		$ps1 = "PS1='\\\\[\\\\033[1;35m\\\\]\\\\u\\\\[\\\\033[1;37m\\\\]".
+               "@\\\\[\\\\033[1;34m\\\\]\\\\h:\\\\[\\\\033[1;37m\\\\]".
+               "\\\\w\\\\[\\\\033[1;37m\\\\]\\\\\$\\\\[\\\\033[0m\\\\] '";
+		}
+	else {
+		# green@blue ~$ (for regular users)
+		$ps1 = "PS1='\\\\[\\\\033[1;32m\\\\]\\\\u\\\\[\\\\033[1;37m\\\\]".
+               "@\\\\[\\\\033[1;34m\\\\]\\\\h:\\\\[\\\\033[1;37m\\\\]".
+               "\\\\w\\\\[\\\\033[1;37m\\\\]\\\\\$\\\\[\\\\033[0m\\\\] '";
+		}
+	$term_flavors = "socket.send(\"alias ls='ls --color=auto'\\r\"); ".
+                    "socket.send(\"$ps1\\r\");";
+	}
+
 # Check for directory to start the shell in
 my $dir = $in{'dir'};
 
@@ -217,6 +237,7 @@ my $term_script = <<EOF;
 		term.loadAddon(attachAddon);
 		term.open(termcont);
 		term.focus();
+		$term_flavors
 		socket.send('clear\\r');
 	};
 	socket.onerror = function() {

From 8c2ae5629881bc291bcebbff9fe951db4822b61f Mon Sep 17 00:00:00 2001
From: iliajie <gpg@ilia.engineer>
Date: Mon, 31 Oct 2022 16:26:49 +0200
Subject: [PATCH 02/12] Add actual config option

---
 xterm/config      | 1 +
 xterm/config.info | 1 +
 2 files changed, 2 insertions(+)

diff --git a/xterm/config b/xterm/config
index a14fe8590..7fa735415 100644
--- a/xterm/config
+++ b/xterm/config
@@ -1 +1,2 @@
 base_port=555
+flavors=1
\ No newline at end of file
diff --git a/xterm/config.info b/xterm/config.info
index c153edef2..440521e9c 100644
--- a/xterm/config.info
+++ b/xterm/config.info
@@ -1,2 +1,3 @@
 base_port=Base port number for WebSockets connections,0,5
 size=Terminal width and height in characters,3,Automatic,5,,,Static (80x24)
+flavors=Enable inbuilt command prompt color customization,1,1-Yes,0-No

From bf745995027c9ac688065f778412285fc1dd168e Mon Sep 17 00:00:00 2001
From: iliajie <gpg@ilia.engineer>
Date: Mon, 31 Oct 2022 16:27:10 +0200
Subject: [PATCH 03/12] Add much smoother terminal initial load

---
 xterm/index.cgi | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/xterm/index.cgi b/xterm/index.cgi
index df9693a64..d74038af5 100644
--- a/xterm/index.cgi
+++ b/xterm/index.cgi
@@ -113,6 +113,19 @@ body[style='height:100%'] {
 #terminal + script ~ * {
 	display: none
 }
+#terminal > .terminal {
+	visibility: hidden;
+	animation: .15s fadeIn;
+	animation-fill-mode: forwards;
+}
+\@keyframes fadeIn {
+  99% {
+    visibility: hidden;
+  }
+  100% {
+    visibility: visible;
+  }
+}
 
 EOF
 

From 1a296d9579beffe8e66c108e53bcdcb0ecfd3049 Mon Sep 17 00:00:00 2001
From: iliajie <gpg@ilia.engineer>
Date: Mon, 31 Oct 2022 16:29:58 +0200
Subject: [PATCH 04/12] Fix to tell SPA themes what's up

---
 xterm/index.cgi | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/xterm/index.cgi b/xterm/index.cgi
index d74038af5..68a636dc0 100644
--- a/xterm/index.cgi
+++ b/xterm/index.cgi
@@ -270,11 +270,13 @@ print "<script>\n";
 if ($xmlhr) {
 	print "var xterm_argv = ".
 	      &convert_to_json(
-			{ 'files' => $termlinks,
-			  'cols' => $env_cols,
-			  'rows' => $env_rows,
-			  'port' => $port,
-			  'socket_url' => $url });
+			{ 'conf'  => \%config,
+              'files' => $termlinks,
+              'socket_url' => $url,
+              'port'  => $port,
+              'cols'  => $env_cols,
+              'rows'  => $env_rows,
+              'ps1'   => $ps1 });
 	}
 else {
 	print $term_script;

From c6419a471ed5e3136eadfa11220107c9e14836d1 Mon Sep 17 00:00:00 2001
From: iliajie <gpg@ilia.engineer>
Date: Mon, 31 Oct 2022 16:45:54 +0200
Subject: [PATCH 05/12] Fix not to store init commands in history

---
 xterm/index.cgi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/xterm/index.cgi b/xterm/index.cgi
index 68a636dc0..04c0d8282 100644
--- a/xterm/index.cgi
+++ b/xterm/index.cgi
@@ -215,8 +215,8 @@ if ($config{'flavors'}) {
                "@\\\\[\\\\033[1;34m\\\\]\\\\h:\\\\[\\\\033[1;37m\\\\]".
                "\\\\w\\\\[\\\\033[1;37m\\\\]\\\\\$\\\\[\\\\033[0m\\\\] '";
 		}
-	$term_flavors = "socket.send(\"alias ls='ls --color=auto'\\r\"); ".
-                    "socket.send(\"$ps1\\r\");";
+	$term_flavors = "socket.send(\" alias ls='ls --color=auto'\\r\"); ".
+                    "socket.send(\" $ps1\\r\");";
 	}
 
 # Check for directory to start the shell in
@@ -251,7 +251,7 @@ my $term_script = <<EOF;
 		term.open(termcont);
 		term.focus();
 		$term_flavors
-		socket.send('clear\\r');
+		socket.send(' clear\\r');
 	};
 	socket.onerror = function() {
 		termcont.innerHTML = '<tt style="color: \#ff0000">Error: ' +

From fa0fcf52c178acb36ef1d579890d880ae4fad99d Mon Sep 17 00:00:00 2001
From: iliajie <gpg@ilia.engineer>
Date: Mon, 31 Oct 2022 17:06:40 +0200
Subject: [PATCH 06/12] Fix to make sure skipping command history works

---
 xterm/index.cgi | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/xterm/index.cgi b/xterm/index.cgi
index 04c0d8282..832676c0f 100644
--- a/xterm/index.cgi
+++ b/xterm/index.cgi
@@ -202,6 +202,8 @@ if ($user eq "root" && $in{'user'}) {
 # Terminal flavors
 my ($ps1, $term_flavors);
 if ($config{'flavors'}) {
+
+	$ENV{'HISTCONTROL'} = 'ignoredups:ignorespace';
 	# Optionally add colors to the prompt depending on the user type
 	if ($user eq "root") {
 		# magenta@blue ~# (for root)

From 41f6eaf1f1d6ed60446762f286f4afde4d87057f Mon Sep 17 00:00:00 2001
From: iliajie <gpg@ilia.engineer>
Date: Mon, 31 Oct 2022 17:15:24 +0200
Subject: [PATCH 07/12] Fix to send commands in a list to the theme

---
 xterm/index.cgi | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/xterm/index.cgi b/xterm/index.cgi
index 832676c0f..5ec803a15 100644
--- a/xterm/index.cgi
+++ b/xterm/index.cgi
@@ -200,25 +200,29 @@ if ($user eq "root" && $in{'user'}) {
 	}
 
 # Terminal flavors
-my ($ps1, $term_flavors);
+my (@cmds, $term_flavors);
 if ($config{'flavors'}) {
 
 	$ENV{'HISTCONTROL'} = 'ignoredups:ignorespace';
+
+	my ($cmd_lsalias, $cmd_ps1) = ("alias ls='ls --color=auto'");
+
 	# Optionally add colors to the prompt depending on the user type
 	if ($user eq "root") {
 		# magenta@blue ~# (for root)
-		$ps1 = "PS1='\\\\[\\\\033[1;35m\\\\]\\\\u\\\\[\\\\033[1;37m\\\\]".
-               "@\\\\[\\\\033[1;34m\\\\]\\\\h:\\\\[\\\\033[1;37m\\\\]".
-               "\\\\w\\\\[\\\\033[1;37m\\\\]\\\\\$\\\\[\\\\033[0m\\\\] '";
+		$cmd_ps1 = "PS1='\\\\[\\\\033[1;35m\\\\]\\\\u\\\\[\\\\033[1;37m\\\\]".
+                   "@\\\\[\\\\033[1;34m\\\\]\\\\h:\\\\[\\\\033[1;37m\\\\]".
+                   "\\\\w\\\\[\\\\033[1;37m\\\\]\\\\\$\\\\[\\\\033[0m\\\\] '";
 		}
 	else {
 		# green@blue ~$ (for regular users)
-		$ps1 = "PS1='\\\\[\\\\033[1;32m\\\\]\\\\u\\\\[\\\\033[1;37m\\\\]".
-               "@\\\\[\\\\033[1;34m\\\\]\\\\h:\\\\[\\\\033[1;37m\\\\]".
-               "\\\\w\\\\[\\\\033[1;37m\\\\]\\\\\$\\\\[\\\\033[0m\\\\] '";
+		$cmd_ps1 = "PS1='\\\\[\\\\033[1;32m\\\\]\\\\u\\\\[\\\\033[1;37m\\\\]".
+                   "@\\\\[\\\\033[1;34m\\\\]\\\\h:\\\\[\\\\033[1;37m\\\\]".
+                   "\\\\w\\\\[\\\\033[1;37m\\\\]\\\\\$\\\\[\\\\033[0m\\\\] '";
 		}
-	$term_flavors = "socket.send(\" alias ls='ls --color=auto'\\r\"); ".
-                    "socket.send(\" $ps1\\r\");";
+	$term_flavors = "socket.send(\" $cmd_lsalias\\r\"); ".
+                    "socket.send(\" $cmd_ps1\\r\");";
+    push(@cmds, $cmd_ps1, $cmd_lsalias);
 	}
 
 # Check for directory to start the shell in
@@ -271,14 +275,14 @@ EOF
 print "<script>\n";
 if ($xmlhr) {
 	print "var xterm_argv = ".
-	      &convert_to_json(
-			{ 'conf'  => \%config,
+          &convert_to_json(
+            { 'conf'  => \%config,
               'files' => $termlinks,
               'socket_url' => $url,
               'port'  => $port,
               'cols'  => $env_cols,
               'rows'  => $env_rows,
-              'ps1'   => $ps1 });
+              'cmds'  => \@cmds });
 	}
 else {
 	print $term_script;

From f144517e6cfef6c576846806ba96ff51c97067a0 Mon Sep 17 00:00:00 2001
From: iliajie <gpg@ilia.engineer>
Date: Mon, 31 Oct 2022 17:45:26 +0200
Subject: [PATCH 08/12] Fix `HISTCONTROL` always be called as we use `clear`
 command uncond

---
 xterm/index.cgi | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/xterm/index.cgi b/xterm/index.cgi
index 5ec803a15..15c831b2d 100644
--- a/xterm/index.cgi
+++ b/xterm/index.cgi
@@ -202,9 +202,6 @@ if ($user eq "root" && $in{'user'}) {
 # Terminal flavors
 my (@cmds, $term_flavors);
 if ($config{'flavors'}) {
-
-	$ENV{'HISTCONTROL'} = 'ignoredups:ignorespace';
-
 	my ($cmd_lsalias, $cmd_ps1) = ("alias ls='ls --color=auto'");
 
 	# Optionally add colors to the prompt depending on the user type
@@ -236,6 +233,7 @@ if (!-r $shellserver_cmd) {
 	}
 defined(getpwnam($user)) || &error(&text('index_euser', &html_escape($user)));
 my $tmpdir = &tempname_dir();
+$ENV{'HISTCONTROL'} = 'ignoredups:ignorespace';
 $ENV{'SESSION_ID'} = $main::session_id;
 &system_logged($shellserver_cmd." ".quotemeta($port)." ".quotemeta($user).
 	       ($dir ? " ".quotemeta($dir) : "").

From 027578312a43ee0c55a1cbc070a4ae09b800d43b Mon Sep 17 00:00:00 2001
From: iliajie <gpg@ilia.engineer>
Date: Mon, 31 Oct 2022 22:21:53 +0200
Subject: [PATCH 09/12] Fix to make sure that feature is available by default
 (server owners)

---
 xterm/config      | 2 +-
 xterm/config.info | 2 +-
 xterm/index.cgi   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/xterm/config b/xterm/config
index 7fa735415..4e3c6bf2d 100644
--- a/xterm/config
+++ b/xterm/config
@@ -1,2 +1,2 @@
 base_port=555
-flavors=1
\ No newline at end of file
+noflavors=0
\ No newline at end of file
diff --git a/xterm/config.info b/xterm/config.info
index 440521e9c..fec2dc3c4 100644
--- a/xterm/config.info
+++ b/xterm/config.info
@@ -1,3 +1,3 @@
 base_port=Base port number for WebSockets connections,0,5
 size=Terminal width and height in characters,3,Automatic,5,,,Static (80x24)
-flavors=Enable inbuilt command prompt color customization,1,1-Yes,0-No
+noflavors=Disable inbuilt command prompt color customization,1,1-Yes,0-No
diff --git a/xterm/index.cgi b/xterm/index.cgi
index 15c831b2d..19f75b3cf 100644
--- a/xterm/index.cgi
+++ b/xterm/index.cgi
@@ -201,7 +201,7 @@ if ($user eq "root" && $in{'user'}) {
 
 # Terminal flavors
 my (@cmds, $term_flavors);
-if ($config{'flavors'}) {
+if (!$config{'noflavors'}) {
 	my ($cmd_lsalias, $cmd_ps1) = ("alias ls='ls --color=auto'");
 
 	# Optionally add colors to the prompt depending on the user type

From f2687a20d1e2390d12cf9d9618a37837c6bd7634 Mon Sep 17 00:00:00 2001
From: iliajie <gpg@ilia.engineer>
Date: Mon, 31 Oct 2022 23:17:23 +0200
Subject: [PATCH 10/12] Revert "Fix to make sure that feature is available by
 default (server owners)"

This reverts commit 027578312a43ee0c55a1cbc070a4ae09b800d43b.
---
 xterm/config      | 2 +-
 xterm/config.info | 2 +-
 xterm/index.cgi   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/xterm/config b/xterm/config
index 4e3c6bf2d..7fa735415 100644
--- a/xterm/config
+++ b/xterm/config
@@ -1,2 +1,2 @@
 base_port=555
-noflavors=0
\ No newline at end of file
+flavors=1
\ No newline at end of file
diff --git a/xterm/config.info b/xterm/config.info
index fec2dc3c4..440521e9c 100644
--- a/xterm/config.info
+++ b/xterm/config.info
@@ -1,3 +1,3 @@
 base_port=Base port number for WebSockets connections,0,5
 size=Terminal width and height in characters,3,Automatic,5,,,Static (80x24)
-noflavors=Disable inbuilt command prompt color customization,1,1-Yes,0-No
+flavors=Enable inbuilt command prompt color customization,1,1-Yes,0-No
diff --git a/xterm/index.cgi b/xterm/index.cgi
index 19f75b3cf..15c831b2d 100644
--- a/xterm/index.cgi
+++ b/xterm/index.cgi
@@ -201,7 +201,7 @@ if ($user eq "root" && $in{'user'}) {
 
 # Terminal flavors
 my (@cmds, $term_flavors);
-if (!$config{'noflavors'}) {
+if ($config{'flavors'}) {
 	my ($cmd_lsalias, $cmd_ps1) = ("alias ls='ls --color=auto'");
 
 	# Optionally add colors to the prompt depending on the user type

From 2e4d3c8ccfd99a8495c7ff2f0328e4128b7df9f7 Mon Sep 17 00:00:00 2001
From: iliajie <gpg@ilia.engineer>
Date: Mon, 31 Oct 2022 23:44:45 +0200
Subject: [PATCH 11/12] Fix to make it off by default

---
 xterm/config | 1 -
 1 file changed, 1 deletion(-)

diff --git a/xterm/config b/xterm/config
index 7fa735415..a14fe8590 100644
--- a/xterm/config
+++ b/xterm/config
@@ -1,2 +1 @@
 base_port=555
-flavors=1
\ No newline at end of file

From 1d414e15330c2f4ed928cb4d4d6837329edab8d0 Mon Sep 17 00:00:00 2001
From: iliajie <gpg@ilia.engineer>
Date: Mon, 31 Oct 2022 23:49:52 +0200
Subject: [PATCH 12/12] Fix to actually add an option with `0` value

---
 xterm/config | 1 +
 1 file changed, 1 insertion(+)

diff --git a/xterm/config b/xterm/config
index a14fe8590..25b687c4a 100644
--- a/xterm/config
+++ b/xterm/config
@@ -1 +1,2 @@
 base_port=555
+flavors=0
\ No newline at end of file