window manager pattern

Author: obfuscatedgenerated

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "ollieos",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "",
   "private": true,
   "main": "server.js",

package.json

@@ -15,6 +15,7 @@ import { LocalStorageFS } from "./fs_impl/localstorage";
 import { initial_fs_setup } from "./initial_fs_setup";
 
 import Swal from "sweetalert2";
+import {DOMWindowManager} from "./window_impl/dom";
 
 
 const boot_screen = document.getElementById("boot_screen");
@@ -138,12 +139,14 @@ async function main() {
     // create initial files
     await initial_fs_setup(fs);
 
+    // create a dom window manager
+    const wm = new DOMWindowManager();
 
     // create a terminal using the registry and filesystem
     const term = new WrappedTerminal(fs, prog_reg, sfx_reg,{
         screenReaderMode: false,
         cursorBlink: true,
-    });
+    }, true, wm);
 
     term.set_variable("VERSION", document.body.dataset.version);
     term.set_variable("ENV", "web");

src/index.ts

@@ -1,6 +1,5 @@
 import type { Program } from "../types";
 import { ANSI } from "../term_ctl";
-import {VirtualWindow} from "../windowing";
 
 export default {
     name: "fsedit",
@@ -43,16 +42,21 @@ export default {
         // url encode the directory
         const encoded_dir = encodeURIComponent(dir);
 
-        // open fsedit in a popup window
-        //window.open(`./fsedit?type=${fs_name}&dir=${encoded_dir}`, "_blank", "popup=true")
-
         const iframe = document.createElement("iframe");
         iframe.src = `./fsedit?type=${fs_name}&dir=${encoded_dir}`;
         iframe.style.border = "none";
         iframe.style.width = "100%";
         iframe.style.height = "100%";
 
-        const wind = new VirtualWindow();
+        const wm = term.get_window_manager();
+        if (!wm) {
+            // fallback to opening in a popup window
+            window.open(`./fsedit?type=${fs_name}&dir=${encoded_dir}`, "_blank", "popup=true");
+            term.writeln("Opened fsedit in a new popup window.");
+            return 0;
+        }
+
+        const wind = new wm.Window();
         wind.title = "fsedit";
 
         wind.width = "75vw";

src/programs/fsedit.ts

@@ -1,6 +1,5 @@
 import {ANSI} from "../../term_ctl";
 import { ProgramMainData } from "../../types"
-import {get_window_by_id} from "../../windowing";
 
 // extract from ANSI to make code less verbose
 const { STYLE, FG, PREFABS } = ANSI;
@@ -25,7 +24,8 @@ export const close_subcommand = async (data: ProgramMainData) => {
         return 1;
     }
 
-    const wind = get_window_by_id(window_id);
+    const wm = term.get_window_manager();
+    const wind = wm!.get_window_by_id(window_id);
 
     if (!wind) {
         term.writeln(`${PREFABS.error}No window found with ID '${window_id}'.`)

src/programs/window/close.ts

@@ -1,6 +1,5 @@
 import {ANSI} from "../../term_ctl";
 import { ProgramMainData } from "../../types"
-import {get_window_by_id} from "../../windowing";
 
 // extract from ANSI to make code less verbose
 const { STYLE, FG, PREFABS } = ANSI;
@@ -25,7 +24,8 @@ export const hide_subcommand = async (data: ProgramMainData) => {
         return 1;
     }
 
-    const wind = get_window_by_id(window_id);
+    const wm = term.get_window_manager();
+    const wind = wm!.get_window_by_id(window_id);
 
     if (!wind) {
         term.writeln(`${PREFABS.error}No window found with ID '${window_id}'.`)

src/programs/window/hide.ts

@@ -46,6 +46,11 @@ export default {
             return 0;
         }
 
+        if (!term.get_window_manager()) {
+            term.writeln(`${PREFABS.error}No window manager found.${STYLE.reset_all}`);
+            return 1;
+        }
+
         switch (args[0]) {
             case "list":
                 return await list_subcommand(data);

src/programs/window/index.ts

@@ -1,6 +1,5 @@
 import {ANSI, NEWLINE} from "../../term_ctl";
 import { ProgramMainData } from "../../types"
-import {get_all_windows} from "../../windowing";
 
 // extract from ANSI to make code less verbose
 const { STYLE, FG } = ANSI;
@@ -24,7 +23,8 @@ export const list_subcommand = async (data: ProgramMainData) => {
 
     term.write(NEWLINE);
 
-    const all_windows = get_all_windows();
+    const wm = term.get_window_manager();
+    const all_windows = wm!.get_all_windows();
     for (const win of all_windows) {
         if (only_visible && !win.visible) {
             continue;

src/programs/window/list.ts

@@ -1,6 +1,5 @@
 import {ANSI} from "../../term_ctl";
 import { ProgramMainData } from "../../types"
-import {get_window_by_id} from "../../windowing";
 
 // extract from ANSI to make code less verbose
 const { STYLE, FG, PREFABS } = ANSI;
@@ -25,7 +24,8 @@ export const show_subcommand = async (data: ProgramMainData) => {
         return 1;
     }
 
-    const wind = get_window_by_id(window_id);
+    const wm = term.get_window_manager();
+    const wind = wm!.get_window_by_id(window_id);
 
     if (!wind) {
         term.writeln(`${PREFABS.error}No window found with ID '${window_id}'.`)

src/programs/window/show.ts

@@ -3,9 +3,10 @@ import { IDisposable, ITerminalOptions, Terminal } from "@xterm/xterm";
 import { ProgramRegistry, recurse_mount_and_register_with_output } from "./prog_registry";
 import type { AbstractFileSystem } from "./filesystem";
 
-import type { KeyEvent, KeyEventHandler, RegisteredKeyEventIdentifier, Program } from "./types";
+import type { KeyEvent, KeyEventHandler, RegisteredKeyEventIdentifier } from "./types";
 import { register_builtin_key_handlers, change_prompt as change_prompt, register_builtin_fs_handlers } from "./event_handlers";
 import { SoundRegistry } from "./sfx_registry";
+import {AbstractWindowManager} from "./windowing";
 
 export const NEWLINE = "\r\n";
 /* eslint-disable-next-line no-control-regex, no-misleading-character-class */
@@ -106,6 +107,7 @@ export class WrappedTerminal extends Terminal {
     _prog_registry: ProgramRegistry;
     _sfx_registry: SoundRegistry;
     _fs: AbstractFileSystem;
+    _wm: AbstractWindowManager | null = null;
 
     _key_handlers: Map<RegisteredKeyEventIdentifier, { handler: KeyEventHandler, block: boolean }[]> = new Map();
     _on_printable_handlers: KeyEventHandler[] = [];
@@ -127,6 +129,9 @@ export class WrappedTerminal extends Terminal {
         return this._fs;
     }
 
+    get_window_manager(): AbstractWindowManager | null {
+        return this._wm;
+    }
 
     get_variable(name: string): string | undefined {
         return this._vars.get(name);
@@ -674,12 +679,13 @@ export class WrappedTerminal extends Terminal {
     }
 
     // be sure to call initialise after this
-    constructor(fs: AbstractFileSystem, prog_registry?: ProgramRegistry, sound_registry?: SoundRegistry, xterm_opts?: ITerminalOptions, register_builtin_handlers = true) {
+    constructor(fs: AbstractFileSystem, prog_registry?: ProgramRegistry, sound_registry?: SoundRegistry, xterm_opts?: ITerminalOptions, register_builtin_handlers = true, wm?: AbstractWindowManager) {
         super(xterm_opts);
 
         this._fs = fs;
         this._prog_registry = prog_registry || new ProgramRegistry();
         this._sfx_registry = sound_registry || new SoundRegistry();
+        this._wm = wm || null;
 
         if (register_builtin_handlers) {
             register_builtin_key_handlers(this);