Using the focus_stack from BufferMapping. (Change in prompt_toolkit.)

Author: jonathanslenders

ptpython/history_browser.py

@@ -468,10 +468,10 @@ def _(event):
     def _(event):
         " Select other window. "
         if event.cli.current_buffer_name == HISTORY_BUFFER:
-            event.cli.focus_stack.replace(DEFAULT_BUFFER)
+            event.cli.focus(DEFAULT_BUFFER)
 
         elif event.cli.current_buffer_name == DEFAULT_BUFFER:
-            event.cli.focus_stack.replace(HISTORY_BUFFER)
+            event.cli.focus(HISTORY_BUFFER)
 
     @handle(Keys.F4)
     def _(event):
@@ -481,18 +481,18 @@ def _(event):
     @handle(Keys.F1)
     def _(event):
         " Display/hide help. "
-        if event.cli.focus_stack.current == HELP_BUFFER:
-            event.cli.focus_stack.pop()
+        if event.cli.current_buffer_name == HELP_BUFFER:
+            event.cli.pop_focus()
         else:
-            event.cli.focus_stack.push(HELP_BUFFER)
+            event.cli.push_focus(HELP_BUFFER)
 
     @handle(Keys.ControlJ, filter=help_focussed)
     @handle(Keys.ControlC, filter=help_focussed)
     @handle(Keys.ControlG, filter=help_focussed)
     @handle(Keys.Escape, filter=help_focussed)
     def _(event):
         " Leave help. "
-        event.cli.focus_stack.pop()
+        event.cli.pop_focus()
 
     @handle('q', filter=main_buffer_focussed)
     @handle(Keys.F3, filter=main_buffer_focussed)

ptpython/layout.py

@@ -303,7 +303,7 @@ def get_tokens(cli):
                                 len(python_buffer._working_lines))))
 
         # Shortcuts.
-        if not python_input.vi_mode and cli.focus_stack.current == 'search':
+        if not python_input.vi_mode and cli.current_buffer_name == SEARCH_BUFFER:
             append((TB, '[Ctrl-G] Cancel search [Enter] Go to this position.'))
         elif bool(cli.current_buffer.selection_state) and not python_input.vi_mode:
             # Emacs cut/copy keys.

ptpython/python_input.py

@@ -548,7 +548,7 @@ def _on_input_timeout(self, cli):
         When there is no input activity,
         in another thread, get the signature of the current code.
         """
-        if cli.focus_stack.current != DEFAULT_BUFFER:
+        if cli.current_buffer_name != DEFAULT_BUFFER:
             return
 
         # Never run multiple get-signature threads.