X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=client_prototype.py;h=b788d6da9b957b62898120dc0b5fd135a159b926;hb=b30c9a02d652e8139dd85e394272c01fa3d8ea94;hp=6813207d9d737c69d060edddfa87291c2dba903e;hpb=69d3c23f7a68cb653ee27ca9f35144b807b2fc31;p=plomrogue

diff --git a/client_prototype.py b/client_prototype.py
index 6813207..b788d6d 100644
--- 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"]()
@@ -177,8 +174,10 @@ def main(stdscr):
     while True:
         draw_screen()
         char = stdscr.getch()
-        if (char >= 0 and chr(char) == 'Q'):
-            exit()
+        if (char >= 0):
+            if chr(char) in commands:
+                commands[chr(char)]()
+
 
 def foo():
     winmap = ['.', 'o', '.', 'o', 'O', 'o', '.', 'o', '.', 'x', 'y', 'x']
@@ -187,6 +186,10 @@ def foo():
     return offset, size, winmap
 
 
+def command_quit():
+    exit()
+
+
 windows = [
     {"config": [1, 33], "func": foo},
     {"config": [-7, 33], "func": foo},
@@ -194,9 +197,10 @@ windows = [
     {"config": [4, 16], "func": foo},
     {"config": [0, -34], "func": foo}
 ]
-
+commands = {
+    "Q": command_quit
+}
 sep_size = 1  # Width of inter-window borders and title bars.
 stdscr = None
 screen_size = [0,0]
-
 curses.wrapper(main)