From 2dea47b162d5cb659bc2b2edd7c15a9d0a144814 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sun, 28 Sep 2014 22:44:12 +0200
Subject: [PATCH] Register prompt per window

---
 qutebrowser/widgets/statusbar/prompt.py   |  2 +-
 qutebrowser/widgets/statusbar/prompter.py | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/qutebrowser/widgets/statusbar/prompt.py b/qutebrowser/widgets/statusbar/prompt.py
index c8718e760..4578ff3fc 100644
--- a/qutebrowser/widgets/statusbar/prompt.py
+++ b/qutebrowser/widgets/statusbar/prompt.py
@@ -55,7 +55,7 @@ class Prompt(QWidget):
 
     def __init__(self, win_id, parent=None):
         super().__init__(parent)
-        objreg.register('prompt', self)
+        objreg.register('prompt', self, scope='window', window=win_id)
         self._hbox = QHBoxLayout(self)
         self._hbox.setContentsMargins(0, 0, 0, 0)
         self._hbox.setSpacing(5)
diff --git a/qutebrowser/widgets/statusbar/prompter.py b/qutebrowser/widgets/statusbar/prompter.py
index 72420d3ed..2fcc632fe 100644
--- a/qutebrowser/widgets/statusbar/prompter.py
+++ b/qutebrowser/widgets/statusbar/prompter.py
@@ -89,7 +89,7 @@ class Prompter:
         """Get a PromptContext based on the current state."""
         if not self._busy:
             return None
-        prompt = objreg.get('prompt')
+        prompt = objreg.get('prompt', scope='window', window=self._win_id)
         ctx = PromptContext(question=self._question,
                             text=prompt.txt.text(),
                             input_text=prompt.lineedit.text(),
@@ -106,7 +106,7 @@ class Prompter:
         Return: True if a context was restored, False otherwise.
         """
         log.statusbar.debug("Restoring context {}".format(ctx))
-        prompt = objreg.get('prompt')
+        prompt = objreg.get('prompt', scope='window', window=self._win_id)
         if ctx is None:
             prompt.hide_prompt.emit()
             self._busy = False
@@ -127,7 +127,7 @@ class Prompter:
         Raise:
             ValueError if the set PromptMode is invalid.
         """
-        prompt = objreg.get('prompt')
+        prompt = objreg.get('prompt', scope='window', window=self._win_id)
         if self._question.mode == usertypes.PromptMode.yesno:
             if self._question.default is None:
                 suffix = ""
@@ -181,7 +181,7 @@ class Prompter:
     @pyqtSlot(usertypes.KeyMode)
     def on_mode_left(self, mode):
         """Clear and reset input when the mode was left."""
-        prompt = objreg.get('prompt')
+        prompt = objreg.get('prompt', scope='window', window=self._win_id)
         if mode in (usertypes.KeyMode.prompt, usertypes.KeyMode.yesno):
             prompt.txt.setText('')
             prompt.lineedit.clear()
@@ -202,7 +202,7 @@ class Prompter:
         This executes the next action depending on the question mode, e.g. asks
         for the password or leaves the mode.
         """
-        prompt = objreg.get('prompt')
+        prompt = objreg.get('prompt', scope='window', window=self._win_id)
         if (self._question.mode == usertypes.PromptMode.user_pwd and
                 self._question.user is None):
             # User just entered an username