src/keybindings: Avoid re-registering window-management mode bindings.

Entering window-management mode removed the normal bindings and
re-added the management bindings, then did the inverse on exit.
This leads to journalctl spam since we overwrite a keybinding,
and mutter logs overwrite warnings.

Register the window-management mode bindings once with it being
inactive initially (Shell.ActionMode.NONE), and later enable it
(Shell.ActionMode.NORMAL) when entering the management mode, and
then disabling on exit.

Closes: #1820
Signed-off-by: Siddh Raman Pant <25429745+siddhpant@users.noreply.github.com>

Author: siddhpant

src/extension.ts

@@ -2715,6 +2715,7 @@ export default class PopShellExtension extends Extension {
         }
 
         ext.keybindings.enable(ext.keybindings.global).enable(ext.keybindings.window_focus);
+        ext.tiler.enable_keybindings(ext);
 
         if (ext.settings.tile_by_default()) {
             ext.auto_tile_on();
@@ -2740,6 +2741,7 @@ export default class PopShellExtension extends Extension {
             layoutManager.removeChrome(ext.overlay);
 
             ext.keybindings.disable(ext.keybindings.global).disable(ext.keybindings.window_focus);
+            ext.tiler.disable_keybindings(ext);
 
             if (ext.auto_tiler) {
                 ext.auto_tiler.destroy(ext);

src/keybindings.ts

@@ -8,6 +8,8 @@ export class Keybindings {
     global: Object;
     window_focus: Object;
 
+    private active: Set<string> = new Set();
+
     private ext: Ext;
 
     constructor(ext: Ext) {
@@ -62,23 +64,43 @@ export class Keybindings {
         };
     }
 
-    enable(keybindings: any) {
+    enable(keybindings: any, modes: number = Shell.ActionMode.NORMAL) {
         for (const name in keybindings) {
+            if (this.active.has(name)) {
+                wm.allowKeybinding(name, modes);
+                continue;
+            }
+
             wm.addKeybinding(
                 name,
                 this.ext.settings.ext,
                 Meta.KeyBindingFlags.NONE,
-                Shell.ActionMode.NORMAL,
+                modes,
                 keybindings[name],
             );
+
+            this.active.add(name);
         }
 
         return this;
     }
 
     disable(keybindings: Object) {
         for (const name in keybindings) {
+            if (!this.active.has(name))
+                continue;
+
             wm.removeKeybinding(name);
+            this.active.delete(name);
+        }
+
+        return this;
+    }
+
+    allow(keybindings: Object, modes: number) {
+        for (const name in keybindings) {
+            if (this.active.has(name))
+                wm.allowKeybinding(name, modes);
         }
 
         return this;

src/tiling.ts

@@ -17,6 +17,7 @@ import { AutoTiler } from './auto_tiler.js';
 import { Fork } from './fork.js';
 
 import Meta from 'gi://Meta';
+import Shell from 'gi://Shell';
 import * as Main from 'resource:///org/gnome/shell/ui/main.js';
 const { ShellWindow } = window;
 
@@ -60,6 +61,14 @@ export class Tiler {
         };
     }
 
+    enable_keybindings(ext: Ext) {
+        ext.keybindings.enable(this.keybindings, Shell.ActionMode.NONE);
+    }
+
+    disable_keybindings(ext: Ext) {
+        ext.keybindings.disable(this.keybindings);
+    }
+
     toggle_orientation(ext: Ext) {
         const window = ext.focus_window();
         if (window && ext.auto_tiler) {
@@ -763,7 +772,9 @@ export class Tiler {
                 });
             }
 
-            ext.keybindings.disable(ext.keybindings.window_focus).enable(this.keybindings);
+            ext.keybindings
+                .allow(ext.keybindings.window_focus, Shell.ActionMode.NONE)
+                .allow(this.keybindings, Shell.ActionMode.NORMAL);
         }
     }
 
@@ -817,7 +828,9 @@ export class Tiler {
             ext.overlay.visible = false;
 
             // Disable tiling keybindings
-            ext.keybindings.disable(this.keybindings).enable(ext.keybindings.window_focus);
+            ext.keybindings
+                .allow(this.keybindings, Shell.ActionMode.NONE)
+                .allow(ext.keybindings.window_focus, Shell.ActionMode.NORMAL);
         }
     }