bump version to 0.4

This reverts commit bdf62b65

Makefile

@@ -1,8 +1,10 @@
 .PHONY: *
 
+TSC_SCRIPT_FLAGS = --lib es2020 ./src/extern/qt.d.ts
+
 config:
 	mkdir -p ./package/contents/config
-	tsc ./src/config/definition.ts ./configgen/kcfg.ts --outFile /dev/stdout | node - > ./package/contents/config/main.xml
+	tsc ${TSC_SCRIPT_FLAGS} ./src/config/definition.ts ./generators/config/kcfg.ts --outFile /dev/stdout | node - > ./package/contents/config/main.xml
 
 build:
 	tsc --outFile ./package/contents/code/main.js
@@ -18,3 +20,12 @@ package:
 
 logs:
 	journalctl -t kwin_x11 -g '^qml:|^file://.*karousel' -f
+
+docs-key-bindings-bbcode:
+	@tsc ${TSC_SCRIPT_FLAGS} ./src/keyBindings/definition.ts ./generators/docs/keyBindings.ts ./generators/docs/keyBindingsBbcode.ts --outFile /dev/stdout | node -
+
+docs-key-bindings-table:
+	@tsc ${TSC_SCRIPT_FLAGS} ./src/keyBindings/definition.ts ./generators/docs/keyBindings.ts ./generators/docs/keyBindingsTable.ts --outFile /dev/stdout | node -
+
+docs-key-bindings-fmt:
+	@tsc ${TSC_SCRIPT_FLAGS} ./src/keyBindings/definition.ts ./generators/docs/keyBindings.ts ./generators/docs/keyBindingsFmt.ts --outFile /dev/stdout | node -

README.md

@@ -20,3 +20,41 @@ Similar window managers include [PaperWM](https://github.com/paperwm/PaperWM) an
 - Doesn't support multiple screens
 - Doesn't support windows on all desktops
 - Doesn't support windows on multiple activities
+
+## Key bindings
+The key bindings can be configured in KDE System Settings among KWin's own keyboard shortcuts.
+Here's the default ones:
+| Shortcut                 | Action                                                                                                                         |
+| ---                      | ---                                                                                                                            |
+| Meta+Space               | Toggle floating                                                                                                                |
+| Meta+A                   | Move focus left                                                                                                                |
+| Meta+D                   | Move focus right                                                                                                               |
+| Meta+W                   | Move focus up                                                                                                                  |
+| Meta+S                   | Move focus down                                                                                                                |
+| Meta+Home                | Move focus to start                                                                                                            |
+| Meta+End                 | Move focus to end                                                                                                              |
+| Meta+Shift+A             | Move window left (Moves window out of and into columns)                                                                        |
+| Meta+Shift+D             | Move window right (Moves window out of and into columns)                                                                       |
+| Meta+Shift+W             | Move window up                                                                                                                 |
+| Meta+Shift+S             | Move window down                                                                                                               |
+| Meta+Shift+Home          | Move window to start                                                                                                           |
+| Meta+Shift+End           | Move window to end                                                                                                             |
+| Meta+X                   | Toggle stacked layout for focused column                                                                                       |
+| Meta+Ctrl+Shift+A        | Move column left                                                                                                               |
+| Meta+Ctrl+Shift+D        | Move column right                                                                                                              |
+| Meta+Ctrl+Shift+Home     | Move column to start                                                                                                           |
+| Meta+Ctrl+Shift+End      | Move column to end                                                                                                             |
+| Meta+Ctrl++              | Increase column width                                                                                                          |
+| Meta+Ctrl+-              | Decrease column width                                                                                                          |
+| Meta+Alt+Return          | Center focused window (Scrolls so that the focused window is centered in the screen)                                           |
+| Meta+Alt+A               | Scroll one column to the left                                                                                                  |
+| Meta+Alt+D               | Scroll one column to the right                                                                                                 |
+| Meta+Alt+PgUp            | Scroll left                                                                                                                    |
+| Meta+Alt+PgDown          | Scroll right                                                                                                                   |
+| Meta+Alt+Home            | Scroll to start                                                                                                                |
+| Meta+Alt+End             | Scroll to end                                                                                                                  |
+| Meta+[N]                 | Move focus to column N                                                                                                         |
+| Meta+Shift+[N]           | Move window to column N (Requires manual remapping according to your keyboard layout, e.g. Meta+Shift+1 -> Meta+!)             |
+| Meta+Ctrl+Shift+[N]      | Move column to position N (Requires manual remapping according to your keyboard layout, e.g. Meta+Ctrl+Shift+1 -> Meta+Ctrl+!) |
+| Meta+Ctrl+Shift+F[N]     | Move column to desktop N                                                                                                       |
+| Meta+Ctrl+Shift+Alt+F[N] | Move this and all following columns to desktop N                                                                               |

generators/docs/keyBindings.ts

@@ -0,0 +1,67 @@
+type KeyBinding = {
+    name: string;
+    description: string;
+    comment?: string;
+    defaultKeySequence: string;
+    action: string;
+}
+
+type NumKeyBinding = {
+    name: string;
+    description: string;
+    comment?: string;
+    defaultModifiers: string;
+    fKeys: boolean;
+    action: string;
+}
+
+function formatComment(comment: string | undefined) {
+    return comment === undefined ? "" : ` (${comment})`;
+}
+
+function printCols(...columns: (string[] | string)[]) {
+    const nCols = columns.length;
+    if (nCols == 0) {
+        return;
+    }
+
+    let nRows = Math.min(...columns.filter(
+        (column: string[] | string) => column instanceof Array
+    ).map(
+        (column: string[] | string) => column.length
+    ));
+    if (nRows == Infinity) {
+        // we only have single string columns
+        nRows = 1;
+    }
+
+    const colWidths = columns.map(
+        (column: string[] | string) => {
+            if (column instanceof Array) {
+                return Math.max(...column.map(
+                    (cell: string) => cell.length
+                ))
+            } else {
+                return column.length;
+            }
+        }
+    );
+
+    function getCell(col: number, row: number) {
+        const column = columns[col];
+        const cell = column instanceof Array ? column[row] : column;
+        if (col < nCols-1) {
+            return cell.padEnd(colWidths[col]);
+        } else {
+            return cell;
+        }
+    }
+
+    for (let row = 0; row < nRows; row++) {
+        let line = "";
+        for (let col = 0; col < nCols; col++) {
+            line += getCell(col, row);
+        }
+        console.log(line);
+    }
+}

generators/docs/keyBindingsBbcode.ts

@@ -0,0 +1,12 @@
+console.log(`[list]`);
+
+for (const binding of keyBindings) {
+    console.log(`    [*] ${binding.defaultKeySequence} — ${binding.description}${formatComment(binding.comment)}`);
+}
+
+for (const binding of numKeyBindings) {
+    const numPrefix = binding.fKeys ? "F" : "";
+    console.log(`    [*] ${binding.defaultModifiers}+${numPrefix}[N] — ${binding.description}N${formatComment(binding.comment)}`);
+}
+
+console.log(`[/list]`);

generators/docs/keyBindingsFmt.ts

@@ -0,0 +1,14 @@
+const colLeft = [
+    ...keyBindings.map((binding: KeyBinding) => binding.defaultKeySequence),
+    ...numKeyBindings.map((binding: NumKeyBinding) => {
+        const numPrefix = binding.fKeys ? "F" : "";
+        return `${binding.defaultModifiers}+${numPrefix}[N]`;
+    }),
+];
+
+const colRight = [
+    ...keyBindings.map((binding: KeyBinding) => `${binding.description}${formatComment(binding.comment)}`),
+    ...numKeyBindings.map((binding: NumKeyBinding) => `${binding.description}N${formatComment(binding.comment)}`),
+];
+
+printCols(colLeft, " ", colRight);

generators/docs/keyBindingsTable.ts

@@ -0,0 +1,18 @@
+const colLeft = [
+    "Shortcut",
+    "---",
+    ...keyBindings.map((binding: KeyBinding) => binding.defaultKeySequence),
+    ...numKeyBindings.map((binding: NumKeyBinding) => {
+        const numPrefix = binding.fKeys ? "F" : "";
+        return `${binding.defaultModifiers}+${numPrefix}[N]`;
+    }),
+];
+
+const colRight = [
+    "Action",
+    "---",
+    ...keyBindings.map((binding: KeyBinding) => `${binding.description}${formatComment(binding.comment)}`),
+    ...numKeyBindings.map((binding: NumKeyBinding) => `${binding.description}N${formatComment(binding.comment)}`),
+];
+
+printCols("| ", colLeft, " | ", colRight, " |");

package/contents/code/main.qml

@@ -1,5 +1,6 @@
 import QtQuick 2.15
 import org.kde.kwin 3.0
+import org.kde.notification 1.0
 import "./main.js" as Karousel
 
 Item {
@@ -9,11 +10,19 @@ Item {
 
     Component.onCompleted: {
         qmlBase.karouselInstance = Karousel.init();
-        print("script started");
     }
 
     Component.onDestruction: {
         qmlBase.karouselInstance.destroy();
-        print("script stopped");
+    }
+
+    Notification {
+        id: notificationInvalidWindowRules
+        componentName: "plasma_workspace"
+        eventId: "notification"
+        title: "Karousel"
+        text: "Your Window Rules JSON is malformed, please review your Karousel configuration"
+        flags: Notification.Persistent
+        urgency: Notification.HighUrgency
     }
 }

package/contents/ui/config.ui

@@ -209,6 +209,14 @@
                             </item>
 
                             <item row="8" column="1">
+                                <widget class="QCheckBox" name="kcfg_untileOnDrag">
+                                    <property name="text">
+                                        <string>Un-tile windows by dragging them</string>
+                                    </property>
+                                </widget>
+                            </item>
+
+                            <item row="9" column="1">
                                 <widget class="QCheckBox" name="kcfg_stackColumnsByDefault">
                                     <property name="text">
                                         <string>Stack columns by default</string>
@@ -216,7 +224,15 @@
                                 </widget>
                             </item>
 
-                            <item row="9" column="0" colspan="2">
+                            <item row="10" column="1">
+                                <widget class="QCheckBox" name="kcfg_resizeNeighborColumn">
+                                    <property name="text">
+                                        <string>Resize neighbor column on edge resize</string>
+                                    </property>
+                                </widget>
+                            </item>
+
+                            <item row="11" column="0" colspan="2">
                                 <spacer name="bottomSpacer_tab_general">
                                     <property name="orientation">
                                         <enum>Qt::Vertical</enum>
@@ -227,7 +243,7 @@
                     </widget>
                     <widget class="QWidget" name="tab_windowRules">
                         <attribute name="title">
-                            <string>Window rules</string>
+                            <string>Window Rules</string>
                         </attribute>
                         <layout class="QVBoxLayout" name="layout_tab_windowRules">
                             <item>

package/metadata.json

@@ -9,7 +9,7 @@
         }],
         "Id": "karousel",
         "ServiceTypes": ["KWin/Script"],
-        "Version": "0.1",
+        "Version": "0.4",
         "License": "GPLv3",
         "Website": "https://github.com/peterfajdiga/karousel",
         "BugReportUrl": "https://github.com/peterfajdiga/karousel/issues"

src/Actions.ts

@@ -0,0 +1,323 @@
+namespace Actions {
+    export function init(world: World, config: Config) {
+        return {
+            focusLeft: () => {
+                world.doIfTiledFocused(true, (world, desktopManager, window, column, grid) => {
+                    const prevColumn = grid.getPrevColumn(column);
+                    if (prevColumn === null) {
+                        return;
+                    }
+                    prevColumn.focus();
+                });
+            },
+
+            focusRight: () => {
+                world.doIfTiledFocused(true, (world, desktopManager, window, column, grid) => {
+                    const nextColumn = grid.getNextColumn(column);
+                    if (nextColumn === null) {
+                        return;
+                    }
+                    nextColumn.focus();
+                });
+            },
+
+            focusUp: () => {
+                world.doIfTiledFocused(true, (world, desktopManager, window, column, grid) => {
+                    const prevWindow = column.getPrevWindow(window);
+                    if (prevWindow === null) {
+                        return;
+                    }
+                    prevWindow.focus();
+                });
+            },
+
+            focusDown: () => {
+                world.doIfTiledFocused(true, (world, desktopManager, window, column, grid) => {
+                    const nextWindow = column.getNextWindow(window);
+                    if (nextWindow === null) {
+                        return;
+                    }
+                    nextWindow.focus();
+                });
+            },
+
+            focusStart: () => {
+                world.do((clientManager, desktopManager) => {
+                    const grid = desktopManager.getCurrentDesktop().grid;
+                    const firstColumn = grid.getFirstColumn();
+                    if (firstColumn === null) {
+                        return;
+                    }
+                    firstColumn.focus();
+                });
+            },
+
+            focusEnd: () => {
+                world.do((clientManager, desktopManager) => {
+                    const grid = desktopManager.getCurrentDesktop().grid;
+                    const lastColumn = grid.getLastColumn();
+                    if (lastColumn === null) {
+                        return;
+                    }
+                    lastColumn.focus();
+                });
+            },
+
+            windowMoveLeft: () => {
+                world.doIfTiledFocused(true, (world, desktopManager, window, column, grid) => {
+                    if (column.getWindowCount() === 1) {
+                        // move from own column into existing column
+                        const prevColumn = grid.getPrevColumn(column);
+                        if (prevColumn === null) {
+                            return;
+                        }
+                        window.moveToColumn(prevColumn);
+                        grid.desktop.autoAdjustScroll();
+                    } else {
+                        // move from shared column into own column
+                        const newColumn = new Column(grid, grid.getPrevColumn(column));
+                        window.moveToColumn(newColumn);
+                    }
+                });
+            },
+
+            windowMoveRight: () => {
+                world.doIfTiledFocused(true, (world, desktopManager, window, column, grid) => {
+                    if (column.getWindowCount() === 1) {
+                        // move from own column into existing column
+                        const nextColumn = grid.getNextColumn(column);
+                        if (nextColumn === null) {
+                            return;
+                        }
+                        window.moveToColumn(nextColumn);
+                        grid.desktop.autoAdjustScroll();
+                    } else {
+                        // move from shared column into own column
+                        const newColumn = new Column(grid, column);
+                        window.moveToColumn(newColumn);
+                    }
+                });
+            },
+
+            windowMoveUp: () => {
+                // TODO (optimization): only arrange moved windows
+                world.doIfTiledFocused(true, (world, desktopManager, window, column, grid) => {
+                    column.moveWindowUp(window);
+                });
+            },
+
+            windowMoveDown: () => {
+                // TODO (optimization): only arrange moved windows
+                world.doIfTiledFocused(true, (world, desktopManager, window, column, grid) => {
+                    column.moveWindowDown(window);
+                });
+            },
+
+            windowMoveStart: () => {
+                world.doIfTiledFocused(true, (world, desktopManager, window, column, grid) => {
+                    const newColumn = new Column(grid, null);
+                    window.moveToColumn(newColumn);
+                });
+            },
+
+            windowMoveEnd: () => {
+                world.doIfTiledFocused(true, (world, desktopManager, window, column, grid) => {
+                    const newColumn = new Column(grid, grid.getLastColumn());
+                    window.moveToColumn(newColumn);
+                });
+            },
+
+            windowToggleFloating: () => {
+                const kwinClient = workspace.activeClient;
+                world.do((clientManager, desktopManager) => {
+                    clientManager.toggleFloatingClient(kwinClient);
+                });
+            },
+
+            columnMoveLeft: () => {
+                world.doIfTiledFocused(true, (world, desktopManager, window, column, grid) => {
+                    grid.moveColumnLeft(column);
+                });
+            },
+
+            columnMoveRight: () => {
+                world.doIfTiledFocused(true, (world, desktopManager, window, column, grid) => {
+                    grid.moveColumnRight(column);
+                });
+            },
+
+            columnMoveStart: () => {
+                world.doIfTiledFocused(true, (world, desktopManager, window, column, grid) => {
+                    column.moveAfter(null);
+                });
+            },
+
+            columnMoveEnd: () => {
+                world.doIfTiledFocused(true, (world, desktopManager, window, column, grid) => {
+                    column.moveAfter(grid.getLastColumn());
+                });
+            },
+
+            columnToggleStacked: () => {
+                world.doIfTiledFocused(false, (world, desktopManager, window, column, grid) => {
+                    column.toggleStacked();
+                });
+            },
+
+            columnWidthIncrease: () => {
+                world.doIfTiledFocused(false, (world, desktopManager, window, column, grid) => {
+                    grid.increaseColumnWidth(column);
+                });
+            },
+
+            columnWidthDecrease: () => {
+                world.doIfTiledFocused(false, (world, desktopManager, window, column, grid) => {
+                    grid.decreaseColumnWidth(column);
+                });
+            },
+
+            gridScrollLeft: () => {
+                gridScroll(world, -config.manualScrollStep);
+            },
+
+            gridScrollRight: () => {
+                gridScroll(world, config.manualScrollStep);
+            },
+
+            gridScrollStart: () => {
+                world.do((clientManager, desktopManager) => {
+                    const grid = desktopManager.getCurrentDesktop().grid;
+                    const firstColumn = grid.getFirstColumn();
+                    if (firstColumn === null) {
+                        return;
+                    }
+                    grid.desktop.scrollToColumn(firstColumn);
+                });
+            },
+
+            gridScrollEnd: () => {
+                world.do((clientManager, desktopManager) => {
+                    const grid = desktopManager.getCurrentDesktop().grid;
+                    const lastColumn = grid.getLastColumn();
+                    if (lastColumn === null) {
+                        return;
+                    }
+                    grid.desktop.scrollToColumn(lastColumn);
+                });
+            },
+
+            gridScrollFocused: () => {
+                world.doIfTiledFocused(true, (world, desktopManager, window, column, grid) => {
+                    grid.desktop.scrollCenterColumn(column);
+                })
+            },
+
+            gridScrollLeftColumn: () => {
+                world.do((clientManager, desktopManager) => {
+                    const grid = desktopManager.getCurrentDesktop().grid;
+                    const column = grid.getLeftmostVisibleColumn(grid.desktop.getCurrentScrollPos(), true);
+                    if (column === null) {
+                        return;
+                    }
+
+                    const prevColumn = grid.getPrevColumn(column);
+                    if (prevColumn === null) {
+                        return;
+                    }
+
+                    grid.desktop.scrollToColumn(prevColumn);
+                });
+            },
+
+            gridScrollRightColumn: () => {
+                world.do((clientManager, desktopManager) => {
+                    const grid = desktopManager.getCurrentDesktop().grid;
+                    const column = grid.getRightmostVisibleColumn(grid.desktop.getCurrentScrollPos(), true);
+                    if (column === null) {
+                        return;
+                    }
+
+                    const nextColumn = grid.getNextColumn(column);
+                    if (nextColumn === null) {
+                        return;
+                    }
+
+                    grid.desktop.scrollToColumn(nextColumn);
+                });
+            },
+        };
+    }
+
+    export function initNum(world: World) {
+        return {
+            focusColumn: (columnIndex: number) => {
+                world.do((clientManager, desktopManager) => {
+                    const grid = desktopManager.getCurrentDesktop().grid;
+                    const targetColumn = grid.getColumnAtIndex(columnIndex);
+                    if (targetColumn === null) {
+                        return null;
+                    }
+                    targetColumn.focus();
+                });
+            },
+
+            windowMoveToColumn: (columnIndex: number) => {
+                world.doIfTiledFocused(true, (world, desktopManager, window, column, grid) => {
+                    const targetColumn = grid.getColumnAtIndex(columnIndex);
+                    if (targetColumn === null) {
+                        return null;
+                    }
+                    window.moveToColumn(targetColumn);
+                    grid.desktop.autoAdjustScroll();
+                });
+            },
+
+            columnMoveToColumn: (columnIndex: number) => {
+                world.doIfTiledFocused(true, (world, desktopManager, window, column, grid) => {
+                    const targetColumn = grid.getColumnAtIndex(columnIndex);
+                    if (targetColumn === null || targetColumn === column) {
+                        return null;
+                    }
+                    if (targetColumn.isAfter(column)) {
+                        column.moveAfter(targetColumn);
+                    } else {
+                        column.moveAfter(grid.getPrevColumn(targetColumn));
+                    }
+                });
+            },
+
+            columnMoveToDesktop: (desktopIndex: number) => {
+                world.doIfTiledFocused(true, (clientManager, desktopManager, window, column, oldGrid) => {
+                    const desktopNumber = desktopIndex + 1;
+                    const newGrid = desktopManager.getDesktopInCurrentActivity(desktopNumber).grid;
+                    if (newGrid === null || newGrid === oldGrid) {
+                        return;
+                    }
+                    column.moveToGrid(newGrid, newGrid.getLastColumn());
+                });
+            },
+
+            tailMoveToDesktop: (desktopIndex: number) => {
+                world.doIfTiledFocused(true, (clientManager, desktopManager, window, column, oldGrid) => {
+                    const desktopNumber = desktopIndex + 1;
+                    const newGrid = desktopManager.getDesktopInCurrentActivity(desktopNumber).grid;
+                    if (newGrid === null || newGrid === oldGrid) {
+                        return;
+                    }
+                    oldGrid.evacuateTail(newGrid, column);
+                });
+            },
+        };
+    }
+
+    function gridScroll(world: World, amount: number) {
+        world.do((clientManager, desktopManager) => {
+            const grid = desktopManager.getCurrentDesktop().grid;
+            grid.desktop.adjustScroll(amount, false);
+        });
+    }
+
+    export type Config = {
+        manualScrollStep: number,
+    };
+}

src/ClientAreaOption.ts

@@ -0,0 +1,10 @@
+enum ClientAreaOption {
+    PlacementArea,
+    MovementArea,
+    MaximizeArea,
+    MaximizeFullArea,
+    FullScreenArea,
+    WorkArea,
+    FullArea,
+    ScreenArea,
+}

src/actions.ts

@@ -1,338 +0,0 @@
-function initActions(world: World) {
-    return {
-        focusLeft: () => {
-            world.doIfTiledFocused(true, (window, column, grid) => {
-                const prevColumn = grid.getPrevColumn(column);
-                if (prevColumn === null) {
-                    return;
-                }
-                prevColumn.focus();
-            });
-        },
-
-        focusRight: () => {
-            world.doIfTiledFocused(true, (window, column, grid) => {
-                const nextColumn = grid.getNextColumn(column);
-                if (nextColumn === null) {
-                    return;
-                }
-                nextColumn.focus();
-            });
-        },
-
-        focusUp: () => {
-            world.doIfTiledFocused(true, (window, column, grid) => {
-                const prevWindow = column.getPrevWindow(window);
-                if (prevWindow === null) {
-                    return;
-                }
-                prevWindow.focus();
-            });
-        },
-
-        focusDown: () => {
-            world.doIfTiledFocused(true, (window, column, grid) => {
-                const nextWindow = column.getNextWindow(window);
-                if (nextWindow === null) {
-                    return;
-                }
-                nextWindow.focus();
-            });
-        },
-
-        focusStart: () => {
-            const grid = world.getCurrentGrid();
-            const firstColumn = grid.getFirstColumn();
-            if (firstColumn === null) {
-                return;
-            }
-            firstColumn.focus();
-            grid.arrange();
-        },
-
-        focusEnd: () => {
-            const grid = world.getCurrentGrid();
-            const lastColumn = grid.getLastColumn();
-            if (lastColumn === null) {
-                return;
-            }
-            lastColumn.focus();
-            grid.arrange();
-        },
-
-        windowMoveLeft: () => {
-            world.doIfTiledFocused(true, (window, column, grid) => {
-                if (column.getWindowCount() === 1) {
-                    // move from own column into existing column
-                    const prevColumn = grid.getPrevColumn(column);
-                    if (prevColumn === null) {
-                        return;
-                    }
-                    window.moveToColumn(prevColumn);
-                    grid.autoAdjustScroll();
-                } else {
-                    // move from shared column into own column
-                    const newColumn = new Column(grid, grid.getPrevColumn(column));
-                    window.moveToColumn(newColumn);
-                }
-                grid.arrange();
-            });
-        },
-
-        windowMoveRight: () => {
-            world.doIfTiledFocused(true, (window, column, grid) => {
-                if (column.getWindowCount() === 1) {
-                    // move from own column into existing column
-                    const nextColumn = grid.getNextColumn(column);
-                    if (nextColumn === null) {
-                        return;
-                    }
-                    window.moveToColumn(nextColumn);
-                    grid.autoAdjustScroll();
-                } else {
-                    // move from shared column into own column
-                    const newColumn = new Column(grid, column);
-                    window.moveToColumn(newColumn);
-                }
-                grid.arrange();
-            });
-        },
-
-        windowMoveUp: () => {
-            world.doIfTiledFocused(true, (window, column, grid) => {
-                column.moveWindowUp(window);
-                grid.arrange(); // TODO (optimization): only arrange moved windows
-            });
-        },
-
-        windowMoveDown: () => {
-            world.doIfTiledFocused(true, (window, column, grid) => {
-                column.moveWindowDown(window);
-                grid.arrange(); // TODO (optimization): only arrange moved windows
-            });
-        },
-
-        windowMoveStart: () => {
-            world.doIfTiledFocused(true, (window, column, grid) => {
-                const newColumn = new Column(grid, null);
-                window.moveToColumn(newColumn);
-                grid.arrange();
-            });
-        },
-
-        windowMoveEnd: () => {
-            world.doIfTiledFocused(true, (window, column, grid) => {
-                const newColumn = new Column(grid, grid.getLastColumn());
-                window.moveToColumn(newColumn);
-                grid.arrange();
-            });
-        },
-
-        windowExpand: () => {
-            world.doIfTiledFocused(false, (window, column, grid) => {
-                column.toggleStacked();
-                grid.arrange();
-            });
-        },
-
-        windowToggleFloating: () => {
-            const kwinClient = workspace.activeClient;
-            world.toggleFloatingClient(kwinClient);
-        },
-
-        columnMoveLeft: () => {
-            world.doIfTiledFocused(true, (window, column, grid) => {
-                grid.moveColumnLeft(column);
-                grid.arrange();
-            });
-        },
-
-        columnMoveRight: () => {
-            world.doIfTiledFocused(true, (window, column, grid) => {
-                grid.moveColumnRight(column);
-                grid.arrange();
-            });
-        },
-
-        columnMoveStart: () => {
-            world.doIfTiledFocused(true, (window, column, grid) => {
-                column.moveAfter(null);
-                grid.arrange();
-            });
-        },
-
-        columnMoveEnd: () => {
-            world.doIfTiledFocused(true, (window, column, grid) => {
-                column.moveAfter(grid.getLastColumn());
-                grid.arrange();
-            });
-        },
-
-        columnExpand: () => {
-            world.doIfTiledFocused(false, (window, column, grid) => {
-                column.expand();
-                grid.arrange();
-            });
-        },
-
-        gridScrollLeft: () => {
-            gridScroll(world, -world.config.manualScrollStep);
-        },
-
-        gridScrollRight: () => {
-            gridScroll(world, world.config.manualScrollStep);
-        },
-
-        gridScrollStart: () => {
-            const grid = world.getCurrentGrid();
-            const firstColumn = grid.getFirstColumn();
-            if (firstColumn === null) {
-                return;
-            }
-            grid.scrollToColumn(firstColumn);
-            grid.arrange();
-        },
-
-        gridScrollEnd: () => {
-            const grid = world.getCurrentGrid();
-            const lastColumn = grid.getLastColumn();
-            if (lastColumn === null) {
-                return;
-            }
-            grid.scrollToColumn(lastColumn);
-            grid.arrange();
-        },
-
-        gridScrollFocused: () => {
-            const focusedWindow = world.getFocusedWindow();
-            if (focusedWindow === null) {
-                return;
-            }
-            const column = focusedWindow.column;
-            const grid = column.grid;
-            grid.scrollToColumn(column);
-            grid.arrange();
-        },
-
-        gridScrollLeftColumn: () => {
-            const grid = world.getCurrentGrid();
-            const column = grid.getLeftmostVisibleColumn(true);
-            if (column === null) {
-                return;
-            }
-
-            const prevColumn = grid.getPrevColumn(column);
-            if (prevColumn === null) {
-                return;
-            }
-
-            grid.scrollToColumn(prevColumn);
-            grid.arrange();
-        },
-
-        gridScrollRightColumn: () => {
-            const grid = world.getCurrentGrid();
-            const column = grid.getRightmostVisibleColumn(true);
-            if (column === null) {
-                return;
-            }
-
-            const nextColumn = grid.getNextColumn(column);
-            if (nextColumn === null) {
-                return;
-            }
-
-            grid.scrollToColumn(nextColumn);
-            grid.arrange();
-        },
-
-        focusColumn: (columnIndex: number) => {
-            const grid = world.getCurrentGrid();
-            const targetColumn = grid.getColumnAtIndex(columnIndex);
-            if (targetColumn === null) {
-                return null;
-            }
-            targetColumn.focus();
-        },
-
-        windowMoveToColumn: (columnIndex: number) => {
-            world.doIfTiledFocused(true, (window, column, grid) => {
-                const targetColumn = grid.getColumnAtIndex(columnIndex);
-                if (targetColumn === null) {
-                    return null;
-                }
-                window.moveToColumn(targetColumn);
-                grid.autoAdjustScroll();
-                grid.arrange();
-            });
-        },
-
-        columnMoveToColumn: (columnIndex: number) => {
-            world.doIfTiledFocused(true, (window, column, grid) => {
-                const targetColumn = grid.getColumnAtIndex(columnIndex);
-                if (targetColumn === null || targetColumn === column) {
-                    return null;
-                }
-                if (targetColumn.isAfter(column)) {
-                    column.moveAfter(targetColumn);
-                } else {
-                    column.moveAfter(grid.getPrevColumn(targetColumn));
-                }
-                grid.arrange();
-            });
-        },
-
-        columnMoveToDesktop: (desktopIndex: number) => {
-            world.doIfTiledFocused(true, (window, column, oldGrid) => {
-                const desktopNumber = desktopIndex + 1;
-                const newGrid = world.getGridInCurrentActivity(desktopNumber);
-                if (newGrid === null || newGrid === oldGrid) {
-                    return;
-                }
-                column.moveToGrid(newGrid, newGrid.getLastColumn());
-                oldGrid.arrange();
-                newGrid.arrange();
-            });
-        },
-
-        tailMoveToDesktop: (desktopIndex: number) => {
-            world.doIfTiledFocused(true, (window, column, oldGrid) => {
-                const desktopNumber = desktopIndex + 1;
-                const newGrid = world.getGridInCurrentActivity(desktopNumber);
-                if (newGrid === null || newGrid === oldGrid) {
-                    return;
-                }
-                oldGrid.evacuateTail(newGrid, column);
-                oldGrid.arrange();
-                newGrid.arrange();
-            });
-        },
-    };
-}
-
-function gridScroll(world: World, amount: number) {
-    const scrollAmount = amount;
-    const grid = world.getCurrentGrid();
-    grid.adjustScroll(scrollAmount, false);
-    grid.arrange();
-}
-
-function canTileEver(kwinClient: AbstractClient) {
-    return kwinClient.resizeable;
-}
-
-function canTileNow(kwinClient: AbstractClient) {
-    return canTileEver(kwinClient) && !kwinClient.minimized && kwinClient.desktop > 0 && kwinClient.activities.length === 1;
-}
-
-function makeTileable(kwinClient: AbstractClient) {
-    if (kwinClient.minimized) {
-        kwinClient.minimized = false;
-    }
-    if (kwinClient.desktop <= 0) {
-        kwinClient.desktop = workspace.currentDesktop;
-    }
-    if (kwinClient.activities.length !== 1) {
-        kwinClient.activities = [workspace.currentActivity];
-    }
-}

src/config/config.ts

@@ -7,6 +7,8 @@ type Config = {
     gapsInnerVertical: number,
     overscroll: number,
     manualScrollStep: number,
+    untileOnDrag: boolean,
     stackColumnsByDefault: boolean,
+    resizeNeighborColumn: boolean,
     windowRules: string,
-}
+};

src/config/definition.ts

@@ -15,6 +15,10 @@ const defaultWindowRules = `[
         "class": "kruler",
         "tile": false
     },
+    {
+        "class": "krunner",
+        "tile": false
+    },
     {
         "class": "zoom",
         "caption": "Zoom Cloud Meetings",
@@ -88,11 +92,21 @@ const configDef = [
         "type": "UInt",
         "default": 200
     },
+    {
+        "name": "untileOnDrag",
+        "type": "Bool",
+        "default": true
+    },
     {
         "name": "stackColumnsByDefault",
         "type": "Bool",
         "default": false
     },
+    {
+        "name": "resizeNeighborColumn",
+        "type": "Bool",
+        "default": false
+    },
     {
         "name": "windowRules",
         "type": "String",

src/extern.d.ts

@@ -1,13 +0,0 @@
-const qmlBase;
-const console;
-const KWin;
-const Qt;
-const workspace;
-const options;
-
-type AbstractClient = any;
-type TopLevel = any;
-type X11Client = any;
-type QRect = any;
-type QSignal = any;
-type QQmlTimer = any;

src/extern/global.d.ts

@@ -0,0 +1,6 @@
+declare const qmlBase: QmlObject;
+declare const notificationInvalidWindowRules: Notification;
+
+type Notification = {
+    sendEvent(): void;
+};

src/extern/kwin.d.ts

@@ -0,0 +1,83 @@
+declare const KWin: {
+    // Functions
+    readConfig(key: string, defaultValue: any): any;
+    registerShortcut(name: string, description: string, keySequence: string, callback: () => void): void;
+};
+
+declare const workspace: {
+    // Read-write Properties
+    readonly desktops: number;
+    readonly currentDesktop: number;
+    readonly currentActivity: string;
+
+    // Read-write Properties
+    activeClient: KwinClient;
+
+    // Signals
+    currentDesktopChanged: QSignal<[oldDesktopNumber: number]>
+    clientAdded: QSignal<[KwinClient]>;
+    clientRemoved: QSignal<[AbstractClient]>;
+    clientMinimized: QSignal<[AbstractClient]>;
+    clientUnminimized: QSignal<[AbstractClient]>;
+    clientMaximizeSet: QSignal<[AbstractClient, horizontally: boolean, vertically: boolean]>;
+    clientActivated: QSignal<[AbstractClient]>;
+    numberDesktopsChanged: QSignal<[oldNumberOfVirtualDesktops: number]>;
+    currentActivityChanged: QSignal<[newActivity: string]>;
+    virtualScreenSizeChanged: QSignal<[void]>;
+
+    // Functions
+    clientArea(option: ClientAreaOption, screenNumber: number, desktopNumber: number);
+    clientList(): TopLevel[];
+};
+
+type Tile = any;
+
+interface AbstractClient {
+    // Read-only Properties
+    readonly caption: string;
+    readonly minSize: QSize;
+    readonly transient: boolean;
+    readonly transientFor: AbstractClient;
+    readonly move: boolean;
+    readonly resize: boolean;
+    readonly resizeable: boolean;
+
+    // Read-write Properties
+    fullScreen: boolean;
+    activities: string[]; // empty array means all activities
+    keepBelow: boolean;
+    shade: boolean;
+    minimized: boolean;
+    tile: Tile;
+
+    // Signals
+    fullScreenChanged: QSignal<[void]>;
+    desktopChanged: QSignal<[void]>;
+    activitiesChanged: QSignal<[AbstractClient]>;
+    captionChanged: QSignal<[void]>;
+    tileChanged: QSignal<[Tile]>;
+    moveResizedChanged: QSignal<[void]>;
+    moveResizeCursorChanged: QSignal<[void]>;
+    clientStartUserMovedResized: QSignal<[void]>;
+
+    // Functions
+    setMaximize(vertically: boolean, horizontally: boolean): void;
+}
+
+interface TopLevel extends AbstractClient {
+    // Read-only Properties
+    readonly screen: number;
+    readonly resourceClass: QByteArray;
+    readonly dock: boolean;
+    readonly normalWindow: boolean;
+    readonly managed: boolean;
+
+    // Read-write Properties
+    frameGeometry: QRect;
+    desktop: number; // -1 means all desktops
+
+    // Signals
+    frameGeometryChanged: QSignal<[TopLevel, oldGeometry: QRect]>;
+}
+
+interface KwinClient extends TopLevel {}

src/extern/qt.d.ts

@@ -0,0 +1,41 @@
+declare const console: {
+    log(...args: any[]);
+    assert(boolean);
+};
+
+declare const Qt: {
+    rect(x: number, y: number, width: number, height: number): QRect;
+    createQmlObject(qml: string, parent: QmlObject);
+};
+
+type QmlObject = unknown;
+
+type QByteArray = string;
+
+type QRect = {
+    x: number;
+    y: number;
+    width: number;
+    height: number;
+    top: number;
+    bottom: number;
+    left: number;
+    right: number;
+};
+
+type QSize = {
+    width: number;
+    height: number;
+};
+
+type QSignal<T extends unknown[]> = {
+    connect(handler: (...args: [...T]) => void): void;
+    disconnect(handler: (...args: [...T]) => void): void;
+};
+
+type QQmlTimer = {
+    interval: number;
+    triggered: QSignal<[void]>;
+    restart(): void;
+    destroy(): void;
+};

src/keyBindings/definition.ts

@@ -0,0 +1,211 @@
+const keyBindings: KeyBinding[] = [
+    {
+        "name": "window-toggle-floating",
+        "description": "Toggle floating",
+        "defaultKeySequence": "Meta+Space",
+        "action": "windowToggleFloating",
+    },
+    {
+        "name": "focus-left",
+        "description": "Move focus left",
+        "defaultKeySequence": "Meta+A",
+        "action": "focusLeft",
+    },
+    {
+        "name": "focus-right",
+        "description": "Move focus right",
+        "comment": "Clashes with default KDE shortcuts, may require manual remapping",
+        "defaultKeySequence": "Meta+D",
+        "action": "focusRight",
+    },
+    {
+        "name": "focus-up",
+        "description": "Move focus up",
+        "comment": "Clashes with default KDE shortcuts, may require manual remapping",
+        "defaultKeySequence": "Meta+W",
+        "action": "focusUp",
+    },
+    {
+        "name": "focus-down",
+        "description": "Move focus down",
+        "comment": "Clashes with default KDE shortcuts, may require manual remapping",
+        "defaultKeySequence": "Meta+S",
+        "action": "focusDown",
+    },
+    {
+        "name": "focus-start",
+        "description": "Move focus to start",
+        "defaultKeySequence": "Meta+Home",
+        "action": "focusStart",
+    },
+    {
+        "name": "focus-end",
+        "description": "Move focus to end",
+        "defaultKeySequence": "Meta+End",
+        "action": "focusEnd",
+    },
+    {
+        "name": "window-move-left",
+        "description": "Move window left",
+        "comment": "Moves window out of and into columns",
+        "defaultKeySequence": "Meta+Shift+A",
+        "action": "windowMoveLeft",
+    },
+    {
+        "name": "window-move-right",
+        "description": "Move window right",
+        "comment": "Moves window out of and into columns",
+        "defaultKeySequence": "Meta+Shift+D",
+        "action": "windowMoveRight",
+    },
+    {
+        "name": "window-move-up",
+        "description": "Move window up",
+        "defaultKeySequence": "Meta+Shift+W",
+        "action": "windowMoveUp",
+    },
+    {
+        "name": "window-move-down",
+        "description": "Move window down",
+        "defaultKeySequence": "Meta+Shift+S",
+        "action": "windowMoveDown",
+    },
+    {
+        "name": "window-move-start",
+        "description": "Move window to start",
+        "defaultKeySequence": "Meta+Shift+Home",
+        "action": "windowMoveStart",
+    },
+    {
+        "name": "window-move-end",
+        "description": "Move window to end",
+        "defaultKeySequence": "Meta+Shift+End",
+        "action": "windowMoveEnd",
+    },
+    {
+        "name": "column-toggle-stacked",
+        "description": "Toggle stacked layout for focused column",
+        "defaultKeySequence": "Meta+X",
+        "action": "columnToggleStacked",
+    },
+    {
+        "name": "column-move-left",
+        "description": "Move column left",
+        "defaultKeySequence": "Meta+Ctrl+Shift+A",
+        "action": "columnMoveLeft",
+    },
+    {
+        "name": "column-move-right",
+        "description": "Move column right",
+        "defaultKeySequence": "Meta+Ctrl+Shift+D",
+        "action": "columnMoveRight",
+    },
+    {
+        "name": "column-move-start",
+        "description": "Move column to start",
+        "defaultKeySequence": "Meta+Ctrl+Shift+Home",
+        "action": "columnMoveStart",
+    },
+    {
+        "name": "column-move-end",
+        "description": "Move column to end",
+        "defaultKeySequence": "Meta+Ctrl+Shift+End",
+        "action": "columnMoveEnd",
+    },
+    {
+        "name": "column-width-increase",
+        "description": "Increase column width",
+        "defaultKeySequence": "Meta+Ctrl++",
+        "action": "columnWidthIncrease",
+    },
+    {
+        "name": "column-width-decrease",
+        "description": "Decrease column width",
+        "defaultKeySequence": "Meta+Ctrl+-",
+        "action": "columnWidthDecrease",
+    },
+    {
+        "name": "grid-scroll-focused",
+        "description": "Center focused window",
+        "comment": "Scrolls so that the focused window is centered in the screen",
+        "defaultKeySequence": "Meta+Alt+Return",
+        "action": "gridScrollFocused",
+    },
+    {
+        "name": "grid-scroll-left-column",
+        "description": "Scroll one column to the left",
+        "defaultKeySequence": "Meta+Alt+A",
+        "action": "gridScrollLeftColumn",
+    },
+    {
+        "name": "grid-scroll-right-column",
+        "description": "Scroll one column to the right",
+        "defaultKeySequence": "Meta+Alt+D",
+        "action": "gridScrollRightColumn",
+    },
+    {
+        "name": "grid-scroll-left",
+        "description": "Scroll left",
+        "defaultKeySequence": "Meta+Alt+PgUp",
+        "action": "gridScrollLeft",
+    },
+    {
+        "name": "grid-scroll-right",
+        "description": "Scroll right",
+        "defaultKeySequence": "Meta+Alt+PgDown",
+        "action": "gridScrollRight",
+    },
+    {
+        "name": "grid-scroll-start",
+        "description": "Scroll to start",
+        "defaultKeySequence": "Meta+Alt+Home",
+        "action": "gridScrollStart",
+    },
+    {
+        "name": "grid-scroll-end",
+        "description": "Scroll to end",
+        "defaultKeySequence": "Meta+Alt+End",
+        "action": "gridScrollEnd",
+    },
+];
+
+const numKeyBindings: NumKeyBinding[] = [
+    {
+        "name": "focus-",
+        "description": "Move focus to column ",
+        "comment": "Clashes with default KDE shortcuts, may require manual remapping",
+        "defaultModifiers": "Meta",
+        "fKeys": false,
+        "action": "focusColumn",
+    },
+    {
+        "name": "window-move-to-column-",
+        "description": "Move window to column ",
+        "comment": "Requires manual remapping according to your keyboard layout, e.g. Meta+Shift+1 -> Meta+!",
+        "defaultModifiers": "Meta+Shift",
+        "fKeys": false,
+        "action": "windowMoveToColumn",
+    },
+    {
+        "name": "column-move-to-column-",
+        "description": "Move column to position ",
+        "comment": "Requires manual remapping according to your keyboard layout, e.g. Meta+Ctrl+Shift+1 -> Meta+Ctrl+!",
+        "defaultModifiers": "Meta+Ctrl+Shift",
+        "fKeys": false,
+        "action": "columnMoveToColumn",
+    },
+    {
+        "name": "column-move-to-desktop-",
+        "description": "Move column to desktop ",
+        "defaultModifiers": "Meta+Ctrl+Shift",
+        "fKeys": true,
+        "action": "columnMoveToDesktop",
+    },
+    {
+        "name": "tail-move-to-desktop-",
+        "description": "Move this and all following columns to desktop ",
+        "defaultModifiers": "Meta+Ctrl+Shift+Alt",
+        "fKeys": true,
+        "action": "tailMoveToDesktop",
+    },
+];

src/keyBindings/loader.ts

@@ -0,0 +1,65 @@
+type KeyBinding = {
+    name: string;
+    description: string;
+    comment?: string;
+    defaultKeySequence: string;
+    action: keyof ReturnType<typeof Actions.init>;
+};
+
+type NumKeyBinding = {
+    name: string;
+    description: string;
+    comment?: string;
+    defaultModifiers: string;
+    fKeys: boolean;
+    action: keyof ReturnType<typeof Actions.initNum>;
+};
+
+function catchWrap(f: () => void) {
+    return () => {
+        try {
+            f();
+        } catch (error: any) {
+            log(error);
+            log(error.stack);
+        }
+    };
+}
+
+function registerKeyBinding(name: string, description: string, keySequence: string, callback: () => void) {
+    KWin.registerShortcut(
+        "karousel-" + name,
+        "Karousel: " + description,
+        keySequence,
+        catchWrap(callback),
+    );
+}
+
+function registerNumKeyBindings(name: string, description: string, modifiers: string, fKeys: boolean, callback: (i: number) => void) {
+    const numPrefix = fKeys ? "F" : "";
+    const n = fKeys ? 12 : 9;
+    for (let i = 0; i < 12; i++) {
+        const numKey = String(i + 1);
+        const keySequence = i < n ?
+            modifiers + "+" + numPrefix + numKey :
+            "";
+        registerKeyBinding(
+            name + numKey,
+            description + numKey,
+            keySequence,
+            () => callback(i),
+        );
+    }
+}
+
+function registerKeyBindings(world: World, config: Config) {
+    const actions = Actions.init(world, config);
+    for (const binding of keyBindings) {
+        registerKeyBinding(binding.name, binding.description, binding.defaultKeySequence, actions[binding.action]);
+    }
+
+    const numActions = Actions.initNum(world);
+    for (const binding of numKeyBindings) {
+        registerNumKeyBindings(binding.name, binding.description, binding.defaultModifiers, binding.fKeys, numActions[binding.action]);
+    }
+}

src/layout/Column.ts

@@ -1,24 +1,23 @@
 class Column {
     public grid: Grid;
     public gridX: number;
-    public width: number; // TODO: increase column width to contain transients
+    private width: number; // TODO: increase column width to contain transients
     private readonly windows: LinkedList<Window>;
     private stacked: boolean;
     private focusTaker: Window|null;
-    private widthBeforeExpand: number;
+    private static readonly minWidth = 10;
 
     constructor(grid: Grid, prevColumn: Column|null) {
         this.gridX = 0;
         this.width = 0;
         this.windows = new LinkedList();
-        this.stacked = grid.world.config.stackColumnsByDefault;
+        this.stacked = grid.config.stackColumnsByDefault;
         this.focusTaker = null;
-        this.widthBeforeExpand = 0;
         this.grid = grid;
         this.grid.onColumnAdded(this, prevColumn);
     }
 
-    moveToGrid(targetGrid: Grid, prevColumn: Column|null) {
+    public moveToGrid(targetGrid: Grid, prevColumn: Column|null) {
         if (targetGrid === this.grid) {
             this.grid.onColumnMoved(this, prevColumn);
         } else {
@@ -26,60 +25,73 @@ class Column {
             this.grid = targetGrid;
             targetGrid.onColumnAdded(this, prevColumn);
             for (const window of this.windows.iterator()) {
-                window.client.kwinClient.desktop = targetGrid.desktop;
+                window.client.kwinClient.desktop = targetGrid.desktop.desktopNumber;
             }
         }
     }
 
-    moveAfter(prevColumn: Column|null) {
+    public moveAfter(prevColumn: Column|null) {
         if (prevColumn === this) {
             return;
         }
         this.grid.onColumnMoved(this, prevColumn);
     }
 
-    isAfter(other: Column) {
+    public isAfter(other: Column) {
         return this.gridX > other.gridX;
     }
 
-    isBefore(other: Column) {
+    public isBefore(other: Column) {
         return this.gridX < other.gridX;
     }
 
-    moveWindowUp(window: Window) {
+    public moveWindowUp(window: Window) {
         this.windows.moveBack(window);
+        this.grid.desktop.onLayoutChanged();
     }
 
-    moveWindowDown(window: Window) {
+    public moveWindowDown(window: Window) {
         this.windows.moveForward(window);
+        this.grid.desktop.onLayoutChanged();
     }
 
-    getWindowCount() {
+    public getWindowCount() {
         return this.windows.length();
     }
 
-    isEmpty() {
+    public isEmpty() {
         return this.getWindowCount() === 0;
     }
 
-    getPrevWindow(window: Window) {
+    public getPrevWindow(window: Window) {
         return this.windows.getPrev(window);
     }
 
-    getNextWindow(window: Window) {
+    public getNextWindow(window: Window) {
         return this.windows.getNext(window);
     }
 
-    getWidth() {
+    public getWidth() {
         return this.width;
     }
 
-    getMaxWidth() {
-        return this.grid.tilingArea.width;
+    public getMinWidth() {
+        let maxMinWidth = Column.minWidth;
+        for (const window of this.windows.iterator()) {
+            const minWidth = window.client.kwinClient.minSize.width;
+            if (minWidth > maxMinWidth) {
+                maxMinWidth = minWidth;
+            }
+        }
+        return maxMinWidth;
     }
 
-    setWidth(width: number, setPreferred: boolean) {
-        width = Math.min(width, this.getMaxWidth());
+    public getMaxWidth() {
+        return this.grid.desktop.tilingArea.width;
+    }
+
+    public setWidth(width: number, setPreferred: boolean) {
+        width = clamp(width, this.getMinWidth(), this.getMaxWidth());
         const oldWidth = this.width;
         this.width = width;
         if (setPreferred) {
@@ -92,22 +104,34 @@ class Column {
         }
     }
 
-    adjustWidth(widthDelta: number, setPreferred: boolean) {
+    public adjustWidth(widthDelta: number, setPreferred: boolean) {
         this.setWidth(this.width + widthDelta, setPreferred);
     }
 
-    expand() {
-        const maxWidth = this.getMaxWidth();
-        const isAlreadyExpanded = this.width === maxWidth && this.widthBeforeExpand > 0;
-        if (isAlreadyExpanded) {
-            this.setWidth(this.widthBeforeExpand, false);
-        } else {
-            this.widthBeforeExpand = this.width;
-            this.setWidth(maxWidth, false);
+    public updateWidth() {
+        let minErr = Infinity;
+        let closestPreferredWidth = this.width;
+        for (const window of this.windows.iterator()) {
+            const err = Math.abs(window.client.preferredWidth - this.width);
+            if (err < minErr) {
+                minErr = err;
+                closestPreferredWidth = window.client.preferredWidth;
+            }
         }
+        this.setWidth(closestPreferredWidth, false);
     }
 
-    adjustWindowHeight(window: Window, heightDelta: number, top: boolean) {
+    // returns x position of left edge in grid space
+    public getLeft() {
+        return this.gridX;
+    }
+
+    // returns x position of right edge in grid space
+    public getRight() {
+        return this.gridX + this.width;
+    }
+
+    public adjustWindowHeight(window: Window, heightDelta: number, top: boolean) {
         const otherWindow = top ? this.windows.getPrev(window) : this.windows.getNext(window);
         if (otherWindow === null) {
             return;
@@ -115,18 +139,20 @@ class Column {
 
         window.height += heightDelta;
         otherWindow.height -= heightDelta;
+
+        this.grid.desktop.onLayoutChanged();
     }
 
-    resizeWindows() {
+    public resizeWindows() {
         const nWindows = this.windows.length();
         if (nWindows === 0) {
             return;
         }
         if (nWindows === 1) {
-            this.stacked = this.grid.world.config.stackColumnsByDefault;
+            this.stacked = this.grid.config.stackColumnsByDefault;
         }
 
-        let remainingPixels = this.grid.tilingArea.height - (nWindows-1) * this.grid.world.config.gapsInnerVertical;
+        let remainingPixels = this.grid.desktop.tilingArea.height - (nWindows-1) * this.grid.config.gapsInnerVertical;
         let remainingWindows = nWindows;
         for (const window of this.windows.iterator()) {
             const windowHeight = Math.round(remainingPixels / remainingWindows);
@@ -135,16 +161,18 @@ class Column {
             remainingWindows--;
         }
         // TODO: respect min height
+
+        this.grid.desktop.onLayoutChanged();
     }
 
-    getFocusTaker() {
+    public getFocusTaker() {
         if (this.focusTaker === null || !this.windows.contains(this.focusTaker)) {
             return null;
         }
         return this.focusTaker;
     }
 
-    focus() {
+    public focus() {
         const window = this.getFocusTaker() ?? this.windows.getFirst();
         if (window === null) {
             return;
@@ -152,20 +180,20 @@ class Column {
         window.focus();
     }
 
-    arrange(x: number) {
+    public arrange(x: number) {
         if (this.stacked && this.windows.length() >= 2) {
             this.arrangeStacked(x);
             return;
         }
-        let y = this.grid.tilingArea.y;
+        let y = this.grid.desktop.tilingArea.y;
         for (const window of this.windows.iterator()) {
             window.client.setShade(false);
             window.arrange(x, y, this.width, window.height);
-            y += window.height + this.grid.world.config.gapsInnerVertical;
+            y += window.height + this.grid.config.gapsInnerVertical;
         }
     }
 
-    arrangeStacked(x: number) {
+    public arrangeStacked(x: number) {
         const expandedWindow = this.getFocusTaker();
         let collapsedHeight;
         for (const window of this.windows.iterator()) {
@@ -178,28 +206,39 @@ class Column {
         }
 
         const nCollapsed = this.getWindowCount() - 1;
-        const expandedHeight = this.grid.tilingArea.height - nCollapsed * (collapsedHeight + this.grid.world.config.gapsInnerVertical);
-        let y = this.grid.tilingArea.y;
+        const expandedHeight = this.grid.desktop.tilingArea.height - nCollapsed * (collapsedHeight! + this.grid.config.gapsInnerVertical);
+        let y = this.grid.desktop.tilingArea.y;
         for (const window of this.windows.iterator()) {
             if (window === expandedWindow) {
                 window.arrange(x, y, this.width, expandedHeight);
                 y += expandedHeight;
             } else {
                 window.arrange(x, y, this.width, window.height);
-                y += collapsedHeight;
+                y += collapsedHeight!;
             }
-            y += this.grid.world.config.gapsInnerVertical;
+            y += this.grid.config.gapsInnerVertical;
         }
     }
 
-    toggleStacked() {
+    public toggleStacked() {
         if (this.windows.length() < 2) {
             return;
         }
         this.stacked = !this.stacked;
+        this.grid.desktop.onLayoutChanged();
     }
 
-    onWindowAdded(window: Window) {
+    public isVisible(scrollPos: Desktop.ScrollPos, fullyVisible: boolean) {
+        if (fullyVisible) {
+            return this.getLeft() >= scrollPos.getLeft() &&
+                this.getRight() <= scrollPos.getRight();
+        } else {
+            return this.getRight() + this.grid.config.gapsInnerHorizontal > scrollPos.getLeft() &&
+                this.getLeft() - this.grid.config.gapsInnerHorizontal < scrollPos.getRight();
+        }
+    }
+
+    public onWindowAdded(window: Window) {
         this.windows.insertEnd(window);
         if (this.width === 0) {
             this.setWidth(window.client.preferredWidth, false);
@@ -211,9 +250,11 @@ class Column {
         if (window.isFocused()) {
             this.onWindowFocused(window);
         }
+
+        this.grid.desktop.onLayoutChanged();
     }
 
-    onWindowRemoved(window: Window, passFocus: boolean) {
+    public onWindowRemoved(window: Window, passFocus: boolean) {
         const lastWindow = this.windows.length() === 1;
         const windowToFocus = this.getPrevWindow(window) ?? this.getNextWindow(window);
 
@@ -232,21 +273,23 @@ class Column {
                 windowToFocus.focus();
             }
         }
+
+        this.grid.desktop.onLayoutChanged();
     }
 
-    onWindowFocused(window: Window) {
+    public onWindowFocused(window: Window) {
         this.grid.onColumnFocused(this);
         this.focusTaker = window;
     }
 
-    restoreToTiled() {
+    public restoreToTiled() {
         const lastFocusedWindow = this.getFocusTaker();
         if (lastFocusedWindow !== null) {
             lastFocusedWindow.restoreToTiled();
         }
     }
 
-    destroy(passFocus: boolean) {
+    private destroy(passFocus: boolean) {
         this.grid.onColumnRemoved(this, passFocus);
     }
 }

src/layout/Desktop.ts

@@ -0,0 +1,183 @@
+class Desktop {
+    public readonly grid: Grid;
+    public readonly desktopNumber: number;
+    private readonly config: Desktop.Config;
+    private scrollX: number;
+    private dirty: boolean;
+    public clientArea: QRect;
+    public tilingArea: QRect;
+
+    constructor(desktopNumber: number, config: Desktop.Config, layoutConfig: LayoutConfig) {
+        this.config = config;
+        this.scrollX = 0;
+        this.dirty = false;
+        this.desktopNumber = desktopNumber;
+        this.grid = new Grid(this, layoutConfig);
+        this.clientArea = Desktop.getClientArea(desktopNumber);
+        this.tilingArea = Desktop.getTilingArea(this.clientArea, config);
+    }
+
+    private updateArea() {
+        const newClientArea = Desktop.getClientArea(this.desktopNumber);
+        if (newClientArea === this.clientArea) {
+            return;
+        }
+        this.clientArea = newClientArea;
+        this.tilingArea = Desktop.getTilingArea(newClientArea, this.config);
+        this.dirty = true;
+        this.grid.onScreenSizeChanged();
+        this.autoAdjustScroll();
+    }
+
+    private static getClientArea(desktopNumber: number) {
+        return workspace.clientArea(ClientAreaOption.PlacementArea, 0, desktopNumber);
+    }
+
+    private static getTilingArea(clientArea: QRect, config: Desktop.Config) {
+        return Qt.rect(
+            clientArea.x + config.marginLeft,
+            clientArea.y + config.marginTop,
+            clientArea.width - config.marginLeft - config.marginRight,
+            clientArea.height - config.marginTop - config.marginBottom,
+        )
+    }
+
+    // calculates Desktop.Pos that scrolls the column into view
+    public getScrollPosForColumn(column: Column) {
+        const left = column.getLeft();
+        const right = column.getRight();
+        const initialScrollPos = this.getCurrentScrollPos();
+
+        let targetScrollX: number;
+        if (left < initialScrollPos.getLeft()) {
+            targetScrollX = left;
+        } else if (right > initialScrollPos.getRight()) {
+            targetScrollX = right - this.tilingArea.width;
+        } else {
+            return this.getScrollPos(this.clampScrollX(this.scrollX));
+        }
+
+        const overscroll = this.getTargetOverscroll(targetScrollX, left < initialScrollPos.getLeft());
+        return this.getScrollPos(this.clampScrollX(targetScrollX + overscroll));
+    }
+
+    private getTargetOverscroll(targetScrollX: number, scrollLeft: boolean) {
+        if (this.config.overscroll === 0) {
+            return 0;
+        }
+        const visibleColumnsWidth = this.grid.getVisibleColumnsWidth(this.getScrollPos(targetScrollX), true);
+        const remainingSpace = this.tilingArea.width - visibleColumnsWidth;
+        const overscrollX = Math.min(this.config.overscroll, Math.round(remainingSpace / 2));
+        const direction = scrollLeft ? -1 : 1;
+        return overscrollX * direction;
+    }
+
+    public scrollToColumn(column: Column) {
+        this.setScroll(this.getScrollPosForColumn(column).x, true);
+    }
+
+    public scrollCenterColumn(column: Column) {
+        const windowCenter = column.getLeft() + column.getWidth() / 2;
+        const screenCenter = this.scrollX + this.tilingArea.width / 2;
+        this.adjustScroll(Math.round(windowCenter - screenCenter), false);
+    }
+
+    public autoAdjustScroll() {
+        const focusedColumn = this.grid.getLastFocusedColumn();
+        if (focusedColumn === null) {
+            this.removeOverscroll();
+            return;
+        }
+
+        if (focusedColumn.grid !== this.grid) {
+            return;
+        }
+
+        this.scrollToColumn(focusedColumn);
+    }
+
+    private getScrollPos(scrollX: number) {
+        return new Desktop.ScrollPos(scrollX, this.tilingArea.width);
+    }
+
+    public getCurrentScrollPos() {
+        return this.getScrollPos(this.scrollX);
+    }
+
+    private clampScrollX(x: number) {
+        let minScroll = 0;
+        let maxScroll = this.grid.getWidth() - this.tilingArea.width;
+        if (maxScroll < 0) {
+            const centerScroll = Math.round(maxScroll / 2);
+            minScroll = centerScroll;
+            maxScroll = centerScroll;
+        }
+        return clamp(x, minScroll, maxScroll);
+    }
+
+    private setScroll(x: number, force: boolean) {
+        const oldScrollX = this.scrollX;
+        this.scrollX = force ? x : this.clampScrollX(x);
+        if (this.scrollX !== oldScrollX) {
+            this.onLayoutChanged();
+        }
+    }
+
+    private applyScrollPos(scrollPos: Desktop.ScrollPos) {
+        this.setScroll(scrollPos.x, true);
+    }
+
+    public adjustScroll(dx: number, force: boolean) {
+        this.setScroll(this.scrollX + dx, force);
+    }
+
+    private removeOverscroll() {
+        this.setScroll(this.scrollX, false);
+    }
+
+    public arrange() {
+        // TODO (optimization): only arrange visible windows
+        this.updateArea();
+        if (!this.dirty) {
+            return;
+        }
+        this.grid.arrange(this.tilingArea.x - this.scrollX);
+        this.dirty = false;
+    }
+
+    public onLayoutChanged() {
+        this.dirty = true;
+    }
+
+    public destroy() {
+        this.grid.destroy();
+    }
+}
+
+namespace Desktop {
+    export type Config = {
+        marginTop: number,
+        marginBottom: number,
+        marginLeft: number,
+        marginRight: number,
+        overscroll: number,
+    };
+
+    export class ScrollPos {
+        public readonly x: number;
+        public readonly width: number;
+
+        constructor(x: number, width: number) {
+            this.x = x;
+            this.width = width;
+        }
+
+        public getLeft() {
+            return this.x;
+        }
+
+        public getRight() {
+            return this.x + this.width;
+        }
+    }
+}

src/layout/Grid.ts

@@ -1,58 +1,35 @@
 class Grid {
-    public readonly world: World;
+    public readonly desktop: Desktop;
+    public readonly config: LayoutConfig;
     private readonly columns: LinkedList<Column>;
     private lastFocusedColumn: Column|null;
-    private scrollX: number;
     private width: number;
     private userResize: boolean; // is any part of the grid being resized by the user
-    public clientArea: QRect;
-    public tilingArea: QRect;
-    public readonly desktop: number;
     private readonly userResizeFinishedDelayer: Delayer;
 
-    constructor(world: World, desktop: number) {
-        this.world = world;
+    constructor(desktop: Desktop, config: LayoutConfig) {
+        this.desktop = desktop;
+        this.config = config;
         this.columns = new LinkedList();
         this.lastFocusedColumn = null;
-        this.scrollX = 0;
         this.width = 0;
         this.userResize = false;
-        this.desktop = desktop;
-        this.updateArea();
         this.userResizeFinishedDelayer = new Delayer(50, () => {
             // this delay prevents windows' contents from freezing after resizing
-            this.autoAdjustScroll();
-            this.arrange();
+            this.desktop.onLayoutChanged();
+            this.desktop.autoAdjustScroll();
+            this.desktop.arrange();
         });
     }
 
-    updateArea() {
-        const newClientArea = workspace.clientArea(workspace.PlacementArea, 0, this.desktop);
-        if (newClientArea === this.clientArea) {
-            return;
-        }
-
-        this.clientArea = newClientArea;
-        this.tilingArea = Qt.rect(
-            newClientArea.x + this.world.config.gapsOuterLeft,
-            newClientArea.y + this.world.config.gapsOuterTop,
-            newClientArea.width - this.world.config.gapsOuterLeft - this.world.config.gapsOuterRight,
-            newClientArea.height - this.world.config.gapsOuterTop - this.world.config.gapsOuterBottom,
-        )
-        for (const column of this.columns.iterator()) {
-            column.resizeWindows();
-        }
-
-        this.autoAdjustScroll();
-    }
-
-    moveColumnLeft(column: Column) {
+    public moveColumnLeft(column: Column) {
         this.columns.moveBack(column);
         this.columnsSetX(column);
-        this.autoAdjustScroll();
+        this.desktop.onLayoutChanged();
+        this.desktop.autoAdjustScroll();
     }
 
-    moveColumnRight(column: Column) {
+    public moveColumnRight(column: Column) {
         const nextColumn = this.columns.getNext(column);
         if (nextColumn === null) {
             return;
@@ -60,52 +37,74 @@ class Grid {
         this.moveColumnLeft(nextColumn);
     }
 
-    getPrevColumn(column: Column) {
+    public getWidth() {
+        return this.width;
+    }
+
+    public getPrevColumn(column: Column) {
         return this.columns.getPrev(column);
     }
 
-    getNextColumn(column: Column) {
+    public getNextColumn(column: Column) {
         return this.columns.getNext(column);
     }
 
-    getFirstColumn() {
+    public getFirstColumn() {
         return this.columns.getFirst();
     }
 
-    getLastColumn() {
+    public getLastColumn() {
         return this.columns.getLast();
     }
 
-    getColumnAtIndex(i: number) {
+    public getColumnAtIndex(i: number) {
         return this.columns.getItemAtIndex(i);
     }
 
-    getLastFocusedColumn() {
+    public getLastFocusedColumn() {
         if (this.lastFocusedColumn === null || this.lastFocusedColumn.grid !== this) {
             return null;
         }
         return this.lastFocusedColumn;
     }
 
-    getLeftmostVisibleColumn(fullyVisible: boolean) {
+    public getLastFocusedWindow() {
+        const lastFocusedColumn = this.getLastFocusedColumn();
+        if (lastFocusedColumn === null) {
+            return null;
+        }
+        return lastFocusedColumn.getFocusTaker();
+    }
+
+    private columnsSetX(firstMovedColumn: Column|null) {
+        const lastUnmovedColumn = firstMovedColumn === null ? this.columns.getLast() : this.columns.getPrev(firstMovedColumn);
+        let x = lastUnmovedColumn === null ? 0 : lastUnmovedColumn.getRight() + this.config.gapsInnerHorizontal;
+        if (firstMovedColumn !== null) {
+            for (const column of this.columns.iteratorFrom(firstMovedColumn)) {
+                column.gridX = x;
+                x += column.getWidth() + this.config.gapsInnerHorizontal;
+            }
+        }
+        this.width = x - this.config.gapsInnerHorizontal;
+    }
+
+    public getLeftmostVisibleColumn(scrollPos: Desktop.ScrollPos, fullyVisible: boolean) {
+        const scrollX = scrollPos.getLeft();
         for (const column of this.columns.iterator()) {
-            const left = column.gridX - this.scrollX; // in screen space
-            const right = left + column.width; // in screen space
-            const x = fullyVisible ? left : right;
-            if (x >= 0) {
+            const x = fullyVisible ? column.getLeft() : column.getRight() + (this.config.gapsInnerHorizontal - 1);
+            if (x >= scrollX) {
                 return column;
             }
         }
         return null;
     }
 
-    getRightmostVisibleColumn(fullyVisible: boolean) {
+    public getRightmostVisibleColumn(scrollPos: Desktop.ScrollPos, fullyVisible: boolean) {
+        const scrollX = scrollPos.getRight();
         let last = null;
         for (const column of this.columns.iterator()) {
-            const left = column.gridX - this.scrollX; // in screen space
-            const right = left + column.width; // in screen space
-            const x = fullyVisible ? right : left;
-            if (x <= this.tilingArea.width) {
+            const x = fullyVisible ? column.getRight() : column.getLeft() - (this.config.gapsInnerHorizontal - 1);
+            if (x <= scrollX) {
                 last = column;
             } else {
                 break;
@@ -114,154 +113,196 @@ class Grid {
         return last;
     }
 
-    scrollToColumn(column: Column) {
-        const left = column.gridX - this.scrollX; // in screen space
-        const right = left + column.width; // in screen space
-        const remainingSpace = this.tilingArea.width - column.width;
-        const overScrollX = Math.min(this.world.config.overscroll, Math.round(remainingSpace / 2));
-        if (left < 0) {
-            this.adjustScroll(left - overScrollX, false);
-        } else if (right > this.tilingArea.width) {
-            this.adjustScroll(right - this.tilingArea.width + overScrollX, false);
-        } else {
-            this.removeOverscroll();
+    public getVisibleColumnsWidth(scrollPos: Desktop.ScrollPos, fullyVisible: boolean) {
+        let width = 0;
+        let nVisible = 0;
+        for (const column of this.columns.iterator()) {
+            if (column.isVisible(scrollPos, fullyVisible)) {
+                width += column.getWidth();
+                nVisible++;
+            }
         }
+
+        if (nVisible > 0) {
+            width += (nVisible-1) * this.config.gapsInnerHorizontal;
+        }
+
+        return width;
     }
 
-    autoAdjustScroll() {
-        const focusedWindow = this.world.getFocusedWindow();
-        if (focusedWindow === null) {
-            this.removeOverscroll();
+    private getLeftOffScreenColumn(scrollPos: Desktop.ScrollPos) {
+        const leftVisible = this.getLeftmostVisibleColumn(scrollPos, true);
+        if (leftVisible === null) {
+            return null;
+        }
+        return this.getPrevColumn(leftVisible);
+    }
+
+    private getRightOffScreenColumn(scrollPos: Desktop.ScrollPos) {
+        const rightVisible = this.getRightmostVisibleColumn(scrollPos, true);
+        if (rightVisible === null) {
+            return null;
+        }
+        return this.getNextColumn(rightVisible);
+    }
+
+    public increaseColumnWidth(column: Column) {
+        const scrollPos = this.desktop.getScrollPosForColumn(column);
+        if (this.width < scrollPos.width) {
+            column.adjustWidth(scrollPos.width - this.width, false);
             return;
         }
 
-        const column = focusedWindow.column;
-        if (column.grid !== this) {
+        let leftColumn = this.getLeftmostVisibleColumn(scrollPos, false);
+        if (leftColumn === column) {
+            leftColumn = null;
+        }
+        let rightColumn = this.getRightmostVisibleColumn(scrollPos, false);
+        if (rightColumn === column) {
+            rightColumn = null;
+        }
+        if (leftColumn === null && rightColumn === null) {
             return;
         }
-        this.scrollToColumn(column);
-    }
 
-    setScroll(x: number, force: boolean) {
-        if (!force) {
-            let minScroll = 0;
-            let maxScroll = this.width - this.tilingArea.width;
-            if (maxScroll < 0) {
-                const centerScroll = Math.round(maxScroll / 2);
-                minScroll = centerScroll;
-                maxScroll = centerScroll;
-            }
-            x = clamp(x, minScroll, maxScroll);
+        const leftVisibleWidth = leftColumn === null ? Infinity : leftColumn.getRight() - scrollPos.getLeft();
+        const rightVisibleWidth = rightColumn === null ? Infinity : scrollPos.getRight() - rightColumn.getLeft();
+        const expandLeft = leftVisibleWidth < rightVisibleWidth;
+        const widthDelta = (expandLeft ? leftVisibleWidth : rightVisibleWidth) + this.config.gapsInnerHorizontal;
+        if (expandLeft) {
+            this.desktop.adjustScroll(widthDelta, false);
         }
-        this.scrollX = x;
+        column.adjustWidth(widthDelta, true);
     }
 
-    adjustScroll(dx: number, force: boolean) {
-        this.setScroll(this.scrollX + dx, force);
-    }
-
-    removeOverscroll() {
-        this.setScroll(this.scrollX, false);
-    }
-
-    columnsSetX(firstMovedColumn: Column|null) {
-        const lastUnmovedColumn = firstMovedColumn === null ? this.columns.getLast() : this.columns.getPrev(firstMovedColumn);
-        let x = lastUnmovedColumn === null ? 0 : lastUnmovedColumn.gridX + lastUnmovedColumn.width + this.world.config.gapsInnerHorizontal;
-        if (firstMovedColumn !== null) {
-            for (const column of this.columns.iteratorFrom(firstMovedColumn)) {
-                column.gridX = x;
-                x += column.width + this.world.config.gapsInnerHorizontal;
-            }
+    public decreaseColumnWidth(column: Column) {
+        const scrollPos = this.desktop.getScrollPosForColumn(column);
+        if (this.width <= scrollPos.width) {
+            column.setWidth(Math.round(column.getWidth() / 2), false);
+            return;
         }
-        this.width = x - this.world.config.gapsInnerHorizontal;
+
+        let leftColumn = this.getLeftOffScreenColumn(scrollPos);
+        if (leftColumn === column) {
+            leftColumn = null;
+        }
+        let rightColumn = this.getRightOffScreenColumn(scrollPos);
+        if (rightColumn === column) {
+            rightColumn = null;
+        }
+        if (leftColumn === null && rightColumn === null) {
+            return;
+        }
+
+        const leftInvisibleWidth = leftColumn === null ? Infinity : scrollPos.getLeft() - leftColumn.getLeft();
+        const rightInvisibleWidth = rightColumn === null ? Infinity : rightColumn.getRight() - scrollPos.getRight();
+        const shrinkLeft = leftInvisibleWidth < rightInvisibleWidth;
+        const widthDelta = (shrinkLeft ? leftInvisibleWidth : rightInvisibleWidth);
+        if (shrinkLeft) {
+            const maxDelta = column.getWidth() - column.getMinWidth();
+            this.desktop.adjustScroll(-Math.min(widthDelta, maxDelta), false);
+        }
+        column.adjustWidth(-widthDelta, true);
     }
 
-    arrange() {
-        // TODO (optimization): only arrange visible windows
-        this.updateArea();
-        let x = this.tilingArea.x - this.scrollX;
+    public arrange(x: number) {
         for (const column of this.columns.iterator()) {
             column.arrange(x);
-            x += column.getWidth() + this.world.config.gapsInnerHorizontal;
+            x += column.getWidth() + this.config.gapsInnerHorizontal;
+        }
+
+        const focusedWindow = this.getLastFocusedWindow();
+        if (focusedWindow !== null) {
+            focusedWindow.client.ensureTransientsVisible(this.desktop.clientArea);
         }
     }
 
-    onColumnAdded(column: Column, prevColumn: Column|null) {
+    public onColumnAdded(column: Column, prevColumn: Column|null) {
         if (prevColumn === null) {
             this.columns.insertStart(column);
         } else {
             this.columns.insertAfter(column, prevColumn);
         }
         this.columnsSetX(column);
-        this.autoAdjustScroll();
+        this.desktop.onLayoutChanged();
+        this.desktop.autoAdjustScroll();
     }
 
-    onColumnRemoved(column: Column, passFocus: boolean) {
+    public onColumnRemoved(column: Column, passFocus: boolean) {
+        const isLastColumn = this.columns.length() === 1;
+        const nextColumn = this.getNextColumn(column);
+        const columnToFocus = isLastColumn ? null : this.getPrevColumn(column) ?? nextColumn;
         if (column === this.lastFocusedColumn) {
-            this.lastFocusedColumn = null;
+            this.lastFocusedColumn = columnToFocus;
         }
 
-        const lastColumn = this.columns.length() === 1;
-        const columnToFocus = lastColumn || !passFocus ? null : this.getPrevColumn(column) ?? this.getNextColumn(column);
-        const nextColumn = this.columns.getNext(column);
-
         this.columns.remove(column);
-
         this.columnsSetX(nextColumn);
-        if (columnToFocus !== null) {
+
+        if (passFocus && columnToFocus !== null) {
             columnToFocus.focus();
         } else {
-            this.removeOverscroll();
+            this.desktop.autoAdjustScroll();
         }
+        this.desktop.onLayoutChanged();
     }
 
-    onColumnMoved(column: Column, prevColumn: Column|null) {
+    public onColumnMoved(column: Column, prevColumn: Column|null) {
         const movedLeft = prevColumn === null ? true : column.isAfter(prevColumn);
         const firstMovedColumn = movedLeft ? column : this.getNextColumn(column);
         this.columns.move(column, prevColumn);
         this.columnsSetX(firstMovedColumn);
-        this.autoAdjustScroll();
+        this.desktop.onLayoutChanged();
+        this.desktop.autoAdjustScroll();
     }
 
-    onColumnWidthChanged(column: Column, oldWidth: number, width: number) {
+    public onColumnWidthChanged(column: Column, oldWidth: number, width: number) {
         const nextColumn = this.columns.getNext(column);
         this.columnsSetX(nextColumn);
         if (!this.userResize) {
-            this.autoAdjustScroll();
+            this.desktop.autoAdjustScroll();
         }
+        this.desktop.onLayoutChanged();
     }
 
-    onColumnFocused(column: Column) {
+    public onColumnFocused(column: Column) {
         const lastFocusedColumn = this.getLastFocusedColumn();
         if (lastFocusedColumn !== null) {
             lastFocusedColumn.restoreToTiled();
         }
         this.lastFocusedColumn = column;
-        this.scrollToColumn(column);
+        this.desktop.scrollToColumn(column);
     }
 
-    onUserResizeStarted() {
+    public onScreenSizeChanged() {
+        for (const column of this.columns.iterator()) {
+            column.updateWidth();
+            column.resizeWindows();
+        }
+    }
+
+    public onUserResizeStarted() {
         this.userResize = true;
     }
 
-    onUserResizeFinished() {
+    public onUserResizeFinished() {
         this.userResize = false;
         this.userResizeFinishedDelayer.run();
     }
 
-    evacuateTail(targetGrid: Grid, startColumn: Column) {
+    public evacuateTail(targetGrid: Grid, startColumn: Column) {
         for (const column of this.columns.iteratorFrom(startColumn)) {
             column.moveToGrid(targetGrid, targetGrid.getLastColumn());
         }
     }
 
-    evacuate(targetGrid: Grid) {
+    public evacuate(targetGrid: Grid) {
         for (const column of this.columns.iterator()) {
             column.moveToGrid(targetGrid, targetGrid.getLastColumn());
         }
     }
 
-    destroy() {
+    public destroy() {
         this.userResizeFinishedDelayer.destroy();
     }
 }

src/layout/LayoutConfig.ts

@@ -0,0 +1,6 @@
+type LayoutConfig = {
+    gapsInnerHorizontal: number,
+    gapsInnerVertical: number,
+    stackColumnsByDefault: boolean,
+    resizeNeighborColumn: boolean,
+};

src/layout/Window.ts

@@ -2,23 +2,17 @@ class Window {
     public column: Column;
     public readonly client: ClientWrapper;
     public height: number;
-    public readonly focusedState: WindowState;
     private skipArrange: boolean;
 
     constructor(client: ClientWrapper, column: Column) {
         this.client = client;
         this.height = client.kwinClient.frameGeometry.height;
-        this.focusedState = {
-            fullScreen: false,
-            maximizedHorizontally: false,
-            maximizedVertically: false,
-        };
         this.skipArrange = false;
         this.column = column;
         column.onWindowAdded(this);
     }
 
-    moveToColumn(targetColumn: Column) {
+    public moveToColumn(targetColumn: Column) {
         if (targetColumn === this.column) {
             return;
         }
@@ -27,21 +21,15 @@ class Window {
         targetColumn.onWindowAdded(this);
     }
 
-    arrange(x: number, y: number, width: number, height: number) {
+    public arrange(x: number, y: number, width: number, height: number) {
         if (this.skipArrange) {
-            // window is being manually resized, prevent fighting with the user
+            // window is maximized, fullscreen, or being manually resized, prevent fighting with the user
             return;
         }
         this.client.place(x, y, width, height);
-        if (this.isFocused()) {
-            // do this here rather than in `onFocused` to ensure it happens after placement
-            // (otherwise placement may not happen at all)
-            this.client.setMaximize(this.focusedState.maximizedVertically, this.focusedState.maximizedHorizontally);
-            this.client.setFullScreen(this.focusedState.fullScreen);
-        }
     }
 
-    focus() {
+    public focus() {
         if (this.client.isShaded()) {
             // workaround for KWin deactivating clients when unshading immediately after activation
             this.client.setShade(false);
@@ -49,67 +37,68 @@ class Window {
         this.client.focus();
     }
 
-    isFocused() {
+    public isFocused() {
         return this.client.isFocused();
     }
 
-    onFocused() {
+    public onFocused() {
         this.column.onWindowFocused(this);
     }
 
-    restoreToTiled() {
+    public restoreToTiled() {
         if (this.isFocused()) {
             return;
         }
-        this.client.setMaximize(false, false);
         this.client.setFullScreen(false);
+        this.client.setMaximize(false, false);
+        this.column.grid.desktop.onLayoutChanged();
     }
 
-    onMaximizedChanged(horizontally: boolean, vertically: boolean) {
+    public onMaximizedChanged(horizontally: boolean, vertically: boolean) {
         const maximized = horizontally || vertically;
         this.skipArrange = maximized;
         this.client.kwinClient.keepBelow = !maximized;
-        if (this.isFocused()) {
-            this.focusedState.maximizedHorizontally = horizontally;
-            this.focusedState.maximizedVertically = vertically;
-        }
     }
 
-    onFullScreenChanged(fullScreen: boolean) {
+    public onFullScreenChanged(fullScreen: boolean) {
         this.skipArrange = fullScreen;
         if (this.isFocused()) {
             this.client.kwinClient.keepBelow = !fullScreen;
-            this.focusedState.fullScreen = fullScreen;
         }
     }
 
-    onUserResize(oldGeometry: QRect) {
+    public onUserResize(oldGeometry: QRect, resizeNeighborColumn: boolean) {
         const newGeometry = this.client.kwinClient.frameGeometry;
         const widthDelta = newGeometry.width - oldGeometry.width;
         const heightDelta = newGeometry.height - oldGeometry.height;
         if (widthDelta !== 0) {
             this.column.adjustWidth(widthDelta, true);
-            if (newGeometry.x !== oldGeometry.x) {
-                this.column.grid.adjustScroll(widthDelta, true);
+            let leftEdgeDelta = newGeometry.left - oldGeometry.left;
+            const resizingLeftSide = leftEdgeDelta !== 0;
+            if (resizeNeighborColumn && this.column.grid.config.resizeNeighborColumn) {
+                const neighborColumn = resizingLeftSide ? this.column.grid.getPrevColumn(this.column) : this.column.grid.getNextColumn(this.column);
+                if (neighborColumn !== null) {
+                    const oldNeighborWidth = neighborColumn.getWidth();
+                    neighborColumn.adjustWidth(-widthDelta, true);
+                    if (resizingLeftSide) {
+                        leftEdgeDelta -= neighborColumn.getWidth() - oldNeighborWidth;
+                    }
+                }
             }
+            this.column.grid.desktop.adjustScroll(-leftEdgeDelta, true);
         }
         if (heightDelta !== 0) {
             this.column.adjustWindowHeight(this, heightDelta, newGeometry.y !== oldGeometry.y);
         }
     }
 
-    onProgrammaticResize(oldGeometry: QRect) {
+    public onFrameGeometryChanged() {
         const newGeometry = this.client.kwinClient.frameGeometry;
         this.column.setWidth(newGeometry.width, true);
+        this.column.grid.desktop.onLayoutChanged();
     }
 
-    destroy(passFocus: boolean) {
+    public destroy(passFocus: boolean) {
         this.column.onWindowRemoved(this, passFocus);
     }
 }
-
-type WindowState = {
-    fullScreen: boolean,
-    maximizedHorizontally: boolean,
-    maximizedVertically: boolean,
-}

src/main.ts

@@ -1,6 +1,6 @@
 function init() {
     const config = loadConfig();
     const world = new World(config);
-    registerShortcuts(world);
+    registerKeyBindings(world, config);
     return world;
 }

src/rules/ClientMatcher.ts

@@ -5,8 +5,8 @@ class ClientMatcher {
         this.rules = rules;
     }
 
-    matches(kwinClient: AbstractClient) {
-        const rule = this.rules.get(String(kwinClient.resourceClass));
+    public matches(kwinClient: TopLevel) {
+        const rule = this.rules.get(kwinClient.resourceClass);
         if (rule === undefined) {
             return false;
         }

src/rules/WindowRule.ts

@@ -2,4 +2,4 @@ type WindowRule = {
     class: string,
     caption: string,
     tile: boolean,
-}
+};

src/rules/WindowRuleEnforcer.ts

@@ -3,21 +3,21 @@ class WindowRuleEnforcer {
     private readonly preferTiling: ClientMatcher;
     private readonly followCaption: Set<string>;
 
-    constructor(world: World, windowRules: WindowRule[]) {
+    constructor(windowRules: WindowRule[]) {
         const [mapFloat, mapTile] = createWindowRuleMaps(windowRules);
         this.preferFloating = new ClientMatcher(mapFloat);
         this.preferTiling = new ClientMatcher(mapTile);
         this.followCaption = new Set([...mapFloat.keys(), ...mapTile.keys()]);
     }
 
-    shouldTile(kwinClient: AbstractClient) {
-        return canTileNow(kwinClient) && (
+    public shouldTile(kwinClient: TopLevel) {
+        return Clients.canTileNow(kwinClient) && (
             this.preferTiling.matches(kwinClient) ||
             kwinClient.normalWindow && kwinClient.managed && !this.preferFloating.matches(kwinClient)
         );
     }
 
-    initClientSignalManager(world: World, kwinClient: AbstractClient) {
+    public initClientSignalManager(world: World, kwinClient: TopLevel) {
         if (!this.followCaption.has(kwinClient.resourceClass)) {
             return null;
         }
@@ -26,11 +26,13 @@ class WindowRuleEnforcer {
         const manager = new SignalManager();
         manager.connect(kwinClient.captionChanged, () => {
             const shouldTile = enforcer.shouldTile(kwinClient);
-            if (shouldTile) {
-                world.tileClient(kwinClient);
-            } else {
-                world.untileClient(kwinClient);
-            }
+            world.do((clientManager, desktopManager) => {
+                if (shouldTile) {
+                    clientManager.tileClient(kwinClient);
+                } else {
+                    clientManager.untileClient(kwinClient);
+                }
+            });
         });
         return manager;
     }

src/shortcuts.ts

@@ -1,63 +0,0 @@
-function catchWrap(f: () => void) {
-    return () => {
-        try {
-            f();
-        } catch (error: any) {
-            console.log(error);
-            console.log(error.stack);
-        }
-    };
-}
-
-function registerShortcutDbg(title: string, text: string, keySequence: string, callback: () => void) {
-    KWin.registerShortcut(title, text, keySequence, catchWrap(callback));
-}
-
-function registerNumShortcuts(title: string, text: string, keySequence: string, callback: (i: number) => void, n: number) {
-    for (let i = 0; i < n; i++) {
-        const numKey = String(i + 1);
-        registerShortcutDbg(title+numKey, text+numKey, keySequence+numKey, () => callback(i));
-    }
-}
-
-function registerShortcuts(world: World) {
-    const actions = initActions(world);
-
-    registerShortcutDbg("karousel-window-toggle-floating", "Karousel: Toggle floating", "Meta+Space", actions.windowToggleFloating);
-
-    registerShortcutDbg("karousel-focus-left", "Karousel: Move focus left", "Meta+A", actions.focusLeft);
-    registerShortcutDbg("karousel-focus-right", "Karousel: Move focus right", "Meta+D", actions.focusRight);
-    registerShortcutDbg("karousel-focus-up", "Karousel: Move focus up", "Meta+W", actions.focusUp);
-    registerShortcutDbg("karousel-focus-down", "Karousel: Move focus down", "Meta+S", actions.focusDown);
-    registerShortcutDbg("karousel-focus-start", "Karousel: Move focus to start", "Meta+Home", actions.focusStart);
-    registerShortcutDbg("karousel-focus-end", "Karousel: Move focus to end", "Meta+End", actions.focusEnd);
-
-    registerShortcutDbg("karousel-window-move-left", "Karousel: Move window left", "Meta+Shift+A", actions.windowMoveLeft);
-    registerShortcutDbg("karousel-window-move-right", "Karousel: Move window right", "Meta+Shift+D", actions.windowMoveRight);
-    registerShortcutDbg("karousel-window-move-up", "Karousel: Move window up", "Meta+Shift+W", actions.windowMoveUp);
-    registerShortcutDbg("karousel-window-move-down", "Karousel: Move window down", "Meta+Shift+S", actions.windowMoveDown);
-    registerShortcutDbg("karousel-window-move-start", "Karousel: Move window to start", "Meta+Shift+Home", actions.windowMoveStart);
-    registerShortcutDbg("karousel-window-move-end", "Karousel: Move window to end", "Meta+Shift+End", actions.windowMoveEnd);
-    registerShortcutDbg("karousel-window-expand", "Karousel: Expand window", "Meta+X", actions.windowExpand);
-
-    registerShortcutDbg("karousel-column-move-left", "Karousel: Move column left", "Meta+Ctrl+Shift+A", actions.columnMoveLeft);
-    registerShortcutDbg("karousel-column-move-right", "Karousel: Move column right", "Meta+Ctrl+Shift+D", actions.columnMoveRight);
-    registerShortcutDbg("karousel-column-move-start", "Karousel: Move column to start", "Meta+Ctrl+Shift+Home", actions.columnMoveStart);
-    registerShortcutDbg("karousel-column-move-end", "Karousel: Move column to end", "Meta+Ctrl+Shift+End", actions.columnMoveEnd);
-    registerShortcutDbg("karousel-column-expand", "Karousel: Expand column", "Meta+Ctrl+X", actions.columnExpand);
-
-    registerShortcutDbg("karousel-grid-scroll-focused", "Karousel: Scroll to focused window", "Meta+Alt+Return", actions.gridScrollFocused);
-    registerShortcutDbg("karousel-grid-scroll-left-column", "Karousel: Scroll one column to the left", "Meta+Alt+A", actions.gridScrollLeftColumn);
-    registerShortcutDbg("karousel-grid-scroll-left-column", "Karousel: Scroll one column to the left", "Meta+Alt+A", actions.gridScrollLeftColumn);
-    registerShortcutDbg("karousel-grid-scroll-right-column", "Karousel: Scroll one column to the right", "Meta+Alt+D", actions.gridScrollRightColumn);
-    registerShortcutDbg("karousel-grid-scroll-left", "Karousel: Scroll left", "Meta+Alt+PgUp", actions.gridScrollLeft);
-    registerShortcutDbg("karousel-grid-scroll-right", "Karousel: Scroll right", "Meta+Alt+PgDown", actions.gridScrollRight);
-    registerShortcutDbg("karousel-grid-scroll-start", "Karousel: Scroll to start", "Meta+Alt+Home", actions.gridScrollStart);
-    registerShortcutDbg("karousel-grid-scroll-end", "Karousel: Scroll to end", "Meta+Alt+End", actions.gridScrollEnd);
-
-    registerNumShortcuts("karousel-focus-", "Karousel: Move focus to column ", "Meta+", actions.focusColumn, 9);
-    registerNumShortcuts("karousel-window-move-to-column-", "Karousel: Move window to column ", "Meta+Shift+", actions.windowMoveToColumn, 9);
-    registerNumShortcuts("karousel-column-move-to-column-", "Karousel: Move column to position ", "Meta+Ctrl+Shift+", actions.columnMoveToColumn, 9);
-    registerNumShortcuts("karousel-column-move-to-desktop-", "Karousel: Move column to desktop ", "Meta+Ctrl+Shift+F", actions.columnMoveToDesktop, 12);
-    registerNumShortcuts("karousel-tail-move-to-desktop-", "Karousel: Move this and all following columns to desktop ", "Meta+Ctrl+Shift+Alt+F", actions.tailMoveToDesktop, 12);
-}

src/utils/Delayer.ts

@@ -7,11 +7,11 @@ class Delayer {
         this.timer.triggered.connect(f);
     }
 
-    run() {
+    public run() {
         this.timer.restart();
     }
 
-    destroy() {
+    public destroy() {
         this.timer.destroy();
     }
 }

src/utils/Doer.ts

@@ -5,13 +5,13 @@ class Doer {
         this.nCalls = 0;
     }
 
-    do (f: () => void) {
+    public do (f: () => void) {
         this.nCalls++;
         f();
         this.nCalls--;
     }
 
-    isDoing() {
+    public isDoing() {
         return this.nCalls > 0;
     }
 }

src/utils/LinkedList.ts

@@ -1,7 +1,7 @@
 class LinkedList<T> {
-    private firstNode: LinkedListNode<T>|null;
-    private lastNode: LinkedListNode<T>|null;
-    private readonly itemMap: Map<T, LinkedListNode<T>>;
+    private firstNode: LinkedList.Node<T>|null;
+    private lastNode: LinkedList.Node<T>|null;
+    private readonly itemMap: Map<T, LinkedList.Node<T>>;
 
     constructor() {
         this.firstNode = null;
@@ -17,31 +17,31 @@ class LinkedList<T> {
         return node;
     }
 
-    insertBefore(item: T, nextItem: T) {
+    public insertBefore(item: T, nextItem: T) {
         const nextNode = this.getNode(nextItem);
         this.insert(item, nextNode.prev, nextNode);
     }
 
-    insertAfter(item: T, prevItem: T) {
+    public insertAfter(item: T, prevItem: T) {
         const prevNode = this.getNode(prevItem);
         this.insert(item, prevNode, prevNode.next);
     }
 
-    insertStart(item: T) {
+    public insertStart(item: T) {
         this.insert(item, null, this.firstNode);
     }
 
-    insertEnd(item: T) {
+    public insertEnd(item: T) {
         this.insert(item, this.lastNode, null);
     }
 
-    private insert(item: T, prevNode: LinkedListNode<T>|null, nextNode: LinkedListNode<T>|null) {
-        const node = new LinkedListNode(item);
+    private insert(item: T, prevNode: LinkedList.Node<T>|null, nextNode: LinkedList.Node<T>|null) {
+        const node = new LinkedList.Node(item);
         this.itemMap.set(item, node);
         this.insertNode(node, prevNode, nextNode);
     }
 
-    private insertNode(node: LinkedListNode<T>, prevNode: LinkedListNode<T>|null, nextNode: LinkedListNode<T>|null) {
+    private insertNode(node: LinkedList.Node<T>, prevNode: LinkedList.Node<T>|null, nextNode: LinkedList.Node<T>|null) {
         node.prev = prevNode;
         node.next = nextNode;
         if (nextNode !== null) {
@@ -60,31 +60,31 @@ class LinkedList<T> {
         }
     }
 
-    getPrev(item: T) {
+    public getPrev(item: T) {
         const prevNode = this.getNode(item).prev;
         return prevNode === null ? null : prevNode.item;
     }
 
-    getNext(item: T) {
+    public getNext(item: T) {
         const nextNode = this.getNode(item).next;
         return nextNode === null ? null : nextNode.item;
     }
 
-    getFirst() {
+    public getFirst() {
         if (this.firstNode === null) {
             return null;
         }
         return this.firstNode.item;
     }
 
-    getLast() {
+    public getLast() {
         if (this.lastNode === null) {
             return null;
         }
         return this.lastNode.item;
     }
 
-    getItemAtIndex(index: number) {
+    public getItemAtIndex(index: number) {
         let node = this.firstNode;
         if (node === null) {
             return null;
@@ -98,13 +98,13 @@ class LinkedList<T> {
         return node.item;
     }
 
-    remove(item: T) {
+    public remove(item: T) {
         const node = this.getNode(item);
         this.itemMap.delete(item);
         this.removeNode(node);
     }
 
-    private removeNode(node: LinkedListNode<T>) {
+    private removeNode(node: LinkedList.Node<T>) {
         const prevNode = node.prev;
         const nextNode = node.next;
         if (prevNode !== null) {
@@ -121,11 +121,11 @@ class LinkedList<T> {
         }
     }
 
-    contains(item: T) {
+    public contains(item: T) {
         return this.itemMap.has(item);
     }
 
-    private swap(node0: LinkedListNode<T>, node1: LinkedListNode<T>) {
+    private swap(node0: LinkedList.Node<T>, node1: LinkedList.Node<T>) {
         console.assert(node0.next === node1 && node1.prev === node0);
         const prevNode = node0.prev;
         const nextNode = node1.next;
@@ -150,7 +150,7 @@ class LinkedList<T> {
         }
     }
 
-    move(item: T, prevItem: T|null) {
+    public move(item: T, prevItem: T|null) {
         const node = this.getNode(item);
         this.removeNode(node);
         if (prevItem === null) {
@@ -161,7 +161,7 @@ class LinkedList<T> {
         }
     }
 
-    moveBack(item: T) {
+    public moveBack(item: T) {
         const node = this.getNode(item);
         if (node.prev !== null) {
             console.assert(node !== this.firstNode);
@@ -169,7 +169,7 @@ class LinkedList<T> {
         }
     }
 
-    moveForward(item: T) {
+    public moveForward(item: T) {
         const node = this.getNode(item);
         if (node.next !== null) {
             console.assert(node !== this.lastNode);
@@ -177,32 +177,34 @@ class LinkedList<T> {
         }
     }
 
-    length() {
+    public length() {
         return this.itemMap.size;
     }
 
-    *iterator() {
+    public *iterator() {
         for (let node = this.firstNode; node !== null; node = node.next) {
             yield node.item;
         }
     }
 
-    *iteratorFrom(startItem: T) {
-        for (let node: LinkedListNode<T>|null = this.getNode(startItem); node !== null; node = node.next) {
+    public *iteratorFrom(startItem: T) {
+        for (let node: LinkedList.Node<T>|null = this.getNode(startItem); node !== null; node = node.next) {
             yield node.item;
         }
     }
 }
 
-// TODO (optimization): reuse nodes
-class LinkedListNode<T> {
-    public readonly item: T;
-    public prev: LinkedListNode<T>|null;
-    public next: LinkedListNode<T>|null;
+namespace LinkedList {
+    // TODO (optimization): reuse nodes
+    export class Node<T> {
+        public readonly item: T;
+        public prev: Node<T> | null;
+        public next: Node<T> | null;
 
-    constructor(item: T) {
-        this.item = item;
-        this.prev = null;
-        this.next = null;
+        constructor(item: T) {
+            this.item = item;
+            this.prev = null;
+            this.next = null;
+        }
     }
 }

src/utils/SignalManager.ts

@@ -1,16 +1,16 @@
 class SignalManager {
-    private connections: { signal: QSignal, handler: (...args: any[]) => void }[];
+    private connections: { signal: QSignal<any>, handler: (...args: any) => void }[];
 
     constructor() {
         this.connections = [];
     }
 
-    connect(signal: QSignal, handler: (...args: any[]) => void) {
+    public connect<T extends unknown[]>(signal: QSignal<T>, handler: (...args: [...T]) => void) {
         signal.connect(handler);
         this.connections.push({ signal: signal, handler: handler });
     }
 
-    destroy() {
+    public destroy() {
         for (const connection of this.connections) {
             connection.signal.disconnect(connection.handler);
         }

src/utils/log.ts

@@ -0,0 +1,3 @@
+function log(...args: any[]) {
+    console.log("Karousel:", ...args);
+}

src/utils/math.ts

@@ -7,10 +7,3 @@ function clamp(value: number, min: number, max: number) {
     }
     return value;
 }
-
-function rectEqual(a: QRect, b: QRect) {
-    return a.x === b.x &&
-        a.y === b.y &&
-        a.width === b.width &&
-        a.height === b.height;
-}

src/workspace.ts

@@ -1,9 +1,8 @@
 function initWorkspaceSignalHandlers(world: World) {
     const manager = new SignalManager();
 
-    manager.connect(workspace.clientAdded, (kwinClient: AbstractClient) => {
-        console.assert(!world.hasClient(kwinClient));
-        if (canTileEver(kwinClient)) {
+    manager.connect(workspace.clientAdded, (kwinClient: KwinClient) => {
+        if (Clients.canTileEver(kwinClient)) {
             // never open new tileable clients on all desktops or activities
             if (kwinClient.desktop <= 0) {
                 kwinClient.desktop = workspace.currentDesktop;
@@ -12,26 +11,35 @@ function initWorkspaceSignalHandlers(world: World) {
                 kwinClient.activities = [workspace.currentActivity];
             }
         }
-        world.addClient(kwinClient);
+        world.do((clientManager, desktopManager) => {
+            clientManager.addClient(kwinClient)
+        });
     });
 
     manager.connect(workspace.clientRemoved, (kwinClient: AbstractClient) => {
-        console.assert(world.hasClient(kwinClient));
-        world.removeClient(kwinClient, true);
+        world.do((clientManager, desktopManager) => {
+            clientManager.removeClient(kwinClient, true);
+        });
     });
 
     manager.connect(workspace.clientMinimized, (kwinClient: AbstractClient) => {
-        world.minimizeClient(kwinClient);
+        world.do((clientManager, desktopManager) => {
+            clientManager.minimizeClient(kwinClient);
+        });
     });
 
     manager.connect(workspace.clientUnminimized, (kwinClient: AbstractClient) => {
-        world.unminimizeClient(kwinClient);
+        world.do((clientManager, desktopManager) => {
+            clientManager.unminimizeClient(kwinClient);
+        });
     });
 
     manager.connect(workspace.clientMaximizeSet, (kwinClient: AbstractClient, horizontally: boolean, vertically: boolean) => {
-        world.doIfTiled(kwinClient, false, (window, column, grid) => {
+        if ((horizontally || vertically) && kwinClient.tile !== null) {
+            kwinClient.tile = null;
+        }
+        world.doIfTiled(kwinClient, false, (world, desktopManager, window, column, grid) => {
             window.onMaximizedChanged(horizontally, vertically);
-            grid.arrange();
         });
     });
 
@@ -39,21 +47,20 @@ function initWorkspaceSignalHandlers(world: World) {
         if (kwinClient === null) {
             return;
         }
-        world.onClientFocused(kwinClient);
-        world.doIfTiled(kwinClient, true, (window, column, grid) => {
-            window.onFocused();
-            grid.arrange();
+        world.do((clientManager, desktopManager) => {
+            clientManager.onClientFocused(kwinClient);
         });
     });
 
-    manager.connect(workspace.clientFullScreenSet, (kwinClient: X11Client, fullScreen: boolean, user: boolean) => {
-        world.doIfTiled(kwinClient, false, (window, column, grid) => {
-            window.onFullScreenChanged(fullScreen);
-            grid.arrange();
-        });
+    manager.connect(workspace.currentDesktopChanged, () => {
+        world.do(() => {}); // re-arrange desktop
     });
 
-    manager.connect(workspace.numberDesktopsChanged, (oldNumberOfDesktops: number) => {
+    manager.connect(workspace.currentActivityChanged, () => {
+        world.do(() => {}); // re-arrange desktop
+    });
+
+    manager.connect(workspace.numberDesktopsChanged, (oldNumberOfVirtualDesktops: number) => {
         world.updateDesktops();
     });
 

src/world/ClientManager.ts

@@ -0,0 +1,165 @@
+class ClientManager {
+    private readonly world: World;
+    private readonly desktopManager: DesktopManager;
+    private readonly clientMap: Map<AbstractClient, ClientWrapper>;
+    private lastFocusedClient: AbstractClient|null;
+    private readonly windowRuleEnforcer: WindowRuleEnforcer;
+
+    constructor(config: Config, world: World, desktopManager: DesktopManager) {
+        this.world = world;
+        this.desktopManager = desktopManager;
+        this.clientMap = new Map();
+        this.lastFocusedClient = null;
+
+        let parsedWindowRules: WindowRule[] = [];
+        try {
+            parsedWindowRules = JSON.parse(config.windowRules);
+        } catch (error: any) {
+            notificationInvalidWindowRules.sendEvent();
+            log("failed to parse windowRules:", error);
+        }
+        this.windowRuleEnforcer = new WindowRuleEnforcer(parsedWindowRules);
+    }
+
+    public addClient(kwinClient: TopLevel) {
+        console.assert(!this.hasClient(kwinClient));
+        const client = new ClientWrapper(
+            kwinClient,
+            new ClientState.Floating(null),
+            this.findTransientFor(kwinClient),
+            this.windowRuleEnforcer.initClientSignalManager(this.world, kwinClient),
+        );
+        this.clientMap.set(kwinClient, client);
+
+        if (kwinClient.dock) {
+            client.stateManager.setState(() => new ClientState.Docked(this.world, kwinClient), false);
+        } else if (this.windowRuleEnforcer.shouldTile(kwinClient)) {
+            const grid = this.desktopManager.getDesktopForClient(client.kwinClient).grid;
+            client.stateManager.setState(() => new ClientState.Tiled(this.world, client, grid), false);
+        }
+    }
+
+    public removeClient(kwinClient: AbstractClient, passFocus: boolean) {
+        console.assert(this.hasClient(kwinClient));
+        const client = this.clientMap.get(kwinClient);
+        if (client === undefined) {
+            return;
+        }
+        client.destroy(passFocus && kwinClient === this.lastFocusedClient);
+        this.clientMap.delete(kwinClient);
+    }
+
+    private findTransientFor(kwinClient: AbstractClient) {
+        if (!kwinClient.transient) {
+            return null;
+        }
+
+        const transientFor = this.clientMap.get(kwinClient.transientFor);
+        if (transientFor === undefined) {
+            return null;
+        }
+
+        return transientFor;
+    }
+
+    public minimizeClient(kwinClient: AbstractClient) {
+        const client = this.clientMap.get(kwinClient);
+        if (client === undefined) {
+            return;
+        }
+        if (client.stateManager.getState() instanceof ClientState.Tiled) {
+            client.stateManager.setState(() => new ClientState.TiledMinimized(), kwinClient === this.lastFocusedClient);
+        }
+    }
+
+    public unminimizeClient(kwinClient: AbstractClient) {
+        const client = this.clientMap.get(kwinClient);
+        if (client === undefined) {
+            return;
+        }
+        if (client.stateManager.getState() instanceof ClientState.TiledMinimized) {
+            const grid = this.desktopManager.getDesktopForClient(client.kwinClient).grid;
+            client.stateManager.setState(() => new ClientState.Tiled(this.world, client, grid), false);
+        }
+    }
+
+    public tileClient(kwinClient: AbstractClient) {
+        const client = this.clientMap.get(kwinClient);
+        if (client === undefined) {
+            return;
+        }
+        if (client.stateManager.getState() instanceof ClientState.Tiled) {
+            return;
+        }
+        const grid = this.desktopManager.getDesktopForClient(client.kwinClient).grid;
+        client.stateManager.setState(() => new ClientState.Tiled(this.world, client, grid), false);
+    }
+
+    public untileClient(kwinClient: AbstractClient) {
+        const client = this.clientMap.get(kwinClient);
+        if (client === undefined) {
+            return;
+        }
+        if (client.stateManager.getState() instanceof ClientState.Tiled) {
+            client.stateManager.setState(() => new ClientState.Floating(client), false);
+        }
+    }
+
+    public toggleFloatingClient(kwinClient: TopLevel) {
+        const client = this.clientMap.get(kwinClient);
+        if (client === undefined) {
+            return;
+        }
+
+        const clientState = client.stateManager.getState();
+        if (clientState instanceof ClientState.Floating && Clients.canTileEver(kwinClient)) {
+            Clients.makeTileable(kwinClient);
+            const grid = this.desktopManager.getDesktopForClient(client.kwinClient).grid;
+            client.stateManager.setState(() => new ClientState.Tiled(this.world, client, grid), false);
+        } else if (clientState instanceof ClientState.Tiled) {
+            client.stateManager.setState(() => new ClientState.Floating(client), false);
+        }
+    }
+
+    public hasClient(kwinClient: AbstractClient) {
+        return this.clientMap.has(kwinClient);
+    }
+
+    public onClientFocused(kwinClient: AbstractClient) {
+        this.lastFocusedClient = kwinClient;
+        const window = this.findTiledWindow(kwinClient, true);
+        if (window !== null) {
+            window.onFocused();
+        }
+    }
+
+    public findTiledWindow(kwinClient: AbstractClient, followTransient: boolean) {
+        const client = this.clientMap.get(kwinClient);
+        if (client === undefined) {
+            return null;
+        }
+
+        return this.findTiledWindowOfClient(client, followTransient);
+    }
+
+    private findTiledWindowOfClient(client: ClientWrapper, followTransient: boolean): Window|null {
+        const clientState = client.stateManager.getState();
+        if (clientState instanceof ClientState.Tiled) {
+            return clientState.window;
+        } else if (followTransient && client.transientFor !== null) {
+            return this.findTiledWindowOfClient(client.transientFor, true);
+        } else {
+            return null;
+        }
+    }
+
+    private removeAllClients() {
+        for (const kwinClient of Array.from(this.clientMap.keys())) {
+            this.removeClient(kwinClient, false);
+        }
+    }
+
+    public destroy() {
+        this.removeAllClients();
+    }
+}

src/world/ClientStateDocked.ts

@@ -1,23 +0,0 @@
-class ClientStateDocked {
-    private readonly world: World;
-    private readonly signalManager: SignalManager;
-
-    constructor(world: World, kwinClient: AbstractClient) {
-        this.world = world;
-        this.signalManager = ClientStateDocked.initSignalManager(world, kwinClient);
-        world.onScreenResized();
-    }
-
-    destroy(passFocus: boolean) {
-        this.signalManager.destroy();
-        this.world.onScreenResized();
-    }
-
-    private static initSignalManager(world: World, kwinClient: AbstractClient) {
-        const manager = new SignalManager();
-        manager.connect(kwinClient.frameGeometryChanged, (kwinClient: TopLevel, oldGeometry: QRect) => {
-            world.onScreenResized();
-        });
-        return manager;
-    }
-}

src/world/ClientStateManager.ts

@@ -1,30 +0,0 @@
-class ClientStateManager {
-    private state: ClientState;
-
-    constructor(initialState: ClientState) {
-        this.state = initialState;
-    }
-
-    setState(newState: ClientState, passFocus: boolean) {
-        this.state.destroy(passFocus);
-        this.state = newState;
-    }
-
-    getState() {
-        return this.state;
-    }
-
-    destroy(passFocus: boolean) {
-        this.state.destroy(passFocus);
-    }
-}
-
-type ClientState = ClientStateTiled | ClientStateTiledMinimized | ClientStateFloating | ClientStateDocked;
-
-class ClientStateTiledMinimized {
-    destroy(passFocus: boolean) {}
-}
-
-class ClientStateFloating {
-    destroy(passFocus: boolean) {}
-}

src/world/ClientStateTiled.ts

@@ -1,103 +0,0 @@
-class ClientStateTiled {
-    readonly window: Window;
-    private readonly signalManager: SignalManager;
-
-    constructor(world: World, client: ClientWrapper) {
-        client.prepareForTiling();
-
-        const grid = world.getClientGrid(client.kwinClient);
-        const column = new Column(grid, grid.getLastFocusedColumn() ?? grid.getLastColumn());
-        const window = new Window(client, column);
-        grid.arrange();
-
-        this.window = window;
-        this.signalManager = ClientStateTiled.initSignalManager(world, window);
-    }
-
-    destroy(passFocus: boolean) {
-        this.signalManager.destroy();
-
-        const window = this.window;
-        const grid = window.column.grid;
-        const clientWrapper = window.client;
-        window.destroy(passFocus);
-        grid.arrange();
-
-        clientWrapper.prepareForFloating(grid.clientArea);
-    }
-
-    static initSignalManager(world: World, window: Window) {
-        const client = window.client;
-        const kwinClient = client.kwinClient;
-        const manager = new SignalManager();
-
-        manager.connect(kwinClient.desktopChanged, () => {
-            if (kwinClient.desktop === -1) {
-                // windows on all desktops are not supported
-                world.untileClient(kwinClient);
-                return;
-            }
-            ClientStateTiled.moveWindowToCorrectGrid(world, window);
-        });
-
-        manager.connect(kwinClient.activitiesChanged, (kwinClient: AbstractClient) => {
-            if (kwinClient.activities.length !== 1) {
-                // windows on multiple activities are not supported
-                world.untileClient(kwinClient);
-                return;
-            }
-            ClientStateTiled.moveWindowToCorrectGrid(world, window);
-        })
-
-        let lastResize = false;
-        manager.connect(kwinClient.moveResizedChanged, () => {
-            if (kwinClient.move) {
-                world.untileClient(kwinClient);
-                return;
-            }
-
-            const grid = window.column.grid;
-            const resize = kwinClient.resize;
-            if (!lastResize && resize) {
-                grid.onUserResizeStarted();
-            }
-            if (lastResize && !resize) {
-                grid.onUserResizeFinished();
-            }
-            lastResize = resize;
-        });
-
-        manager.connect(kwinClient.frameGeometryChanged, (kwinClient: TopLevel, oldGeometry: QRect) => {
-            console.assert(!kwinClient.move, "moved clients are removed in kwinClient.moveResizedChanged");
-            const grid = window.column.grid;
-            if (kwinClient.resize) {
-                window.onUserResize(oldGeometry);
-                grid.arrange();
-            } else {
-                const maximized = rectEqual(kwinClient.frameGeometry, grid.clientArea);
-                if (!client.isManipulatingGeometry() && !kwinClient.fullScreen && !maximized) {
-                    window.onProgrammaticResize(oldGeometry);
-                    grid.arrange();
-                }
-            }
-        });
-
-        return manager;
-    }
-
-    static moveWindowToCorrectGrid(world: World, window: Window) {
-        const kwinClient = window.client.kwinClient;
-
-        const oldGrid = window.column.grid;
-        const newGrid = world.getClientGrid(kwinClient);
-        if (oldGrid === newGrid) {
-            // window already on the correct grid
-            return;
-        }
-
-        const newColumn = new Column(newGrid, newGrid.getLastFocusedColumn() ?? newGrid.getLastColumn());
-        window.moveToColumn(newColumn);
-        oldGrid.arrange();
-        newGrid.arrange();
-    }
-}

src/world/ClientWrapper.ts

@@ -1,6 +1,6 @@
 class ClientWrapper {
-    public readonly kwinClient: AbstractClient;
-    public readonly stateManager: ClientStateManager;
+    public readonly kwinClient: TopLevel;
+    public readonly stateManager: ClientState.Manager;
     public transientFor: ClientWrapper | null;
     private readonly transients: ClientWrapper[];
     private readonly signalManager: SignalManager;
@@ -9,13 +9,13 @@ class ClientWrapper {
     private readonly manipulatingGeometry: Doer;
 
     constructor(
-        kwinClient: AbstractClient,
-        initialState: ClientState,
+        kwinClient: TopLevel,
+        initialState: ClientState.State,
         transientFor: ClientWrapper | null,
         rulesSignalManager: SignalManager | null,
     ) {
         this.kwinClient = kwinClient;
-        this.stateManager = new ClientStateManager(initialState);
+        this.stateManager = new ClientState.Manager(initialState);
         this.transientFor = transientFor;
         this.transients = [];
         if (transientFor !== null) {
@@ -27,7 +27,7 @@ class ClientWrapper {
         this.manipulatingGeometry = new Doer();
     }
 
-    place(x: number, y: number, width: number, height: number) {
+    public place(x: number, y: number, width: number, height: number) {
         this.manipulatingGeometry.do(() => {
             if (this.kwinClient.resize) {
                 // window is being manually resized, prevent fighting with the user
@@ -37,76 +37,87 @@ class ClientWrapper {
         });
     }
 
-    private moveTransient(dx: number, dy: number) {
+    private moveTransient(dx: number, dy: number, desktopNumber: number) {
         // TODO: prevent moving off the grid
-        if (this.stateManager.getState() instanceof ClientStateFloating) {
-            const frame = this.kwinClient.frameGeometry;
-            this.kwinClient.frameGeometry = Qt.rect(
-                frame.x + dx,
-                frame.y + dy,
-                frame.width,
-                frame.height,
-            );
+        if (this.stateManager.getState() instanceof ClientState.Floating) {
+            if (this.kwinClient.desktop === desktopNumber) {
+                const frame = this.kwinClient.frameGeometry;
+                this.kwinClient.frameGeometry = Qt.rect(
+                    frame.x + dx,
+                    frame.y + dy,
+                    frame.width,
+                    frame.height,
+                );
+            }
 
             for (const transient of this.transients) {
-                transient.moveTransient(dx, dy);
+                transient.moveTransient(dx, dy, desktopNumber);
             }
         }
     }
 
-    focus() {
+    public focus() {
         workspace.activeClient = this.kwinClient;
     }
 
-    isFocused() {
+    public isFocused() {
         return workspace.activeClient === this.kwinClient;
     }
 
-    setMaximize(horizontally: boolean, vertically: boolean) {
+    public setMaximize(horizontally: boolean, vertically: boolean) {
         this.manipulatingGeometry.do(() => {
             this.kwinClient.setMaximize(vertically, horizontally);
         });
     }
 
-    setFullScreen(fullScreen: boolean) {
+    public setFullScreen(fullScreen: boolean) {
         this.manipulatingGeometry.do(() => {
             this.kwinClient.fullScreen = fullScreen;
         });
     }
 
-    setShade(shade: boolean) {
+    public setShade(shade: boolean) {
         this.manipulatingGeometry.do(() => {
             this.kwinClient.shade = shade;
         });
     }
 
-    isShaded() {
+    public isShaded() {
         return this.kwinClient.shade;
     }
 
-    isManipulatingGeometry() {
+    public isManipulatingGeometry() {
         return this.manipulatingGeometry.isDoing();
     }
 
-    prepareForTiling() {
+    public prepareForTiling() {
         this.kwinClient.keepBelow = true;
         this.setFullScreen(false);
+        if (this.kwinClient.tile !== null) {
+            this.setMaximize(false, true); // disable quick tile mode
+        }
         this.setMaximize(false, false);
     }
 
-    prepareForFloating(screenSize: QRect) {
+    public restoreAfterTiling(screenSize: QRect) {
         this.kwinClient.keepBelow = false;
         this.setShade(false);
         this.setFullScreen(false);
-        this.setMaximize(false, false);
+        if (this.kwinClient.tile === null) {
+            this.setMaximize(false, false);
+        }
+        this.ensureVisible(screenSize);
+    }
 
+    public prepareForFloating() {
+        const placementArea = workspace.clientArea(ClientAreaOption.PlacementArea, this.kwinClient.screen, this.kwinClient.desktop);
         const clientRect = this.kwinClient.frameGeometry;
         const width = this.preferredWidth;
         this.place(
-            clamp(clientRect.x, screenSize.left, screenSize.right - width),
+            clientRect.x,
             clientRect.y,
             width,
-            Math.min(clientRect.height, Math.round(screenSize.height / 2)),
+            Math.min(clientRect.height, Math.round(placementArea.height / 2)),
         );
     }
 
@@ -119,7 +130,28 @@ class ClientWrapper {
         this.transients.splice(i, 1);
     }
 
-    destroy(passFocus: boolean) {
+    public ensureTransientsVisible(screenSize: QRect) {
+        for (const transient of this.transients) {
+            if (transient.stateManager.getState() instanceof ClientState.Floating) {
+                transient.ensureVisible(screenSize);
+                transient.ensureTransientsVisible(screenSize);
+            }
+        }
+    }
+
+    public ensureVisible(screenSize: QRect) {
+        if (this.kwinClient.desktop !== workspace.currentDesktop) {
+            return;
+        }
+        const frame = this.kwinClient.frameGeometry;
+        if (frame.left < 0) {
+            frame.x = 0;
+        } else if (frame.right > screenSize.width) {
+            frame.x = screenSize.width - frame.width;
+        }
+    }
+
+    public destroy(passFocus: boolean) {
         this.stateManager.destroy(passFocus);
         this.signalManager.destroy();
         if (this.rulesSignalManager !== null) {
@@ -133,10 +165,10 @@ class ClientWrapper {
         }
     }
 
-    static initSignalManager(client: ClientWrapper) {
+    private static initSignalManager(client: ClientWrapper) {
         const manager = new SignalManager();
         manager.connect(client.kwinClient.frameGeometryChanged, (kwinClient: TopLevel, oldGeometry: QRect) => {
-            if (client.stateManager.getState() instanceof ClientStateTiled) {
+            if (client.stateManager.getState() instanceof ClientState.Tiled) {
                 const newGeometry = client.kwinClient.frameGeometry;
                 const oldCenterX = oldGeometry.x + oldGeometry.width/2;
                 const oldCenterY = oldGeometry.y + oldGeometry.height/2;
@@ -145,7 +177,7 @@ class ClientWrapper {
                 const dx = Math.round(newCenterX - oldCenterX);
                 const dy = Math.round(newCenterY - oldCenterY);
                 for (const transient of client.transients) {
-                    transient.moveTransient(dx, dy);
+                    transient.moveTransient(dx, dy, client.kwinClient.desktop);
                 }
             }
         });

src/world/Clients.ts

@@ -0,0 +1,31 @@
+namespace Clients {
+    export function canTileEver(kwinClient: AbstractClient) {
+        return kwinClient.resizeable;
+    }
+
+    export function canTileNow(kwinClient: TopLevel) {
+        return canTileEver(kwinClient) && !kwinClient.minimized && kwinClient.desktop > 0 && kwinClient.activities.length === 1;
+    }
+
+    export function makeTileable(kwinClient: TopLevel) {
+        if (kwinClient.minimized) {
+            kwinClient.minimized = false;
+        }
+        if (kwinClient.desktop <= 0) {
+            kwinClient.desktop = workspace.currentDesktop;
+        }
+        if (kwinClient.activities.length !== 1) {
+            kwinClient.activities = [workspace.currentActivity];
+        }
+    }
+
+    export function isMaximizedGeometry(kwinClient: TopLevel) {
+        const maximizeArea = workspace.clientArea(ClientAreaOption.MaximizeArea, kwinClient.screen, kwinClient.desktop);
+        return kwinClient.frameGeometry === maximizeArea;
+    }
+
+    export function isFullScreenGeometry(kwinClient: TopLevel) {
+        const fullScreenArea = workspace.clientArea(ClientAreaOption.FullScreenArea, kwinClient.screen, kwinClient.desktop);
+        return kwinClient.frameGeometry === fullScreenArea;
+    }
+}

src/world/DesktopManager.ts

@@ -0,0 +1,106 @@
+class DesktopManager {
+    private readonly config: Desktop.Config;
+    public readonly layoutConfig: LayoutConfig;
+    private readonly desktopsPerActivity: Map<string, Desktop[]>;
+    private nVirtualDesktops: number;
+
+    constructor(config: Desktop.Config, layoutConfig: LayoutConfig, currentActivity: string) {
+        this.config = config;
+        this.layoutConfig = layoutConfig;
+        this.desktopsPerActivity = new Map();
+        this.nVirtualDesktops = 0;
+        this.update()
+        this.addActivity(currentActivity);
+    }
+
+    public update() {
+        this.setNVirtualDesktops(workspace.desktops);
+    }
+
+    public getDesktop(activity: string, desktopNumber: number) {
+        const desktopIndex = desktopNumber - 1;
+        if (desktopIndex >= this.nVirtualDesktops || desktopIndex < 0) {
+            throw new Error("invalid desktop number: " + String(desktopNumber));
+        }
+        if (!this.desktopsPerActivity.has(activity)) {
+            this.addActivity(activity);
+        }
+        return this.desktopsPerActivity.get(activity)![desktopIndex];
+    }
+
+    public getCurrentDesktop() {
+        return this.getDesktop(workspace.currentActivity, workspace.currentDesktop);
+    }
+
+    public getDesktopInCurrentActivity(desktopNumber: number) {
+        return this.getDesktop(workspace.currentActivity, desktopNumber);
+    }
+
+    public getDesktopForClient(kwinClient: TopLevel) {
+        console.assert(kwinClient.activities.length === 1);
+        return this.getDesktop(kwinClient.activities[0], kwinClient.desktop);
+    }
+
+    private setNVirtualDesktops(nVirtualDesktops: number) {
+        if (nVirtualDesktops > this.nVirtualDesktops) {
+            this.addDesktopsToActivities(nVirtualDesktops - this.nVirtualDesktops);
+        } else if (nVirtualDesktops < this.nVirtualDesktops) {
+            this.removeDesktopsFromActivities(this.nVirtualDesktops - nVirtualDesktops);
+        }
+        this.nVirtualDesktops = nVirtualDesktops;
+    }
+
+    private addDesktopsToActivities(n: number) {
+        for (const desktops of this.desktopsPerActivity.values()) {
+            this.addDesktops(desktops, n);
+        }
+    }
+
+    private addDesktops(desktops: Desktop[], n: number) {
+        const nStart = desktops.length;
+        for (let i = 0; i < n; i++) {
+            const desktopNumber = nStart + i + 1;
+            desktops.push(new Desktop(desktopNumber, this.config, this.layoutConfig));
+        }
+    }
+
+    private removeDesktopsFromActivities(n: number) {
+        const lastRemainingDesktopIndex = this.nVirtualDesktops - n - 1;
+        for (const desktops of this.desktopsPerActivity.values()) {
+            const targetDesktop = desktops[lastRemainingDesktopIndex];
+            for (let i = 0; i < n; i++) {
+                const removedDesktop = desktops.pop()!;
+                removedDesktop.grid.evacuate(targetDesktop.grid);
+            }
+        }
+    }
+
+    private addActivity(activity: string) {
+        const desktops: Desktop[] = [];
+        this.addDesktops(desktops, this.nVirtualDesktops);
+        this.desktopsPerActivity.set(activity, desktops);
+    }
+
+    private removeActivity(activity: string) {
+        const removedDesktops = this.desktopsPerActivity.get(activity)!;
+        this.desktopsPerActivity.delete(activity);
+        const targetActivityDesktops = this.desktopsPerActivity.values().next().value;
+        for (let i = 0; i < removedDesktops.length; i++) {
+            removedDesktops[i].grid.evacuate(targetActivityDesktops[i]);
+        }
+    }
+
+    public destroy() {
+        for (const desktop of this.desktops()) {
+            desktop.destroy();
+        }
+    }
+
+    public *desktops() {
+        for (const desktops of this.desktopsPerActivity.values()) {
+            for (const desktop of desktops) {
+                yield desktop;
+            }
+        }
+    }
+}

src/world/GridManager.ts

@@ -1,81 +0,0 @@
-class GridManager {
-    private readonly world: World;
-    private readonly gridsPerActivity: Map<string, Grid[]>;
-    private nDesktops: number;
-
-    constructor(world: World, currentActivity: string, nDesktops: number) {
-        this.world = world;
-        this.gridsPerActivity = new Map();
-        this.nDesktops = 0;
-        this.setNDesktops(nDesktops);
-        this.addActivity(currentActivity);
-    }
-
-    get(activity: string, desktopNumber: number) {
-        const desktopIndex = desktopNumber - 1;
-        if (desktopIndex >= this.nDesktops || this.nDesktops < 0) {
-            throw new Error("invalid desktop number: " + String(desktopNumber));
-        }
-        if (!this.gridsPerActivity.has(activity)) {
-            this.addActivity(activity);
-        }
-        return this.gridsPerActivity.get(activity)![desktopIndex];
-    }
-
-    setNDesktops(nDesktops: number) {
-        if (nDesktops > this.nDesktops) {
-            this.addDesktopsToActivities(nDesktops - this.nDesktops);
-        } else if (nDesktops < this.nDesktops) {
-            this.removeDesktopsFromActivities(this.nDesktops - nDesktops);
-        }
-        this.nDesktops = nDesktops;
-    }
-
-    private addDesktopsToActivities(n: number) {
-        for (const grids of this.gridsPerActivity.values()) {
-            this.addDesktops(grids, n);
-        }
-    }
-
-    private addDesktops(grids: Grid[], n: number) {
-        const nStart = grids.length;
-        for (let i = 0; i < n; i++) {
-            const desktopNumber = nStart + i + 1;
-            grids.push(new Grid(this.world, desktopNumber));
-        }
-    }
-
-    private removeDesktopsFromActivities(n: number) {
-        const lastRemainingDesktopIndex = this.nDesktops - n - 1;
-        for (const grids of this.gridsPerActivity.values()) {
-            const targetGrid = grids[lastRemainingDesktopIndex];
-            for (let i = 0; i < n; i++) {
-                const removedGrid = grids.pop()!;
-                removedGrid.evacuate(targetGrid);
-            }
-        }
-    }
-
-    addActivity(activity: string) {
-        const grids: Grid[] = [];
-        this.addDesktops(grids, this.nDesktops);
-        this.gridsPerActivity.set(activity, grids);
-    }
-
-    removeActivity(activity: string) {
-        const removedGrids = this.gridsPerActivity.get(activity)!;
-        this.gridsPerActivity.delete(activity);
-        const targetActivityGrids = this.gridsPerActivity.values().next().value;
-        for (let i = 0; i < removedGrids.length; i++) {
-            removedGrids[i].evacuate(targetActivityGrids[i]);
-        }
-    }
-
-    *grids() {
-        for (const grids of this.gridsPerActivity.values()) {
-            for (const grid of grids) {
-                yield grid;
-            }
-        }
-    }
-}

src/world/World.ts

@@ -1,226 +1,89 @@
 class World {
-    public readonly config: Config;
-    private readonly gridManager: GridManager;
-    private readonly clientMap: Map<AbstractClient, ClientWrapper>;
-    private lastFocusedClient: AbstractClient|null;
+    public readonly untileOnDrag: boolean;
+    private readonly desktopManager: DesktopManager;
+    public readonly clientManager: ClientManager;
     private readonly workspaceSignalManager: SignalManager;
-    private readonly windowRuleEnforcer: WindowRuleEnforcer;
     private readonly screenResizedDelayer: Delayer;
 
     constructor(config: Config) {
-        this.config = config;
-        this.clientMap = new Map();
-        this.lastFocusedClient = null;
+        this.untileOnDrag = config.untileOnDrag;
         this.workspaceSignalManager = initWorkspaceSignalHandlers(this);
 
-        let parsedWindowRules: WindowRule[] = [];
-        try {
-            parsedWindowRules = JSON.parse(config.windowRules);
-        } catch (error: any) {
-            console.log("failed to parse windowRules:", error);
-        }
-        this.windowRuleEnforcer = new WindowRuleEnforcer(this, parsedWindowRules);
-
         this.screenResizedDelayer = new Delayer(1000, () => {
             // this delay ensures that docks get taken into account by `workspace.clientArea`
-            const gridManager = this.gridManager; // workaround for bug in Qt5's JS engine
-            for (const grid of gridManager.grids()) {
-                grid.arrange();
+            const desktopManager = this.desktopManager; // workaround for bug in Qt5's JS engine
+            for (const desktop of desktopManager.desktops()) {
+                desktop.onLayoutChanged();
             }
+            this.update();
         });
 
-        this.gridManager = new GridManager(this, workspace.currentActivity, workspace.desktops);
+        this.desktopManager = new DesktopManager(
+            {
+                marginTop: config.gapsOuterTop,
+                marginBottom: config.gapsOuterBottom,
+                marginLeft: config.gapsOuterLeft,
+                marginRight: config.gapsOuterRight,
+                overscroll: config.overscroll,
+            },
+            config,
+            workspace.currentActivity,
+        );
+        this.clientManager = new ClientManager(config, this, this.desktopManager);
         this.addExistingClients();
-    }
-
-    updateDesktops() {
-        this.gridManager.setNDesktops(workspace.desktops);
+        this.update();
     }
 
     private addExistingClients() {
         const kwinClients = workspace.clientList();
         for (let i = 0; i < kwinClients.length; i++) {
             const kwinClient = kwinClients[i];
-            this.addClient(kwinClient);
+            this.clientManager.addClient(kwinClient);
         }
     }
 
-    getGrid(activity: string, desktopNumber: number) {
-        console.assert(desktopNumber > 0 && desktopNumber <= workspace.desktops);
-        return this.gridManager.get(activity, desktopNumber);
+    public updateDesktops() {
+        this.desktopManager.update();
     }
 
-    getGridInCurrentActivity(desktopNumber: number) {
-        return this.getGrid(workspace.currentActivity, desktopNumber);
+    private update() {
+        this.desktopManager.getCurrentDesktop().arrange();
     }
 
-    getCurrentGrid() {
-        return this.getGrid(workspace.currentActivity, workspace.currentDesktop);
+    public do(f: (clientManager: ClientManager, desktopManager: DesktopManager) => void) {
+        f(this.clientManager, this.desktopManager);
+        this.update();
     }
 
-    getClientGrid(kwinClient: AbstractClient) {
-        console.assert(kwinClient.activities.length === 1);
-        return this.getGrid(kwinClient.activities[0], kwinClient.desktop);
-    }
-
-    addClient(kwinClient: AbstractClient) {
-        const client = new ClientWrapper(
-            kwinClient,
-            new ClientStateFloating(),
-            this.findTransientFor(kwinClient),
-            this.windowRuleEnforcer.initClientSignalManager(this, kwinClient),
-        );
-        this.clientMap.set(kwinClient, client);
-
-        if (kwinClient.dock) {
-            client.stateManager.setState(new ClientStateDocked(this, kwinClient), false);
-        } else if (this.windowRuleEnforcer.shouldTile(kwinClient)) {
-            client.stateManager.setState(new ClientStateTiled(this, client), false);
-        }
-    }
-
-    removeClient(kwinClient: AbstractClient, passFocus: boolean) {
-        const client = this.clientMap.get(kwinClient);
-        if (client === undefined) {
+    public doIfTiled(
+        kwinClient: AbstractClient,
+        followTransient: boolean,
+        f: (clientManager: ClientManager, desktopManager: DesktopManager, window: Window, column: Column, grid: Grid) => void,
+    ) {
+        const window = this.clientManager.findTiledWindow(kwinClient, followTransient);
+        if (window === null) {
             return;
         }
-        client.destroy(passFocus && kwinClient === this.lastFocusedClient);
-        this.clientMap.delete(kwinClient);
+        const column = window.column;
+        const grid = column.grid;
+        f(this.clientManager, this.desktopManager, window, column, grid);
+        this.update();
     }
 
-    findTransientFor(kwinClient: AbstractClient) {
-        if (!kwinClient.transient) {
-            return null;
-        }
-
-        const transientFor = this.clientMap.get(kwinClient.transientFor);
-        if (transientFor === undefined) {
-            return null;
-        }
-
-        return transientFor;
-    }
-
-    minimizeClient(kwinClient: AbstractClient) {
-        const client = this.clientMap.get(kwinClient);
-        if (client === undefined) {
-            return;
-        }
-        if (client.stateManager.getState() instanceof ClientStateTiled) {
-            client.stateManager.setState(new ClientStateTiledMinimized(), kwinClient === this.lastFocusedClient);
-        }
-    }
-
-    unminimizeClient(kwinClient: AbstractClient) {
-        const client = this.clientMap.get(kwinClient);
-        if (client === undefined) {
-            return;
-        }
-        if (client.stateManager.getState() instanceof ClientStateTiledMinimized) {
-            client.stateManager.setState(new ClientStateTiled(this, client), false);
-        }
-    }
-
-    tileClient(kwinClient: AbstractClient) {
-        const client = this.clientMap.get(kwinClient);
-        if (client === undefined) {
-            return;
-        }
-        if (client.stateManager.getState() instanceof ClientStateTiled) {
-            return;
-        }
-        client.stateManager.setState(new ClientStateTiled(this, client), false);
-    }
-
-    untileClient(kwinClient: AbstractClient) {
-        const client = this.clientMap.get(kwinClient);
-        if (client === undefined) {
-            return;
-        }
-        if (client.stateManager.getState() instanceof ClientStateTiled) {
-            client.stateManager.setState(new ClientStateFloating(), false);
-        }
-    }
-
-    toggleFloatingClient(kwinClient: AbstractClient) {
-        const client = this.clientMap.get(kwinClient);
-        if (client === undefined) {
-            return;
-        }
-
-        const clientState = client.stateManager.getState();
-        if (clientState instanceof ClientStateFloating && canTileEver(kwinClient)) {
-            makeTileable(kwinClient);
-            client.stateManager.setState(new ClientStateTiled(this, client), false);
-        } else if (clientState instanceof ClientStateTiled) {
-            client.stateManager.setState(new ClientStateFloating(), false);
-        }
-    }
-
-    hasClient(kwinClient: AbstractClient) {
-        return this.clientMap.has(kwinClient);
-    }
-
-    onClientFocused(kwinClient: AbstractClient) {
-        this.lastFocusedClient = kwinClient;
-    }
-
-    private doIfTiledInner(client: ClientWrapper, followTransient: boolean, f: (window: Window, column: Column, grid: Grid) => void) {
-        const clientState = client.stateManager.getState();
-        if (clientState instanceof ClientStateTiled) {
-            const window = clientState.window;
-            const column = window.column;
-            const grid = column.grid;
-            f(window, column, grid);
-        } else if (followTransient && client.transientFor !== null) {
-            this.doIfTiledInner(client.transientFor, true, f);
-        }
-    }
-
-    doIfTiled(kwinClient: AbstractClient, followTransient: boolean, f: (window: Window, column: Column, grid: Grid) => void) {
-        const client = this.clientMap.get(kwinClient);
-        if (client === undefined) {
-            return;
-        }
-        this.doIfTiledInner(client, followTransient, f);
-    }
-
-    doIfTiledFocused(followTransient: boolean, f: (window: Window, column: Column, grid: Grid) => void) {
+    public doIfTiledFocused(
+        followTransient: boolean,
+        f: (clientManager: ClientManager, desktopManager: DesktopManager, window: Window, column: Column, grid: Grid) => void,
+    ) {
         this.doIfTiled(workspace.activeClient, followTransient, f);
     }
 
-    getFocusedWindow() {
-        const activeClient = workspace.activeClient;
-        if (activeClient === null) {
-            return null;
-        }
-        const client = this.clientMap.get(activeClient);
-        if (client === undefined) {
-            return null;
-        }
-        const clientState = client.stateManager.getState();
-        if (clientState instanceof ClientStateTiled) {
-            return clientState.window;
-        } else {
-            return null;
-        }
-    }
-
-    removeAllClients() {
-        for (const kwinClient of Array.from(this.clientMap.keys())) {
-            this.removeClient(kwinClient, false);
-        }
-    }
-
-    destroy() {
+    public destroy() {
         this.workspaceSignalManager.destroy();
-        this.removeAllClients();
-        for (const grid of this.gridManager.grids()) {
-            grid.destroy();
-        }
+        this.clientManager.destroy();
+        this.desktopManager.destroy();
     }
 
-    onScreenResized() {
+    public onScreenResized() {
         this.screenResizedDelayer.run();
     }
 }

src/world/clientState/Docked.ts

@@ -0,0 +1,25 @@
+namespace ClientState {
+    export class Docked implements State {
+        private readonly world: World;
+        private readonly signalManager: SignalManager;
+
+        constructor(world: World, kwinClient: TopLevel) {
+            this.world = world;
+            this.signalManager = Docked.initSignalManager(world, kwinClient);
+            world.onScreenResized();
+        }
+
+        public destroy(passFocus: boolean) {
+            this.signalManager.destroy();
+            this.world.onScreenResized();
+        }
+
+        private static initSignalManager(world: World, kwinClient: TopLevel) {
+            const manager = new SignalManager();
+            manager.connect(kwinClient.frameGeometryChanged, (kwinClient: TopLevel, oldGeometry: QRect) => {
+                world.onScreenResized();
+            });
+            return manager;
+        }
+    }
+}

src/world/clientState/Floating.ts

@@ -0,0 +1,11 @@
+namespace ClientState {
+    export class Floating implements State {
+        constructor(client: ClientWrapper | null) {
+            if (client !== null && client.kwinClient.tile === null) {
+                client.prepareForFloating();
+            }
+        }
+
+        public destroy(passFocus: boolean) {}
+    }
+}

src/world/clientState/Manager.ts

@@ -0,0 +1,26 @@
+namespace ClientState {
+    export class Manager {
+        private state: State;
+
+        constructor(initialState: State) {
+            this.state = initialState;
+        }
+
+        public setState(constructNewState: () => State, passFocus: boolean) {
+            this.state.destroy(passFocus);
+            this.state = constructNewState();
+        }
+
+        public getState() {
+            return this.state;
+        }
+
+        public destroy(passFocus: boolean) {
+            this.state.destroy(passFocus);
+        }
+    }
+
+    export type State = {
+        destroy(passFocus: boolean): void;
+    };
+}

src/world/clientState/Tiled.ts

@@ -0,0 +1,121 @@
+namespace ClientState {
+    export class Tiled implements State {
+        public readonly window: Window;
+        private readonly signalManager: SignalManager;
+
+        constructor(world: World, client: ClientWrapper, grid: Grid) {
+            client.prepareForTiling();
+
+            const column = new Column(grid, grid.getLastFocusedColumn() ?? grid.getLastColumn());
+            const window = new Window(client, column);
+
+            this.window = window;
+            this.signalManager = Tiled.initSignalManager(world, window);
+        }
+
+        public destroy(passFocus: boolean) {
+            this.signalManager.destroy();
+
+            const window = this.window;
+            const grid = window.column.grid;
+            const client = window.client;
+            window.destroy(passFocus);
+
+            client.restoreAfterTiling(grid.desktop.clientArea);
+        }
+
+        private static initSignalManager(world: World, window: Window) {
+            const client = window.client;
+            const kwinClient = client.kwinClient;
+            const manager = new SignalManager();
+
+            manager.connect(kwinClient.desktopChanged, () => {
+                world.do((clientManager, desktopManager) => {
+                    if (kwinClient.desktop === -1) {
+                        // windows on all desktops are not supported
+                        clientManager.untileClient(kwinClient);
+                        return;
+                    }
+                    Tiled.moveWindowToCorrectGrid(desktopManager, window);
+                });
+            });
+
+            manager.connect(kwinClient.activitiesChanged, (kwinClient: AbstractClient) => {
+                world.do((clientManager, desktopManager) => {
+                    if (kwinClient.activities.length !== 1) {
+                        // windows on multiple activities are not supported
+                        clientManager.untileClient(kwinClient);
+                        return;
+                    }
+                    Tiled.moveWindowToCorrectGrid(desktopManager, window);
+                });
+            })
+
+            let lastResize = false;
+            manager.connect(kwinClient.moveResizedChanged, () => {
+                world.do((clientManager, desktopManager) => {
+                    if (world.untileOnDrag && kwinClient.move) {
+                        clientManager.untileClient(kwinClient);
+                        return;
+                    }
+
+                    const grid = window.column.grid;
+                    const resize = kwinClient.resize;
+                    if (!lastResize && resize) {
+                        grid.onUserResizeStarted();
+                    }
+                    if (lastResize && !resize) {
+                        grid.onUserResizeFinished();
+                    }
+                    lastResize = resize;
+                });
+            });
+
+            let cursorChangedAfterResizeStart = false;
+            manager.connect(kwinClient.moveResizeCursorChanged, () => {
+                cursorChangedAfterResizeStart = true;
+            });
+            manager.connect(kwinClient.clientStartUserMovedResized, () => {
+                cursorChangedAfterResizeStart = false;
+            });
+
+            manager.connect(kwinClient.frameGeometryChanged, (kwinClient: TopLevel, oldGeometry: QRect) => {
+                world.do((clientManager, desktopManager) => {
+                    if (kwinClient.resize) {
+                        window.onUserResize(oldGeometry, !cursorChangedAfterResizeStart);
+                    } else if (!client.isManipulatingGeometry() && !Clients.isMaximizedGeometry(kwinClient) && !Clients.isFullScreenGeometry(kwinClient)) {
+                        window.onFrameGeometryChanged();
+                    }
+                });
+            });
+
+            manager.connect(kwinClient.fullScreenChanged, () => {
+                window.onFullScreenChanged(kwinClient.fullScreen);
+            });
+
+            manager.connect(kwinClient.tileChanged, (tile: Tile) => {
+                if (tile !== null) {
+                    world.do((clientManager, desktopManager) => {
+                        clientManager.untileClient(kwinClient);
+                    })
+                }
+            });
+
+            return manager;
+        }
+
+        private static moveWindowToCorrectGrid(desktopManager: DesktopManager, window: Window) {
+            const kwinClient = window.client.kwinClient;
+
+            const oldGrid = window.column.grid;
+            const newGrid = desktopManager.getDesktopForClient(kwinClient).grid;
+            if (oldGrid === newGrid) {
+                // window already on the correct grid
+                return;
+            }
+
+            const newColumn = new Column(newGrid, newGrid.getLastFocusedColumn() ?? newGrid.getLastColumn());
+            window.moveToColumn(newColumn);
+        }
+    }
+}

src/world/clientState/TiledMinimized.ts

@@ -0,0 +1,5 @@
+namespace ClientState {
+    export class TiledMinimized implements State {
+        public destroy(passFocus: boolean) {}
+    }
+}