From c3d36471115bf83e6762f4f10523742de4244fe6 Mon Sep 17 00:00:00 2001
From: sawka <mike.sawka@gmail.com>
Date: Fri, 26 Aug 2022 17:35:36 -0700
Subject: [PATCH] use new relative arguments for screen switching instead of
 computing it on FE

---
 src/model.ts | 37 ++++---------------------------------
 1 file changed, 4 insertions(+), 33 deletions(-)

diff --git a/src/model.ts b/src/model.ts
index 07c7df09..417999b3 100644
--- a/src/model.ts
+++ b/src/model.ts
@@ -463,30 +463,6 @@ class Session {
     dispose() : void {
     }
 
-    getRelativeScreenId(rel : number) : string {
-        if (!rel) {
-            return this.activeScreenId.get();
-        }
-        if (this.screens.length == 0) {
-            return null;
-        }
-        if (this.screens.length == 1) {
-            return this.screens[0].screenId;
-        }
-        let foundIdx = 0;
-        for (let i=0; i<this.screens.length; i++) {
-            if (this.screens[i].screenId == this.activeScreenId.get()) {
-                foundIdx = i;
-                break;
-            }
-        }
-        let relIdx = (foundIdx + rel) % this.screens.length;
-        if (relIdx < 0) {
-            relIdx += this.screens.length;
-        }
-        return this.screens[relIdx].screenId;
-    }
-
     // session updates only contain screens (no windows)
     mergeData(sdata : SessionDataType) {
         if (sdata.sessionid != this.sessionId) {
@@ -941,20 +917,15 @@ class Model {
     }
 
     onBracketCmd(e : any, arg : {relative: number}, mods : KeyModsType) {
-        console.log("switch screen (bracket)", arg, mods);
-        let activeSession = this.getActiveSession();
-        if (activeSession == null) {
-            return;
+        if (arg.relative == 1) {
+            GlobalInput.switchScreen("+");
         }
-        let newScreenId = activeSession.getRelativeScreenId(arg.relative);
-        if (newScreenId == null) {
-            return;
+        else if (arg.relative == -1) {
+            GlobalInput.switchScreen("-");
         }
-        GlobalInput.switchScreen(newScreenId);
     }
 
     onDigitCmd(e : any, arg : {digit: number}, mods : KeyModsType) {
-        console.log("switch screen (digit)", arg, mods);
         GlobalInput.switchScreen(String(arg.digit));
     }