From e8c78079b1b8a1230d08721aa3131380c9a09bf4 Mon Sep 17 00:00:00 2001
From: "Mr. Stallion" <mrstallion@nobody.nowhere.fauxdomain.ext>
Date: Fri, 13 Nov 2020 15:33:57 -0600
Subject: [PATCH] Flexible tab switching

---
 CHANGELOG.md        |  4 ++++
 README.md           |  1 +
 electron/Index.vue  | 11 +++++++++--
 electron/Window.vue |  4 ++++
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe6ea77..9dc518c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Canary
+*   Use `Ctrl+Tab`, `Ctrl+Shift+Tab`, `Ctrl+PgDown`, and `Ctrl+PgUp` to switch between character tabs
+
+
 ## 1.4.1
 *   Fixed some image previews showing up black
 
diff --git a/README.md b/README.md
index 3f6778a..406efde 100644
--- a/README.md
+++ b/README.md
@@ -63,6 +63,7 @@ This repository contains a heavily customized version of the mainline F-Chat 3.0
     *    Conversation dialog can be opened by typing in a character name
     *    Message search matches character names
     *    PM list shows characters' online status as a colored icon
+    *    Use `Ctrl+Tab`, `Ctrl+Shift+Tab`, `Ctrl+PgDown`, and `Ctrl+PgUp` to switch between character tabs
 *   Technical Details for Nerds
     *    Upgraded to Electron 10.x
     *    Replaced `node-spellchecker` with the built-in spellchecker that ships with Electron 8+
diff --git a/electron/Index.vue b/electron/Index.vue
index 488bd41..0181734 100644
--- a/electron/Index.vue
+++ b/electron/Index.vue
@@ -293,8 +293,15 @@
             });
 
             window.addEventListener('keydown', (e) => {
-                if(getKey(e) === Keys.Tab && e.ctrlKey && !e.altKey && !e.shiftKey)
-                    parent.send('switch-tab', this.character);
+                const key = getKey(e);
+
+                if ((key === Keys.Tab) && (e.ctrlKey) && (!e.altKey)) {
+                    parent.send(`${e.shiftKey ? 'previous' : 'switch'}-tab`, this.character);
+                }
+
+                if (((key === Keys.PageDown) || (key === Keys.PageUp)) && (e.ctrlKey) && (!e.altKey) && (!e.shiftKey)) {
+                  parent.send(`${key === Keys.PageUp ? 'previous' : 'switch'}-tab`, this.character);
+                }
             });
 
             log.debug('init.chat.listeners.done');
diff --git a/electron/Window.vue b/electron/Window.vue
index 98ceb31..859a1cd 100644
--- a/electron/Window.vue
+++ b/electron/Window.vue
@@ -162,6 +162,10 @@
                 const index = this.tabs.indexOf(this.activeTab!);
                 this.show(this.tabs[index + 1 === this.tabs.length ? 0 : index + 1]);
             });
+            electron.ipcRenderer.on('previous-tab', (_e: Event) => {
+                const index = this.tabs.indexOf(this.activeTab!);
+                this.show(this.tabs[index - 1 < 0 ? this.tabs.length - 1 : index - 1]);
+            });
             electron.ipcRenderer.on('show-tab', (_e: Event, id: number) => {
                 this.show(this.tabMap[id]);
             });