New client: Minor variable renaming (make it more descriptive).

[plomrogue] / client_prototype.py

diff --git a/client_prototype.py b/client_prototype.py
index 6813207d9d737c69d060edddfa87291c2dba903e..2ed03fd645dc46c0357e97e910f6362be0a3d444 100644 (file)
--- a/client_prototype.py
+++ b/client_prototype.py
@@ -127,8 +127,8 @@ def draw_screen():
                             and x_in_screen < screen_size[1]):
                         stdscr.addch(y_in_screen, x_in_screen, cell)
         def draw_scroll_hints():
-            def draw_scroll_string(hint_number):
-                hint = ' ' + str(hint_number + 1) + ' more ' + unit + ' '
+            def draw_scroll_string(n_lines_outside):
+                hint = ' ' + str(n_lines_outside + 1) + ' more ' + unit + ' '
                 if len(hint) <= win["size"][ni]:
                     non_hint_space = win["size"][ni] - len(hint)
                     hint_offset = int(non_hint_space / 2)
@@ -136,24 +136,21 @@ def draw_screen():
                         pos_2 = win["start"][ni] + hint_offset + j
                         x, y = (pos_2, pos_1) if ni else (pos_1, pos_2)
                         stdscr.addch(y, x, hint[j], curses.A_REVERSE)
+            def draw_scroll_arrows(ar1, ar2):
+                for j in range(win["size"][ni]):
+                    pos_2 = win["start"][ni] + j
+                    x, y = (pos_2, pos_1) if ni else (pos_1, pos_2)
+                    stdscr.addch(y, x, ar1 if ni else ar2, curses.A_REVERSE)
             for i in range(2):
                 ni = int(i == 0)
                 unit = 'rows' if ni else 'columns'
                 if (offset[i] > 0):
                     pos_1 = win["start"][i]
-                    for j in range(win["size"][ni]):
-                        pos_2 = win["start"][ni] + j
-                        x, y = (pos_2, pos_1) if ni else (pos_1, pos_2)
-                        stdscr.addch(y, x, '^' if ni else '<',
-                            curses.A_REVERSE)
+                    draw_scroll_arrows('^', '<')
                     draw_scroll_string(offset[i])
                 if (size[i] > offset[i] + win["size"][i]):
                     pos_1 = win["start"][i] + win["size"][i] - 1
-                    for j in range(win["size"][ni]):
-                        pos_2 = win["start"][ni] + j
-                        x, y = (pos_2, pos_1) if ni else (pos_1, pos_2)
-                        stdscr.addch(y, x, 'v' if ni else '>',
-                            curses.A_REVERSE)
+                    draw_scroll_arrows('v', '>')
                     draw_scroll_string(size[i] - offset[i] - win["size"][i])
         for win in windows:
             offset, size, winmap = win["func"]()