From dfd3b3d9c446601fa30ba94488b683a72dd25673 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sun, 5 Oct 2014 22:17:29 +0200
Subject: [PATCH] Store window registries in objreg.

---
 qutebrowser/keyinput/modeman.py   |  6 ++++--
 qutebrowser/utils/objreg.py       | 20 ++++++++------------
 qutebrowser/widgets/mainwindow.py |  8 ++++++--
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/qutebrowser/keyinput/modeman.py b/qutebrowser/keyinput/modeman.py
index cf172b8a5..350057cb7 100644
--- a/qutebrowser/keyinput/modeman.py
+++ b/qutebrowser/keyinput/modeman.py
@@ -359,8 +359,10 @@ class ModeManager(QObject):
             # We already handled this same event at some point earlier, so
             # we're not interested in it anymore.
             return False
-        if (QApplication.instance().activeWindow() not in
-                objreg.window_registry.values()):
+        win = QApplication.instance().activeWindow()
+        if win is None:
+            return False
+        if win.objectName() != 'MainWindow':
             # Some other window (print dialog, etc.) is focused so we pass
             # the event through.
             return False
diff --git a/qutebrowser/utils/objreg.py b/qutebrowser/utils/objreg.py
index 205530e1f..b0f99f129 100644
--- a/qutebrowser/utils/objreg.py
+++ b/qutebrowser/utils/objreg.py
@@ -115,22 +115,19 @@ def _get_tab_registry():
         raise RegistryUnavailableError('tab')
 
 
-def _get_window_registry(window):
+def _get_window_registry(win_id):
     """Get the registry of a window."""
-    if window is None:
-        raise TypeError("window is None with scope window!")
-    if window is 'current':
+    if win_id is None:
+        raise TypeError("win_id is None with scope window!")
+    if win_id == 'current':
         app = get('app')
         win = app.activeWindow()
         if win is None:
             raise RegistryUnavailableError('window')
-    else:
-        try:
-            win = window_registry[window]
-        except KeyError:
-            raise RegistryUnavailableError('window')
+        else:
+            win_id = win.win_id
     try:
-        return win.registry
+        return window_registry[win_id]
     except AttributeError:
         raise RegistryUnavailableError('window')
 
@@ -199,8 +196,7 @@ def dump_objects():
     blocks = []
     lines = []
     blocks.append(('global', global_registry.dump_objects()))
-    for win_id in window_registry:
-        registry = _get_registry('window', window=win_id)
+    for win_id, registry in window_registry.items():
         blocks.append(('window-{}'.format(win_id), registry.dump_objects()))
     # FIXME: Add tab registries
     for name, data in sorted(blocks, key=lambda e: e[0]):
diff --git a/qutebrowser/widgets/mainwindow.py b/qutebrowser/widgets/mainwindow.py
index 76f2e5529..0a0bb6081 100644
--- a/qutebrowser/widgets/mainwindow.py
+++ b/qutebrowser/widgets/mainwindow.py
@@ -72,11 +72,15 @@ class MainWindow(QWidget):
 
     def __init__(self, win_id, parent=None):
         super().__init__(parent)
+        # Note the objectname is used in the event filter to filter keypresses
+        # not intended for the mainwindow. If this is changed, the event filter
+        # needs to be changed as well!
+        self.setObjectName('MainWindow')
         self.setAttribute(Qt.WA_DeleteOnClose)
         self._commandrunner = None
         self.win_id = win_id
-        self.registry = objreg.ObjectRegistry()
-        objreg.window_registry[win_id] = self
+        registry = objreg.ObjectRegistry()
+        objreg.window_registry[win_id] = registry
         objreg.register('main-window', self, scope='window', window=win_id)
 
         message_bridge = message.MessageBridge(self)