refactor: split classes and ifaces to files

src/config.ts

@@ -0,0 +1,21 @@
+// Copyright (c) 2018-2019 Eon S. Jeon <esjeon@hyunmu.am>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+let CONFIG: IConfig;

src/driver/test/test_driver.ts

@@ -0,0 +1,68 @@
+// Copyright (c) 2018-2019 Eon S. Jeon <esjeon@hyunmu.am>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+class TestDriver {
+  public currentScreen: number;
+  public currentWindow: number;
+  public numScreen: number;
+  public screenSize: Rect;
+  public windows: Window[];
+
+  constructor() {
+    this.currentScreen = 0;
+    this.currentWindow = 0;
+    this.numScreen = 1;
+    this.screenSize = new Rect(0, 0, 10000, 10000);
+    this.windows = [];
+  }
+
+  public forEachScreen(func: (srf: ISurface) => void) {
+    for (let screen = 0; screen < this.numScreen; screen++)
+      func(new TestSurface(this, screen));
+  }
+
+  public getCurrentContext(): ISurface {
+    const window = this.getCurrentWindow();
+    if (window) return window.surface;
+    return new TestSurface(this, 0);
+  }
+
+  public getCurrentWindow(): Window | null {
+    return this.windows.length !== 0 ? this.windows[this.currentWindow] : null;
+  }
+
+  public getWorkingArea(srf: ISurface): Rect {
+    return this.screenSize;
+  }
+
+  public setCurrentWindow(window: Window) {
+    const idx = this.windows.indexOf(window);
+    if (idx !== -1) this.currentWindow = idx;
+  }
+
+  public setTimeout(func: () => void, timeout: number) {
+    setTimeout(func, timeout);
+  }
+}
+
+function setTestConfig(name: string, value: any) {
+  if (!CONFIG) CONFIG = {} as any;
+  (CONFIG as any)[name] = value;
+}

src/driver/test/test_surface.ts

@@ -0,0 +1,44 @@
+// Copyright (c) 2018-2019 Eon S. Jeon <esjeon@hyunmu.am>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+class TestSurface implements ISurface {
+  public readonly screen: number;
+
+  public get id(): string {
+    return String(this.screen);
+  }
+
+  public get ignore(): boolean {
+    // TODO: optionally ignore some surface to test LayoutStore
+    return false;
+  }
+
+  public get workingArea(): Rect {
+    return this.driver.screenSize;
+  }
+
+  constructor(private driver: TestDriver, screen: number) {
+    this.screen = screen;
+  }
+
+  public next(): ISurface {
+    return new TestSurface(this.driver, this.screen + 1);
+  }
+}

src/driver/test/test_window.ts

@@ -18,75 +18,6 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-class TestDriver {
-  public currentScreen: number;
-  public currentWindow: number;
-  public numScreen: number;
-  public screenSize: Rect;
-  public windows: Window[];
-
-  constructor() {
-    this.currentScreen = 0;
-    this.currentWindow = 0;
-    this.numScreen = 1;
-    this.screenSize = new Rect(0, 0, 10000, 10000);
-    this.windows = [];
-  }
-
-  public forEachScreen(func: (srf: ISurface) => void) {
-    for (let screen = 0; screen < this.numScreen; screen++)
-      func(new TestSurface(this, screen));
-  }
-
-  public getCurrentContext(): ISurface {
-    const window = this.getCurrentWindow();
-    if (window) return window.surface;
-    return new TestSurface(this, 0);
-  }
-
-  public getCurrentWindow(): Window | null {
-    return this.windows.length !== 0 ? this.windows[this.currentWindow] : null;
-  }
-
-  public getWorkingArea(srf: ISurface): Rect {
-    return this.screenSize;
-  }
-
-  public setCurrentWindow(window: Window) {
-    const idx = this.windows.indexOf(window);
-    if (idx !== -1) this.currentWindow = idx;
-  }
-
-  public setTimeout(func: () => void, timeout: number) {
-    setTimeout(func, timeout);
-  }
-}
-
-class TestSurface implements ISurface {
-  public readonly screen: number;
-
-  public get id(): string {
-    return String(this.screen);
-  }
-
-  public get ignore(): boolean {
-    // TODO: optionally ignore some surface to test LayoutStore
-    return false;
-  }
-
-  public get workingArea(): Rect {
-    return this.driver.screenSize;
-  }
-
-  constructor(private driver: TestDriver, screen: number) {
-    this.screen = screen;
-  }
-
-  public next(): ISurface {
-    return new TestSurface(this.driver, this.screen + 1);
-  }
-}
-
 class TestWindow implements IDriverWindow {
   private static windowCount: number = 0;
 
@@ -136,8 +67,3 @@ class TestWindow implements IDriverWindow {
     return this.surface.screen === tctx.screen;
   }
 }
-
-function setTestConfig(name: string, value: any) {
-  if (!CONFIG) CONFIG = {} as any;
-  (CONFIG as any)[name] = value;
-}

src/iconfig.ts

@@ -18,51 +18,6 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-enum Shortcut {
-  Left,
-  Right,
-  Up,
-  Down,
-
-  /* Alternate HJKL bindings */
-  FocusUp,
-  FocusDown,
-  FocusLeft,
-  FocusRight,
-
-  ShiftLeft,
-  ShiftRight,
-  ShiftUp,
-  ShiftDown,
-
-  SwapUp,
-  SwapDown,
-  SwapLeft,
-  SwapRight,
-
-  GrowWidth,
-  GrowHeight,
-  ShrinkWidth,
-  ShrinkHeight,
-
-  Increase,
-  Decrease,
-  ShiftIncrease,
-  ShiftDecrease,
-
-  ToggleFloat,
-  ToggleFloatAll,
-  SetMaster,
-  NextLayout,
-  PreviousLayout,
-  SetLayout,
-
-  Rotate,
-  RotatePart,
-}
-
-//#region Driver
-
 interface IConfig {
   //#region Layout
   layoutOrder: string[];
@@ -92,59 +47,3 @@ interface IConfig {
   newWindowAsMaster: boolean;
   //#endregion
 }
-
-interface IDriverWindow {
-  readonly fullScreen: boolean;
-  readonly geometry: Readonly<Rect>;
-  readonly id: string;
-  readonly maximized: boolean;
-  readonly shouldIgnore: boolean;
-  readonly shouldFloat: boolean;
-
-  surface: ISurface;
-
-  commit(geometry?: Rect, noBorder?: boolean, keepAbove?: boolean): void;
-  visible(srf: ISurface): boolean;
-}
-
-interface ISurface {
-  readonly id: string;
-  readonly ignore: boolean;
-  readonly workingArea: Readonly<Rect>;
-
-  next(): ISurface | null;
-}
-
-interface IDriverContext {
-  readonly backend: string;
-  readonly screens: ISurface[];
-  readonly cursorPosition: [number, number] | null;
-
-  currentSurface: ISurface;
-  currentWindow: Window | null;
-
-  setTimeout(func: () => void, timeout: number): void;
-  showNotification(text: string): void;
-}
-
-//#endregion
-
-interface ILayoutClass {
-  readonly id: string;
-  new (): ILayout;
-}
-
-interface ILayout {
-  /* read-only */
-  readonly capacity?: number;
-  readonly description: string;
-
-  /* methods */
-  adjust?(area: Rect, tiles: Window[], basis: Window, delta: RectDelta): void;
-  apply(ctx: EngineContext, tileables: Window[], area: Rect): void;
-  handleShortcut?(ctx: EngineContext, input: Shortcut, data?: any): boolean;
-
-  toString(): string;
-}
-
-let CONFIG: IConfig;

src/idriver_context.ts

@@ -0,0 +1,31 @@
+// Copyright (c) 2018-2019 Eon S. Jeon <esjeon@hyunmu.am>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+interface IDriverContext {
+  readonly backend: string;
+  readonly screens: ISurface[];
+  readonly cursorPosition: [number, number] | null;
+
+  currentSurface: ISurface;
+  currentWindow: Window | null;
+
+  setTimeout(func: () => void, timeout: number): void;
+  showNotification(text: string): void;
+}

src/idriver_window.ts

@@ -0,0 +1,33 @@
+// Copyright (c) 2018-2019 Eon S. Jeon <esjeon@hyunmu.am>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+interface IDriverWindow {
+  readonly fullScreen: boolean;
+  readonly geometry: Readonly<Rect>;
+  readonly id: string;
+  readonly maximized: boolean;
+  readonly shouldIgnore: boolean;
+  readonly shouldFloat: boolean;
+
+  surface: ISurface;
+
+  commit(geometry?: Rect, noBorder?: boolean, keepAbove?: boolean): void;
+  visible(srf: ISurface): boolean;
+}

src/ilayout.ts

@@ -0,0 +1,37 @@
+// Copyright (c) 2018-2019 Eon S. Jeon <esjeon@hyunmu.am>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+interface ILayoutClass {
+  readonly id: string;
+  new (): ILayout;
+}
+
+interface ILayout {
+  /* read-only */
+  readonly capacity?: number;
+  readonly description: string;
+
+  /* methods */
+  adjust?(area: Rect, tiles: Window[], basis: Window, delta: RectDelta): void;
+  apply(ctx: EngineContext, tileables: Window[], area: Rect): void;
+  handleShortcut?(ctx: EngineContext, input: Shortcut, data?: any): boolean;
+
+  toString(): string;
+}

src/isurface.ts

@@ -0,0 +1,27 @@
+// Copyright (c) 2018-2019 Eon S. Jeon <esjeon@hyunmu.am>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+interface ISurface {
+  readonly id: string;
+  readonly ignore: boolean;
+  readonly workingArea: Readonly<Rect>;
+
+  next(): ISurface | null;
+}

src/shortcut.ts

@@ -0,0 +1,62 @@
+// Copyright (c) 2018-2019 Eon S. Jeon <esjeon@hyunmu.am>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+enum Shortcut {
+  Left,
+  Right,
+  Up,
+  Down,
+
+  /* Alternate HJKL bindings */
+  FocusUp,
+  FocusDown,
+  FocusLeft,
+  FocusRight,
+
+  ShiftLeft,
+  ShiftRight,
+  ShiftUp,
+  ShiftDown,
+
+  SwapUp,
+  SwapDown,
+  SwapLeft,
+  SwapRight,
+
+  GrowWidth,
+  GrowHeight,
+  ShrinkWidth,
+  ShrinkHeight,
+
+  Increase,
+  Decrease,
+  ShiftIncrease,
+  ShiftDecrease,
+
+  ToggleFloat,
+  ToggleFloatAll,
+  SetMaster,
+  NextLayout,
+  PreviousLayout,
+  SetLayout,
+
+  Rotate,
+  RotatePart,
+}