Merge pull request #360 from Leleat/asssert-window-exists

moveHandler: Assert window exists before operating on it

Author: Leleat

tiling-assistant@leleat-on-github/src/extension/moveHandler.js

@@ -212,52 +212,56 @@ export default class TilingMoveHandler {
     }
 
     _onMoveFinished(window) {
-        if (this._posChangedId) {
-            window.disconnect(this._posChangedId);
-            this._posChangedId = 0;
-        }
+        try {
+            window.assertExistence();
+
+            if (this._tileRect) {
+                // Ctrl-drag to replace some windows in a tile group / create a new tile group
+                // with at least 1 window being part of multiple tile groups.
+                let isCtrlReplacement = false;
+                const ctrlReplacedTileGroup = [];
+                const topTileGroup = Twm.getTopTileGroup({ skipTopWindow: true });
+                const pointerPos = { x: global.get_pointer()[0], y: global.get_pointer()[1] };
+                const twHovered = topTileGroup.some(w => w.tiledRect.containsPoint(pointerPos));
+                if (this._currPreviewMode === MoveModes.ADAPTIVE_TILING && !this._splitRects.size && twHovered) {
+                    isCtrlReplacement = true;
+                    ctrlReplacedTileGroup.push(window);
+                    topTileGroup.forEach(w => {
+                        if (!this._tileRect.containsRect(w.tiledRect))
+                            ctrlReplacedTileGroup.push(w);
+                    });
+                }
 
-        if (this._tileRect) {
-            // Ctrl-drag to replace some windows in a tile group / create a new tile group
-            // with at least 1 window being part of multiple tile groups.
-            let isCtrlReplacement = false;
-            const ctrlReplacedTileGroup = [];
-            const topTileGroup = Twm.getTopTileGroup({ skipTopWindow: true });
-            const pointerPos = { x: global.get_pointer()[0], y: global.get_pointer()[1] };
-            const twHovered = topTileGroup.some(w => w.tiledRect.containsPoint(pointerPos));
-            if (this._currPreviewMode === MoveModes.ADAPTIVE_TILING && !this._splitRects.size && twHovered) {
-                isCtrlReplacement = true;
-                ctrlReplacedTileGroup.push(window);
-                topTileGroup.forEach(w => {
-                    if (!this._tileRect.containsRect(w.tiledRect))
-                        ctrlReplacedTileGroup.push(w);
+                this._splitRects.forEach((rect, w) => Twm.tile(w, rect, { openTilingPopup: false }));
+                this._splitRects.clear();
+                Twm.tile(window, this._tileRect, {
+                    monitorNr: this._monitorNr,
+                    openTilingPopup: this._currPreviewMode !== MoveModes.ADAPTIVE_TILING,
+                    ignoreTA: this._ignoreTA
                 });
-            }
+                this._tileRect = null;
 
-            this._splitRects.forEach((rect, w) => Twm.tile(w, rect, { openTilingPopup: false }));
-            this._splitRects.clear();
-            Twm.tile(window, this._tileRect, {
-                monitorNr: this._monitorNr,
-                openTilingPopup: this._currPreviewMode !== MoveModes.ADAPTIVE_TILING,
-                ignoreTA: this._ignoreTA
-            });
-            this._tileRect = null;
+                // Create a new tile group, in which some windows are already part
+                // of a different tile group, with ctrl-(super)-drag. The window may
+                // be maximized by ctrl-super-drag.
+                isCtrlReplacement && window.isTiled && Twm.updateTileGroup(ctrlReplacedTileGroup);
+            }
+        } finally {
+            if (this._posChangedId) {
+                window.disconnect(this._posChangedId);
+                this._posChangedId = 0;
+            }
 
-            // Create a new tile group, in which some windows are already part
-            // of a different tile group, with ctrl-(super)-drag. The window may
-            // be maximized by ctrl-super-drag.
-            isCtrlReplacement && window.isTiled && Twm.updateTileGroup(ctrlReplacedTileGroup);
+            this._favoriteLayout = [];
+            this._favoritePreviews?.forEach(p => p.destroy());
+            this._favoritePreviews = [];
+            this._freeScreenRects = [];
+            this._anchorRect = null;
+            this._topTileGroup = null;
+            this._tilePreview.close();
+            this._currPreviewMode = MoveModes.ADAPTIVE_TILING;
+            this._isGrabOp = false;
         }
-
-        this._favoriteLayout = [];
-        this._favoritePreviews?.forEach(p => p.destroy());
-        this._favoritePreviews = [];
-        this._freeScreenRects = [];
-        this._anchorRect = null;
-        this._topTileGroup = null;
-        this._tilePreview.close();
-        this._currPreviewMode = MoveModes.ADAPTIVE_TILING;
-        this._isGrabOp = false;
     }
 
     // If lowPerfMode is enabled in the settings:

tiling-assistant@leleat-on-github/src/extension/tilingWindowManager.js

@@ -16,8 +16,28 @@ export class TilingWindowManager {
         // { windowId1: [windowIdX, windowIdY, ...], windowId2: [...], ... }
         this._tileGroups = new Map();
 
-        // [windowIds]
-        this._unmanagingWindows = [];
+        const assertExistenceFor = window => {
+            window.assertExistence = () => {};
+
+            window.connectObject(
+                'unmanaging',
+                () => {
+                    window.assertExistence = () => {
+                        throw new Error(
+                            'Trying to operate on an unmanaging window!'
+                        );
+                    };
+                },
+                this
+            );
+        };
+
+        global.display.list_all_windows().forEach(w => assertExistenceFor(w));
+        global.display.connectObject(
+            'window-created',
+            (_, window) => assertExistenceFor(window),
+            this
+        );
 
         global.workspace_manager.connectObject(
             'workspace-added',
@@ -36,9 +56,15 @@ export class TilingWindowManager {
         this._signals = null;
 
         global.workspace_manager.disconnectObject(this);
+        global.display.disconnectObject(this);
+
+        global.display.list_all_windows().forEach(w => {
+            w.disconnectObject(this);
+
+            delete w.assertExistence;
+        });
 
         this._tileGroups.clear();
-        this._unmanagingWindows = [];
 
         if (this._openAppTiledTimerId) {
             GLib.Source.remove(this._openAppTiledTimerId);
@@ -411,9 +437,8 @@ export class TilingWindowManager {
             const unmanagingSignal = signals.get(TilingSignals.UNMANAGING);
             unmanagingSignal && window.disconnect(unmanagingSignal);
 
-            const umId = window.connect('unmanaging', w => {
+            const umId = window.connect('unmanaging', () => {
                 this.clearTilingProps(windowId);
-                this._unmanagingWindows.push(w.get_stable_sequence());
             });
             signals.set(TilingSignals.UNMANAGING, umId);
 
@@ -1194,9 +1219,8 @@ export class TilingWindowManager {
         const unmanagingSignal = signals.get(TilingSignals.UNMANAGING);
         unmanagingSignal && window.disconnect(unmanagingSignal);
 
-        const umId = window.connect('unmanaging', w => {
+        const umId = window.connect('unmanaging', () => {
             this.clearTilingProps(window.get_id());
-            this._unmanagingWindows.push(w.get_stable_sequence());
         });
         signals.set(TilingSignals.UNMANAGING, umId);
 
@@ -1278,11 +1302,12 @@ export class TilingWindowManager {
      */
     static _onWindowWorkspaceChanged(window) {
         // Closing a window triggers a ws-changed signal, which may lead to a
-        // crash, if we try to operate on it any further. So we listen to the
-        // 'unmanaging'-signal to see, if there is a 'true  workspace change'
-        // or whether the window was just closed
-        if (this._unmanagingWindows.includes(window.get_stable_sequence()))
+        // crash, if we try to operate on it any further.
+        try {
+            window.assertExistence();
+        } catch {
             return;
+        }
 
         if (this._ignoreWsChange)
             return;