track activity

Author: ragusa87

contents/code/config.ts

@@ -33,8 +33,8 @@ export class Config {
         this.logWindowProperties = readConfig('logWindowProperties', false)
         this.doShowOutline = readConfig('showOutline', true) && false
         this.rearrangeBetweenMonitors = readConfig('rearrangeBetweenMonitors', false)
-        this.doMaximizeSingleWindow = false // readConfig('maximizeSingleWindow', true)
-        this.doMaximizeWhenNoLayoutExists = false
+        this.doMaximizeSingleWindow = readConfig('maximizeSingleWindow', true)
+        this.doMaximizeWhenNoLayoutExists = false // We now use the root tile instead.
         this.doRearrangeWindows = readConfig('rearrangeWindows', true)
         this.maximizeWithPadding = readConfig('maximizeWithPadding', true)
         this.rearrangeLayout = readConfig('rearrangeLayout', false)

contents/code/engine.ts

@@ -30,6 +30,7 @@ export interface EngineInterface{
     retileOther(client: AbstractClient|null, affectedTile: Tile|null): void;
     layoutModified(output: Output): void;
     interactiveMoveResizeFinished(client: AbstractClient, cursPos: QPoint): void;
+    workspaceChanged(): void;
 }
 
 export class Engine implements EngineInterface {
@@ -41,6 +42,9 @@ export class Engine implements EngineInterface {
         this.logger = logger
     }
 
+    public workspaceChanged(): void {
+        this.handleMaximizeMinimize(workspace.activeScreen, 'workspace-changed')
+    }
     public attachClient(client: AbstractClient): void {
         const tile = this.rearrangeLayout(client.output, false)
         const affectedTile = this.doTile(client, 'attachClient', tile == null ? null :getTileCenter(tile))
@@ -151,12 +155,13 @@ export class Engine implements EngineInterface {
                 return
             }
             // Create new layouts
-            const tile = this.rearrangeLayout(client.output)
-            const affectedTile = this.doTile(client, 'unminimized', tile == null ? null :getTileCenter(tile))
-            this.retileUntiled(client.output, 'unminimized');
+            const tile = this.rearrangeLayout(client.output, client.minimized)
+            const label = client.minimized ? 'unminimized' : 'minimized'
+            const affectedTile = this.doTile(client, label, tile == null ? null :getTileCenter(tile))
+            this.retileUntiled(client.output, label);
             this.retileOther(client, affectedTile)
             if(tile === null)
-                this.handleMaximizeMinimize(client.output, 'unminimized')
+                this.handleMaximizeMinimize(client.output, label)
     }
 
     public layoutModified(output: Output): void{
@@ -190,33 +195,37 @@ export class Engine implements EngineInterface {
         return numberOfTilesToCreate
     }
     public rearrangeLayout(output: Output, isDeletion: boolean = false): Tile|null {
-        if (!this.config.getRearrangeLayout()) {
+        if (!this.config.rearrangeLayout) {
             return null;
         }
 
         const numberOfTilesToCreate = this.getNumberOfTilesToCreate(output)
+        isDeletion = isDeletion || numberOfTilesToCreate < 0
         this.doLogIf(this.config.logRearrangeLayout, LogLevel.ERROR, `rearrangeLayout: ${numberOfTilesToCreate} tile(s) to ${(numberOfTilesToCreate < 0 ? 'delete' : 'add')} on ${output.name}`)
 
         const direction: LayoutDirection = 1 // Horizontal split
         const emptyTiles = getEmptyTilesByOutput(output)
+        this.doLogIf(this.config.logRearrangeLayout, LogLevel.DEBUG, `rearrangeLayout: ${emptyTiles.length} empty tile(s)`)
 
         if(isDeletion && numberOfTilesToCreate < 0 && emptyTiles.length > 0) {
-            let candidate = emptyTiles[0]
-            for (const tile of emptyTiles) {
-                if (tile.canBeRemoved && direction == 1 && tile.absoluteGeometryInScreen.width > candidate.absoluteGeometryInScreen.width) {
-                    candidate = tile
+            for(let i = numberOfTilesToCreate; i < 0 && emptyTiles.length > 0; i++) {
+                let candidate = emptyTiles[0]
+                for (const tile of emptyTiles) {
+                    if (tile.canBeRemoved && direction == 1 && tile.absoluteGeometryInScreen.width > candidate.absoluteGeometryInScreen.width) {
+                        candidate = tile
+                    }
+                    if (tile.canBeRemoved && direction != 1 && tile.absoluteGeometryInScreen.height > candidate.absoluteGeometryInScreen.height) {
+                        candidate = tile
+                    }
                 }
-                if (tile.canBeRemoved && direction != 1 && tile.absoluteGeometryInScreen.height > candidate.absoluteGeometryInScreen.height) {
-                    candidate = tile
+                this.doLogIf(this.config.logRearrangeLayout, LogLevel.DEBUG, 'rearrangeLayout...' + `Remove empty tile ${tileToString(emptyTiles[0])}`)
+                if (!candidate.canBeRemoved) {
+                    this.logger.error(`Can not remove tile ${tileToString(candidate)}`)
+                    return null
                 }
+                emptyTiles.splice(emptyTiles.indexOf(candidate), 1)
+                candidate.remove()
             }
-            this.doLogIf(this.config.logRearrangeLayout,LogLevel.DEBUG, 'rearrangeLayout...' + `Remove one empty tile ${tileToString(emptyTiles[0])}`)
-            emptyTiles.splice(emptyTiles.indexOf(candidate), 1)
-            if(!candidate.canBeRemoved){
-                this.logger.error(`Can not remove tile ${tileToString(candidate)}`)
-                return null
-            }
-            candidate.remove()
             return null
         }
 

contents/code/extern/client.d.ts

@@ -43,8 +43,14 @@ declare interface KWinEnums{
 }
 
 declare interface VirtualDesktop{
-
+    readonly id: string
+    readonly name: string
+    readonly x11DesktopNumber: number
+    nameChanged: Signal<() => void>;
+    x11DesktopNumberChanged: Signal<() => void>;
+    aboutToBeDestroyed: Signal<() => void>;
 }
+
 declare interface Toplevel {
     readonly popupWindow: boolean;
     readonly frameGeometry: QRect;

contents/code/tiler.ts

@@ -25,6 +25,8 @@ export class Tiler{
     outputChangedHandlers: Map<AbstractClient, () => void>;
     interactiveMoveResizeSteppedHandlers: Map<AbstractClient, () => void>;
     desktopChangedHandlers: Map<AbstractClient, () => void>;
+    previousActivity: string
+    previousDesktop: VirtualDesktop
     constructor(config: Config){
         this.config = config;
         this.logger = new Console(this.config.logLevel)
@@ -35,7 +37,8 @@ export class Tiler{
         this.interactiveMoveResizeFinishedHandlers = new Map<AbstractClient, () => void>();
         this.interactiveMoveResizeSteppedHandlers = new Map<AbstractClient, () => void>();
         this.desktopChangedHandlers = new Map<AbstractClient, () => void>();
-
+        this.previousDesktop = workspace.currentDesktop
+        this.previousActivity = workspace.currentActivity
 
         this.minimizedChanged = (client: AbstractClient) => {
             this.event( `minimizedChanged: ${clientToString(client)} ${client.minimized ? 'minimized' : 'unminimized'}`)
@@ -71,6 +74,16 @@ export class Tiler{
             }
             this.event(`windowActivated: ${clientToString(client)}`)
             this.lastWindowActivated = client
+            if(this.previousDesktop.id !== workspace.currentDesktop.id){
+                this.event('workspace changed')
+                this.engine.workspaceChanged()
+            }
+            if(this.previousActivity !== workspace.currentActivity){
+                this.event('Activity changed')
+                this.engine.workspaceChanged() // TODO add event ?
+            }
+            this.previousDesktop = workspace.currentDesktop
+            this.previousActivity = workspace.currentActivity
         })
 
         // Detach old client