spektor56
diff --git a/‎OpenpilotToolkit/Controls/Terminal/index.html‎
Lines changed: 50 additions & 68 deletions b/‎OpenpilotToolkit/Controls/Terminal/index.html‎
Lines changed: 50 additions & 68 deletions
diff --git a/‎OpenpilotToolkit/Controls/Wizards/ucSshWizard.Designer.cs‎
Lines changed: 7 additions & 6 deletions b/‎OpenpilotToolkit/Controls/Wizards/ucSshWizard.Designer.cs‎
Lines changed: 7 additions & 6 deletions
diff --git a/‎OpenpilotToolkit/Controls/Wizards/ucSshWizard.cs‎
Lines changed: 2 additions & 7 deletions b/‎OpenpilotToolkit/Controls/Wizards/ucSshWizard.cs‎
Lines changed: 2 additions & 7 deletions
@@ -35,82 +35,64 @@
 <body style="width:100%;height:100%;margin:0; padding:0">
 
     <div id="terminal" style="width:100%;height:100%"></div>
-    <script>
-        var command = '';
+<script>
+    
+    CefSharp.BindObjectAsync("sshHost");
 
-        var terminal = new Terminal({
+    var command = '';
+
+    var terminal = new Terminal({
+        fontFamily: 'RobotoPowerline',
+        theme: {
             fontFamily: 'RobotoPowerline',
-            theme: {
-                fontFamily: 'RobotoPowerline',
-                background: '#505050'
-            },
-            cursorBlink: true
-        });
+            background: '#505050'
+        },
+        cursorBlink: true
+    });
 
-        var fitaddon = new FitAddon.FitAddon();
-        var webgl = new WebglAddon.WebglAddon();
+    var fitaddon = new FitAddon.FitAddon();
+    var webgl = new WebglAddon.WebglAddon();
 
-        terminal.loadAddon(fitaddon);
-        
+    terminal.loadAddon(fitaddon);
 
-        function runCommand(terminal, text) {
-            prompt(terminal);
-        }
 
-        function prompt(terminal) {
-            command = '';
-            terminal.write('\r\n$ ');
-        }
+    function runCommand(terminal, text) {
+        prompt(terminal);
+    }
 
-        function ClearTerminal() {
-            //terminal.clear();
-            terminal.write('\x1bc')
-        }
+    function prompt(terminal) {
+        command = '';
+        terminal.write('\r\n$ ');
+    }
 
-        function WriteText(stringText) {
-            terminal.write(stringText);
-        }
+    function ClearTerminal() {
+        //terminal.clear();
+        terminal.write('\x1bc');
+    }
 
-        function resizeTerminal() {
-            fitaddon.fit();
-            console.log(terminal.rows, terminal.cols);
-            //term.write(' (' + term.rows + ', ' + term.cols + ')');
-            CefSharp.PostMessage(terminal.rows + ',' + terminal.cols);
-        }
-        /*
-        terminal.onData(e => {
-            switch (e) {
-                case '\u0003': // Ctrl+C
-                    terminal.write('^C');
-                    prompt(terminal);
-                    break;
-                case '\r': // terminal
-                    runCommand(terminal, command);
-                    command = '';
-                    break;
-                case '\u007F': // Backspace (DEL)
-                    // Do not delete the prompt
-                    if (terminal._core.buffer.x > 2) {
-                        terminal.write('\b \b');
-                        if (command.length > 0) {
-                            command = command.substr(0, command.length - 1);
-                        }
-                    }
-                    break;
-                default: // Print all other characters for demo
-                    if (e >= String.fromCharCode(0x20) && e <= String.fromCharCode(0x7B) || e >= '\u00a0') {
-                        command += e;
-                        terminal.write(e);
-                    }
-            }
-        });
-        */
-        terminal.open(document.getElementById('terminal'));
-        terminal.loadAddon(webgl);
-
-        resizeTerminal();
-
-        window.addEventListener('resize', resizeTerminal);
-    </script>
+    function WriteText(stringText) {
+        terminal.write(stringText);
+    }
+
+    function resizeTerminal() {
+        fitaddon.fit();
+        console.log(terminal.rows, terminal.cols);
+        //term.write(' (' + term.rows + ', ' + term.cols + ')');
+        //sshHost.resizeTerminal(terminal.rows, terminal.cols);
+        CefSharp.PostMessage(terminal.rows + ',' + terminal.cols);
+    }
+    
+    terminal.open(document.getElementById('terminal'));
+    terminal.loadAddon(webgl);
+
+    resizeTerminal();
+
+    window.addEventListener('resize', resizeTerminal);
+
+    terminal.onData((e) => {
+        sshHost.terminalData(e);
+    });
+    
+</script>
 </body>
 </html>
@@ -122,16 +122,11 @@ protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
         {
             if (keyData == Keys.Enter)
             {
-                if (mtcSSHWizard.SelectedTab == tpGithubLogin)
+                if (mtcSSHWizard.SelectedTab == tpGithubLogin && txtUsername.Focused)
                 {
                     btnLogin.PerformClick();
+                    return true;
                 }
-                else
-                {
-                    btnNext.PerformClick();
-                }
-                
-                return true;
             }
             return base.ProcessCmdKey(ref msg, keyData);
         }
Original file line number	Diff line number	Diff line change
`@@ -122,16 +122,11 @@ protected override bool ProcessCmdKey(ref Message msg, Keys keyData)`
`122`	`122`	`{`
`123`	`123`	`if (keyData == Keys.Enter)`
`124`	`124`	`{`
`125`		`- if (mtcSSHWizard.SelectedTab == tpGithubLogin)`
	`125`	`+ if (mtcSSHWizard.SelectedTab == tpGithubLogin && txtUsername.Focused)`
`126`	`126`	`{`
`127`	`127`	`btnLogin.PerformClick();`
	`128`	`+ return true;`
`128`	`129`	`}`
`129`		`- else`
`130`		`- {`
`131`		`- btnNext.PerformClick();`
`132`		`- }`
`133`		`-`
`134`		`- return true;`
`135`	`130`	`}`
`136`	`131`	`return base.ProcessCmdKey(ref msg, keyData);`
`137`	`132`	`}`