independent layout implementation

Makefile

@@ -22,6 +22,7 @@ $(FILE_SCRIPT): src/common.ts
 $(FILE_SCRIPT): src/driver.ts
 $(FILE_SCRIPT): src/engine.ts
 $(FILE_SCRIPT): src/kwin.d.ts
+$(FILE_SCRIPT): src/layout.ts
 	@mkdir -vp `dirname $(FILE_SCRIPT)`
 	tsc --outFile $(FILE_SCRIPT)
 

src/engine.ts

@@ -20,13 +20,11 @@
 
 class Screen {
     public id: number;
-    public layout: any;
-    public layoutOpts: any;
+    public layout: ILayout;
 
     constructor(id: number) {
         this.id = id;
-        this.layout = layout_tile;
-        this.layoutOpts = {};
+        this.layout = new TileLayout();
     }
 }
 
@@ -53,53 +51,6 @@ class Tile {
     }
 }
 
-// TODO: declare Layout class (`layout.js`?)
-// TODO: layouts in separate file(s)
-function layout_tile(tiles: Tile[], areaWidth: number, areaHeight: number, opts: any) {
-    if (!opts.tile_ratio) opts.tile_ratio = 0.45;
-    if (!opts.tile_nmaster) opts.tile_nmaster = 1;
-
-    let masterCount;
-    let masterWidth;
-    let masterHeight;
-    let stackCount;
-    let stackWidth;
-    let stackHeight;
-    let stackX;
-
-    if (tiles.length <= opts.tile_nmaster) {
-        masterCount = tiles.length;
-        masterWidth = areaWidth;
-        masterHeight = Math.floor(areaHeight / masterCount);
-
-        stackCount = stackWidth = stackHeight = stackX = 0;
-    } else {
-        masterCount = opts.tile_nmaster;
-        masterWidth = Math.floor(areaWidth * (1 - opts.tile_ratio));
-        masterHeight = Math.floor(areaHeight / masterCount);
-
-        stackCount = tiles.length - masterCount;
-        stackWidth = areaWidth - masterWidth;
-        stackHeight = Math.floor(areaHeight / stackCount);
-        stackX = masterWidth + 1;
-    }
-
-    for (let i = 0; i < masterCount; i++) {
-        tiles[i].geometry.x = 0;
-        tiles[i].geometry.y = masterHeight * i;
-        tiles[i].geometry.width = masterWidth;
-        tiles[i].geometry.height = masterHeight;
-    }
-
-    for (let i = 0; i < stackCount; i++) {
-        const j = masterCount + i;
-        tiles[j].geometry.x = stackX;
-        tiles[j].geometry.y = stackHeight * i;
-        tiles[j].geometry.width = stackWidth;
-        tiles[j].geometry.height = stackHeight;
-    }
-}
-
 class TilingEngine {
     public screens: Screen[];
     private driver: KWinDriver;
@@ -126,7 +77,7 @@ class TilingEngine {
             });
 
             // TODO: fullscreen handling
-            screen.layout(visibles, area.width, area.height, screen.layoutOpts);
+            screen.layout.apply(visibles, area.width, area.height);
 
             visibles.forEach((tile) => {
                 tile.arrangeCount = 0;

src/layout.ts

@@ -0,0 +1,76 @@
+// Copyright (c) 2018 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 ILayout {
+    apply(tiles: Tile[], areaWidth: number, areaHeight: number);
+}
+
+class TileLayout implements ILayout {
+    private numMaster: number;
+    private masterRatio: number; /* in ratio */
+
+    constructor() {
+        this.numMaster = 1;
+        this.masterRatio = 0.55;
+    }
+
+    public apply = (tiles: Tile[], areaWidth: number, areaHeight: number) => {
+        if (!this.masterRatio) this.masterRatio = 0.45;
+        if (!this.numMaster) this.numMaster = 1;
+
+        let masterCount, masterWidth, masterHeight;
+        let stackCount, stackWidth, stackHeight, stackX;
+
+        if (tiles.length <= this.numMaster) {
+            masterCount = tiles.length;
+            masterWidth = areaWidth;
+            masterHeight = Math.floor(areaHeight / masterCount);
+
+            stackCount = stackWidth = stackHeight = stackX = 0;
+        } else {
+            masterCount = this.numMaster;
+            masterWidth = Math.floor(areaWidth * this.masterRatio);
+            masterHeight = Math.floor(areaHeight / masterCount);
+
+            stackCount = tiles.length - masterCount;
+            stackWidth = areaWidth - masterWidth;
+            stackHeight = Math.floor(areaHeight / stackCount);
+            stackX = masterWidth + 1;
+        }
+
+        for (let i = 0; i < masterCount; i++) {
+            tiles[i].geometry.x = 0;
+            tiles[i].geometry.y = masterHeight * i;
+            tiles[i].geometry.width = masterWidth;
+            tiles[i].geometry.height = masterHeight;
+        }
+
+        for (let i = 0; i < stackCount; i++) {
+            const j = masterCount + i;
+            tiles[j].geometry.x = stackX;
+            tiles[j].geometry.y = stackHeight * i;
+            tiles[j].geometry.width = stackWidth;
+            tiles[j].geometry.height = stackHeight;
+        }
+    }
+}
+
+// TODO: MonocleLayout
+// TODO: ColumnLayout

tslint.json

@@ -5,8 +5,9 @@
     ],
     "jsRules": {},
     "rules": {
-        "max-classes-per-file": false,
         "curly": false,
+        "max-classes-per-file": false,
+        "one-variable-per-declaration": false,
         "prefer-for-of": false
     },
     "rulesDirectory": []