✨ Better keyboard shortcut for tabs

Author: GitSquared

src/_boot.js

@@ -163,12 +163,6 @@ app.on('ready', () => {
     };
     tty.ondisconnected = () => {
         signale.error("Lost connection to frontend");
-        Object.keys(extraTtys).forEach(key => {
-            if (extraTtys[key] !== null) {
-                extraTtys[key].close();
-                extraTtys[key] = null;
-            }
-        });
         signale.watch("Waiting for frontend connection...");
     };
 
@@ -232,6 +226,7 @@ app.on('ready', () => {
             term.ondisconnected = () => {
                 term.onclosed = () => {};
                 term.close();
+                term.wss.close();
                 extraTtys[term.port] = null;
                 delete term;
             };

src/_renderer.js

@@ -427,7 +427,7 @@ window.focusShellTab = (number) => {
                 };
 
                 window.term[number].onprocesschange = p => {
-                    document.getElementById("shell_tab"+number).innerText = `#${number} - ${p}`;
+                    document.getElementById("shell_tab"+number).innerText = `#${number+1} - ${p}`;
                 };
 
                 document.getElementById("shell_tab"+number).innerText = "::"+port;
@@ -441,13 +441,54 @@ window.focusShellTab = (number) => {
 
 // Global keyboard shortcuts
 const globalShortcut = electron.remote.globalShortcut;
+globalShortcut.unregisterAll();
+
+// Switch tabs
+// Next
 globalShortcut.register("CommandOrControl+Tab", () => {
-    if (window.currentTerm <= 3) {
+    console.log("next");
+    if (window.term[window.currentTerm+1]) {
         window.focusShellTab(window.currentTerm+1);
+    } else if (window.term[window.currentTerm+2]) {
+        window.focusShellTab(window.currentTerm+2);
+    } else if (window.term[window.currentTerm+3]) {
+        window.focusShellTab(window.currentTerm+3);
+    } else if (window.term[window.currentTerm+4]) {
+        window.focusShellTab(window.currentTerm+4);
     } else {
         window.focusShellTab(0);
     }
 });
+// Previous
+globalShortcut.register("CommandOrControl+Shift+Tab", () => {
+    if (window.term[window.currentTerm-1]) {
+        window.focusShellTab(window.currentTerm-1);
+    } else if (window.term[window.currentTerm-2]) {
+        window.focusShellTab(window.currentTerm-2);
+    } else if (window.term[window.currentTerm-3]) {
+        window.focusShellTab(window.currentTerm-3);
+    } else if (window.term[window.currentTerm-4]) {
+        window.focusShellTab(window.currentTerm-4);
+    } else if (window.term[4]){
+        window.focusShellTab(4);
+    }
+});
+// By tab number
+globalShortcut.register("CommandOrControl+1", () => {
+    window.focusShellTab(0);
+});
+globalShortcut.register("CommandOrControl+2", () => {
+    window.focusShellTab(1);
+});
+globalShortcut.register("CommandOrControl+3", () => {
+    window.focusShellTab(2);
+});
+globalShortcut.register("CommandOrControl+4", () => {
+    window.focusShellTab(3);
+});
+globalShortcut.register("CommandOrControl+5", () => {
+    window.focusShellTab(4);
+});
 
 
 // Prevent showing menu, exiting fullscreen or app with keyboard shortcuts