fix display of keyboard events

thomasballinger · thomasballinger · commit bace6210a4a0 · 2015-01-24T13:38:25.000-05:00
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -1154,6 +1154,12 @@ def move_screen_up(current_line_start_row):
             else:
                 arr[statusbar_row, :] = 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], self.config)
+            arr[arr.height-last_key_box.height:arr.height, arr.width-last_key_box.width:arr.width] = last_key_box
+
         if self.config.color_scheme['background'] not in ('d', 'D'):
             for r in range(arr.height):
                 arr[r] = fmtstr(arr[r], bg=color_for_letter(self.config.color_scheme['background']))
diff --git a/bpython/curtsiesfrontend/replpainter.py b/bpython/curtsiesfrontend/replpainter.py
@@ -177,8 +177,8 @@ def paint_last_events(rows, columns, names, config):
         return fsarray([])
     width = min(max(len(name) for name in names), columns-2)
     output_lines = []
-    output_lines.append(config.left_top_corner+config.top_border*(width+2)+config.right_top_corner)
-    for name in names[-(rows-2):]:
+    output_lines.append(config.left_top_corner+config.top_border*(width)+config.right_top_corner)
+    for name in names[max(0, len(names)-(rows-2)):]:
         output_lines.append(config.left_border+name[:width].center(width)+config.right_border)
     output_lines.append(config.left_bottom_corner+config.bottom_border*width+config.right_bottom_corner)
     return fsarray(output_lines)
diff --git a/bpython/test/test_curtsies_painting.py b/bpython/test/test_curtsies_painting.py
@@ -93,12 +93,18 @@ def foo(x, y, z=10):
 
     def test_formatted_docstring(self):
         actual = replpainter.formatted_docstring(
-                'Returns the results\n\n' 'Also has side effects',
-                40, config=setup_config())
+            'Returns the results\n\n' 'Also has side effects',
+            40, config=setup_config())
         expected = fsarray(['Returns the results', '', 'Also has side effects'])
         self.assertFSArraysEqualIgnoringFormatting(actual, expected)
 
-
+    def test_paint_lasts_events(self):
+        actual = replpainter.paint_last_events(4, 100, ['a', 'b', 'c'], config=setup_config())
+        expected = fsarray(["┌─┐",
+                            "│b│",
+                            "│c│",
+                            "└─┘"])
+        self.assertFSArraysEqualIgnoringFormatting(actual, expected)
 
 @contextmanager
 def output_to_repl(repl):
