bump version to 0.9.1

README.md

@@ -19,7 +19,7 @@ Similar window managers include [PaperWM](https://github.com/paperwm/PaperWM),
 
 ## Dependencies
 Karousel requires the following QML modules:
-- QtQuick 2.15
+- QtQuick 6.0
 - org.kde.kwin 3.0
 - org.kde.notification 1.0
 

package/contents/ui/config.ui

@@ -121,6 +121,13 @@
                                                 </property>
                                             </widget>
                                         </item>
+                                        <item>
+                                            <widget class="QRadioButton" name="kcfg_noLayering">
+                                                <property name="text">
+                                                    <string>No layering</string>
+                                                </property>
+                                            </widget>
+                                        </item>
                                     </layout>
                                 </widget>
                             </item>

package/metadata.json

@@ -9,7 +9,7 @@
             "Name": "Peter Fajdiga"
         }],
         "Id": "karousel",
-        "Version": "0.8",
+        "Version": "0.9.1",
         "License": "GPLv3",
         "Website": "https://github.com/peterfajdiga/karousel",
         "BugReportUrl": "https://github.com/peterfajdiga/karousel/issues"

src/config/definition.ts

@@ -4,43 +4,31 @@ const defaultWindowRules = `[
         "tile": false
     },
     {
-        "class": "kcalc",
+        "class": "(org\\\\.kde\\\\.)?plasmashell",
         "tile": false
     },
     {
-        "class": "org.kde.kcalc",
+        "class": "(org\\\\.kde\\\\.)?kded6",
         "tile": false
     },
     {
-        "class": "kfind",
+        "class": "(org\\\\.kde\\\\.)?kcalc",
+        "tile": false
+    },
+    {
+        "class": "(org\\\\.kde\\\\.)?kfind",
         "tile": true
     },
     {
-        "class": "org.kde.kfind",
-        "tile": true
-    },
-    {
-        "class": "kruler",
+        "class": "(org\\\\.kde\\\\.)?kruler",
         "tile": false
     },
     {
-        "class": "org.kde.kruler",
+        "class": "(org\\\\.kde\\\\.)?krunner",
         "tile": false
     },
     {
-        "class": "krunner",
-        "tile": false
-    },
-    {
-        "class": "org.kde.krunner",
-        "tile": false
-    },
-    {
-        "class": "yakuake",
-        "tile": false
-    },
-    {
-        "class": "org.kde.yakuake",
+        "class": "(org\\\\.kde\\\\.)?yakuake",
         "tile": false
     },
     {
@@ -166,6 +154,11 @@ const configDef = [
         type: "Bool",
         default: false,
     },
+    {
+        name: "noLayering",
+        type: "Bool",
+        default: false,
+    },
     {
         name: "windowRules",
         type: "String",

src/extern/kwin.d.ts

@@ -9,7 +9,7 @@ declare const Workspace: {
     readonly currentActivity: string;
     readonly activeScreen: Output;
     readonly windows: KwinClient[];
-    readonly cursorPos: QmlPoint;
+    readonly cursorPos: Readonly<QmlPoint>;
 
     activeWindow: KwinClient;
 
@@ -49,9 +49,10 @@ type Output = unknown;
 interface KwinClient {
     readonly shadeable: boolean;
     readonly caption: string;
-    readonly minSize: QmlSize;
+    readonly minSize: Readonly<QmlSize>;
     readonly transient: boolean;
     readonly transientFor: KwinClient;
+    readonly clientGeometry: Readonly<QmlRect>;
     readonly move: boolean;
     readonly resize: boolean;
     readonly moveable: boolean;
@@ -59,7 +60,7 @@ interface KwinClient {
     readonly fullScreenable: boolean;
     readonly maximizable: boolean;
     readonly output: Output;
-    readonly resourceClass: QByteArray;
+    readonly resourceClass: string;
     readonly dock: boolean;
     readonly normalWindow: boolean;
     readonly managed: boolean;
@@ -81,7 +82,6 @@ interface KwinClient {
     readonly desktopsChanged: QSignal<[]>;
     readonly activitiesChanged: QSignal<[]>;
     readonly minimizedChanged: QSignal<[]>;
-    readonly maximizedChanged: QSignal<[]>
     readonly maximizedAboutToChange: QSignal<[MaximizedMode]>
     readonly captionChanged: QSignal<[]>;
     readonly tileChanged: QSignal<[]>;

src/extern/qt.d.ts

@@ -11,8 +11,6 @@ declare const Qt: {
 
 type QmlObject = unknown;
 
-type QByteArray = string;
-
 type QmlPoint = {
     x: number;
     y: number;

src/rules/ClientMatcher.ts

@@ -1,15 +1,19 @@
 class ClientMatcher {
-    private readonly rules: Map<string, RegExp>;
+    private readonly regex: RegExp;
 
-    constructor(rules: Map<string, RegExp>) {
-        this.rules = rules;
+    constructor(regex: RegExp) {
+        this.regex = regex;
     }
 
     public matches(kwinClient: KwinClient) {
-        const rule = this.rules.get(kwinClient.resourceClass);
-        if (rule === undefined) {
-            return false;
-        }
-        return rule.test(kwinClient.caption);
+        return this.regex.test(ClientMatcher.getClientString(kwinClient));
+    }
+
+    public static getClientString(kwinClient: KwinClient) {
+        return ClientMatcher.getRuleString(kwinClient.resourceClass, kwinClient.caption);
+    }
+
+    public static getRuleString(ruleClass: string, ruleCaption: string) {
+        return ruleClass + "\0" + ruleCaption;
     }
 }

src/rules/WindowRule.ts

@@ -1,5 +1,5 @@
 type WindowRule = {
-    class: string,
-    caption: string,
+    class: string | undefined,
+    caption: string | undefined,
     tile: boolean,
 };

src/rules/WindowRuleEnforcer.ts

@@ -1,13 +1,13 @@
 class WindowRuleEnforcer {
     private readonly preferFloating: ClientMatcher;
     private readonly preferTiling: ClientMatcher;
-    private readonly followCaption: Set<string>;
+    private readonly followCaption: RegExp;
 
     constructor(windowRules: WindowRule[]) {
-        const [mapFloat, mapTile] = WindowRuleEnforcer.createWindowRuleMaps(windowRules);
-        this.preferFloating = new ClientMatcher(mapFloat);
-        this.preferTiling = new ClientMatcher(mapTile);
-        this.followCaption = new Set([...mapFloat.keys(), ...mapTile.keys()]);
+        const [floatRegex, tileRegex, followCaptionRegex] = WindowRuleEnforcer.createWindowRuleRegexes(windowRules);
+        this.preferFloating = new ClientMatcher(floatRegex);
+        this.preferTiling = new ClientMatcher(tileRegex);
+        this.followCaption = followCaptionRegex;
     }
 
     public shouldTile(kwinClient: KwinClient) {
@@ -22,7 +22,7 @@ class WindowRuleEnforcer {
     }
 
     public initClientSignalManager(world: World, kwinClient: KwinClient) {
-        if (!this.followCaption.has(kwinClient.resourceClass)) {
+        if (!this.followCaption.test(kwinClient.resourceClass)) {
             return null;
         }
 
@@ -42,46 +42,47 @@ class WindowRuleEnforcer {
         return manager;
     }
 
-    private static createWindowRuleMaps(windowRules: WindowRule[]) {
-        const mapFloat = new Map<string, string[]>();
-        const mapTile = new Map<string, string[]>();
+    private static createWindowRuleRegexes(windowRules: WindowRule[]) {
+        const floatRegexes: string[] = [];
+        const tileRegexes: string[] = [];
+        const followCaptionRegexes: 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);
+            const ruleClass = WindowRuleEnforcer.parseRegex(windowRule.class);
+            const ruleCaption = WindowRuleEnforcer.parseRegex(windowRule.caption);
+            const ruleString = ClientMatcher.getRuleString(ruleClass, ruleCaption);
+
+            (windowRule.tile ? tileRegexes : floatRegexes).push(ruleString);
+            if (ruleCaption !== ".*") {
+                followCaptionRegexes.push(ruleClass);
             }
         }
 
         return [
-            WindowRuleEnforcer.createWindowRuleRegexMap(mapFloat),
-            WindowRuleEnforcer.createWindowRuleRegexMap(mapTile),
+            WindowRuleEnforcer.joinRegexes(floatRegexes),
+            WindowRuleEnforcer.joinRegexes(tileRegexes),
+            WindowRuleEnforcer.joinRegexes(followCaptionRegexes),
         ];
     }
 
-    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));
+    private static parseRegex(rawRule: string | undefined) {
+        if (rawRule === undefined || rawRule === "" || rawRule === ".*") {
+            return ".*";
+        } else {
+            return rawRule;
         }
-        return regexMap;
     }
 
     private static joinRegexes(regexes: string[]) {
         if (regexes.length === 0) {
-            return new RegExp("");
+            return new RegExp("a^"); // match nothing
         }
 
         if (regexes.length === 1) {
-            return new RegExp("^" + regexes[0] + "$");
+            return new RegExp("^(" + regexes[0] + ")$");
         }
 
         const joinedRegexes = regexes.map(WindowRuleEnforcer.wrapParens).join("|");
-        return new RegExp("^" + joinedRegexes + "$");
+        return new RegExp("^(" + joinedRegexes + ")$");
     }
 
     private static wrapParens(str: string) {

src/world/clientState/Tiled.ts

@@ -82,8 +82,8 @@ namespace ClientState {
 
                 if (kwinClient.resize) {
                     resizing = true;
-                    resizingBorder = Workspace.cursorPos.x > kwinClient.frameGeometry.right ||
-                        Workspace.cursorPos.x < kwinClient.frameGeometry.left;
+                    resizingBorder = Workspace.cursorPos.x > kwinClient.clientGeometry.right ||
+                        Workspace.cursorPos.x < kwinClient.clientGeometry.left;
                     window.column.grid.onUserResizeStarted();
                 }
             });
@@ -174,6 +174,9 @@ namespace ClientState {
             if (config.tiledKeepBelow) {
                 client.kwinClient.keepBelow = false;
             }
+            if (config.offScreenOpacity < 1.0) {
+                client.kwinClient.opacity = 1.0;
+            }
             client.setShade(false);
             client.setFullScreen(false);
             if (client.kwinClient.tile === null) {