bump version to 0.7

This reverts commit dda63d68cde58c7f4a7162b11a2fd614365d36ff.

README.md

@@ -13,9 +13,16 @@ unprompted reflow of window content.
 Windows are automatically centered when possible. And when running out of width, windows can be
 scrolled through horizontally.
 
-Similar window managers include [PaperWM](https://github.com/paperwm/PaperWM) and
+Similar window managers include [PaperWM](https://github.com/paperwm/PaperWM),
+[Niri](https://github.com/YaLTeR/niri), and
 [Cardboard](https://gitlab.com/cardboardwm/cardboard).
 
+## Dependencies
+Karousel requires the following QML modules:
+- QtQuick 2.15
+- org.kde.kwin 3.0
+- org.kde.notification 1.0
+
 ## Limitations
 - Doesn't support multiple screens
 - Doesn't support windows on all desktops
@@ -28,9 +35,9 @@ Here's the default ones:
 | ---                      | ---                                                                                                                            |
 | 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+D                   | Move focus right (Clashes with default KDE shortcuts, may require manual remapping)                                            |
+| Meta+W                   | Move focus up (Clashes with default KDE shortcuts, may require manual remapping)                                               |
+| Meta+S                   | Move focus down (Clashes with default KDE shortcuts, may require manual remapping)                                             |
 | 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)                                                                        |
@@ -39,13 +46,14 @@ Here's the default ones:
 | 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+X                   | Toggle stacked layout for focused column (One window in the column visible, others shaded; not supported on Wayland)           |
 | 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+Ctrl+X              | Equalize widths of visible columns                                                                                             |
 | 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                                                                                                 |
@@ -53,7 +61,7 @@ Here's the default ones:
 | 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+[N]                 | Move focus to column N (Clashes with default KDE shortcuts, may require manual remapping)                                      |
 | 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                                                                                                       |

generators/config/kcfg.ts

@@ -5,9 +5,20 @@ console.log(`<?xml version="1.0" encoding="UTF-8"?>
 
 for (const entry of configDef) {
     console.log(`        <entry name="${entry.name}" type="${entry.type}">
-            <default>${entry.default}</default>
+            <default>${escapeXml(entry.default)}</default>
         </entry>`);
 }
 
 console.log(`    </group>
 </kcfg>`);
+
+function escapeXml(input: any) {
+    if (typeof input === "string") {
+        return input
+            .replace(/&/g, '&amp;')
+            .replace(/</g, '&lt;')
+            .replace(/>/g, '&gt;');
+    } else {
+        return input;
+    }
+}

package/contents/ui/config.ui

@@ -11,19 +11,146 @@
         <layout class="QVBoxLayout" name="layout_main">
             <item>
                 <widget class="QTabWidget" name="tabContainer">
-                    <widget class="QWidget" name="tab_general">
+                    <widget class="QWidget" name="tab_behavior">
                         <attribute name="title">
-                            <string>General</string>
+                            <string>Behavior</string>
                         </attribute>
-                        <layout class="QGridLayout" name="layout_tab_general" columnstretch="0,1">
+                        <layout class="QVBoxLayout">
+                            <item>
+                                <widget class="QGroupBox">
+                                    <property name="flat">
+                                        <bool>true</bool>
+                                    </property>
+                                    <layout class="QVBoxLayout">
+                                        <item>
+                                            <widget class="QCheckBox" name="kcfg_untileOnDrag">
+                                                <property name="text">
+                                                    <string>Un-tile windows by dragging them</string>
+                                                </property>
+                                            </widget>
+                                        </item>
+                                        <item>
+                                            <widget class="QCheckBox" name="kcfg_stackColumnsByDefault">
+                                                <property name="text">
+                                                    <string>Stack columns by default</string>
+                                                </property>
+                                                <property name="toolTip">
+                                                    <string>New columns start in stacked mode (one window in the column visible, others shaded). Not supported on Wayland.</string>
+                                                </property>
+                                            </widget>
+                                        </item>
+                                        <item>
+                                            <widget class="QCheckBox" name="kcfg_resizeNeighborColumn">
+                                                <property name="text">
+                                                    <string>Resize neighbor column on edge resize</string>
+                                                </property>
+                                                <property name="toolTip">
+                                                    <string>When resizing a column by dragging its edge, also inversely resize the column on the other side of the edge</string>
+                                                </property>
+                                            </widget>
+                                        </item>
+                                        <item>
+                                            <widget class="QCheckBox" name="kcfg_reMaximize">
+                                                <property name="text">
+                                                    <string>Re-maximize tiled windows</string>
+                                                </property>
+                                                <property name="toolTip">
+                                                    <string>Restore maximized and full-screen states of tiled windows on focus</string>
+                                                </property>
+                                            </widget>
+                                        </item>
+                                        <item>
+                                            <widget class="QCheckBox" name="kcfg_skipSwitcher">
+                                                <property name="text">
+                                                    <string>Tiled windows skip switcher</string>
+                                                </property>
+                                            </widget>
+                                        </item>
+                                    </layout>
+                                </widget>
+                            </item>
+
+                            <item>
+                                <widget class="QGroupBox">
+                                    <property name="title">
+                                        <string>Scrolling mode</string>
+                                    </property>
+                                    <layout class="QVBoxLayout">
+                                        <item>
+                                            <widget class="QRadioButton" name="kcfg_scrollingLazy">
+                                                <property name="text">
+                                                    <string>Only scroll as necessary</string>
+                                                </property>
+                                            </widget>
+                                        </item>
+                                        <item>
+                                            <widget class="QRadioButton" name="kcfg_scrollingCentered">
+                                                <property name="text">
+                                                    <string>Center focused column</string>
+                                                </property>
+                                            </widget>
+                                        </item>
+                                        <item>
+                                            <widget class="QRadioButton" name="kcfg_scrollingGrouped">
+                                                <property name="text">
+                                                    <string>Center visible columns</string>
+                                                </property>
+                                            </widget>
+                                        </item>
+                                    </layout>
+                                </widget>
+                            </item>
+
+                            <item>
+                                <widget class="QGroupBox">
+                                    <property name="title">
+                                        <string>Layering mode</string>
+                                    </property>
+                                    <layout class="QVBoxLayout">
+                                        <item>
+                                            <widget class="QRadioButton" name="kcfg_tiledKeepBelow">
+                                                <property name="text">
+                                                    <string>Keep tiled windows below</string>
+                                                </property>
+                                            </widget>
+                                        </item>
+                                        <item>
+                                            <widget class="QRadioButton" name="kcfg_floatingKeepAbove">
+                                                <property name="text">
+                                                    <string>Keep floating windows above</string>
+                                                </property>
+                                            </widget>
+                                        </item>
+                                    </layout>
+                                </widget>
+                            </item>
+
+                            <item>
+                                <spacer name="spacer_footer">
+                                    <property name="orientation">
+                                        <enum>Qt::Vertical</enum>
+                                    </property>
+                                    <property name="sizeHint" stdset="0">
+                                        <size>
+                                            <width>0</width>
+                                            <height>0</height>
+                                        </size>
+                                    </property>
+                                </spacer>
+                            </item>
+                        </layout>
+                    </widget>
+
+                    <widget class="QWidget" name="tab_parameters">
+                        <attribute name="title">
+                            <string>Parameters</string>
+                        </attribute>
+                        <layout class="QFormLayout">
                             <item row="0" column="0">
                                 <widget class="QLabel" name="label_gapsOuterTop">
                                     <property name="text">
                                         <string>Top margin:</string>
                                     </property>
-                                    <property name="alignment">
-                                        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                                    </property>
                                 </widget>
                             </item>
                             <item row="0" column="1">
@@ -45,9 +172,6 @@
                                     <property name="text">
                                         <string>Bottom margin:</string>
                                     </property>
-                                    <property name="alignment">
-                                        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                                    </property>
                                 </widget>
                             </item>
                             <item row="1" column="1">
@@ -69,9 +193,6 @@
                                     <property name="text">
                                         <string>Left margin:</string>
                                     </property>
-                                    <property name="alignment">
-                                        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                                    </property>
                                 </widget>
                             </item>
                             <item row="2" column="1">
@@ -93,9 +214,6 @@
                                     <property name="text">
                                         <string>Right margin:</string>
                                     </property>
-                                    <property name="alignment">
-                                        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                                    </property>
                                 </widget>
                             </item>
                             <item row="3" column="1">
@@ -117,9 +235,6 @@
                                     <property name="text">
                                         <string>Horizontal gaps between windows:</string>
                                     </property>
-                                    <property name="alignment">
-                                        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                                    </property>
                                 </widget>
                             </item>
                             <item row="4" column="1">
@@ -141,9 +256,6 @@
                                     <property name="text">
                                         <string>Vertical gaps between windows:</string>
                                     </property>
-                                    <property name="alignment">
-                                        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                                    </property>
                                 </widget>
                             </item>
                             <item row="5" column="1">
@@ -161,40 +273,13 @@
                             </item>
 
                             <item row="6" column="0">
-                                <widget class="QLabel" name="label_overscroll">
-                                    <property name="text">
-                                        <string>Overscroll amount:</string>
-                                    </property>
-                                    <property name="alignment">
-                                        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                                    </property>
-                                </widget>
-                            </item>
-                            <item row="6" column="1">
-                                <widget class="QSpinBox" name="kcfg_overscroll">
-                                    <property name="suffix">
-                                        <string> px</string>
-                                    </property>
-                                    <property name="maximum">
-                                        <number>999</number>
-                                    </property>
-                                    <property name="value">
-                                        <number>0</number>
-                                    </property>
-                                </widget>
-                            </item>
-
-                            <item row="7" column="0">
                                 <widget class="QLabel" name="label_manualScrollStep">
                                     <property name="text">
                                         <string>Manual scroll step size:</string>
                                     </property>
-                                    <property name="alignment">
-                                        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                                    </property>
                                 </widget>
                             </item>
-                            <item row="7" column="1">
+                            <item row="6" column="1">
                                 <widget class="QSpinBox" name="kcfg_manualScrollStep">
                                     <property name="suffix">
                                         <string> px</string>
@@ -208,44 +293,55 @@
                                 </widget>
                             </item>
 
+                            <item row="7" column="0">
+                                <widget class="QLabel" name="label_manualResizeStep">
+                                    <property name="text">
+                                        <string>Manual resize step size:</string>
+                                    </property>
+                                </widget>
+                            </item>
+                            <item row="7" column="1">
+                                <widget class="QSpinBox" name="kcfg_manualResizeStep">
+                                    <property name="suffix">
+                                        <string> px</string>
+                                    </property>
+                                    <property name="maximum">
+                                        <number>999</number>
+                                    </property>
+                                    <property name="value">
+                                        <number>0</number>
+                                    </property>
+                                </widget>
+                            </item>
+
+                            <item row="8" column="0">
+                                <widget class="QLabel" name="label_offScreenOpacity">
+                                    <property name="text">
+                                        <string>Obscured window opacity:</string>
+                                    </property>
+                                </widget>
+                            </item>
                             <item row="8" column="1">
-                                <widget class="QCheckBox" name="kcfg_untileOnDrag">
-                                    <property name="text">
-                                        <string>Un-tile windows by dragging them</string>
+                                <widget class="QSpinBox" name="kcfg_offScreenOpacity">
+                                    <property name="suffix">
+                                        <string> %</string>
+                                    </property>
+                                    <property name="maximum">
+                                        <number>100</number>
+                                    </property>
+                                    <property name="value">
+                                        <number>0</number>
                                     </property>
                                 </widget>
                             </item>
-
-                            <item row="9" column="1">
-                                <widget class="QCheckBox" name="kcfg_stackColumnsByDefault">
-                                    <property name="text">
-                                        <string>Stack columns by default</string>
-                                    </property>
-                                </widget>
-                            </item>
-
-                            <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>
-                                    </property>
-                                </spacer>
-                            </item>
                         </layout>
                     </widget>
+
                     <widget class="QWidget" name="tab_windowRules">
                         <attribute name="title">
                             <string>Window Rules</string>
                         </attribute>
-                        <layout class="QVBoxLayout" name="layout_tab_windowRules">
+                        <layout class="QVBoxLayout">
                             <item>
                                 <widget class="QPlainTextEdit" name="kcfg_windowRules">
                                     <property name="tabChangesFocus">

package/metadata.json

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

src/Actions.ts

@@ -2,7 +2,7 @@ namespace Actions {
     export function init(world: World, config: Config) {
         return {
             focusLeft: () => {
-                world.doIfTiledFocused(true, (world, desktopManager, window, column, grid) => {
+                world.doIfTiledFocused(true, (clientManager, desktopManager, window, column, grid) => {
                     const prevColumn = grid.getPrevColumn(column);
                     if (prevColumn === null) {
                         return;
@@ -12,7 +12,7 @@ namespace Actions {
             },
 
             focusRight: () => {
-                world.doIfTiledFocused(true, (world, desktopManager, window, column, grid) => {
+                world.doIfTiledFocused(true, (clientManager, desktopManager, window, column, grid) => {
                     const nextColumn = grid.getNextColumn(column);
                     if (nextColumn === null) {
                         return;
@@ -22,7 +22,7 @@ namespace Actions {
             },
 
             focusUp: () => {
-                world.doIfTiledFocused(true, (world, desktopManager, window, column, grid) => {
+                world.doIfTiledFocused(true, (clientManager, desktopManager, window, column, grid) => {
                     const prevWindow = column.getPrevWindow(window);
                     if (prevWindow === null) {
                         return;
@@ -32,7 +32,7 @@ namespace Actions {
             },
 
             focusDown: () => {
-                world.doIfTiledFocused(true, (world, desktopManager, window, column, grid) => {
+                world.doIfTiledFocused(true, (clientManager, desktopManager, window, column, grid) => {
                     const nextWindow = column.getNextWindow(window);
                     if (nextWindow === null) {
                         return;
@@ -64,7 +64,7 @@ namespace Actions {
             },
 
             windowMoveLeft: () => {
-                world.doIfTiledFocused(true, (world, desktopManager, window, column, grid) => {
+                world.doIfTiledFocused(true, (clientManager, desktopManager, window, column, grid) => {
                     if (column.getWindowCount() === 1) {
                         // move from own column into existing column
                         const prevColumn = grid.getPrevColumn(column);
@@ -82,7 +82,7 @@ namespace Actions {
             },
 
             windowMoveRight: () => {
-                world.doIfTiledFocused(true, (world, desktopManager, window, column, grid) => {
+                world.doIfTiledFocused(true, (clientManager, desktopManager, window, column, grid) => {
                     if (column.getWindowCount() === 1) {
                         // move from own column into existing column
                         const nextColumn = grid.getNextColumn(column);
@@ -101,27 +101,27 @@ namespace Actions {
 
             windowMoveUp: () => {
                 // TODO (optimization): only arrange moved windows
-                world.doIfTiledFocused(true, (world, desktopManager, window, column, grid) => {
+                world.doIfTiledFocused(true, (clientManager, desktopManager, window, column, grid) => {
                     column.moveWindowUp(window);
                 });
             },
 
             windowMoveDown: () => {
                 // TODO (optimization): only arrange moved windows
-                world.doIfTiledFocused(true, (world, desktopManager, window, column, grid) => {
+                world.doIfTiledFocused(true, (clientManager, desktopManager, window, column, grid) => {
                     column.moveWindowDown(window);
                 });
             },
 
             windowMoveStart: () => {
-                world.doIfTiledFocused(true, (world, desktopManager, window, column, grid) => {
+                world.doIfTiledFocused(true, (clientManager, desktopManager, window, column, grid) => {
                     const newColumn = new Column(grid, null);
                     window.moveToColumn(newColumn);
                 });
             },
 
             windowMoveEnd: () => {
-                world.doIfTiledFocused(true, (world, desktopManager, window, column, grid) => {
+                world.doIfTiledFocused(true, (clientManager, desktopManager, window, column, grid) => {
                     const newColumn = new Column(grid, grid.getLastColumn());
                     window.moveToColumn(newColumn);
                 });
@@ -135,44 +135,126 @@ namespace Actions {
             },
 
             columnMoveLeft: () => {
-                world.doIfTiledFocused(true, (world, desktopManager, window, column, grid) => {
+                world.doIfTiledFocused(true, (clientManager, desktopManager, window, column, grid) => {
                     grid.moveColumnLeft(column);
                 });
             },
 
             columnMoveRight: () => {
-                world.doIfTiledFocused(true, (world, desktopManager, window, column, grid) => {
+                world.doIfTiledFocused(true, (clientManager, desktopManager, window, column, grid) => {
                     grid.moveColumnRight(column);
                 });
             },
 
             columnMoveStart: () => {
-                world.doIfTiledFocused(true, (world, desktopManager, window, column, grid) => {
+                world.doIfTiledFocused(true, (clientManager, desktopManager, window, column, grid) => {
                     column.moveAfter(null);
                 });
             },
 
             columnMoveEnd: () => {
-                world.doIfTiledFocused(true, (world, desktopManager, window, column, grid) => {
+                world.doIfTiledFocused(true, (clientManager, desktopManager, window, column, grid) => {
                     column.moveAfter(grid.getLastColumn());
                 });
             },
 
             columnToggleStacked: () => {
-                world.doIfTiledFocused(false, (world, desktopManager, window, column, grid) => {
+                world.doIfTiledFocused(false, (clientManager, desktopManager, window, column, grid) => {
                     column.toggleStacked();
                 });
             },
 
             columnWidthIncrease: () => {
-                world.doIfTiledFocused(false, (world, desktopManager, window, column, grid) => {
-                    grid.increaseColumnWidth(column);
+                world.doIfTiledFocused(false, (clientManager, desktopManager, window, column, grid) => {
+                    const desktop = grid.desktop;
+                    const visibleRange = desktop.getCurrentVisibleRange();
+                    if(!column.isVisible(visibleRange, true) || column.getWidth() >= column.getMaxWidth()) {
+                        return;
+                    }
+
+                    let leftVisibleColumn = grid.getLeftmostVisibleColumn(visibleRange, true);
+                    let rightVisibleColumn = grid.getRightmostVisibleColumn(visibleRange, true);
+                    if (leftVisibleColumn === null || rightVisibleColumn === null) {
+                        console.assert(false); // should at least see self
+                        return;
+                    }
+
+                    const leftSpace = leftVisibleColumn.getLeft() - visibleRange.getLeft();
+                    const rightSpace = visibleRange.getRight() - rightVisibleColumn.getRight();
+
+                    const newWidth = findNextStep(
+                        [
+                            visibleRange.getWidth(),
+                            column.getWidth() + config.manualResizeStep,
+                            column.getWidth() + leftSpace + rightSpace,
+                            column.getWidth() + leftSpace + rightSpace + leftVisibleColumn.getWidth() + grid.config.gapsInnerHorizontal,
+                            column.getWidth() + leftSpace + rightSpace + rightVisibleColumn.getWidth() + grid.config.gapsInnerHorizontal,
+                        ],
+                        width => width - column.getWidth(),
+                    )
+                    if (newWidth === undefined) {
+                        return;
+                    }
+
+                    column.setWidth(newWidth, true);
+                    desktop.scrollCenterVisible(column, false);
+                    desktop.onLayoutChanged();
+                    desktop.autoAdjustScroll();
                 });
             },
 
             columnWidthDecrease: () => {
-                world.doIfTiledFocused(false, (world, desktopManager, window, column, grid) => {
-                    grid.decreaseColumnWidth(column);
+                world.doIfTiledFocused(false, (clientManager, desktopManager, window, column, grid) => {
+                    const desktop = grid.desktop;
+                    const visibleRange = desktop.getCurrentVisibleRange();
+                    if(!column.isVisible(visibleRange, true) || column.getWidth() <= column.getMinWidth()) {
+                        return;
+                    }
+
+                    const leftVisibleColumn = grid.getLeftmostVisibleColumn(visibleRange, true);
+                    const rightVisibleColumn = grid.getRightmostVisibleColumn(visibleRange, true);
+                    if (leftVisibleColumn === null || rightVisibleColumn === null) {
+                        console.assert(false); // should at least see self
+                        return;
+                    }
+
+                    let leftOffScreenColumn = grid.getPrevColumn(leftVisibleColumn);
+                    if (leftOffScreenColumn === column) {
+                        leftOffScreenColumn = null;
+                    }
+                    let rightOffScreenColumn = grid.getNextColumn(rightVisibleColumn);
+                    if (rightOffScreenColumn === column) {
+                        rightOffScreenColumn = null;
+                    }
+
+                    const visibleColumnsWidth = rightVisibleColumn.getRight() - leftVisibleColumn.getLeft();
+                    const unusedWidth = visibleRange.getWidth() - visibleColumnsWidth;
+                    const leftOffScreen = leftOffScreenColumn === null ? 0 : leftOffScreenColumn.getWidth() + grid.config.gapsInnerHorizontal - unusedWidth;
+                    const rightOffScreen = rightOffScreenColumn === null ? 0 : rightOffScreenColumn.getWidth() + grid.config.gapsInnerHorizontal - unusedWidth;
+
+                    const newWidth = findNextStep(
+                        [
+                            visibleRange.getWidth(),
+                            column.getWidth() - config.manualResizeStep,
+                            column.getWidth() - leftOffScreen,
+                            column.getWidth() - rightOffScreen,
+                        ],
+                        width => column.getWidth() - width,
+                    )
+                    if (newWidth === undefined) {
+                        return;
+                    }
+
+                    column.setWidth(newWidth, true);
+                    desktop.scrollCenterVisible(column, true);
+                    desktop.onLayoutChanged();
+                    desktop.autoAdjustScroll();
+                });
+            },
+
+            columnsWidthEqualize: () => {
+                world.do((clientManager, desktopManager) => {
+                    desktopManager.getCurrentDesktop().equalizeVisibleColumnsWidths();
                 });
             },
 
@@ -207,15 +289,15 @@ namespace Actions {
             },
 
             gridScrollFocused: () => {
-                world.doIfTiledFocused(true, (world, desktopManager, window, column, grid) => {
-                    grid.desktop.scrollCenterColumn(column);
+                world.doIfTiledFocused(true, (clientManager, desktopManager, window, column, grid) => {
+                    grid.desktop.scrollCenterRange(column);
                 })
             },
 
             gridScrollLeftColumn: () => {
                 world.do((clientManager, desktopManager) => {
                     const grid = desktopManager.getCurrentDesktop().grid;
-                    const column = grid.getLeftmostVisibleColumn(grid.desktop.getCurrentScrollPos(), true);
+                    const column = grid.getLeftmostVisibleColumn(grid.desktop.getCurrentVisibleRange(), true);
                     if (column === null) {
                         return;
                     }
@@ -232,7 +314,7 @@ namespace Actions {
             gridScrollRightColumn: () => {
                 world.do((clientManager, desktopManager) => {
                     const grid = desktopManager.getCurrentDesktop().grid;
-                    const column = grid.getRightmostVisibleColumn(grid.desktop.getCurrentScrollPos(), true);
+                    const column = grid.getRightmostVisibleColumn(grid.desktop.getCurrentVisibleRange(), true);
                     if (column === null) {
                         return;
                     }
@@ -262,7 +344,7 @@ namespace Actions {
             },
 
             windowMoveToColumn: (columnIndex: number) => {
-                world.doIfTiledFocused(true, (world, desktopManager, window, column, grid) => {
+                world.doIfTiledFocused(true, (clientManager, desktopManager, window, column, grid) => {
                     const targetColumn = grid.getColumnAtIndex(columnIndex);
                     if (targetColumn === null) {
                         return null;
@@ -273,7 +355,7 @@ namespace Actions {
             },
 
             columnMoveToColumn: (columnIndex: number) => {
-                world.doIfTiledFocused(true, (world, desktopManager, window, column, grid) => {
+                world.doIfTiledFocused(true, (clientManager, desktopManager, window, column, grid) => {
                     const targetColumn = grid.getColumnAtIndex(columnIndex);
                     if (targetColumn === null || targetColumn === column) {
                         return null;
@@ -317,7 +399,21 @@ namespace Actions {
         });
     }
 
+    function findNextStep(steps: number[], evaluate: (step: number) => number) {
+        let bestScore = Infinity;
+        let bestStep = undefined;
+        for (const step of steps) {
+            const score = evaluate(step);
+            if (score > 0 && score < bestScore) {
+                bestScore = score;
+                bestStep = step;
+            }
+        }
+        return bestStep;
+    }
+
     export type Config = {
         manualScrollStep: number,
+        manualResizeStep: number,
     };
 }

src/config/config.ts

@@ -5,10 +5,18 @@ type Config = {
     gapsOuterRight: number,
     gapsInnerHorizontal: number,
     gapsInnerVertical: number,
-    overscroll: number,
     manualScrollStep: number,
+    manualResizeStep: number,
+    offScreenOpacity: number,
     untileOnDrag: boolean,
     stackColumnsByDefault: boolean,
     resizeNeighborColumn: boolean,
+    reMaximize: boolean,
+    skipSwitcher: boolean,
+    scrollingLazy: boolean,
+    scrollingCentered: boolean,
+    scrollingGrouped: boolean,
+    tiledKeepBelow: boolean,
+    floatingKeepAbove: boolean,
     windowRules: string,
 };

src/config/definition.ts

@@ -7,26 +7,45 @@ const defaultWindowRules = `[
         "class": "kcalc",
         "tile": false
     },
+    {
+        "class": "org.kde.kcalc",
+        "tile": false
+    },
     {
         "class": "kfind",
         "tile": true
     },
+    {
+        "class": "org.kde.kfind",
+        "tile": true
+    },
     {
         "class": "kruler",
         "tile": false
     },
+    {
+        "class": "org.kde.kruler",
+        "tile": false
+    },
     {
         "class": "krunner",
         "tile": false
     },
     {
-        "class": "zoom",
-        "caption": "Zoom Cloud Meetings",
+        "class": "org.kde.krunner",
+        "tile": false
+    },
+    {
+        "class": "yakuake",
+        "tile": false
+    },
+    {
+        "class": "org.kde.yakuake",
         "tile": false
     },
     {
         "class": "zoom",
-        "caption": "zoom",
+        "caption": "Zoom Cloud Meetings|zoom|zoom <2>",
         "tile": false
     },
     {
@@ -82,16 +101,21 @@ const configDef = [
         "type": "UInt",
         "default": 18
     },
-    {
-        "name": "overscroll",
-        "type": "UInt",
-        "default": 18
-    },
     {
         "name": "manualScrollStep",
         "type": "UInt",
         "default": 200
     },
+    {
+        "name": "manualResizeStep",
+        "type": "UInt",
+        "default": 600
+    },
+    {
+        "name": "offScreenOpacity",
+        "type": "UInt",
+        "default": 100
+    },
     {
         "name": "untileOnDrag",
         "type": "Bool",
@@ -107,6 +131,41 @@ const configDef = [
         "type": "Bool",
         "default": false
     },
+    {
+        "name": "reMaximize",
+        "type": "Bool",
+        "default": false
+    },
+    {
+        "name": "skipSwitcher",
+        "type": "Bool",
+        "default": false
+    },
+    {
+        "name": "scrollingLazy",
+        "type": "Bool",
+        "default": true
+    },
+    {
+        "name": "scrollingCentered",
+        "type": "Bool",
+        "default": false
+    },
+    {
+        "name": "scrollingGrouped",
+        "type": "Bool",
+        "default": false
+    },
+    {
+        "name": "tiledKeepBelow",
+        "type": "Bool",
+        "default": true
+    },
+    {
+        "name": "floatingKeepAbove",
+        "type": "Bool",
+        "default": false
+    },
     {
         "name": "windowRules",
         "type": "String",

src/config/loader.ts

@@ -1,4 +1,4 @@
-function loadConfig() {
+function loadConfig(): Config {
     const config: any = {};
     for (const entry of configDef) {
         config[entry.name] = KWin.readConfig(entry.name, entry.default);

src/extern/kwin.d.ts

@@ -16,68 +16,62 @@ declare const workspace: {
     // 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]>;
+    clientRemoved: QSignal<[KwinClient]>;
+    clientMinimized: QSignal<[KwinClient]>;
+    clientUnminimized: QSignal<[KwinClient]>;
+    clientMaximizeSet: QSignal<[KwinClient, horizontally: boolean, vertically: boolean]>;
+    clientActivated: QSignal<[KwinClient]>;
     numberDesktopsChanged: QSignal<[oldNumberOfVirtualDesktops: number]>;
     currentActivityChanged: QSignal<[newActivity: string]>;
     virtualScreenSizeChanged: QSignal<[void]>;
 
     // Functions
     clientArea(option: ClientAreaOption, screenNumber: number, desktopNumber: number);
-    clientList(): TopLevel[];
+    clientList(): KwinClient[];
 };
 
 type Tile = any;
 
-interface AbstractClient {
+interface KwinClient {
     // Read-only Properties
+    readonly shadeable: boolean;
     readonly caption: string;
-    readonly minSize: QSize;
+    readonly minSize: QmlSize;
     readonly transient: boolean;
-    readonly transientFor: AbstractClient;
+    readonly transientFor: KwinClient;
     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;
+    opacity: number;
 
     // Read-write Properties
-    frameGeometry: QRect;
+    fullScreen: boolean;
+    activities: string[]; // empty array means all activities
+    skipSwitcher: boolean;
+    keepAbove: boolean;
+    keepBelow: boolean;
+    shade: boolean;
+    minimized: boolean;
+    frameGeometry: QmlRect;
     desktop: number; // -1 means all desktops
+    tile: Tile;
 
     // Signals
-    frameGeometryChanged: QSignal<[TopLevel, oldGeometry: QRect]>;
-}
+    fullScreenChanged: QSignal<[void]>;
+    desktopChanged: QSignal<[void]>;
+    activitiesChanged: QSignal<[KwinClient]>;
+    captionChanged: QSignal<[void]>;
+    tileChanged: QSignal<[Tile]>;
+    moveResizedChanged: QSignal<[void]>;
+    moveResizeCursorChanged: QSignal<[void]>;
+    clientStartUserMovedResized: QSignal<[void]>;
+    frameGeometryChanged: QSignal<[KwinClient, oldGeometry: QmlRect]>;
 
-interface KwinClient extends TopLevel {}
+    // Functions
+    setMaximize(vertically: boolean, horizontally: boolean): void;
+}

src/extern/qt.d.ts

@@ -4,7 +4,7 @@ declare const console: {
 };
 
 declare const Qt: {
-    rect(x: number, y: number, width: number, height: number): QRect;
+    rect(x: number, y: number, width: number, height: number): QmlRect;
     createQmlObject(qml: string, parent: QmlObject);
 };
 
@@ -12,18 +12,18 @@ type QmlObject = unknown;
 
 type QByteArray = string;
 
-type QRect = {
+type QmlRect = {
     x: number;
     y: number;
     width: number;
     height: number;
     top: number;
-    bottom: number;
+    bottom: number; // top + height
     left: number;
-    right: number;
+    right: number; // left + width
 };
 
-type QSize = {
+type QmlSize = {
     width: number;
     height: number;
 };
@@ -33,7 +33,7 @@ type QSignal<T extends unknown[]> = {
     disconnect(handler: (...args: [...T]) => void): void;
 };
 
-type QQmlTimer = {
+type QmlTimer = {
     interval: number;
     triggered: QSignal<[void]>;
     restart(): void;

src/keyBindings/definition.ts

@@ -85,6 +85,7 @@ const keyBindings: KeyBinding[] = [
     {
         "name": "column-toggle-stacked",
         "description": "Toggle stacked layout for focused column",
+        "comment": "One window in the column visible, others shaded; not supported on Wayland",
         "defaultKeySequence": "Meta+X",
         "action": "columnToggleStacked",
     },
@@ -124,6 +125,12 @@ const keyBindings: KeyBinding[] = [
         "defaultKeySequence": "Meta+Ctrl+-",
         "action": "columnWidthDecrease",
     },
+    {
+        "name": "columns-width-equalize",
+        "description": "Equalize widths of visible columns",
+        "defaultKeySequence": "Meta+Ctrl+X",
+        "action": "columnsWidthEqualize",
+    },
     {
         "name": "grid-scroll-focused",
         "description": "Center focused window",

src/layout/Column.ts

@@ -180,8 +180,15 @@ class Column {
         window.focus();
     }
 
-    public arrange(x: number) {
-        if (this.stacked && this.windows.length() >= 2) {
+    public arrange(x: number, visibleRange: Range, forceOpaque: boolean) {
+        if (this.grid.config.offScreenOpacity < 1.0 && !forceOpaque) {
+            const opacity = this.isVisible(visibleRange, true) ? 100 : this.grid.config.offScreenOpacity;
+            for (const window of this.windows.iterator()) {
+                window.client.kwinClient.opacity = opacity;
+            }
+        }
+
+        if (this.stacked && this.windows.length() >= 2 && this.canStack()) {
             this.arrangeStacked(x);
             return;
         }
@@ -228,13 +235,22 @@ class Column {
         this.grid.desktop.onLayoutChanged();
     }
 
-    public isVisible(scrollPos: Desktop.ScrollPos, fullyVisible: boolean) {
+    private canStack() {
+        for (const window of this.windows.iterator()) {
+            if (!window.client.kwinClient.shadeable) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public isVisible(visibleRange: Desktop.Range, fullyVisible: boolean) {
         if (fullyVisible) {
-            return this.getLeft() >= scrollPos.getLeft() &&
-                this.getRight() <= scrollPos.getRight();
+            return this.getLeft() >= visibleRange.getLeft() &&
+                this.getRight() <= visibleRange.getRight();
         } else {
-            return this.getRight() + this.grid.config.gapsInnerHorizontal > scrollPos.getLeft() &&
-                this.getLeft() - this.grid.config.gapsInnerHorizontal < scrollPos.getRight();
+            return this.getRight() + this.grid.config.gapsInnerHorizontal > visibleRange.getLeft() &&
+                this.getLeft() - this.grid.config.gapsInnerHorizontal < visibleRange.getRight();
         }
     }
 

src/layout/Desktop.ts

@@ -1,30 +1,38 @@
 class Desktop {
     public readonly grid: Grid;
     public readonly desktopNumber: number;
+    private readonly pinManager: PinManager;
     private readonly config: Desktop.Config;
     private scrollX: number;
     private dirty: boolean;
-    public clientArea: QRect;
-    public tilingArea: QRect;
+    private dirtyScroll: boolean;
+    private dirtyPins: boolean;
+    public clientArea: QmlRect;
+    public tilingArea: QmlRect;
 
-    constructor(desktopNumber: number, config: Desktop.Config, layoutConfig: LayoutConfig) {
+    constructor(desktopNumber: number, pinManager: PinManager, config: Desktop.Config, layoutConfig: LayoutConfig) {
+        this.pinManager = pinManager;
         this.config = config;
         this.scrollX = 0;
-        this.dirty = false;
+        this.dirty = true;
+        this.dirtyScroll = true;
+        this.dirtyPins = true;
         this.desktopNumber = desktopNumber;
         this.grid = new Grid(this, layoutConfig);
         this.clientArea = Desktop.getClientArea(desktopNumber);
-        this.tilingArea = Desktop.getTilingArea(this.clientArea, config);
+        this.tilingArea = Desktop.getTilingArea(this.clientArea, desktopNumber, pinManager, config);
     }
 
     private updateArea() {
         const newClientArea = Desktop.getClientArea(this.desktopNumber);
-        if (newClientArea === this.clientArea) {
+        if (newClientArea === this.clientArea && !this.dirtyPins) {
             return;
         }
         this.clientArea = newClientArea;
-        this.tilingArea = Desktop.getTilingArea(newClientArea, this.config);
+        this.tilingArea = Desktop.getTilingArea(newClientArea, this.desktopNumber, this.pinManager, this.config);
         this.dirty = true;
+        this.dirtyScroll = true;
+        this.dirtyPins = false;
         this.grid.onScreenSizeChanged();
         this.autoAdjustScroll();
     }
@@ -33,106 +41,125 @@ class Desktop {
         return workspace.clientArea(ClientAreaOption.PlacementArea, 0, desktopNumber);
     }
 
-    private static getTilingArea(clientArea: QRect, config: Desktop.Config) {
+    private static getTilingArea(clientArea: QmlRect, desktopNumber: number, pinManager: PinManager, config: Desktop.Config) {
+        const availableSpace = pinManager.getAvailableSpace(desktopNumber, clientArea);
+        const top = availableSpace.top + config.marginTop;
+        const bottom = availableSpace.bottom - config.marginBottom;
+        const left = availableSpace.left + config.marginLeft;
+        const right = availableSpace.right - config.marginRight;
         return Qt.rect(
-            clientArea.x + config.marginLeft,
-            clientArea.y + config.marginTop,
-            clientArea.width - config.marginLeft - config.marginRight,
-            clientArea.height - config.marginTop - config.marginBottom,
+            left,
+            top,
+            right - left,
+            bottom - top,
         )
     }
 
-    // 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();
+    public scrollIntoView(range: Desktop.Range) {
+        const left = range.getLeft();
+        const right = range.getRight();
+        const initialVisibleRange = this.getCurrentVisibleRange();
 
         let targetScrollX: number;
-        if (left < initialScrollPos.getLeft()) {
+        if (left < initialVisibleRange.getLeft()) {
             targetScrollX = left;
-        } else if (right > initialScrollPos.getRight()) {
+        } else if (right > initialVisibleRange.getRight()) {
             targetScrollX = right - this.tilingArea.width;
         } else {
-            return this.getScrollPos(this.clampScrollX(this.scrollX));
+            targetScrollX = initialVisibleRange.getLeft();
         }
 
-        const overscroll = this.getTargetOverscroll(targetScrollX, left < initialScrollPos.getLeft());
-        return this.getScrollPos(this.clampScrollX(targetScrollX + overscroll));
+        this.setScroll(targetScrollX, false);
     }
 
-    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;
+    public scrollCenterRange(range: Desktop.Range) {
+        const windowCenter = range.getLeft() + range.getWidth() / 2;
         const screenCenter = this.scrollX + this.tilingArea.width / 2;
         this.adjustScroll(Math.round(windowCenter - screenCenter), false);
     }
 
+    public scrollCenterVisible(focusedColumn: Column, prioritiseVisible: boolean) {
+        const columnRange = new Desktop.ColumnRange(focusedColumn);
+        const visibleRange = this.getCurrentVisibleRange();
+        if (prioritiseVisible) {
+            columnRange.addNeighbors(visibleRange, this.grid.config.gapsInnerHorizontal, column => column.isVisible(visibleRange, true));
+        }
+        columnRange.addNeighbors(visibleRange, this.grid.config.gapsInnerHorizontal, () => true);
+        this.scrollCenterRange(columnRange);
+    }
+
     public autoAdjustScroll() {
         const focusedColumn = this.grid.getLastFocusedColumn();
-        if (focusedColumn === null) {
-            this.removeOverscroll();
-            return;
-        }
-
-        if (focusedColumn.grid !== this.grid) {
+        if (focusedColumn === null || focusedColumn.grid !== this.grid) {
             return;
         }
 
         this.scrollToColumn(focusedColumn);
     }
 
-    private getScrollPos(scrollX: number) {
-        return new Desktop.ScrollPos(scrollX, this.tilingArea.width);
+    public scrollToColumn(column: Column) {
+        if (this.dirtyScroll || !column.isVisible(this.getCurrentVisibleRange(), true)) {
+            this.config.scroller.scrollToColumn(this, column);
+        }
     }
 
-    public getCurrentScrollPos() {
-        return this.getScrollPos(this.scrollX);
+    private getVisibleRange(scrollX: number) {
+        return new Desktop.RangeImpl(scrollX, this.tilingArea.width);
+    }
+
+    public getCurrentVisibleRange() {
+        return this.getVisibleRange(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);
+        return this.config.scroller.clampScrollX(this, x);
     }
 
-    private setScroll(x: number, force: boolean) {
+    public 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);
+        this.dirtyScroll = false;
     }
 
     public adjustScroll(dx: number, force: boolean) {
         this.setScroll(this.scrollX + dx, force);
     }
 
-    private removeOverscroll() {
-        this.setScroll(this.scrollX, false);
+    public equalizeVisibleColumnsWidths() {
+        const visibleRange = this.getCurrentVisibleRange();
+        const visibleColumns = Array.from(this.grid.getVisibleColumns(visibleRange, true));
+
+        let remainingWidth = this.tilingArea.width - (visibleColumns.length-1) * this.grid.config.gapsInnerHorizontal;
+        let remainingColumns = visibleColumns.length;
+
+        const minWidths = visibleColumns.map(column => column.getMinWidth()).sort((a, b) => b - a);
+        for (const minWidth of minWidths) {
+            if (minWidth > remainingWidth / remainingColumns) {
+                remainingWidth -= minWidth;
+                remainingColumns--;
+            }
+        }
+
+        const avgWidth = remainingWidth / remainingColumns;
+        for (const column of visibleColumns) {
+            const minWidth = column.getMinWidth();
+            if (minWidth > avgWidth) {
+                column.setWidth(minWidth, true);
+            } else {
+                const columnWidth = Math.round(remainingWidth / remainingColumns);
+                column.setWidth(columnWidth, true);
+                remainingWidth -= column.getWidth();
+                remainingColumns--;
+            }
+        }
+
+        this.scrollCenterRange(Desktop.RangeImpl.fromRanges(
+            visibleColumns[0],
+            visibleColumns[visibleColumns.length - 1],
+        ));
     }
 
     public arrange() {
@@ -141,12 +168,19 @@ class Desktop {
         if (!this.dirty) {
             return;
         }
-        this.grid.arrange(this.tilingArea.x - this.scrollX);
+        this.grid.arrange(this.tilingArea.x - this.scrollX, this.getCurrentVisibleRange());
         this.dirty = false;
     }
 
     public onLayoutChanged() {
         this.dirty = true;
+        this.dirtyScroll = true;
+    }
+
+    public onPinsChanged() {
+        this.dirty = true;
+        this.dirtyScroll = true;
+        this.dirtyPins = true;
     }
 
     public destroy() {
@@ -160,12 +194,18 @@ namespace Desktop {
         marginBottom: number,
         marginLeft: number,
         marginRight: number,
-        overscroll: number,
+        scroller: Desktop.Scroller,
     };
 
-    export class ScrollPos {
-        public readonly x: number;
-        public readonly width: number;
+    export type Range = {
+        getLeft(): number;
+        getRight(): number;
+        getWidth(): number;
+    }
+
+    export class RangeImpl {
+        private readonly x: number;
+        private readonly width: number;
 
         constructor(x: number, width: number) {
             this.x = x;
@@ -179,5 +219,93 @@ namespace Desktop {
         public getRight() {
             return this.x + this.width;
         }
+
+        public getWidth() {
+            return this.width;
+        }
+
+        public static fromRanges(leftRange: Range, rightRange: Range) {
+            const left = leftRange.getLeft();
+            const right = rightRange.getRight();
+            return new RangeImpl(left, right - left);
+        }
+    }
+
+    export class ColumnRange {
+        private left: Column;
+        private right: Column;
+        private width: number;
+
+        constructor(initialColumn: Column) {
+            this.left = initialColumn;
+            this.right = initialColumn;
+            this.width = initialColumn.getWidth();
+        }
+
+        public addNeighbors(visibleRange: Desktop.Range, gap: number, condition: (column: Column) => boolean) {
+            const grid = this.left.grid;
+
+            const columnRange = this;
+            function canFit(column: Column) {
+                return columnRange.width + gap + column.getWidth() <= visibleRange.getWidth()
+            }
+            function isUsable(column: Column|null) {
+                return column !== null &&
+                    canFit(column) &&
+                    condition(column)
+            }
+
+            let leftColumn = grid.getPrevColumn(this.left);
+            let rightColumn = grid.getNextColumn(this.right);
+            function checkColumns() {
+                if (!isUsable(leftColumn)) {
+                    leftColumn = null;
+                }
+                if (!isUsable(rightColumn)) {
+                    rightColumn = null;
+                }
+            }
+            checkColumns();
+
+            while (leftColumn !== null || rightColumn !== null) {
+                const leftWidth = leftColumn === null ? 0 : leftColumn.getWidth();
+                const rightWidth = rightColumn === null ? 0 : rightColumn.getWidth();
+                if (leftWidth > rightWidth) {
+                    this.addLeft(leftColumn!, gap);
+                    leftColumn = grid.getPrevColumn(leftColumn!);
+                } else {
+                    this.addRight(rightColumn!, gap);
+                    rightColumn = grid.getNextColumn(rightColumn!);
+                }
+                checkColumns();
+            }
+        }
+
+        public addLeft(column: Column, gap: number) {
+            this.left = column;
+            this.width += column.getWidth() + gap;
+        }
+
+        public addRight(column: Column, gap: number) {
+            this.right = column;
+            this.width += column.getWidth() + gap;
+        }
+
+        public getLeft() {
+            return this.left.getLeft();
+        }
+
+        public getRight() {
+            return this.right.getRight();
+        }
+
+        public getWidth() {
+            return this.width;
+        }
+    }
+
+    export type Scroller = {
+        scrollToColumn(desktop: Desktop, column: Column): void;
+        clampScrollX(desktop: Desktop, x: number): number;
     }
 }

src/layout/Grid.ts

@@ -1,3 +1,5 @@
+import Range = Desktop.Range;
+
 class Grid {
     public readonly desktop: Desktop;
     public readonly config: LayoutConfig;
@@ -88,39 +90,41 @@ class Grid {
         this.width = x - this.config.gapsInnerHorizontal;
     }
 
-    public getLeftmostVisibleColumn(scrollPos: Desktop.ScrollPos, fullyVisible: boolean) {
-        const scrollX = scrollPos.getLeft();
+    public getLeftmostVisibleColumn(visibleRange: Desktop.Range, fullyVisible: boolean) {
         for (const column of this.columns.iterator()) {
-            const x = fullyVisible ? column.getLeft() : column.getRight() + (this.config.gapsInnerHorizontal - 1);
-            if (x >= scrollX) {
+            if (column.isVisible(visibleRange, fullyVisible)) {
                 return column;
             }
         }
         return null;
     }
 
-    public getRightmostVisibleColumn(scrollPos: Desktop.ScrollPos, fullyVisible: boolean) {
-        const scrollX = scrollPos.getRight();
+    public getRightmostVisibleColumn(visibleRange: Desktop.Range, fullyVisible: boolean) {
         let last = null;
         for (const column of this.columns.iterator()) {
-            const x = fullyVisible ? column.getRight() : column.getLeft() - (this.config.gapsInnerHorizontal - 1);
-            if (x <= scrollX) {
+            if (column.isVisible(visibleRange, fullyVisible)) {
                 last = column;
-            } else {
+            } else if (last !== null) {
                 break;
             }
         }
         return last;
     }
 
-    public getVisibleColumnsWidth(scrollPos: Desktop.ScrollPos, fullyVisible: boolean) {
+    public *getVisibleColumns(visibleRange: Desktop.Range, fullyVisible: boolean) {
+        for (const column of this.columns.iterator()) {
+            if (column.isVisible(visibleRange, fullyVisible)) {
+                yield column;
+            }
+        }
+    }
+
+    public getVisibleColumnsWidth(visibleRange: Desktop.Range, fullyVisible: boolean) {
         let width = 0;
         let nVisible = 0;
-        for (const column of this.columns.iterator()) {
-            if (column.isVisible(scrollPos, fullyVisible)) {
-                width += column.getWidth();
-                nVisible++;
-            }
+        for (const column of this.getVisibleColumns(visibleRange, fullyVisible)) {
+            width += column.getWidth();
+            nVisible++;
         }
 
         if (nVisible > 0) {
@@ -130,84 +134,9 @@ class Grid {
         return width;
     }
 
-    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;
-        }
-
-        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;
-        }
-
-        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);
-        }
-        column.adjustWidth(widthDelta, true);
-    }
-
-    public decreaseColumnWidth(column: Column) {
-        const scrollPos = this.desktop.getScrollPosForColumn(column);
-        if (this.width <= scrollPos.width) {
-            column.setWidth(Math.round(column.getWidth() / 2), false);
-            return;
-        }
-
-        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);
-    }
-
-    public arrange(x: number) {
+    public arrange(x: number, visibleRange: Range) {
         for (const column of this.columns.iterator()) {
-            column.arrange(x);
+            column.arrange(x, visibleRange, this.userResize);
             x += column.getWidth() + this.config.gapsInnerHorizontal;
         }
 
@@ -239,12 +168,12 @@ class Grid {
         this.columns.remove(column);
         this.columnsSetX(nextColumn);
 
+        this.desktop.onLayoutChanged();
         if (passFocus && columnToFocus !== null) {
             columnToFocus.focus();
         } else {
             this.desktop.autoAdjustScroll();
         }
-        this.desktop.onLayoutChanged();
     }
 
     public onColumnMoved(column: Column, prevColumn: Column|null) {
@@ -259,10 +188,10 @@ class Grid {
     public onColumnWidthChanged(column: Column, oldWidth: number, width: number) {
         const nextColumn = this.columns.getNext(column);
         this.columnsSetX(nextColumn);
+        this.desktop.onLayoutChanged();
         if (!this.userResize) {
             this.desktop.autoAdjustScroll();
         }
-        this.desktop.onLayoutChanged();
     }
 
     public onColumnFocused(column: Column) {

src/layout/LayoutConfig.ts

@@ -1,6 +1,11 @@
 type LayoutConfig = {
     gapsInnerHorizontal: number,
     gapsInnerVertical: number,
+    offScreenOpacity: number,
     stackColumnsByDefault: boolean,
     resizeNeighborColumn: boolean,
+    reMaximize: boolean,
+    skipSwitcher: boolean,
+    tiledKeepBelow: boolean,
+    maximizedKeepAbove: boolean,
 };

src/layout/ScrollerCentered.ts

@@ -0,0 +1,21 @@
+class ScrollerCentered {
+    public scrollToColumn(desktop: Desktop, column: Column) {
+        desktop.scrollCenterRange(column);
+    }
+
+    public clampScrollX(desktop: Desktop, x: number) {
+        return ScrollerCentered.clampScrollX(desktop, x);
+    }
+
+    public static clampScrollX(desktop: Desktop, x: number) {
+        const firstColumn = desktop.grid.getFirstColumn();
+        if (firstColumn === null) {
+            return 0;
+        }
+        const lastColumn = desktop.grid.getLastColumn()!;
+
+        let minScroll = Math.round((firstColumn.getWidth() - desktop.tilingArea.width) / 2);
+        let maxScroll = Math.round(desktop.grid.getWidth() - (desktop.tilingArea.width + lastColumn.getWidth()) / 2);
+        return clamp(x, minScroll, maxScroll);
+    }
+}

src/layout/ScrollerGrouped.ts

@@ -0,0 +1,9 @@
+class ScrollerGrouped {
+    public scrollToColumn(desktop: Desktop, column: Column) {
+        desktop.scrollCenterVisible(column, true);
+    }
+
+    public clampScrollX(desktop: Desktop, x: number) {
+        return ScrollerCentered.clampScrollX(desktop, x);
+    }
+}

src/layout/ScrollerLazy.ts

@@ -0,0 +1,14 @@
+class ScrollerLazy {
+    public scrollToColumn(desktop: Desktop, column: Column) {
+        desktop.scrollIntoView(column);
+    }
+
+    public clampScrollX(desktop: Desktop, x: number) {
+        let minScroll = 0;
+        let maxScroll = desktop.grid.getWidth() - desktop.tilingArea.width;
+        if (maxScroll < 0) {
+            return Math.round(maxScroll / 2);
+        }
+        return clamp(x, minScroll, maxScroll);
+    }
+}

src/layout/Window.ts

@@ -2,11 +2,17 @@ class Window {
     public column: Column;
     public readonly client: ClientWrapper;
     public height: number;
+    public readonly focusedState: Window.State;
     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);
@@ -26,7 +32,23 @@ class Window {
             // window is maximized, fullscreen, or being manually resized, prevent fighting with the user
             return;
         }
-        this.client.place(x, y, width, height);
+
+        let maximized = false;
+        if (this.column.grid.config.reMaximize && this.isFocused()) {
+            // do this here rather than in `onFocused` to ensure it happens after placement
+            // (otherwise placement may not happen at all)
+            if (this.focusedState.maximizedVertically || this.focusedState.maximizedHorizontally) {
+                this.client.setMaximize(this.focusedState.maximizedVertically, this.focusedState.maximizedHorizontally);
+                maximized = true;
+            }
+            if (this.focusedState.fullScreen) {
+                this.client.setFullScreen(true);
+                maximized = true;
+            }
+        }
+        if (!maximized) {
+            this.client.place(x, y, width, height);
+        }
     }
 
     public focus() {
@@ -57,17 +79,34 @@ class Window {
     public onMaximizedChanged(horizontally: boolean, vertically: boolean) {
         const maximized = horizontally || vertically;
         this.skipArrange = maximized;
-        this.client.kwinClient.keepBelow = !maximized;
+        if (this.column.grid.config.tiledKeepBelow) {
+            this.client.kwinClient.keepBelow = !maximized;
+        }
+        if (this.column.grid.config.maximizedKeepAbove) {
+            this.client.kwinClient.keepAbove = maximized;
+        }
+        if (this.isFocused()) {
+            this.focusedState.maximizedHorizontally = horizontally;
+            this.focusedState.maximizedVertically = vertically;
+        }
+        this.column.grid.desktop.onLayoutChanged();
     }
 
     public onFullScreenChanged(fullScreen: boolean) {
         this.skipArrange = fullScreen;
-        if (this.isFocused()) {
+        if (this.column.grid.config.tiledKeepBelow) {
             this.client.kwinClient.keepBelow = !fullScreen;
         }
+        if (this.column.grid.config.maximizedKeepAbove) {
+            this.client.kwinClient.keepAbove = fullScreen;
+        }
+        if (this.isFocused()) {
+            this.focusedState.fullScreen = fullScreen;
+        }
+        this.column.grid.desktop.onLayoutChanged();
     }
 
-    public onUserResize(oldGeometry: QRect, resizeNeighborColumn: boolean) {
+    public onUserResize(oldGeometry: QmlRect, resizeNeighborColumn: boolean) {
         const newGeometry = this.client.kwinClient.frameGeometry;
         const widthDelta = newGeometry.width - oldGeometry.width;
         const heightDelta = newGeometry.height - oldGeometry.height;
@@ -102,3 +141,11 @@ class Window {
         this.column.onWindowRemoved(this, passFocus);
     }
 }
+
+namespace Window {
+    export type State = {
+        fullScreen: boolean,
+        maximizedHorizontally: boolean,
+        maximizedVertically: boolean,
+    }
+}

src/rules/ClientMatcher.ts

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

src/rules/WindowRuleEnforcer.ts

@@ -4,20 +4,24 @@ class WindowRuleEnforcer {
     private readonly followCaption: Set<string>;
 
     constructor(windowRules: WindowRule[]) {
-        const [mapFloat, mapTile] = createWindowRuleMaps(windowRules);
+        const [mapFloat, mapTile] = WindowRuleEnforcer.createWindowRuleMaps(windowRules);
         this.preferFloating = new ClientMatcher(mapFloat);
         this.preferTiling = new ClientMatcher(mapTile);
         this.followCaption = new Set([...mapFloat.keys(), ...mapTile.keys()]);
     }
 
-    public shouldTile(kwinClient: TopLevel) {
+    public shouldTile(kwinClient: KwinClient) {
         return Clients.canTileNow(kwinClient) && (
-            this.preferTiling.matches(kwinClient) ||
-            kwinClient.normalWindow && kwinClient.managed && !this.preferFloating.matches(kwinClient)
+            this.preferTiling.matches(kwinClient) || (
+                kwinClient.normalWindow &&
+                !kwinClient.transient &&
+                kwinClient.managed &&
+                !this.preferFloating.matches(kwinClient)
+            )
         );
     }
 
-    public initClientSignalManager(world: World, kwinClient: TopLevel) {
+    public initClientSignalManager(world: World, kwinClient: KwinClient) {
         if (!this.followCaption.has(kwinClient.resourceClass)) {
             return null;
         }
@@ -36,50 +40,50 @@ class WindowRuleEnforcer {
         });
         return manager;
     }
-}
 
-function createWindowRuleMaps(windowRules: WindowRule[]) {
-    const mapFloat = new Map<string, string[]>();
-    const mapTile = new Map<string, string[]>();
-    for (const windowRule of windowRules) {
-        const map = windowRule.tile ? mapTile : mapFloat;
-        let captions = map.get(windowRule.class);
-        if (captions === undefined) {
-            captions = [];
-            map.set(windowRule.class, captions);
+    private static createWindowRuleMaps(windowRules: WindowRule[]) {
+        const mapFloat = new Map<string, string[]>();
+        const mapTile = new Map<string, string[]>();
+        for (const windowRule of windowRules) {
+            const map = windowRule.tile ? mapTile : mapFloat;
+            let captions = map.get(windowRule.class);
+            if (captions === undefined) {
+                captions = [];
+                map.set(windowRule.class, captions);
+            }
+            if (windowRule.caption !== undefined) {
+                captions.push(windowRule.caption);
+            }
         }
-        if (windowRule.caption !== undefined) {
-            captions.push(windowRule.caption);
+
+        return [
+            WindowRuleEnforcer.createWindowRuleRegexMap(mapFloat),
+            WindowRuleEnforcer.createWindowRuleRegexMap(mapTile),
+        ];
+    }
+
+    private static createWindowRuleRegexMap(windowRuleMap: Map<string, string[]>) {
+        const regexMap = new Map<string, RegExp>;
+        for (const [k, v] of windowRuleMap) {
+            regexMap.set(k, WindowRuleEnforcer.joinRegexes(v));
         }
+        return regexMap;
     }
 
-    return [
-        createWindowRuleRegexMap(mapFloat),
-        createWindowRuleRegexMap(mapTile),
-    ];
-}
+    private static joinRegexes(regexes: string[]) {
+        if (regexes.length == 0) {
+            return new RegExp("");
+        }
 
-function createWindowRuleRegexMap(windowRuleMap: Map<string, string[]>) {
-    const regexMap = new Map<string, RegExp>;
-    for (const [k, v] of windowRuleMap) {
-        regexMap.set(k, joinRegexes(v));
-    }
-    return regexMap;
-}
+        if (regexes.length == 1) {
+            return new RegExp("^" + regexes[0] + "$");
+        }
 
-function joinRegexes(regexes: string[]) {
-    if (regexes.length == 0) {
-        return new RegExp("");
+        const joinedRegexes = regexes.map(WindowRuleEnforcer.wrapParens).join("|");
+        return new RegExp("^" + joinedRegexes + "$");
     }
 
-    if (regexes.length == 1) {
-        return new RegExp("^" + regexes[0] + "$");
+    private static wrapParens(str: string) {
+        return "(" + str + ")";
     }
-
-    const joinedRegexes = regexes.map(wrapParens).join("|");
-    return new RegExp("^" + joinedRegexes + "$");
-}
-
-function wrapParens(str: string) {
-    return "(" + str + ")";
 }

src/utils/Delayer.ts

@@ -1,5 +1,5 @@
 class Delayer {
-    private readonly timer: QQmlTimer;
+    private readonly timer: QmlTimer;
 
     constructor(delay: number, f: () => void) {
         this.timer = initQmlTimer();

src/utils/math.ts

@@ -7,3 +7,8 @@ function clamp(value: number, min: number, max: number) {
     }
     return value;
 }
+
+function union<T>(array0: T[], array1: T[]) {
+    const set = new Set([...array0, ...array1]);
+    return [...set];
+}

src/workspace.ts

@@ -16,34 +16,34 @@ function initWorkspaceSignalHandlers(world: World) {
         });
     });
 
-    manager.connect(workspace.clientRemoved, (kwinClient: AbstractClient) => {
+    manager.connect(workspace.clientRemoved, (kwinClient: KwinClient) => {
         world.do((clientManager, desktopManager) => {
             clientManager.removeClient(kwinClient, true);
         });
     });
 
-    manager.connect(workspace.clientMinimized, (kwinClient: AbstractClient) => {
+    manager.connect(workspace.clientMinimized, (kwinClient: KwinClient) => {
         world.do((clientManager, desktopManager) => {
             clientManager.minimizeClient(kwinClient);
         });
     });
 
-    manager.connect(workspace.clientUnminimized, (kwinClient: AbstractClient) => {
+    manager.connect(workspace.clientUnminimized, (kwinClient: KwinClient) => {
         world.do((clientManager, desktopManager) => {
             clientManager.unminimizeClient(kwinClient);
         });
     });
 
-    manager.connect(workspace.clientMaximizeSet, (kwinClient: AbstractClient, horizontally: boolean, vertically: boolean) => {
+    manager.connect(workspace.clientMaximizeSet, (kwinClient: KwinClient, horizontally: boolean, vertically: boolean) => {
         if ((horizontally || vertically) && kwinClient.tile !== null) {
             kwinClient.tile = null;
         }
-        world.doIfTiled(kwinClient, false, (world, desktopManager, window, column, grid) => {
+        world.doIfTiled(kwinClient, false, (clientManager, desktopManager, window, column, grid) => {
             window.onMaximizedChanged(horizontally, vertically);
         });
     });
 
-    manager.connect(workspace.clientActivated, (kwinClient: AbstractClient) => {
+    manager.connect(workspace.clientActivated, (kwinClient: KwinClient) => {
         if (kwinClient === null) {
             return;
         }

src/world/ClientManager.ts

@@ -1,13 +1,17 @@
 class ClientManager {
     private readonly world: World;
+    private readonly config: ClientManager.Config;
     private readonly desktopManager: DesktopManager;
-    private readonly clientMap: Map<AbstractClient, ClientWrapper>;
-    private lastFocusedClient: AbstractClient|null;
+    private readonly pinManager: PinManager;
+    private readonly clientMap: Map<KwinClient, ClientWrapper>;
+    private lastFocusedClient: KwinClient|null;
     private readonly windowRuleEnforcer: WindowRuleEnforcer;
 
-    constructor(config: Config, world: World, desktopManager: DesktopManager) {
+    constructor(config: Config, world: World, desktopManager: DesktopManager, pinManager: PinManager) {
         this.world = world;
+        this.config = { keepAbove: config.floatingKeepAbove };
         this.desktopManager = desktopManager;
+        this.pinManager = pinManager;
         this.clientMap = new Map();
         this.lastFocusedClient = null;
 
@@ -21,25 +25,29 @@ class ClientManager {
         this.windowRuleEnforcer = new WindowRuleEnforcer(parsedWindowRules);
     }
 
-    public addClient(kwinClient: TopLevel) {
+    public addClient(kwinClient: KwinClient) {
         console.assert(!this.hasClient(kwinClient));
+
+        let constructState: (client: ClientWrapper) => ClientState.State;
+        if (kwinClient.dock) {
+            constructState = () => new ClientState.Docked(this.world, kwinClient);
+        } else if (this.windowRuleEnforcer.shouldTile(kwinClient)) {
+            const grid = this.desktopManager.getDesktopForClient(kwinClient).grid;
+            constructState = (client: ClientWrapper) => new ClientState.Tiled(this.world, client, grid);
+        } else {
+            constructState = (client: ClientWrapper) => new ClientState.Floating(this.world, client, this.config, false);
+        }
+
         const client = new ClientWrapper(
             kwinClient,
-            new ClientState.Floating(null),
+            constructState,
             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) {
+    public removeClient(kwinClient: KwinClient, passFocus: boolean) {
         console.assert(this.hasClient(kwinClient));
         const client = this.clientMap.get(kwinClient);
         if (client === undefined) {
@@ -49,7 +57,7 @@ class ClientManager {
         this.clientMap.delete(kwinClient);
     }
 
-    private findTransientFor(kwinClient: AbstractClient) {
+    private findTransientFor(kwinClient: KwinClient) {
         if (!kwinClient.transient) {
             return null;
         }
@@ -62,7 +70,7 @@ class ClientManager {
         return transientFor;
     }
 
-    public minimizeClient(kwinClient: AbstractClient) {
+    public minimizeClient(kwinClient: KwinClient) {
         const client = this.clientMap.get(kwinClient);
         if (client === undefined) {
             return;
@@ -72,18 +80,18 @@ class ClientManager {
         }
     }
 
-    public unminimizeClient(kwinClient: AbstractClient) {
+    public unminimizeClient(kwinClient: KwinClient) {
         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;
+            const grid = this.desktopManager.getDesktopForClient(kwinClient).grid;
             client.stateManager.setState(() => new ClientState.Tiled(this.world, client, grid), false);
         }
     }
 
-    public tileClient(kwinClient: AbstractClient) {
+    public tileClient(kwinClient: KwinClient) {
         const client = this.clientMap.get(kwinClient);
         if (client === undefined) {
             return;
@@ -91,41 +99,66 @@ class ClientManager {
         if (client.stateManager.getState() instanceof ClientState.Tiled) {
             return;
         }
-        const grid = this.desktopManager.getDesktopForClient(client.kwinClient).grid;
+        const grid = this.desktopManager.getDesktopForClient(kwinClient).grid;
         client.stateManager.setState(() => new ClientState.Tiled(this.world, client, grid), false);
     }
 
-    public untileClient(kwinClient: AbstractClient) {
+    public untileClient(kwinClient: KwinClient) {
         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);
+            client.stateManager.setState(() => new ClientState.Floating(this.world, client, this.config, true), false);
         }
     }
 
-    public toggleFloatingClient(kwinClient: TopLevel) {
+    public pinClient(kwinClient: KwinClient) {
+        const client = this.clientMap.get(kwinClient);
+        if (client === undefined) {
+            return;
+        }
+        client.stateManager.setState(() => new ClientState.Pinned(this.world, this.pinManager, this.desktopManager, kwinClient, this.config), false);
+        this.pinManager.addClient(kwinClient);
+        for (const desktop of this.desktopManager.getDesktopsForClient(kwinClient)) {
+            desktop.onPinsChanged();
+        }
+    }
+
+    public unpinClient(kwinClient: KwinClient) {
+        const client = this.clientMap.get(kwinClient);
+        if (client === undefined) {
+            return;
+        }
+        console.assert(client.stateManager.getState() instanceof ClientState.Pinned);
+        client.stateManager.setState(() => new ClientState.Floating(this.world, client, this.config, false), false);
+        this.pinManager.removeClient(kwinClient);
+        for (const desktop of this.desktopManager.getDesktopsForClient(kwinClient)) {
+            desktop.onPinsChanged();
+        }
+    }
+
+    public toggleFloatingClient(kwinClient: KwinClient) {
         const client = this.clientMap.get(kwinClient);
         if (client === undefined) {
             return;
         }
 
         const clientState = client.stateManager.getState();
-        if (clientState instanceof ClientState.Floating && Clients.canTileEver(kwinClient)) {
+        if ((clientState instanceof ClientState.Floating || clientState instanceof ClientState.Pinned) && Clients.canTileEver(kwinClient)) {
             Clients.makeTileable(kwinClient);
-            const grid = this.desktopManager.getDesktopForClient(client.kwinClient).grid;
+            const grid = this.desktopManager.getDesktopForClient(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);
+            client.stateManager.setState(() => new ClientState.Floating(this.world, client, this.config, true), false);
         }
     }
 
-    public hasClient(kwinClient: AbstractClient) {
+    public hasClient(kwinClient: KwinClient) {
         return this.clientMap.has(kwinClient);
     }
 
-    public onClientFocused(kwinClient: AbstractClient) {
+    public onClientFocused(kwinClient: KwinClient) {
         this.lastFocusedClient = kwinClient;
         const window = this.findTiledWindow(kwinClient, true);
         if (window !== null) {
@@ -133,7 +166,7 @@ class ClientManager {
         }
     }
 
-    public findTiledWindow(kwinClient: AbstractClient, followTransient: boolean) {
+    public findTiledWindow(kwinClient: KwinClient, followTransient: boolean) {
         const client = this.clientMap.get(kwinClient);
         if (client === undefined) {
             return null;
@@ -163,3 +196,9 @@ class ClientManager {
         this.removeAllClients();
     }
 }
+
+namespace ClientManager {
+    export type Config = {
+        keepAbove: boolean,
+    }
+}

src/world/ClientWrapper.ts

@@ -1,30 +1,30 @@
 class ClientWrapper {
-    public readonly kwinClient: TopLevel;
+    public readonly kwinClient: KwinClient;
     public readonly stateManager: ClientState.Manager;
     public transientFor: ClientWrapper | null;
     private readonly transients: ClientWrapper[];
-    private readonly signalManager: SignalManager;
     private readonly rulesSignalManager: SignalManager | null;
     public preferredWidth: number;
     private readonly manipulatingGeometry: Doer;
+    private lastPlacement: QmlRect | null; // workaround for issue #19
 
     constructor(
-        kwinClient: TopLevel,
-        initialState: ClientState.State,
+        kwinClient: KwinClient,
+        constructInitialState: (client: ClientWrapper) => ClientState.State,
         transientFor: ClientWrapper | null,
         rulesSignalManager: SignalManager | null,
     ) {
         this.kwinClient = kwinClient;
-        this.stateManager = new ClientState.Manager(initialState);
         this.transientFor = transientFor;
         this.transients = [];
         if (transientFor !== null) {
             transientFor.addTransient(this);
         }
-        this.signalManager = ClientWrapper.initSignalManager(this);
         this.rulesSignalManager = rulesSignalManager;
         this.preferredWidth = kwinClient.frameGeometry.width;
         this.manipulatingGeometry = new Doer();
+        this.lastPlacement = null;
+        this.stateManager = new ClientState.Manager(constructInitialState(this));
     }
 
     public place(x: number, y: number, width: number, height: number) {
@@ -33,12 +33,12 @@ class ClientWrapper {
                 // window is being manually resized, prevent fighting with the user
                 return;
             }
-            this.kwinClient.frameGeometry = Qt.rect(x, y, width, height);
+            this.lastPlacement = Qt.rect(x, y, width, height);
+            this.kwinClient.frameGeometry = this.lastPlacement;
         });
     }
 
     private moveTransient(dx: number, dy: number, desktopNumber: number) {
-        // TODO: prevent moving off the grid
         if (this.stateManager.getState() instanceof ClientState.Floating) {
             if (this.kwinClient.desktop === desktopNumber) {
                 const frame = this.kwinClient.frameGeometry;
@@ -56,6 +56,12 @@ class ClientWrapper {
         }
     }
 
+    public moveTransients(dx: number, dy: number) {
+        for (const transient of this.transients) {
+            transient.moveTransient(dx, dy, this.kwinClient.desktop);
+        }
+    }
+
     public focus() {
         workspace.activeClient = this.kwinClient;
     }
@@ -86,41 +92,13 @@ class ClientWrapper {
         return this.kwinClient.shade;
     }
 
-    public isManipulatingGeometry() {
+    public isManipulatingGeometry(newGeometry: QmlRect | null) {
+        if (newGeometry !== null && newGeometry === this.lastPlacement) {
+            return true;
+        }
         return this.manipulatingGeometry.isDoing();
     }
 
-    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);
-    }
-
-    public restoreAfterTiling(screenSize: QRect) {
-        this.kwinClient.keepBelow = false;
-        this.setShade(false);
-        this.setFullScreen(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(
-            clientRect.x,
-            clientRect.y,
-            width,
-            Math.min(clientRect.height, Math.round(placementArea.height / 2)),
-        );
-    }
-
     private addTransient(transient: ClientWrapper) {
         this.transients.push(transient);
     }
@@ -130,7 +108,7 @@ class ClientWrapper {
         this.transients.splice(i, 1);
     }
 
-    public ensureTransientsVisible(screenSize: QRect) {
+    public ensureTransientsVisible(screenSize: QmlRect) {
         for (const transient of this.transients) {
             if (transient.stateManager.getState() instanceof ClientState.Floating) {
                 transient.ensureVisible(screenSize);
@@ -139,21 +117,20 @@ class ClientWrapper {
         }
     }
 
-    public ensureVisible(screenSize: QRect) {
+    public ensureVisible(screenSize: QmlRect) {
         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;
+        if (frame.left < screenSize.left) {
+            frame.x = screenSize.left;
+        } else if (frame.right > screenSize.right) {
+            frame.x = screenSize.right - frame.width;
         }
     }
 
     public destroy(passFocus: boolean) {
         this.stateManager.destroy(passFocus);
-        this.signalManager.destroy();
         if (this.rulesSignalManager !== null) {
             this.rulesSignalManager.destroy();
         }
@@ -164,23 +141,4 @@ class ClientWrapper {
             transient.transientFor = null;
         }
     }
-
-    private static initSignalManager(client: ClientWrapper) {
-        const manager = new SignalManager();
-        manager.connect(client.kwinClient.frameGeometryChanged, (kwinClient: TopLevel, oldGeometry: QRect) => {
-            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;
-                const newCenterX = newGeometry.x + newGeometry.width/2;
-                const newCenterY = newGeometry.y + newGeometry.height/2;
-                const dx = Math.round(newCenterX - oldCenterX);
-                const dy = Math.round(newCenterY - oldCenterY);
-                for (const transient of client.transients) {
-                    transient.moveTransient(dx, dy, client.kwinClient.desktop);
-                }
-            }
-        });
-        return manager;
-    }
 }

src/world/Clients.ts

@@ -1,13 +1,13 @@
 namespace Clients {
-    export function canTileEver(kwinClient: AbstractClient) {
+    export function canTileEver(kwinClient: KwinClient) {
         return kwinClient.resizeable;
     }
 
-    export function canTileNow(kwinClient: TopLevel) {
+    export function canTileNow(kwinClient: KwinClient) {
         return canTileEver(kwinClient) && !kwinClient.minimized && kwinClient.desktop > 0 && kwinClient.activities.length === 1;
     }
 
-    export function makeTileable(kwinClient: TopLevel) {
+    export function makeTileable(kwinClient: KwinClient) {
         if (kwinClient.minimized) {
             kwinClient.minimized = false;
         }
@@ -19,13 +19,17 @@ namespace Clients {
         }
     }
 
-    export function isMaximizedGeometry(kwinClient: TopLevel) {
+    export function isMaximizedGeometry(kwinClient: KwinClient) {
         const maximizeArea = workspace.clientArea(ClientAreaOption.MaximizeArea, kwinClient.screen, kwinClient.desktop);
         return kwinClient.frameGeometry === maximizeArea;
     }
 
-    export function isFullScreenGeometry(kwinClient: TopLevel) {
+    export function isFullScreenGeometry(kwinClient: KwinClient) {
         const fullScreenArea = workspace.clientArea(ClientAreaOption.FullScreenArea, kwinClient.screen, kwinClient.desktop);
         return kwinClient.frameGeometry === fullScreenArea;
     }
+
+    export function isOnVirtualDesktop(kwinClient: KwinClient, desktopNumber: number) {
+        return kwinClient.desktop === desktopNumber || kwinClient.desktop === -1;
+    }
 }

src/world/DesktopManager.ts

@@ -1,10 +1,12 @@
 class DesktopManager {
+    private readonly pinManager: PinManager;
     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) {
+    constructor(pinManager: PinManager, config: Desktop.Config, layoutConfig: LayoutConfig, currentActivity: string) {
+        this.pinManager = pinManager;
         this.config = config;
         this.layoutConfig = layoutConfig;
         this.desktopsPerActivity = new Map();
@@ -36,8 +38,8 @@ class DesktopManager {
         return this.getDesktop(workspace.currentActivity, desktopNumber);
     }
 
-    public getDesktopForClient(kwinClient: TopLevel) {
-        console.assert(kwinClient.activities.length === 1);
+    public getDesktopForClient(kwinClient: KwinClient) {
+        console.assert(kwinClient.activities.length === 1 && kwinClient.desktop > 0);
         return this.getDesktop(kwinClient.activities[0], kwinClient.desktop);
     }
 
@@ -60,7 +62,7 @@ class DesktopManager {
         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));
+            desktops.push(new Desktop(desktopNumber, this.pinManager, this.config, this.layoutConfig));
         }
     }
 
@@ -103,4 +105,43 @@ class DesktopManager {
             }
         }
     }
+
+    public *getDesktopsForClient(kwinClient: KwinClient) {
+        const activities = kwinClient.activities.length > 0 ? kwinClient.activities : this.desktopsPerActivity.keys();
+        for (const activity of activities) {
+            if (!this.desktopsPerActivity.has(activity)) {
+                this.addActivity(activity);
+            }
+            const activityDesktops = this.desktopsPerActivity.get(activity)!;
+            if (kwinClient.desktop === -1) {
+                for (const desktop of activityDesktops) {
+                    yield desktop;
+                }
+            } else {
+                const desktopIndex = kwinClient.desktop - 1;
+                yield activityDesktops[desktopIndex];
+            }
+        }
+    }
+
+    // empty array means all
+    public *getDesktops(desktopNumbers: number[], inputActivities: string[]) {
+        const activities = inputActivities.length > 0 ? inputActivities : this.desktopsPerActivity.keys();
+        for (const activity of activities) {
+            if (!this.desktopsPerActivity.has(activity)) {
+                this.addActivity(activity);
+            }
+            const activityDesktops = this.desktopsPerActivity.get(activity)!;
+            if (desktopNumbers.length === 0) {
+                for (const desktop of activityDesktops) {
+                    yield desktop;
+                }
+            } else {
+                for (const desktopNumber of desktopNumbers) {
+                    const desktopIndex = desktopNumber - 1;
+                    yield activityDesktops[desktopIndex];
+                }
+            }
+        }
+    }
 }

src/world/PinManager.ts

@@ -0,0 +1,86 @@
+class PinManager {
+    private readonly pinnedClients: Set<KwinClient>;
+
+    constructor() {
+        this.pinnedClients = new Set();
+    }
+
+    public addClient(kwinClient: KwinClient) {
+        this.pinnedClients.add(kwinClient);
+    }
+
+    public removeClient(kwinClient: KwinClient) {
+        this.pinnedClients.delete(kwinClient);
+    }
+
+    public getAvailableSpace(desktopNumber: number, screen: QmlRect) {
+        const baseLot = new PinManager.Lot(screen.top, screen.bottom, screen.left, screen.right);
+        let lots = [baseLot];
+        for (const client of this.pinnedClients) {
+            if (!Clients.isOnVirtualDesktop(client, desktopNumber)) {
+                continue;
+            }
+
+            const newLots: PinManager.Lot[] = [];
+            for (const lot of lots) {
+                lot.split(newLots, client.frameGeometry);
+            }
+            lots = newLots;
+        }
+
+        let largestLot = baseLot;
+        let largestArea = 0;
+        for (const lot of lots) {
+            const area = lot.area();
+            if (area > largestArea) {
+                largestArea = area;
+                largestLot = lot;
+            }
+        }
+        return largestLot;
+    }
+}
+
+namespace PinManager {
+    export class Lot {
+        private static readonly minWidth = 200;
+        private static readonly minHeight = 200;
+
+        constructor(
+            public readonly top: number,
+            public readonly bottom: number,
+            public readonly left: number,
+            public readonly right: number,
+        ) {}
+
+        public split(destLots: Lot[], obstacle: QmlRect) {
+            if (!this.contains(obstacle)) {
+                // don't split
+                destLots.push(this);
+                return;
+            }
+
+            if (obstacle.top - this.top >= Lot.minHeight) {
+                destLots.push(new Lot(this.top, obstacle.top, this.left, this.right));
+            }
+            if (this.bottom - obstacle.bottom >= Lot.minHeight) {
+                destLots.push(new Lot(obstacle.bottom, this.bottom, this.left, this.right));
+            }
+            if (obstacle.left - this.left >= Lot.minWidth) {
+                destLots.push(new Lot(this.top, this.bottom, this.left, obstacle.left));
+            }
+            if (this.right - obstacle.right >= Lot.minWidth) {
+                destLots.push(new Lot(this.top, this.bottom, obstacle.right, this.right));
+            }
+        }
+
+        private contains(obstacle: QmlRect) {
+            return obstacle.right > this.left && obstacle.left < this.right &&
+                obstacle.bottom > this.top && obstacle.top < this.bottom;
+        }
+
+        public area() {
+            return (this.bottom - this.top) * (this.right - this.left);
+        }
+    }
+}

src/world/World.ts

@@ -2,6 +2,7 @@ class World {
     public readonly untileOnDrag: boolean;
     private readonly desktopManager: DesktopManager;
     public readonly clientManager: ClientManager;
+    private readonly pinManager: PinManager;
     private readonly workspaceSignalManager: SignalManager;
     private readonly screenResizedDelayer: Delayer;
 
@@ -18,18 +19,36 @@ class World {
             this.update();
         });
 
+        this.pinManager = new PinManager();
+
+        const layoutConfig = {
+            gapsInnerHorizontal: config.gapsInnerHorizontal,
+            gapsInnerVertical: config.gapsInnerVertical,
+            offScreenOpacity: config.offScreenOpacity / 100.0,
+            stackColumnsByDefault: config.stackColumnsByDefault,
+            resizeNeighborColumn: config.resizeNeighborColumn,
+            reMaximize: config.reMaximize,
+            skipSwitcher: config.skipSwitcher,
+            tiledKeepBelow: config.tiledKeepBelow,
+            maximizedKeepAbove: config.floatingKeepAbove,
+        };
+
         this.desktopManager = new DesktopManager(
+            this.pinManager,
             {
                 marginTop: config.gapsOuterTop,
                 marginBottom: config.gapsOuterBottom,
                 marginLeft: config.gapsOuterLeft,
                 marginRight: config.gapsOuterRight,
-                overscroll: config.overscroll,
+                scroller: config.scrollingLazy ? new ScrollerLazy() :
+                    config.scrollingCentered ? new ScrollerCentered() :
+                    config.scrollingGrouped ? new ScrollerGrouped() :
+                    console.assert(false),
             },
-            config,
+            layoutConfig,
             workspace.currentActivity,
         );
-        this.clientManager = new ClientManager(config, this, this.desktopManager);
+        this.clientManager = new ClientManager(config, this, this.desktopManager, this.pinManager);
         this.addExistingClients();
         this.update();
     }
@@ -56,7 +75,7 @@ class World {
     }
 
     public doIfTiled(
-        kwinClient: AbstractClient,
+        kwinClient: KwinClient,
         followTransient: boolean,
         f: (clientManager: ClientManager, desktopManager: DesktopManager, window: Window, column: Column, grid: Grid) => void,
     ) {

src/world/clientState/Docked.ts

@@ -3,7 +3,7 @@ namespace ClientState {
         private readonly world: World;
         private readonly signalManager: SignalManager;
 
-        constructor(world: World, kwinClient: TopLevel) {
+        constructor(world: World, kwinClient: KwinClient) {
             this.world = world;
             this.signalManager = Docked.initSignalManager(world, kwinClient);
             world.onScreenResized();
@@ -14,9 +14,9 @@ namespace ClientState {
             this.world.onScreenResized();
         }
 
-        private static initSignalManager(world: World, kwinClient: TopLevel) {
+        private static initSignalManager(world: World, kwinClient: KwinClient) {
             const manager = new SignalManager();
-            manager.connect(kwinClient.frameGeometryChanged, (kwinClient: TopLevel, oldGeometry: QRect) => {
+            manager.connect(kwinClient.frameGeometryChanged, (kwinClient: KwinClient, oldGeometry: QmlRect) => {
                 world.onScreenResized();
             });
             return manager;

src/world/clientState/Floating.ts

@@ -1,11 +1,62 @@
 namespace ClientState {
     export class Floating implements State {
-        constructor(client: ClientWrapper | null) {
-            if (client !== null && client.kwinClient.tile === null) {
-                client.prepareForFloating();
+        private readonly client: ClientWrapper;
+        private readonly config: ClientManager.Config;
+        private readonly signalManager: SignalManager;
+
+        constructor(world: World, client: ClientWrapper, config: ClientManager.Config, limitHeight: boolean) {
+            this.client = client;
+            this.config = config;
+            if (config.keepAbove) {
+                client.kwinClient.keepAbove = true;
+            }
+            if (limitHeight && client.kwinClient.tile === null) {
+                Floating.limitHeight(client);
+            }
+            this.signalManager = Floating.initSignalManager(world, client.kwinClient);
+        }
+
+        public destroy(passFocus: boolean) {
+            this.signalManager.destroy();
+            if (this.config.keepAbove) {
+                this.client.kwinClient.keepAbove = false;
             }
         }
 
-        public destroy(passFocus: boolean) {}
+        private static limitHeight(client: ClientWrapper) {
+            const placementArea = workspace.clientArea(ClientAreaOption.PlacementArea, client.kwinClient.screen, client.kwinClient.desktop);
+            const clientRect = client.kwinClient.frameGeometry;
+            const width = client.preferredWidth;
+            client.place(
+                clientRect.x,
+                clientRect.y,
+                width,
+                Math.min(clientRect.height, Math.round(placementArea.height / 2)),
+            );
+        }
+
+        private static initSignalManager(world: World, kwinClient: KwinClient) {
+            const manager = new SignalManager();
+
+            manager.connect(kwinClient.tileChanged, () => {
+                // on X11, this fires after `frameGeometryChanged`
+                if (kwinClient.tile !== null) {
+                    world.do((clientManager, desktopManager) => {
+                        clientManager.pinClient(kwinClient);
+                    });
+                }
+            });
+            
+            manager.connect(kwinClient.frameGeometryChanged, () => {
+                // on Wayland, this fires after `tileChanged`
+                if (kwinClient.tile !== null) {
+                    world.do((clientManager, desktopManager) => {
+                        clientManager.pinClient(kwinClient);
+                    });
+                }
+            })
+
+            return manager;
+        }
     }
 }

src/world/clientState/Manager.ts

@@ -21,6 +21,6 @@ namespace ClientState {
     }
 
     export type State = {
-        destroy(passFocus: boolean): void;
+        destroy(passFocus: boolean): void,
     };
 }

src/world/clientState/Pinned.ts

@@ -0,0 +1,87 @@
+namespace ClientState {
+    export class Pinned implements State {
+        private readonly kwinClient: KwinClient;
+        private readonly pinManager: PinManager;
+        private readonly desktopManager: DesktopManager;
+        private readonly config: ClientManager.Config;
+        private readonly signalManager: SignalManager;
+
+        constructor(world: World, pinManager: PinManager, desktopManager: DesktopManager, kwinClient: KwinClient, config: ClientManager.Config) {
+            this.kwinClient = kwinClient;
+            this.pinManager = pinManager;
+            this.desktopManager = desktopManager;
+            this.config = config;
+            if (config.keepAbove) {
+                kwinClient.keepAbove = true;
+            }
+            this.signalManager = Pinned.initSignalManager(world, pinManager, kwinClient);
+        }
+
+        public destroy(passFocus: boolean) {
+            this.signalManager.destroy();
+            if (this.config.keepAbove) {
+                this.kwinClient.keepAbove = true;
+            }
+            this.pinManager.removeClient(this.kwinClient);
+            for (const desktop of this.desktopManager.getDesktopsForClient(this.kwinClient)) {
+                desktop.onPinsChanged();
+            }
+        }
+
+        private static initSignalManager(world: World, pinManager: PinManager, kwinClient: KwinClient) {
+            const manager = new SignalManager();
+            let oldDesktopNumber = kwinClient.desktop;
+            let oldActivities = kwinClient.activities;
+
+            manager.connect(kwinClient.tileChanged, () => {
+                if (kwinClient.tile === null) {
+                    world.do((clientManager, desktopManager) => {
+                        clientManager.unpinClient(kwinClient);
+                    });
+                }
+            });
+
+            manager.connect(kwinClient.frameGeometryChanged, (kwinClient: KwinClient, oldGeometry: QmlRect) => {
+                if (kwinClient.tile === null) {
+                    world.do((clientManager, desktopManager) => {
+                        clientManager.unpinClient(kwinClient);
+                    });
+                    return;
+                }
+
+                world.do((clientManager, desktopManager) => {
+                    for (const desktop of desktopManager.getDesktopsForClient(kwinClient)) {
+                        desktop.onPinsChanged();
+                    }
+                })
+            });
+
+            manager.connect(kwinClient.desktopChanged, () => {
+                const changedDesktops = oldDesktopNumber === -1 || kwinClient.desktop === -1 ?
+                    [] :
+                    [oldDesktopNumber, kwinClient.desktop];
+                world.do((clientManager, desktopManager) => {
+                    for (const desktop of desktopManager.getDesktops(changedDesktops, kwinClient.activities)) {
+                        desktop.onPinsChanged();
+                    }
+                });
+                oldDesktopNumber = kwinClient.desktop;
+            });
+
+            manager.connect(kwinClient.activitiesChanged, (kwinClient: KwinClient) => {
+                const desktops = kwinClient.desktop === -1 ? [] : [kwinClient.desktop];
+                const changedActivities = oldActivities.length === 0 || kwinClient.activities.length === 0 ?
+                    [] :
+                    union(oldActivities, kwinClient.activities);
+                world.do((clientManager, desktopManager) => {
+                    for (const desktop of desktopManager.getDesktops(desktops, changedActivities)) {
+                        desktop.onPinsChanged();
+                    }
+                });
+                oldActivities = kwinClient.activities;
+            });
+
+            return manager;
+        }
+    }
+}

src/world/clientState/Tiled.ts

@@ -1,10 +1,12 @@
 namespace ClientState {
     export class Tiled implements State {
         public readonly window: Window;
+        private readonly defaultState: Tiled.WindowState;
         private readonly signalManager: SignalManager;
 
         constructor(world: World, client: ClientWrapper, grid: Grid) {
-            client.prepareForTiling();
+            this.defaultState = { skipSwitcher: client.kwinClient.skipSwitcher };
+            Tiled.prepareClientForTiling(client, grid.config);
 
             const column = new Column(grid, grid.getLastFocusedColumn() ?? grid.getLastColumn());
             const window = new Window(client, column);
@@ -21,7 +23,7 @@ namespace ClientState {
             const client = window.client;
             window.destroy(passFocus);
 
-            client.restoreAfterTiling(grid.desktop.clientArea);
+            Tiled.restoreClientAfterTiling(client, grid.config, this.defaultState, grid.desktop.clientArea);
         }
 
         private static initSignalManager(world: World, window: Window) {
@@ -40,7 +42,7 @@ namespace ClientState {
                 });
             });
 
-            manager.connect(kwinClient.activitiesChanged, (kwinClient: AbstractClient) => {
+            manager.connect(kwinClient.activitiesChanged, () => {
                 world.do((clientManager, desktopManager) => {
                     if (kwinClient.activities.length !== 1) {
                         // windows on multiple activities are not supported
@@ -54,8 +56,10 @@ namespace ClientState {
             let lastResize = false;
             manager.connect(kwinClient.moveResizedChanged, () => {
                 world.do((clientManager, desktopManager) => {
-                    if (world.untileOnDrag && kwinClient.move) {
-                        clientManager.untileClient(kwinClient);
+                    if (kwinClient.move) {
+                        if (world.untileOnDrag) {
+                            clientManager.untileClient(kwinClient);
+                        }
                         return;
                     }
 
@@ -79,25 +83,47 @@ namespace ClientState {
                 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.frameGeometryChanged, (kwinClient: KwinClient, oldGeometry: QmlRect) => {
+                // on Wayland, this fires after `tileChanged`
+                if (kwinClient.tile !== null) {
+                    world.do((clientManager, desktopManager) => {
+                        clientManager.pinClient(kwinClient);
+                    });
+                    return;
+                }
+
+                const newGeometry = client.kwinClient.frameGeometry;
+                const oldCenterX = oldGeometry.x + oldGeometry.width/2;
+                const oldCenterY = oldGeometry.y + oldGeometry.height/2;
+                const newCenterX = newGeometry.x + newGeometry.width/2;
+                const newCenterY = newGeometry.y + newGeometry.height/2;
+                const dx = Math.round(newCenterX - oldCenterX);
+                const dy = Math.round(newCenterY - oldCenterY);
+                if (dx !== 0 || dy !== 0) {
+                    client.moveTransients(dx, dy);
+                }
+
+                if (kwinClient.resize) {
+                    world.do(() => window.onUserResize(oldGeometry, !cursorChangedAfterResizeStart));
+                } else if (
+                    !client.isManipulatingGeometry(newGeometry) &&
+                    !Clients.isMaximizedGeometry(kwinClient) &&
+                    !Clients.isFullScreenGeometry(kwinClient) // not using `kwinClient.fullScreen` because it may not be set yet at this point
+                ) {
+                    world.do(() => window.onFrameGeometryChanged());
+                }
             });
 
             manager.connect(kwinClient.fullScreenChanged, () => {
-                window.onFullScreenChanged(kwinClient.fullScreen);
+                world.do(() => window.onFullScreenChanged(kwinClient.fullScreen));
             });
 
-            manager.connect(kwinClient.tileChanged, (tile: Tile) => {
-                if (tile !== null) {
+            manager.connect(kwinClient.tileChanged, () => {
+                // on X11, this fires after `frameGeometryChanged`
+                if (kwinClient.tile !== null) {
                     world.do((clientManager, desktopManager) => {
-                        clientManager.untileClient(kwinClient);
-                    })
+                        clientManager.pinClient(kwinClient);
+                    });
                 }
             });
 
@@ -117,5 +143,40 @@ namespace ClientState {
             const newColumn = new Column(newGrid, newGrid.getLastFocusedColumn() ?? newGrid.getLastColumn());
             window.moveToColumn(newColumn);
         }
+
+        private static prepareClientForTiling(client: ClientWrapper, config: LayoutConfig) {
+            if (config.skipSwitcher) {
+                client.kwinClient.skipSwitcher = true;
+            }
+            if (config.tiledKeepBelow) {
+                client.kwinClient.keepBelow = true;
+            }
+            client.setFullScreen(false);
+            if (client.kwinClient.tile !== null) {
+                client.setMaximize(false, true); // disable quick tile mode
+            }
+            client.setMaximize(false, false);
+        }
+
+        private static restoreClientAfterTiling(client: ClientWrapper, config: LayoutConfig, defaultState: Tiled.WindowState, screenSize: QmlRect) {
+            if (config.skipSwitcher) {
+                client.kwinClient.skipSwitcher = defaultState.skipSwitcher;
+            }
+            if (config.tiledKeepBelow) {
+                client.kwinClient.keepBelow = false;
+            }
+            client.setShade(false);
+            client.setFullScreen(false);
+            if (client.kwinClient.tile === null) {
+                client.setMaximize(false, false);
+            }
+            client.ensureVisible(screenSize);
+        }
+    }
+
+    namespace Tiled {
+        export type WindowState = {
+            skipSwitcher: boolean,
+        }
     }
 }