Remove curtsies fill_terminal option

thomasballinger · thomasballinger · commit 9d487336bf9b · 2014-10-15T00:05:36.000-04:00
At some point I thought character-perfect matching
of bpython.cli was important, but if folks want that UI, use cli!
diff --git a/bpython/config.py b/bpython/config.py
@@ -89,7 +89,6 @@ def loadini(struct, configfile):
         },
         'curtsies': {
             'list_above' : False,
-            'fill_terminal' : False,
             'right_arrow_completion' : True,
         }})
     if not config.read(config_path):
@@ -157,7 +156,6 @@ def loadini(struct, configfile):
     struct.save_append_py = config.getboolean('general', 'save_append_py')
 
     struct.curtsies_list_above = config.getboolean('curtsies', 'list_above')
-    struct.curtsies_fill_terminal = config.getboolean('curtsies', 'fill_terminal')
     struct.curtsies_right_arrow_completion = config.getboolean('curtsies', 'right_arrow_completion')
 
     color_scheme_name = config.get('general', 'color_scheme')
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -272,12 +272,7 @@ def smarter_request_reload(desc):
         self.get_term_hw = get_term_hw
         self.get_cursor_vertical_diff = get_cursor_vertical_diff
 
-        self.status_bar = StatusBar(
-            (_(" <%s> Rewind  <%s> Save  <%s> Pastebin <%s> Editor")
-             % (config.undo_key, config.save_key, config.pastebin_key, config.external_editor_key)
-             if config.curtsies_fill_terminal else ''),
-            refresh_request=self.request_refresh
-            )
+        self.status_bar = StatusBar('', refresh_request=self.request_refresh)
         self.edit_keys = edit_keys.mapping_with_config(config, key_dispatch)
         logger.debug("starting parent init")
         super(Repl, self).__init__(interp, config)
@@ -1009,18 +1004,15 @@ def paint(self, about_to_exit=False, user_quit=False):
             self.clean_up_current_line_for_exit() # exception to not changing state!
 
         width, min_height = self.width, self.height
-        show_status_bar = bool(self.status_bar.should_show_message) or (self.config.curtsies_fill_terminal or self.status_bar.has_focus)
+        show_status_bar = bool(self.status_bar.should_show_message) or self.status_bar.has_focus
         if show_status_bar:
             min_height -= 1
 
         current_line_start_row = len(self.lines_for_display) - max(0, self.scroll_offset)
         #current_line_start_row = len(self.lines_for_display) - self.scroll_offset
         if self.request_paint_to_clear_screen: # or show_status_bar and about_to_exit ?
             self.request_paint_to_clear_screen = False
-            if self.config.curtsies_fill_terminal: #TODO clean up this logic - really necessary check?
-                arr = FSArray(self.height - 1 + current_line_start_row, width)
-            else:
-                arr = FSArray(self.height + current_line_start_row, width)
+            arr = FSArray(min_height + current_line_start_row, width)
         else:
             arr = FSArray(0, width)
         #TODO test case of current line filling up the whole screen (there aren't enough rows to show it)
@@ -1106,23 +1098,11 @@ def paint(self, about_to_exit=False, user_quit=False):
 
         logger.debug('about to exit: %r', about_to_exit)
         if show_status_bar:
-            if self.config.curtsies_fill_terminal:
-                if about_to_exit:
-                    arr[max(arr.height, min_height), :] = FSArray(1, width)
-                else:
-                    arr[max(arr.height, min_height), :] = paint.paint_statusbar(1, width, self.status_bar.current_line, self.config)
-
-                    if self.presentation_mode:
-                        rows = arr.height
-                        columns = arr.width
-                        last_key_box = paint.paint_last_events(rows, columns, [events.pp_event(x) for x in self.last_events if x])
-                        arr[arr.height-last_key_box.height:arr.height, arr.width-last_key_box.width:arr.width] = last_key_box
+            statusbar_row = min_height + 1 if arr.height == min_height else arr.height
+            if about_to_exit:
+                arr[statusbar_row, :] = FSArray(1, width)
             else:
-                statusbar_row = min_height + 1 if arr.height == min_height else arr.height
-                if about_to_exit:
-                    arr[statusbar_row, :] = FSArray(1, width)
-                else:
-                    arr[statusbar_row, :] = paint.paint_statusbar(1, width, self.status_bar.current_line, self.config)
+                arr[statusbar_row, :] = paint.paint_statusbar(1, width, self.status_bar.current_line, self.config)
 
         if self.config.color_scheme['background'] not in ('d', 'D'):
             for r in range(arr.height):
diff --git a/doc/sphinx/source/configuration-options.rst b/doc/sphinx/source/configuration-options.rst
@@ -290,13 +290,6 @@ This refers to the ``[curtsies]`` section in your config file.
 
 .. versionadded:: 0.13
 
-fill_terminal
-^^^^^^^^^^^^^
-Default: False
-
-Whether bpython should clear the screen on start, and always display a status
-bar at the bottom.
-
 list_above
 ^^^^^^^^^^
 Default: False
