X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=client_prototype.py;h=6813207d9d737c69d060edddfa87291c2dba903e;hb=69d3c23f7a68cb653ee27ca9f35144b807b2fc31;hp=0a2bb0a1d58e9fe361ed9a811ecf49b41db81317;hpb=5e1997b93636a18e2a4b94ce96601170b821ffbd;p=plomrogue

diff --git a/client_prototype.py b/client_prototype.py
index 0a2bb0a..6813207 100644
--- a/client_prototype.py
+++ b/client_prototype.py
@@ -1,4 +1,5 @@
 import curses
+import signal
 
 
 def set_window_geometries():
@@ -25,8 +26,7 @@ def set_window_geometries():
         if (win_i > 0):
 
             # If not, get win's closest predecessor starting a new stack on the
-            # screen top, fit win's top left corner that predecessor's top
-            # right corner.
+            # screen top,fit win's top left to that win_top's top right corner.
             win_top = None
             for i in range(win_i - 1, -1, -1):
                 win_top = windows[i]
@@ -45,13 +45,11 @@ def set_window_geometries():
                 win["start"][0] = next_free_y
 
             # If that fails, try to fit win's top left corner to the top right
-            # corner of its closest predecessor win_test that 1) is below
-            # win_top (win's closest predecessor starting a new stack on the
-            # screen top) 2) and has enough space open to its right between its
-            # right edge and the lower edge of a window win_high located
-            # directly above win_test to fit win there (without growing further
-            # to the right than win_high does or surpassing the lower edge of
-            # the screen).
+            # corner of its closest predecessor win_test 1) below win_top (see
+            # above) 2) and with enough space open to its right between its
+            # right edge and the lower edge of a win_high located directly
+            # above win_test to fit win there (without growing further to the
+            # right than win_high does or surpassing the screen's lower edge).
             else:
                 win_test = win_prev
                 win_high = None
@@ -72,6 +70,10 @@ def set_window_geometries():
                         break
                     win_test = win_high
 
+    global screen_size, stdscr
+    curses.endwin()
+    stdscr = curses.initscr()
+    screen_size = stdscr.getmaxyx()
     for win in windows:
         set_window_size()
         place_window()
@@ -85,8 +87,8 @@ def draw_screen():
                 j = win["start"][int(k == 0)] - sep_size
                 if (j >= 0 and j < screen_size[int(k == 0)]):
                     start = win["start"][k]
+                    # start = start if start >= 0 else 0
                     end = win["start"][k] + win["size"][k]
-                    start = start if start >= 0 else 0
                     end = end if end < screen_size[k] else screen_size[k]
                     if k:
                         [stdscr.addch(j, i, '-') for i in range(start, end)]
@@ -111,8 +113,7 @@ def draw_screen():
                     stdscr.addch(down, right, '+')
 
     def draw_window_contents():
-        for win in windows:
-            offset, size, winmap = win["func"]()
+        def draw_winmap():
             stop = [0, 0]
             for i in range(2):
                 stop[i] = win["size"][i] + offset[i]
@@ -125,7 +126,41 @@ def draw_screen():
                     if (y_in_screen < screen_size[0]
                             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 + ' '
+                if len(hint) <= win["size"][ni]:
+                    non_hint_space = win["size"][ni] - len(hint)
+                    hint_offset = int(non_hint_space / 2)
+                    for j in range(win["size"][ni] - non_hint_space):
+                        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)
+            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_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_string(size[i] - offset[i] - win["size"][i])
+        for win in windows:
+            offset, size, winmap = win["func"]()
+            draw_winmap()
+            draw_scroll_hints()
 
+    stdscr.clear()
     draw_window_border_lines()
     draw_window_border_corners()
     draw_window_contents()
@@ -136,11 +171,14 @@ def main(stdscr):
     curses.noecho()
     curses.curs_set(False)
     # stdscr.keypad(True)
+    signal.signal(signal.SIGWINCH,
+        lambda ignore_1, ignore_2: set_window_geometries())
     set_window_geometries()
     while True:
         draw_screen()
-        stdscr.getch()
-
+        char = stdscr.getch()
+        if (char >= 0 and chr(char) == 'Q'):
+            exit()
 
 def foo():
     winmap = ['.', 'o', '.', 'o', 'O', 'o', '.', 'o', '.', 'x', 'y', 'x']
@@ -158,7 +196,7 @@ windows = [
 ]
 
 sep_size = 1  # Width of inter-window borders and title bars.
-stdscr = curses.initscr()
-screen_size = stdscr.getmaxyx()
+stdscr = None
+screen_size = [0,0]
 
 curses.wrapper(main)