character read fixes, but not complete. Continuing testing...

Author: nikitaeverywhere

classes/%WebTerminal.Engine.cls

@@ -163,30 +163,36 @@ wstr(s)
     do ##class(%Device).ReDirectIO($$$NO)
     do WriteMessage("O#"_s)
     do ##class(%Device).ReDirectIO($$$YES)
+    set $X = $X + $LENGTH(s)
     quit
 
 wchr(c) 
     do ##class(%Device).ReDirectIO($$$NO)
     do WriteMessage("O#"_$c(c))
     do ##class(%Device).ReDirectIO($$$YES)
+    set $X = $X + 1
     quit
 
 wnl 
     do ##class(%Device).ReDirectIO($$$NO)
     do WriteMessage("O#"_$c(13, 10))
     do ##class(%Device).ReDirectIO($$$YES)
+    set $X = 0
     quit
 
 wff 
     do ##class(%Device).ReDirectIO($$$NO)
     do WriteMessage("CLRSCR#")
     do ##class(%Device).ReDirectIO($$$YES)
+    set $Y = 0
+    set $X = 0
     quit
 
 wtab(s)
     do ##class(%Device).ReDirectIO($$$NO)
     do WriteMessage("O#" _ $C(27) _ "[" _ (s + 1) _ "G")
     do ##class(%Device).ReDirectIO($$$YES)
+    set $X = s
     quit
 
 rstr(len = 32656, timeout = 86400, data)
@@ -199,8 +205,8 @@ rstr(len = 32656, timeout = 86400, data)
 rchr(timeout = 86400, data)
     do ##class(%Device).ReDirectIO($$$NO)
     do WriteMessage("RC#")
-    set data = $$ReadMessage(1, timeout)
-    set data = $ASCII($EXTRACT(data,1,1))
+    set data = $$ReadMessage(, timeout)
+    set data = data * 1 // $ASCII($EXTRACT(data,1,1))
     do ##class(%Device).ReDirectIO($$$YES)
     quit data
 }
@@ -397,10 +403,15 @@ ClassMethod getGlobalsJSON(namespace As %String) As %String
         set out = out _ """" _ $Piece(rset.GetData(1),"(",1) _ """:0,"
     }
     set out = $EXTRACT(out,1,$LENGTH(out)-1) _ "}"
+    
+    // todo:
+    // Set Rset = ##class(%Library.ResultSet).%New("%SYS.GlobalQuery:NameSpaceListChui")
+    // s Status=Rset.Execute(NameSpace,Mask,SystemGlobals,.UnavailableDatabases)
+    
     q out
 }
 
-/// Generates autocomplete file for namespace. Second parameter deсides if
+/// Generates autocomplete file for namespace. Second parameter decides if
 /// it will be regenerated again. But if namespace equals to "%" - generates
 /// autocomplete file for system classes. Make sure that autocomplete for
 /// system classes generates one time and forever.
@@ -851,7 +862,10 @@ Method Server() As %Status
         do ..SendData("1", ..ConstClientAuthorizationStatus)
         do ..SendData(..CurrentNamespace, ..ConstClientChangeNamespace)
 
-        use $io::("^" _ ..InitialZName) // switch to routine
+        //open $io:(/NOXY:/BREAK):"^" _ ..InitialZName // switch to routine
+        use $io:(/NOXY:/BREAK):"^" _ ..InitialZName
+        //OPEN $IO:(80:"BFU":$CHAR(13)) // :"^" _ ..InitialZName
+        //USE $IO:(80:"BFU":$CHAR(13)):"^" _ ..InitialZName
         do ..ClientLoop()
 
     } else {

package.json

@@ -17,4 +17,4 @@
     "grunt-contrib-uglify": ">=0.5.1",
     "grunt-preprocess": ">=4.0.0"
   }
-}
+}

webSource/js/CacheWebTerminalServer.js

@@ -162,7 +162,7 @@ CacheWebTerminalServer.prototype.onError = function () {
     var _this = this;
 
     this.CONTROLLER.TERMINAL.output.print(
-        this._lc.get(6, this.socket.url, this.RECONNECTION_TIMEOUT/1000)
+        this._lc.get(6, this.socket.url, this.RECONNECTION_TIMEOUT/1000) + "\r\n"
     );
 
     setTimeout(function () {

webSource/js/TerminalController.js

@@ -525,7 +525,13 @@ TerminalController.prototype.clientAction = {
     },
 
     RC: function () {
-        this.TERMINAL.input.prompt("", 1);
+
+        var _this = this;
+
+        this.TERMINAL.input.getChar(function (char) {
+            _this.server.send(char);
+        });
+
     },
 
     AUTH: function (data) {

webSource/js/TerminalInput.js

@@ -65,6 +65,12 @@ var TerminalInput = function (TERMINAL) {
      */
     this._handler = null;
 
+    /**
+     * @type {boolean}
+     * @private
+     */
+    this.__readingChar = false;
+
     /**
      * Shows the input beginning position.
      *
@@ -416,4 +422,57 @@ TerminalInput.prototype.prompt = function (invitationMessage, length, handler) {
 
     this._enable();
 
+};
+
+/**
+ * Get character from keyboard. This works for all keys.
+ *
+ * @param {function} callback
+ */
+TerminalInput.prototype.getChar = function (callback) {
+
+    var _this = this,
+        shift = false;
+
+    if (this.__readingChar) return false;
+
+    this.__readingChar = true;
+
+    this.TERMINAL.progressIndicator.hide();
+
+    var listener = function (e) {
+
+        var code = e.keyCode,
+            char = String.fromCharCode(code);
+
+        if (code === 16) shift = true;
+        if (code === 16 || code === 17 || code === 18) return;
+
+        if (shift) {
+            char = char.toUpperCase();
+        } else {
+            char = char.toLowerCase();
+        }
+
+        _this.TERMINAL.output.print(char);
+
+        window.removeEventListener("keydown", listener, true);
+        window.removeEventListener("keyup", upListener, true);
+        e.preventDefault();
+        e.cancelBubble = true;
+
+        _this.__readingChar = false;
+        callback.call(_this, char.charCodeAt(0).toString());
+
+    };
+
+    var upListener = function (e) {
+
+        if (e.keyCode === 16) shift = false;
+
+    };
+
+    window.addEventListener("keydown", listener, true);
+    window.addEventListener("keyup", upListener, true);
+
 };