From f8119ae0bf1d7a4ba155f61ba2864ea44dcc6dc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Sun, 15 Jul 2018 19:35:22 +0200
Subject: [PATCH] Record overrides in the `actionIdMap`

This means we can get rid of more cases in the ugly switch in navigator.

Guard against non mutter action names, but apply the override even when we can't
get the id.

For some reason restore-shortcuts (`<Super>Escape`) returns
KeybindingsAction.NONE.

Also remove setKeybinding
---
 keybindings.js | 35 +++++++++++++++++++++++++++++++----
 navigator.js   | 15 ---------------
 2 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/keybindings.js b/keybindings.js
index 170c589..567ab25 100644
--- a/keybindings.js
+++ b/keybindings.js
@@ -268,8 +268,31 @@ function enableAction(action) {
     }
 }
 
-function setKeybinding(name, func) {
-    Main.wm.setCustomKeybindingHandler(name, Shell.ActionMode.NORMAL, func);
+function getActionId(mutterName) {
+    let id;
+    try {
+        id = Meta.prefs_get_keybinding_action(mutterName);
+    } catch (e) {
+        // This is a pretty ugly hack to extract any action id
+        // When the mutterName isn't a builtin it throws, exposing the id in the
+        // message.
+
+        // The error message starts off with the action id, so we just strip
+        // everything after that.
+        id = Number.parseInt(e.message.replace(/ .*$/, ''));
+        if (!Number.isInteger(id))
+            throw Error(`${id} is not an integer, broken hack`);
+    }
+    return id;
+}
+
+function overrideAction(mutterName, action) {
+    let id = getActionId(mutterName);
+    Main.wm.setCustomKeybindingHandler(mutterName, Shell.ActionMode.NORMAL,
+                                       action.keyHandler);
+    if (id === Meta.KeyBindingAction.NONE)
+        return;
+    actionIdMap[id] = action;
 }
 
 function resolveConflicts() {
@@ -277,7 +300,7 @@ function resolveConflicts() {
     for (let conflict of Settings.findConflicts()) {
         let {name, conflicts} = conflict;
         let action = byMutterName(name);
-        conflicts.forEach(c => setKeybinding(c, action.handler));
+        conflicts.forEach(c => overrideAction(c, action));
         overrides.push(conflict);
     }
 }
@@ -285,6 +308,8 @@ function resolveConflicts() {
 function resetConflicts() {
     let names = overrides.reduce((sum, add) => sum.concat(add.conflicts), []);
     for (let name of names) {
+        let id = getActionId(name);
+        delete actionIdMap[id];
         // Bultin mutter actions can be reset by setting their custom handler to
         // null. However gnome-shell often sets a custom handler of its own,
         // which means we most often can't rely on that
@@ -302,7 +327,9 @@ function resetConflicts() {
         case 'cycle-windows': case 'cycle-windows-backwards':
         case 'switch-applications': case 'switch-applications-backward':
         case 'switch-group': case 'switch-group-backward':
-            setKeybinding(name, Main.wm._startSwitcher.bind(Main.wm));
+            Main.wm.setCustomKeybindingHandler(
+                name, Shell.ActionMode.NORMAL,
+                Main.wm._startSwitcher.bind(Main.wm));
             break;
         case 'switch-panels': case 'switch-panels-backwards':
             Main.wm.setCustomKeybindingHandler(
diff --git a/navigator.js b/navigator.js
index 619cf32..f1402be 100644
--- a/navigator.js
+++ b/navigator.js
@@ -232,21 +232,6 @@ var PreviewedWindowNavigator = new Lang.Class({
         case Meta.KeyBindingAction.WORKSPACE_DOWN: // PageDown
             mutterActionId = Keybindings.idOf('previous-workspace');
             break;
-        case Meta.KeyBindingAction.TOGGLE_TILED_RIGHT: // Right
-            mutterActionId = Keybindings.idOf('switch-right');
-            break;
-        case Meta.KeyBindingAction.TOGGLE_TILED_LEFT: // Left
-            mutterActionId = Keybindings.idOf('switch-left');
-            break;
-        case Meta.KeyBindingAction.MAXIMIZE: // Up
-            mutterActionId = Keybindings.idOf('switch-up');
-            break;
-        case Meta.KeyBindingAction.UNMAXIMIZE: // Down
-            mutterActionId = Keybindings.idOf('switch-down');
-            break;
-        case Meta.KeyBindingAction.CLOSE:
-            mutterActionId = Keybindings.idOf('close-window');
-            break;
         }
 
         if (mutterActionId