Update xterm to latest version

packages.json

@@ -455,8 +455,8 @@
 		"description": "https://raw.githubusercontent.com/lxsang/antosdk-apps/2.0.x/vTerm/README.md",
 		"category": "System",
 		"author": "Xuan Sang LE",
-		"version": "0.1.18-a",
+		"version": "0.1.19-a",
-		"dependencies": ["Antunnel@0.2.1-b","xTerm@4.8.1-r"],
+		"dependencies": ["Antunnel@0.2.1-b","xTerm@5.1.0-r"],
 		"download": "https://raw.githubusercontent.com/lxsang/antosdk-apps/2.0.x/vTerm/build/release/vTerm.zip"
 	},
 	{
@@ -465,7 +465,7 @@
 		"description": "https://raw.githubusercontent.com/lxsang/antosdk-apps/2.0.x/xTerm/README.md",
 		"category": "Library",
 		"author": "",
-		"version": "4.8.1-r",
+		"version": "5.1.0-r",
 		"dependencies": [],
 		"download": "https://raw.githubusercontent.com/lxsang/antosdk-apps/2.0.x/xTerm/build/release/xTerm.zip"
 	}

vTerm/README.md

@@ -12,6 +12,7 @@ VTerm depends on the server side **tunnel** plugin and the AntOS **Antunnel**
 client side package
 
 ## Change logs
+- v0.1.19-a Use the new xterm.js libraries v5.1.0
 - v0.1.18-a support AntOS v2.0.x
 - v0.1.17-a update dependencies to latest
 - v0.1.16-a fix incorrect control command

vTerm/build/debug/README.md

@@ -12,6 +12,7 @@ VTerm depends on the server side **tunnel** plugin and the AntOS **Antunnel**
 client side package
 
 ## Change logs
+- v0.1.19-a Use the new xterm.js libraries v5.1.0
 - v0.1.18-a support AntOS v2.0.x
 - v0.1.17-a update dependencies to latest
 - v0.1.16-a fix incorrect control command

vTerm/build/debug/package.json

@@ -7,13 +7,13 @@
         "author": "Xuan Sang LE",
         "email": "xsang.le@gmail.com"
     },
-    "version":"0.1.18-a",
+    "version":"0.1.19-a",
     "category":"System",
     "iconclass":"bi bi-terminal-fill",
     "mimes":["none"],
     "dependencies": [
         "Antunnel@0.2.1-b",
-        "xTerm@4.8.1-r"
+        "xTerm@5.1.0-r"
     ],
     "locales":{
         "fr_FR": {

vTerm/package.json

@@ -7,13 +7,13 @@
         "author": "Xuan Sang LE",
         "email": "xsang.le@gmail.com"
     },
-    "version":"0.1.18-a",
+    "version":"0.1.19-a",
     "category":"System",
     "iconclass":"bi bi-terminal-fill",
     "mimes":["none"],
     "dependencies": [
         "Antunnel@0.2.1-b",
-        "xTerm@4.8.1-r"
+        "xTerm@5.1.0-r"
     ],
     "locales":{
         "fr_FR": {

xTerm/build.json

@@ -0,0 +1,73 @@
+{
+    "name": "xTerm",
+    "targets": {
+        "init": {
+            "jobs": [
+                {
+                    "name": "vfs-mkdir",
+                    "data": [
+                        "build",
+                        "build/debug",
+                        "build/release"
+                    ]
+                }
+            ]
+        },
+        "cat": {
+            "jobs": [
+                {
+                    "name": "vfs-cat",
+                    "data": {
+                        "src": [
+                            "xterm-addon-fit.js",
+                            "xterm.js"
+                        ],
+                        "dest": "build/debug/main.js"
+                    }
+                },
+                {
+                    "name": "vfs-cat",
+                    "data": {
+                        "src": [
+                            "xterm.css"
+                        ],
+                        "dest": "build/debug/main.css"
+                    }
+                }
+            ]
+        },
+        "copy": {
+            "jobs": [
+                {
+                    "name": "vfs-cp",
+                    "data": {
+                        "src": [
+                            "package.json",
+                            "README.md"
+                        ],
+                        "dest": "build/debug"
+                    }
+                }
+            ]
+        },
+        "release": {
+            "require": [
+                "zip"
+            ],
+            "depend": [
+                "init",
+                "cat",
+                "copy"
+            ],
+            "jobs": [
+                {
+                    "name": "zip-mk",
+                    "data": {
+                        "src": "build/debug",
+                        "dest": "build/release/xTerm.zip"
+                    }
+                }
+            ]
+        }
+    }
+}

xTerm/build/debug/main.css

@@ -37,7 +37,7 @@
  */
 
 .xterm {
-    font-feature-settings: "liga" 0;
+    cursor: text;
     position: relative;
     user-select: none;
     -ms-user-select: none;
@@ -60,10 +60,10 @@
 }
 
 .xterm .xterm-helper-textarea {
-    /*
+    padding: 0;
-     * HACK: to fix IE's blinking cursor
+    border: 0;
-     * Move textarea out of the screen to the far left, so that the cursor is not visible.
+    margin: 0;
-     */
+    /* Move textarea out of the screen to the far left, so that the cursor is not visible */
     position: absolute;
     opacity: 0;
     left: -9999em;
@@ -126,15 +126,12 @@
     line-height: normal;
 }
 
-.xterm {
-    cursor: text;
-}
-
 .xterm.enable-mouse-events {
     /* When mouse events are enabled (eg. tmux), revert to the standard pointer cursor */
     cursor: default;
 }
 
+.xterm.xterm-cursor-pointer,
 .xterm .xterm-cursor-pointer {
     cursor: pointer;
 }
@@ -150,7 +147,6 @@
     left: 0;
     top: 0;
     bottom: 0;
-    right: 0;
     z-index: 10;
     color: transparent;
 }
@@ -167,6 +163,30 @@
     opacity: 0.5;
 }
 
-.xterm-underline {
+.xterm-underline-1 { text-decoration: underline; }
-    text-decoration: underline;
+.xterm-underline-2 { text-decoration: double underline; }
+.xterm-underline-3 { text-decoration: wavy underline; }
+.xterm-underline-4 { text-decoration: dotted underline; }
+.xterm-underline-5 { text-decoration: dashed underline; }
+
+.xterm-strikethrough {
+    text-decoration: line-through;
+}
+
+.xterm-screen .xterm-decoration-container .xterm-decoration {
+	z-index: 6;
+	position: absolute;
+}
+
+.xterm-decoration-overview-ruler {
+    z-index: 7;
+    position: absolute;
+    top: 0;
+    right: 0;
+    pointer-events: none;
+}
+
+.xterm-decoration-top {
+    z-index: 2;
+    position: relative;
 }

xTerm/build/debug/package.json

@@ -6,7 +6,7 @@
         "author": "",
         "email": ""
     },
-    "version":"4.8.1-r",
+    "version":"5.1.0-r",
     "category":"Library",
     "iconclass":"fa fa-cog",
     "mimes":["none"],

xTerm/package.json

@@ -6,7 +6,7 @@
         "author": "",
         "email": ""
     },
-    "version":"4.8.1-r",
+    "version":"5.1.0-r",
     "category":"Library",
     "iconclass":"fa fa-cog",
     "mimes":["none"],

xTerm/xterm-addon-fit.js

@@ -1,2 +1,2 @@
-!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports.FitAddon=t():e.FitAddon=t()}(window,(function(){return function(e){var t={};function r(n){if(t[n])return t[n].exports;var o=t[n]={i:n,l:!1,exports:{}};return e[n].call(o.exports,o,o.exports,r),o.l=!0,o.exports}return r.m=e,r.c=t,r.d=function(e,t,n){r.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:n})},r.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},r.t=function(e,t){if(1&t&&(e=r(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(r.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)r.d(n,o,function(t){return e[t]}.bind(null,o));return n},r.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(t,"a",t),t},r.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},r.p="",r(r.s=0)}([function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.FitAddon=void 0;var n=function(){function e(){}return e.prototype.activate=function(e){this._terminal=e},e.prototype.dispose=function(){},e.prototype.fit=function(){var e=this.proposeDimensions();if(e&&this._terminal){var t=this._terminal._core;this._terminal.rows===e.rows&&this._terminal.cols===e.cols||(t._renderService.clear(),this._terminal.resize(e.cols,e.rows))}},e.prototype.proposeDimensions=function(){if(this._terminal&&this._terminal.element&&this._terminal.element.parentElement){var e=this._terminal._core,t=window.getComputedStyle(this._terminal.element.parentElement),r=parseInt(t.getPropertyValue("height")),n=Math.max(0,parseInt(t.getPropertyValue("width"))),o=window.getComputedStyle(this._terminal.element),i=r-(parseInt(o.getPropertyValue("padding-top"))+parseInt(o.getPropertyValue("padding-bottom"))),a=n-(parseInt(o.getPropertyValue("padding-right"))+parseInt(o.getPropertyValue("padding-left")))-e.viewport.scrollBarWidth;return{cols:Math.max(2,Math.floor(a/e._renderService.dimensions.actualCellWidth)),rows:Math.max(1,Math.floor(i/e._renderService.dimensions.actualCellHeight))}}},e}();t.FitAddon=n}])}));
+!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports.FitAddon=t():e.FitAddon=t()}(self,(function(){return(()=>{"use strict";var e={};return(()=>{var t=e;Object.defineProperty(t,"__esModule",{value:!0}),t.FitAddon=void 0,t.FitAddon=class{constructor(){}activate(e){this._terminal=e}dispose(){}fit(){const e=this.proposeDimensions();if(!e||!this._terminal||isNaN(e.cols)||isNaN(e.rows))return;const t=this._terminal._core;this._terminal.rows===e.rows&&this._terminal.cols===e.cols||(t._renderService.clear(),this._terminal.resize(e.cols,e.rows))}proposeDimensions(){if(!this._terminal)return;if(!this._terminal.element||!this._terminal.element.parentElement)return;const e=this._terminal._core,t=e._renderService.dimensions;if(0===t.css.cell.width||0===t.css.cell.height)return;const r=0===this._terminal.options.scrollback?0:e.viewport.scrollBarWidth,i=window.getComputedStyle(this._terminal.element.parentElement),o=parseInt(i.getPropertyValue("height")),s=Math.max(0,parseInt(i.getPropertyValue("width"))),n=window.getComputedStyle(this._terminal.element),l=o-(parseInt(n.getPropertyValue("padding-top"))+parseInt(n.getPropertyValue("padding-bottom"))),a=s-(parseInt(n.getPropertyValue("padding-right"))+parseInt(n.getPropertyValue("padding-left")))-r;return{cols:Math.max(2,Math.floor(a/t.css.cell.width)),rows:Math.max(1,Math.floor(l/t.css.cell.height))}}}})(),e})()}));
 //# sourceMappingURL=xterm-addon-fit.js.map

xTerm/xterm.css

@@ -36,7 +36,7 @@
  */
 
 .xterm {
-    font-feature-settings: "liga" 0;
+    cursor: text;
     position: relative;
     user-select: none;
     -ms-user-select: none;
@@ -59,10 +59,10 @@
 }
 
 .xterm .xterm-helper-textarea {
-    /*
+    padding: 0;
-     * HACK: to fix IE's blinking cursor
+    border: 0;
-     * Move textarea out of the screen to the far left, so that the cursor is not visible.
+    margin: 0;
-     */
+    /* Move textarea out of the screen to the far left, so that the cursor is not visible */
     position: absolute;
     opacity: 0;
     left: -9999em;
@@ -125,15 +125,12 @@
     line-height: normal;
 }
 
-.xterm {
-    cursor: text;
-}
-
 .xterm.enable-mouse-events {
     /* When mouse events are enabled (eg. tmux), revert to the standard pointer cursor */
     cursor: default;
 }
 
+.xterm.xterm-cursor-pointer,
 .xterm .xterm-cursor-pointer {
     cursor: pointer;
 }
@@ -149,7 +146,6 @@
     left: 0;
     top: 0;
     bottom: 0;
-    right: 0;
     z-index: 10;
     color: transparent;
 }
@@ -166,6 +162,30 @@
     opacity: 0.5;
 }
 
-.xterm-underline {
+.xterm-underline-1 { text-decoration: underline; }
-    text-decoration: underline;
+.xterm-underline-2 { text-decoration: double underline; }
+.xterm-underline-3 { text-decoration: wavy underline; }
+.xterm-underline-4 { text-decoration: dotted underline; }
+.xterm-underline-5 { text-decoration: dashed underline; }
+
+.xterm-strikethrough {
+    text-decoration: line-through;
+}
+
+.xterm-screen .xterm-decoration-container .xterm-decoration {
+	z-index: 6;
+	position: absolute;
+}
+
+.xterm-decoration-overview-ruler {
+    z-index: 7;
+    position: absolute;
+    top: 0;
+    right: 0;
+    pointer-events: none;
+}
+
+.xterm-decoration-top {
+    z-index: 2;
+    position: relative;
 }