webssh

commit 4ae2a33654057311de94de017bf732fa656d61d3
parent e0cc20914bb657882200bcd3198491b624c5fb9f
Author: Sheng <webmaster0115@gmail.com>
Date:   Tue, 21 Aug 2018 10:52:14 +0800

Added resize_terminal function to wssh

Diffstat:
M
webssh/static/js/main.js
 | 
71
++++++++++++++++++++++++++++++++++++++++++++---------------------------

1 file changed, 44 insertions(+), 27 deletions(-)
diff --git a/webssh/static/js/main.js b/webssh/static/js/main.js
@@ -30,19 +30,10 @@ jQuery(function($){
   }
 
 
-  function resize_term(term, sock) {
-    var geometry = current_geometry(),
-        cols = geometry.cols,
-        rows = geometry.rows;
-    // console.log([cols, rows]);
-    // console.log(term.geometry);
-
-    if (cols !== term.geometry[0] || rows !== term.geometry[1]) {
-      console.log('resizing term');
-      term.resize(cols, rows);
-      sock.send(JSON.stringify({'resize': [cols, rows]}));
-    }
-  }
+  wssh.window_size = function() {
+    var geo = current_geometry();
+    console.log('Current window size: ' + geo.cols + ',' + geo.rows);
+  };
 
 
   function callback(msg) {
@@ -67,10 +58,15 @@ jQuery(function($){
 
     console.log(url);
     console.log('The deault encoding of your server is ' + encoding);
-    wssh.sock = sock;
-    wssh.term = term;
+    // wssh.sock = sock;
+    // wssh.term = term;
     var test_decoder;
 
+    function resize_terminal (term) {
+      var geometry = current_geometry();
+      term.on_resize(geometry.cols, geometry.rows);
+    }
+
     wssh.set_encoding = function (new_encoding) {
       try {
         test_decoder = new window.TextDecoder(new_encoding);
@@ -90,6 +86,34 @@ jQuery(function($){
       console.log('Reset encoding to ' + msg.encoding);
     };
 
+    wssh.resize_terminal = function (raw_cols, raw_rows) {
+      // for console use
+      var cols = parseInt(raw_cols, 10),
+          rows = parseInt(raw_rows, 10),
+          valid_args = false;
+
+      if (cols > 0 && rows > 0)  {
+        var geometry = current_geometry();
+        if (cols <= geometry.cols && rows <= geometry.rows) {
+          valid_args = true;
+        }
+      }
+
+      if (!valid_args) {
+        console.log('Invalid arguments: ' + raw_cols + ',' + raw_rows);
+      } else {
+        term.on_resize(cols, rows);
+      }
+    };
+
+    term.on_resize = function (cols, rows) {
+      if (cols !== this.geometry[0] || rows !== this.geometry[1]) {
+        console.log('Resizing terminal size to: ' + cols + ',' + rows);
+        this.resize(cols, rows);
+        sock.send(JSON.stringify({'resize': [cols, rows]}));
+      }
+    };
+
     term.on('data', function(data) {
       // console.log(data);
       sock.send(JSON.stringify({'data': data}));
@@ -110,7 +134,7 @@ jQuery(function($){
         // console.log(text);
         term.write(text);
         if (!term.resized) {
-          resize_term(term, sock);
+          resize_terminal(term);
           term.resized = true;
         }
       };
@@ -125,12 +149,14 @@ jQuery(function($){
     sock.onclose = function(e) {
       console.log(e);
       term.destroy();
-      wssh.term = undefined;
-      wssh.sock = undefined;
       $('.container').show();
       status.text(e.reason);
       btn.prop('disabled', false);
     };
+
+    $(window).resize(function(){
+      resize_terminal(term);
+    });
   }
 
 
@@ -165,14 +191,5 @@ jQuery(function($){
           contentType: false,
           processData: false
       });
-
   });
-
-
-  $(window).resize(function(){
-    if (wssh.term && wssh.sock) {
-      resize_term(wssh.term, wssh.sock);
-    }
-  });
-
 });