X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=client_prototype.py;h=2340bfed6dbaf8e1b3614ee02b6cbe56026ef3a8;hb=2746c58eafa13e770bbd3447b63bca28ea9f36bc;hp=8200a5bd9226703a1efcd49667f7481f0e8fa6f8;hpb=7922809b8c20873eb360d825bd2c58d5ceee9a19;p=plomrogue

diff --git a/client_prototype.py b/client_prototype.py
index 8200a5b..2340bfe 100644
--- a/client_prototype.py
+++ b/client_prototype.py
@@ -87,7 +87,7 @@ 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
+                    # start = start if start >= 0 else 0
                     end = win["start"][k] + win["size"][k]
                     end = end if end < screen_size[k] else screen_size[k]
                     if k:
@@ -113,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]
@@ -127,19 +126,36 @@ 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)
+            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"][int(i == 0)]):
-                        pos_2 = win["start"][int(i == 0)] + j
-                        x, y = (pos_2, pos_1) if i == 0 else (pos_1, pos_2)
-                        stdscr.addch(y, x, '^' if 0 == i else '<')
+                    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"][int(i == 0)]):
-                        pos_2 = win["start"][int(i == 0)] + j
-                        x, y = (pos_2, pos_1) if i == 0 else (pos_1, pos_2)
-                        stdscr.addch(y, x, 'v' if 0 == i else '>')
+                    draw_scroll_arrows('v', '>')
+                    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()